Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[7.16](backport #28080) Spelling #28819

Merged
merged 1 commit into from
Nov 8, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions auditbeat/module/file_integrity/eventreader_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ func init() {
const ErrorSharingViolation syscall.Errno = 32

func TestEventReader(t *testing.T) {
t.Skip("Flaky test: about 1/10 of bulds fails https://github.com/elastic/beats/issues/21302")
t.Skip("Flaky test: about 1/10 of builds fails https://github.com/elastic/beats/issues/21302")
// Make dir to monitor.
dir, err := ioutil.TempDir("", "audit")
if err != nil {
Expand Down Expand Up @@ -241,7 +241,7 @@ func TestEventReader(t *testing.T) {
}

func TestRaces(t *testing.T) {
t.Skip("Flaky test: about 1/20 of bulds fails https://github.com/elastic/beats/issues/21303")
t.Skip("Flaky test: about 1/20 of builds fails https://github.com/elastic/beats/issues/21303")
const (
fileMode os.FileMode = 0640
N = 100
Expand Down
2 changes: 1 addition & 1 deletion auditbeat/module/file_integrity/fileinfo_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ func fileOwner(path string) (sid, owner string, err error) {
}
defer syscall.LocalFree((syscall.Handle)(unsafe.Pointer(securityDescriptor)))

// Covert SID to a string and lookup the username.
// Convert SID to a string and lookup the username.
var errs multierror.Errors
sid, err = securityID.String()
if err != nil {
Expand Down
6 changes: 3 additions & 3 deletions dev-tools/ecs-migration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2022,7 +2022,7 @@
- from: method
to: http.request.method
alias: false
comment: Field is used by serveral protocols.
comment: Field is used by several protocols.
beat: packetbeat

- from: path
Expand All @@ -2033,15 +2033,15 @@
- from: real_ip
to: network.forwarded_ip
alias: false
comment: Field is used by serveral protocols.
comment: Field is used by several protocols.
beat: packetbeat

## MySQL
- from: mysql.iserror
to: status
alias: false
comment: >
Status reflects whether or not an error occured. Its values are either
Status reflects whether or not an error occurred. Its values are either
OK or Error.
beat: packetbeat

Expand Down
2 changes: 1 addition & 1 deletion dev-tools/jenkins_release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ cleanup() {
trap cleanup EXIT

# This controls the defaults used the Jenkins package job. They can be
# overridden by setting them in the environement prior to running this script.
# overridden by setting them in the environment prior to running this script.
export SNAPSHOT="${SNAPSHOT:-true}"
export PLATFORMS="${PLATFORMS:-+linux/armv7 +linux/ppc64le +linux/s390x +linux/mips64}"

Expand Down
2 changes: 1 addition & 1 deletion dev-tools/mage/gotest_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ func TestGoTest_CaptureOutput(t *testing.T) {

output := buf.String()
if !re.MatchString(output) {
t.Fatalf("GoTest output missmatch:\nwant:\n%v\n\ngot:\n%v", test.want, output)
t.Fatalf("GoTest output mismatch:\nwant:\n%v\n\ngot:\n%v", test.want, output)
}
})
}
Expand Down
2 changes: 1 addition & 1 deletion dev-tools/mage/integtest.go
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ type IntegrationTester interface {
Use(dir string) (bool, error)
// HasRequirements returns an error if requirements are missing.
HasRequirements() error
// Test performs excecuting the test inside the environment.
// Test performs executing the test inside the environment.
Test(dir string, mageTarget string, env map[string]string) error
// InsideTest performs the actual test on the inside of environment.
InsideTest(test func() error) error
Expand Down
4 changes: 2 additions & 2 deletions dev-tools/mage/kubernetes/kubectl.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"github.com/magefile/mage/sh"
)

// KubectlApply applys the manifest file to the kubernetes cluster.
// KubectlApply applies the manifest file to the kubernetes cluster.
//
// KUBECONFIG must be in `env` to target a specific cluster.
func KubectlApply(env map[string]string, stdout, stderr io.Writer, filepath string) error {
Expand Down Expand Up @@ -60,7 +60,7 @@ func KubectlDelete(env map[string]string, stdout, stderr io.Writer, filepath str
return err
}

// KubectlApplyInput applys the manifest string to the kubernetes cluster.
// KubectlApplyInput applies the manifest string to the kubernetes cluster.
//
// KUBECONFIG must be in `env` to target a specific cluster.
func KubectlApplyInput(env map[string]string, stdout, stderr io.Writer, manifest string) error {
Expand Down