Small fixes (knative#3310)

Author: gauron99

cmd/build.go

@@ -468,8 +468,8 @@ func (c buildConfig) Validate(cmd *cobra.Command) (err error) {
 // for S2I.
 //
 // TODO: As a further optimization, it might be ideal to only build the
-// image necessary for the target cluster, since the end product of  a function
-// deployment is not the contiainer, but rather the running service.
+// image necessary for the target cluster, since the end product of a function
+// deployment is not the container, but rather the running service.
 func (c buildConfig) clientOptions() ([]fn.Option, error) {
 	o := []fn.Option{fn.WithRegistry(c.Registry)}
 

cmd/deploy_test.go

@@ -1227,7 +1227,7 @@ func TestDeploy_NamespaceUpdateWarning(t *testing.T) {
 
 	activeNamespace, err := k8s.GetDefaultNamespace()
 	if err != nil {
-		t.Fatalf("Couldnt get active namespace, got error: %v", err)
+		t.Fatalf("Couldn't get active namespace, got error: %v", err)
 	}
 
 	expected1 := "Info: chosen namespace has changed from 'myns' to 'newns'. Undeploying function from 'myns' and deploying new in 'newns'."
@@ -1248,7 +1248,7 @@ func TestDeploy_NamespaceUpdateWarning(t *testing.T) {
 	}
 }
 
-// TestDeploy_BasicRedeploy simply ensures that redeploy works and doesnt brake
+// TestDeploy_BasicRedeploy simply ensures that redeploy works and doesn't break
 // using standard deploy method when desired namespace is deleted.
 func TestDeploy_BasicRedeployInCorrectNamespace(t *testing.T) {
 	root := FromTempDirectory(t)
@@ -1289,7 +1289,7 @@ func TestDeploy_BasicRedeployInCorrectNamespace(t *testing.T) {
 }
 
 // TestDeploy_BasicRedeployPipelines simply ensures that deploy 2 times works
-// and doesnt brake using pipelines
+// and doesn't break using pipelines
 func TestDeploy_BasicRedeployPipelinesCorrectNamespace(t *testing.T) {
 	root := FromTempDirectory(t)
 
@@ -1816,7 +1816,7 @@ func TestReDeploy_OnRegistryChange(t *testing.T) {
 	// ASSERT
 	expectF, err := fn.NewFunction(root)
 	if err != nil {
-		t.Fatal("couldnt load function from path")
+		t.Fatal("couldn't load function from path")
 	}
 
 	if !strings.Contains(expectF.Build.Image, newRegistry) {
@@ -1865,7 +1865,7 @@ func TestReDeploy_OnRegistryChangeWithBuildFalse(t *testing.T) {
 
 // TestDeploy_NoErrorOnOldFunctionNotFound assures that no error is given when
 // old Function's service is not available (is already deleted manually or the
-// namespace doesnt exist etc.)
+// namespace doesn't exist etc.)
 func TestDeploy_NoErrorOnOldFunctionNotFound(t *testing.T) {
 	var (
 		root    = FromTempDirectory(t)
@@ -1918,7 +1918,7 @@ func TestDeploy_NoErrorOnOldFunctionNotFound(t *testing.T) {
 	if err = cmd.Execute(); err != nil {
 		// possible TODO: catch the os.Stderr output and check that this is printed out
 		// and if this is implemented, probably change the name to *_WarnOnFunction
-		// expectedWarning := fmt.Sprintf("Warning: Cant undeploy Function in namespace '%s' - service not found. Namespace/Service might be deleted already", nsOne)
+		// expectedWarning := fmt.Sprintf("Warning: Can't undeploy Function in namespace '%s' - service not found. Namespace/Service might be deleted already", nsOne)
 
 		// ASSERT
 

cmd/run.go

@@ -232,7 +232,7 @@ Or if you have an existing function:
 			}
 		}
 	} else { // if !container
-		// dont run digested image without a container
+		// don't run digested image without a container
 		if cfg.Image != "" {
 			digested, err := isDigested(cfg.Image)
 			if err != nil {

cmd/run_test.go

@@ -459,7 +459,7 @@ func TestRun_DirectOverride(t *testing.T) {
 			return
 		}
 
-		// Ensure invocation doesnt happen for the second time as the image was
+		// Ensure invocation doesn't happen for the second time as the image was
 		// provided with a digest (should not build)
 		if builder2.BuildInvoked {
 			runErrCh <- fmt.Errorf("Function was not expected to build again but it did")

hack/cmd/components/main.go

@@ -10,7 +10,7 @@
 // This is running on semi-auto basis where versions are being auto bumped via
 // PRs sent to main. Semi-auto because if repo is missing 'owner' or 'repo' fields
 // in the .json it will not be automatically bumped (it has no repo to look).
-// This is intentional for components we dont want autobumped like this.
+// This is intentional for components we don't want autobumped like this.
 // The source-of-truth file is found in this repo @root/hack/component-versions.json
 //
 // ADD NEW/MODIFY COMPONENTS
@@ -74,7 +74,7 @@ type ComponentList map[string]*Component
 func main() {
 	// Set up context for possible signal inputs to not disrupt cleanup process.
 	// This is not gonna do much for workflows since they finish and shutdown
-	// but in case of local testing - dont leave left over resources on disk/RAM.
+	// but in case of local testing - don't leave left over resources on disk/RAM.
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	sigs := make(chan os.Signal, 1)
@@ -194,7 +194,7 @@ func writeFiles(cl ComponentList, script, json string) error {
 func writeSource(cl ComponentList, file string) error {
 	vB, err := json.MarshalIndent(cl, "", "	")
 	if err != nil {
-		return fmt.Errorf("cant Marshal versions: %v", err)
+		return fmt.Errorf("can't Marshal versions: %v", err)
 	}
 	f, err := os.Create(file)
 	if err != nil {

hack/cmd/update-builder/main.go

@@ -44,7 +44,7 @@ import (
 func main() {
 	// Set up context for possible signal inputs to not disrupt cleanup process.
 	// This is not gonna do much for workflows since they finish and shutdown
-	// but in case of local testing - dont leave left over resources on disk/RAM.
+	// but in case of local testing - don't leave left over resources on disk/RAM.
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	sigs := make(chan os.Signal, 1)
@@ -98,7 +98,7 @@ func buildBuilderImage(ctx context.Context, variant, version, arch, builderTomlP
 		return "", fmt.Errorf("cannot patch java buildpacks: %w", err)
 	}
 	if arch == "arm64" && variant == "base" {
-		// dotnet,ruby&web-servers are not multiarch & we dont need them
+		// dotnet,ruby&web-servers are not multiarch & we don't need them
 		err = fixupRemoveUnusedBuildpacks(&builderConfig)
 		if err != nil {
 			return "", fmt.Errorf("failed to remove unused buildpacks: %w", err)
@@ -659,7 +659,7 @@ func downloadTarball(tarballUrl, destDir string) error {
 		case tar.TypeDir:
 			err = os.MkdirAll(dest, 0755)
 			if err != nil {
-				return fmt.Errorf("cannmot create a directory: %w", err)
+				return fmt.Errorf("cannot create a directory: %w", err)
 			}
 		case tar.TypeXGlobalHeader:
 			// ignore this type
@@ -780,7 +780,7 @@ func fixupRemoveUnusedBuildpacks(c *builder.Config) error {
 	return nil
 }
 
-// Copy build & run images from stack so that we dont use docker registry based images
+// Copy build & run images from stack so that we don't use docker registry based images
 // Run images are simply copied over to ghcr
 func copyStackImages(ctx context.Context, configPath string) error {
 	var err error

hack/test-full.sh

@@ -107,7 +107,7 @@ preconditions() {
         exit 1
     fi
     MISSING_BINS=""
-    for bin in kubectl kind jq stern dapr helm kn
+    for bin in kubectl kind jq stern dapr helm kn; do
         # Check with and without .exe for Windows compatibility
         if [ ! -f "${PROJECT_ROOT}/hack/bin/${bin}" ] && [ ! -f "${PROJECT_ROOT}/hack/bin/${bin}.exe" ]; then
             MISSING_BINS="${MISSING_BINS} ${bin}"

hack/update-deps.sh

@@ -26,7 +26,7 @@ echo ">> args='$@'"
 # This is a guard for running only when its running via bot to update deps and
 # potentially create a PR.
 # When this is running in 'verify deps' workflow it runs with no arguments.
-# We dont want these changes to break the GH Action for all PRs therefore we
+# We don't want these changes to break the GH Action for all PRs therefore we
 # limit this only for dependency bumps.
 if [[ $# -gt 0 ]]; then
     echo ">> Running make hack-generate-components"

pkg/builders/builders_int_test.go

@@ -157,7 +157,7 @@ password=nbusr123
 		{
 			Name:         "pack",
 			Builder:      buildpacks.NewBuilder(buildpacks.WithVerbose(true)),
-			BuilderImage: buildPatcheBuildpackBuilder,
+			BuilderImage: buildPatchedBuildpackBuilder,
 			Envs: []fn.Env{
 				{
 					Name:  ptr("SERVICE_BINDING_ROOT"),
@@ -280,7 +280,7 @@ USER 1001:0
 }
 
 // Builds a tiny paketo builder that trusts to our self-signed certificate (see createCertificate).
-func buildPatcheBuildpackBuilder(ctx context.Context, t *testing.T, certDir string) string {
+func buildPatchedBuildpackBuilder(ctx context.Context, t *testing.T, certDir string) string {
 	tag := "localhost:50000/builder-jammy-tin:test"
 	dockerfile := `FROM ghcr.io/knative/builder-jammy-tiny:latest
 COPY 85c05568.0 /etc/ssl/certs/

pkg/creds/credentials_test.go

@@ -768,11 +768,11 @@ func TestCredentialsHomePermissions(t *testing.T) {
 			_, err := testConfigPathError(t)
 			if err != nil { // If error was returned
 				if os.IsPermission(err) { // and its a permission error
-					if !tt.expPermsDeniedErr { // but it wasnt expected
-						t.Fatalf("didnt expect permissions denied error, but got: %s", err)
+					if !tt.expPermsDeniedErr { // but it wasn't expected
+						t.Fatalf("didn't expect permissions denied error, but got: %s", err)
 					}
 
-				} else { // and it wasnt permission error
+				} else { // and it wasn't permission error
 					t.Fatalf("got unexpected error: %v", err)
 				}
 			} else { // Else no error was returned
@@ -1287,7 +1287,7 @@ func setHomeWithPermissions(perm os.FileMode) func(t *testing.T) {
 
 		// if home is empty, nothing to do
 		if homeDir == "" {
-			t.Fatal("home dir is empty, cant set perms")
+			t.Fatal("home dir is empty, can't set perms")
 		}
 
 		fmt.Printf("setting permissions (%v) on home dir: %s\n", perm, homeDir)