From 5865159766d56229899432cb1a72949d171e860c Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Thu, 9 Feb 2023 07:44:19 -0500 Subject: [PATCH] Run codespell on codebase Signed-off-by: Daniel J Walsh --- Makefile | 2 +- contrib/cirrus/lib.sh | 2 +- libpod/define/container_inspect.go | 2 +- pkg/k8s.io/api/core/v1/types.go | 6 +++--- pkg/k8s.io/apimachinery/pkg/api/resource/quantity.go | 2 +- test/system/035-logs.bats | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index cccaebe0d4..89a7a2c00d 100644 --- a/Makefile +++ b/Makefile @@ -275,7 +275,7 @@ test/version/version: version/version.go .PHONY: codespell codespell: - codespell -S bin,vendor,.git,go.sum,.cirrus.yml,"RELEASE_NOTES.md,*.xz,*.gz,*.ps1,*.tar,swagger.yaml,*.tgz,bin2img,*ico,*.png,*.1,*.5,copyimg,*.orig,apidoc.go" -L te,clos,ans,pullrequest,uint,iff,od,seeked,splitted,marge,erro,hist,ether,specif -w + codespell -S bin,vendor,.git,go.sum,.cirrus.yml,"RELEASE_NOTES.md,*.xz,*.gz,*.ps1,*.tar,swagger.yaml,*.tgz,bin2img,*ico,*.png,*.1,*.5,copyimg,*.orig,apidoc.go" -L hastable,te,clos,ans,pullrequest,uint,iff,od,seeked,splitted,marge,erro,hist,ether,specif -w .PHONY: validate validate: lint .gitvalidation validate.completions man-page-check swagger-check tests-included tests-expect-exit pr-removes-fixed-skips diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh index 81372b2e95..2f4e913abf 100644 --- a/contrib/cirrus/lib.sh +++ b/contrib/cirrus/lib.sh @@ -74,7 +74,7 @@ CIRRUS_REPO_NAME=${CIRRUS_REPO_NAME:-podman} # Cirrus only sets $CIRRUS_BASE_SHA properly for PRs, but $EPOCH_TEST_COMMIT # needs to be set from this value in order for `make validate` to run properly. # When running get_ci_vm.sh, most $CIRRUS_xyz variables are empty. Attempt -# to accomidate both branch and get_ci_vm.sh testing by discovering the base +# to accommodate both branch and get_ci_vm.sh testing by discovering the base # branch SHA value. # shellcheck disable=SC2154 if [[ -z "$CIRRUS_BASE_SHA" ]] && [[ -z "$CIRRUS_TAG" ]] diff --git a/libpod/define/container_inspect.go b/libpod/define/container_inspect.go index 038d4971b3..9a9f88672e 100644 --- a/libpod/define/container_inspect.go +++ b/libpod/define/container_inspect.go @@ -341,7 +341,7 @@ type InspectContainerHostConfig struct { // DnsSearch is a list of DNS search domains that will be set in the // container's resolv.conf DnsSearch []string `json:"DnsSearch"` - // ExtraHosts contains hosts that will be aded to the container's + // ExtraHosts contains hosts that will be added to the container's // /etc/hosts. ExtraHosts []string `json:"ExtraHosts"` // GroupAdd contains groups that the user inside the container will be diff --git a/pkg/k8s.io/api/core/v1/types.go b/pkg/k8s.io/api/core/v1/types.go index 7d72693af4..1f1b80a8b5 100644 --- a/pkg/k8s.io/api/core/v1/types.go +++ b/pkg/k8s.io/api/core/v1/types.go @@ -4512,11 +4512,11 @@ type Config struct { APIVersion string `json:"apiVersion,omitempty"` // Preferences holds general information to be use for cli interactions Preferences Preferences `json:"preferences"` - // Clusters is a map of referencable names to cluster configs + // Clusters is a map of referenceable names to cluster configs Clusters []NamedCluster `json:"clusters"` - // AuthInfos is a map of referencable names to user configs + // AuthInfos is a map of referenceable names to user configs AuthInfos []NamedAuthInfo `json:"users"` - // Contexts is a map of referencable names to context configs + // Contexts is a map of referenceable names to context configs Contexts []NamedContext `json:"contexts"` // CurrentContext is the name of the context that you would like to use by default CurrentContext string `json:"current-context"` diff --git a/pkg/k8s.io/apimachinery/pkg/api/resource/quantity.go b/pkg/k8s.io/apimachinery/pkg/api/resource/quantity.go index 8c642b34ed..f1f74ac4c2 100644 --- a/pkg/k8s.io/apimachinery/pkg/api/resource/quantity.go +++ b/pkg/k8s.io/apimachinery/pkg/api/resource/quantity.go @@ -120,7 +120,7 @@ type CanonicalValue interface { AsCanonicalBase1024Bytes(out []byte) ([]byte, int32) } -// Format lists the three possible formattings of a quantity. +// Format lists the three possible formats of a quantity. type Format string const ( diff --git a/test/system/035-logs.bats b/test/system/035-logs.bats index 8f378054af..da0d01a802 100644 --- a/test/system/035-logs.bats +++ b/test/system/035-logs.bats @@ -283,7 +283,7 @@ function _log_test_follow() { run_podman ${events_backend} logs -f $cname is "$output" "$contentA $contentB -$contentC" "logs -f on exitted container works" +$contentC" "logs -f on exited container works" run_podman ${events_backend} rm -t 0 -f $cname }