From 24bd87132cd341d6a8c8ef0b1169581049374f3e Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 8 Nov 2021 10:49:12 +0100 Subject: [PATCH] Fix some spelling mistakes (#28080) (#28819) (cherry picked from commit 2d173ea1c0590ee53f622782637c0e0ce169e9ac) Co-authored-by: Austin Songer --- auditbeat/module/file_integrity/eventreader_test.go | 4 ++-- auditbeat/module/file_integrity/fileinfo_windows.go | 2 +- dev-tools/ecs-migration.yml | 6 +++--- dev-tools/jenkins_release.sh | 2 +- dev-tools/mage/gotest_test.go | 2 +- dev-tools/mage/integtest.go | 2 +- dev-tools/mage/kubernetes/kubectl.go | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/auditbeat/module/file_integrity/eventreader_test.go b/auditbeat/module/file_integrity/eventreader_test.go index a00367f350ad..53db8b28c3e2 100644 --- a/auditbeat/module/file_integrity/eventreader_test.go +++ b/auditbeat/module/file_integrity/eventreader_test.go @@ -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 { @@ -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 diff --git a/auditbeat/module/file_integrity/fileinfo_windows.go b/auditbeat/module/file_integrity/fileinfo_windows.go index 4c3e8f1f357a..0766e61ae3f1 100644 --- a/auditbeat/module/file_integrity/fileinfo_windows.go +++ b/auditbeat/module/file_integrity/fileinfo_windows.go @@ -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 { diff --git a/dev-tools/ecs-migration.yml b/dev-tools/ecs-migration.yml index 6d8cea78a215..cb4b9d8b8d70 100644 --- a/dev-tools/ecs-migration.yml +++ b/dev-tools/ecs-migration.yml @@ -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 @@ -2033,7 +2033,7 @@ - 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 @@ -2041,7 +2041,7 @@ 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 diff --git a/dev-tools/jenkins_release.sh b/dev-tools/jenkins_release.sh index cd22480c7e36..02950637610d 100755 --- a/dev-tools/jenkins_release.sh +++ b/dev-tools/jenkins_release.sh @@ -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}" diff --git a/dev-tools/mage/gotest_test.go b/dev-tools/mage/gotest_test.go index f88186a19107..b3689c8ff314 100644 --- a/dev-tools/mage/gotest_test.go +++ b/dev-tools/mage/gotest_test.go @@ -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) } }) } diff --git a/dev-tools/mage/integtest.go b/dev-tools/mage/integtest.go index 16321fa90326..f36189c1b8ec 100644 --- a/dev-tools/mage/integtest.go +++ b/dev-tools/mage/integtest.go @@ -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 diff --git a/dev-tools/mage/kubernetes/kubectl.go b/dev-tools/mage/kubernetes/kubectl.go index f69edcc40101..4cc757a6905e 100644 --- a/dev-tools/mage/kubernetes/kubectl.go +++ b/dev-tools/mage/kubernetes/kubectl.go @@ -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 { @@ -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 {