diff --git a/src/internal/api/v1alpha1/validate.go b/src/internal/api/v1alpha1/validate.go index d65061a8be..df84ca7c42 100644 --- a/src/internal/api/v1alpha1/validate.go +++ b/src/internal/api/v1alpha1/validate.go @@ -16,7 +16,7 @@ import ( const ( // ZarfMaxChartNameLength limits helm chart name size to account for K8s/helm limits and zarf prefix ZarfMaxChartNameLength = 40 - errChartReleaseNameEmpty = "release name empty, unable to fallback to chart name" + errChartReleaseNameEmpty = "release name empty, unable to fall back to chart name" ) // Package errors found during validation. @@ -248,10 +248,10 @@ func validateAction(action v1alpha1.ZarfComponentAction) error { return err } -// validateReleaseName validates a release name against DNS 1035 spec, using chartName as fallback. +// validateReleaseName validates a release name against DNS 1035 spec, using chartName as a fallback. // https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#rfc-1035-label-names func validateReleaseName(chartName, releaseName string) error { - // Fallback to chartName if releaseName is empty + // Fall back to chartName if releaseName is empty // NOTE: Similar fallback mechanism happens in src/internal/packager/helm/chart.go:InstallOrUpgradeChart if releaseName == "" { releaseName = chartName diff --git a/src/internal/api/v1alpha1/validate_test.go b/src/internal/api/v1alpha1/validate_test.go index 76f959e1c1..2a984ad74d 100644 --- a/src/internal/api/v1alpha1/validate_test.go +++ b/src/internal/api/v1alpha1/validate_test.go @@ -299,7 +299,7 @@ func TestValidateChart(t *testing.T) { partialMatch: true, }, { - name: "missing releaseName fallsback to name", + name: "missing releaseName falls back to name", chart: v1alpha1.ZarfChart{Name: "chart3", Namespace: "namespace", URL: "http://whatever", Version: "v1.0.0"}, expectedErrs: nil, }, diff --git a/src/pkg/packager/publish_test.go b/src/pkg/packager/publish_test.go index 9999e3cc10..2926c4e85e 100644 --- a/src/pkg/packager/publish_test.go +++ b/src/pkg/packager/publish_test.go @@ -315,7 +315,7 @@ func TestPublishPackageDirectoryNameCollision(t *testing.T) { require.NoError(t, err) // Create a temporary directory to use as working directory and - // create a subdir with same name as the package to test name collission + // create a subdir with same name as the package to test name collision // https://github.com/zarf-dev/zarf/issues/4148 tmpDir := t.TempDir() collisionDir := filepath.Join(tmpDir, "test") diff --git a/src/pkg/packager/testdata/find-images/image-archives/deployment.yaml b/src/pkg/packager/testdata/find-images/image-archives/deployment.yaml index c21c9c33a7..2c12366078 100644 --- a/src/pkg/packager/testdata/find-images/image-archives/deployment.yaml +++ b/src/pkg/packager/testdata/find-images/image-archives/deployment.yaml @@ -1,7 +1,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: scrach + name: scratch spec: selector: matchLabels: diff --git a/src/pkg/packager/testdata/find-images/multiple-image-archives/deployment-scratch-other.yaml b/src/pkg/packager/testdata/find-images/multiple-image-archives/deployment-scratch-other.yaml index 129c047f02..6ccffa568e 100644 --- a/src/pkg/packager/testdata/find-images/multiple-image-archives/deployment-scratch-other.yaml +++ b/src/pkg/packager/testdata/find-images/multiple-image-archives/deployment-scratch-other.yaml @@ -1,7 +1,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: scrach + name: scratch spec: selector: matchLabels: diff --git a/src/pkg/packager/testdata/find-images/multiple-image-archives/deployment.yaml b/src/pkg/packager/testdata/find-images/multiple-image-archives/deployment.yaml index 5077e4123a..f747de98ad 100644 --- a/src/pkg/packager/testdata/find-images/multiple-image-archives/deployment.yaml +++ b/src/pkg/packager/testdata/find-images/multiple-image-archives/deployment.yaml @@ -1,7 +1,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: scrach + name: scratch spec: selector: matchLabels: diff --git a/src/pkg/packager/testdata/find-images/valid-image-uri/deployment.yaml b/src/pkg/packager/testdata/find-images/valid-image-uri/deployment.yaml index a0221ca48a..565724873b 100644 --- a/src/pkg/packager/testdata/find-images/valid-image-uri/deployment.yaml +++ b/src/pkg/packager/testdata/find-images/valid-image-uri/deployment.yaml @@ -23,7 +23,7 @@ spec: image: xn--7o8h.com/myimage:9.8.7 - name: project image: registry.io/foo/project--id.module--name.ver---sion--name - - name: seperate + - name: separate image: foo_bar:latest - name: domain-port image: foo.com:8080/bar:1.2.3