fix: resolve golangci-lint warnings

Resolve issues discovered from `make golangci-lint` related to improper use of logging/print functions

Signed-off-by: Mike Frisch <[email protected]>

src/cloud-api-adaptor/test/e2e/nginx_deployment.go

@@ -28,8 +28,10 @@ const (
 	WAIT_NGINX_DEPLOYMENT_TIMEOUT                    = time.Second * 900
 )
 
-type contextValueString string
-type deploymentOption func(*appsv1.Deployment)
+type (
+	contextValueString string
+	deploymentOption   func(*appsv1.Deployment)
+)
 
 func WithReplicaCount(replicas int32) deploymentOption {
 	return func(deployment *appsv1.Deployment) {
@@ -191,7 +193,7 @@ func waitForNginxDeploymentAvailable(ctx context.Context, t *testing.T, client k
 		}
 		for _, pod := range podlist.Items {
 			if pod.ObjectMeta.Labels["app"] == "nginx" {
-				//Added logs for debugging nightly tests
+				// Added logs for debugging nightly tests
 				t.Log("===================")
 				t.Logf("Debug info for pod: %v", pod.ObjectMeta.Name)
 				yamlData, err := yaml.Marshal(pod.Status)
@@ -205,11 +207,11 @@ func waitForNginxDeploymentAvailable(ctx context.Context, t *testing.T, client k
 					t.Logf("===================")
 					podLogString, _ := GetPodLog(ctx, client, &pod)
 					if podLogString != "" {
-						t.Logf(podLogString)
+						t.Log(podLogString)
 					} else {
-						t.Logf("No logs found")
+						t.Log("No logs found")
 					}
-					t.Logf("===================")
+					t.Log("===================")
 				}
 			}
 		}

src/cloud-api-adaptor/test/provisioner/ibmcloud/provision_kustomize.go

@@ -92,18 +92,18 @@ func isWorkerS390xFlavors() bool {
 func getCaaLatestCommitTag() string {
 	resp, err := http.Get("https://quay.io/api/v1/repository/confidential-containers/cloud-api-adaptor/tag/")
 	if err != nil {
-		log.Errorf(err.Error())
+		log.Error(err.Error())
 	}
 	defer resp.Body.Close()
 
 	body, err := io.ReadAll(resp.Body)
 	if err != nil {
-		log.Errorf(err.Error())
+		log.Error(err.Error())
 	}
 
 	var result QuayTagsResponse
 	if err := json.Unmarshal(body, &result); err != nil {
-		log.Errorf(err.Error())
+		log.Error(err.Error())
 		return ""
 	}
 

src/cloud-api-adaptor/test/provisioner/provision.go

@@ -135,7 +135,6 @@ func GetCloudProvisioner(provider string, propertiesFile string) (CloudProvision
 
 // GetInstallOverlay returns the InstallOverlay implementation for the provider
 func GetInstallOverlay(provider string, installDir string) (InstallOverlay, error) {
-
 	overlayFunc, ok := NewInstallOverlayFunctions[provider]
 	if !ok {
 		return nil, fmt.Errorf("Not implemented install overlay for %s\n", provider)
@@ -168,7 +167,7 @@ func (p *CloudAPIAdaptor) Delete(ctx context.Context, cfg *envconf.Config) error
 
 	log.Info("Uninstall CCRuntime CRD")
 	cmd := exec.Command("kubectl", "delete", "-k", p.ccOpGitRepo+"/config/samples/ccruntime/peer-pods?ref="+p.ccOpGitRef)
-	cmd.Env = append(os.Environ(), fmt.Sprintf("KUBECONFIG="+cfg.KubeconfigFile()))
+	cmd.Env = append(os.Environ(), "KUBECONFIG="+cfg.KubeconfigFile())
 	stdoutStderr, err := cmd.CombinedOutput()
 	log.Tracef("%v, output: %s", cmd, stdoutStderr)
 	if err != nil {
@@ -188,7 +187,7 @@ func (p *CloudAPIAdaptor) Delete(ctx context.Context, cfg *envconf.Config) error
 
 	log.Info("Uninstall the controller manager")
 	cmd = exec.Command("kubectl", "delete", "-k", p.ccOpGitRepo+"/operator/config/default?ref="+p.ccOpGitRef)
-	cmd.Env = append(os.Environ(), fmt.Sprintf("KUBECONFIG="+cfg.KubeconfigFile()))
+	cmd.Env = append(os.Environ(), "KUBECONFIG="+cfg.KubeconfigFile())
 	stdoutStderr, err = cmd.CombinedOutput()
 	log.Tracef("%v, output: %s", cmd, stdoutStderr)
 	if err != nil {
@@ -206,7 +205,7 @@ func (p *CloudAPIAdaptor) Delete(ctx context.Context, cfg *envconf.Config) error
 	// Run the command from the root src dir
 	cmd.Dir = p.rootSrcDir
 	// Set the KUBECONFIG env var
-	cmd.Env = append(os.Environ(), fmt.Sprintf("KUBECONFIG="+cfg.KubeconfigFile()))
+	cmd.Env = append(os.Environ(), "KUBECONFIG="+cfg.KubeconfigFile())
 	stdoutStderr, err = cmd.CombinedOutput()
 	log.Tracef("%v, output: %s", cmd, stdoutStderr)
 	if err != nil {
@@ -216,7 +215,8 @@ func (p *CloudAPIAdaptor) Delete(ctx context.Context, cfg *envconf.Config) error
 	log.Info("Wait for the peerpod-ctrl deployment to be deleted")
 	if err = wait.For(conditions.New(resources).ResourcesDeleted(
 		&appsv1.DeploymentList{Items: []appsv1.Deployment{
-			{ObjectMeta: metav1.ObjectMeta{Name: "peerpod-ctrl-controller-manager", Namespace: p.namespace}}}}),
+			{ObjectMeta: metav1.ObjectMeta{Name: "peerpod-ctrl-controller-manager", Namespace: p.namespace}},
+		}}),
 		wait.WithTimeout(time.Minute*1)); err != nil {
 		return err
 	}
@@ -235,7 +235,7 @@ func (p *CloudAPIAdaptor) Deploy(ctx context.Context, cfg *envconf.Config, props
 	log.Info("Install the controller manager")
 	// TODO - find go idiomatic way to apply/delete remote kustomize and apply to this file
 	cmd := exec.Command("kubectl", "apply", "-k", p.ccOpGitRepo+"/config/default?ref="+p.ccOpGitRef)
-	cmd.Env = append(os.Environ(), fmt.Sprintf("KUBECONFIG="+cfg.KubeconfigFile()))
+	cmd.Env = append(os.Environ(), "KUBECONFIG="+cfg.KubeconfigFile())
 	stdoutStderr, err := cmd.CombinedOutput()
 	log.Tracef("%v, output: %s", cmd, stdoutStderr)
 	if err != nil {
@@ -254,7 +254,7 @@ func (p *CloudAPIAdaptor) Deploy(ctx context.Context, cfg *envconf.Config, props
 	}
 
 	cmd = exec.Command("kubectl", "apply", "-k", p.ccOpGitRepo+"/config/samples/ccruntime/peer-pods?ref="+p.ccOpGitRef)
-	cmd.Env = append(os.Environ(), fmt.Sprintf("KUBECONFIG="+cfg.KubeconfigFile()))
+	cmd.Env = append(os.Environ(), "KUBECONFIG="+cfg.KubeconfigFile())
 	stdoutStderr, err = cmd.CombinedOutput()
 	log.Tracef("%v, output: %s", cmd, stdoutStderr)
 	if err != nil {
@@ -296,7 +296,7 @@ func (p *CloudAPIAdaptor) Deploy(ctx context.Context, cfg *envconf.Config, props
 	}
 
 	cmd = exec.Command("kubectl", "get", "cm", "peer-pods-cm", "-n", "confidential-containers-system", "-o", "yaml")
-	cmd.Env = append(os.Environ(), fmt.Sprintf("KUBECONFIG="+cfg.KubeconfigFile()))
+	cmd.Env = append(os.Environ(), "KUBECONFIG="+cfg.KubeconfigFile())
 	stdoutStderr, err = cmd.CombinedOutput()
 	log.Tracef("%v, output: %s", cmd, stdoutStderr)
 	if err != nil {
@@ -314,7 +314,7 @@ func (p *CloudAPIAdaptor) Deploy(ctx context.Context, cfg *envconf.Config, props
 	// Run the deployment from the root src dir
 	cmd.Dir = p.rootSrcDir
 	// Set the KUBECONFIG env var
-	cmd.Env = append(os.Environ(), fmt.Sprintf("KUBECONFIG="+cfg.KubeconfigFile()))
+	cmd.Env = append(os.Environ(), "KUBECONFIG="+cfg.KubeconfigFile())
 	stdoutStderr, err = cmd.CombinedOutput()
 	log.Tracef("%v, output: %s", cmd, stdoutStderr)
 	if err != nil {
@@ -334,7 +334,7 @@ func (p *CloudAPIAdaptor) Deploy(ctx context.Context, cfg *envconf.Config, props
 	cmd = exec.Command("make", "-C", "../webhook", "deploy-cert-manager")
 	// Run the deployment from the root src dir
 	cmd.Dir = p.rootSrcDir
-	cmd.Env = append(os.Environ(), fmt.Sprintf("KUBECONFIG="+cfg.KubeconfigFile()))
+	cmd.Env = append(os.Environ(), "KUBECONFIG="+cfg.KubeconfigFile())
 	stdoutStderr, err = cmd.CombinedOutput()
 	log.Tracef("%v, output: %s", cmd, stdoutStderr)
 	if err != nil {
@@ -348,7 +348,7 @@ func (p *CloudAPIAdaptor) Deploy(ctx context.Context, cfg *envconf.Config, props
 	// Run the deployment from the root src dir
 	cmd.Dir = p.rootSrcDir
 	// Set the KUBECONFIG env var
-	cmd.Env = append(os.Environ(), fmt.Sprintf("KUBECONFIG="+cfg.KubeconfigFile()))
+	cmd.Env = append(os.Environ(), "KUBECONFIG="+cfg.KubeconfigFile())
 	stdoutStderr, err = cmd.CombinedOutput()
 	log.Tracef("%v, output: %s", cmd, stdoutStderr)
 	if err != nil {

src/cloud-api-adaptor/test/provisioner/trustee_kbs.go

@@ -70,7 +70,7 @@ func NewKeyBrokerService(clusterName string, cfg *envconf.Config) (*KeyBrokerSer
 
 	filePath := filepath.Join(getKbsKubernetesFilePath(), overlaysPath, "key.bin")
 
-	err = os.WriteFile(filePath, content, 0644)
+	err = os.WriteFile(filePath, content, 0o644)
 	if err != nil {
 		return nil, err
 	}
@@ -190,7 +190,7 @@ func NewKeyBrokerService(clusterName string, cfg *envconf.Config) (*KeyBrokerSer
 
 func saveToFile(filename string, content []byte) error {
 	// Save contents to file
-	err := os.WriteFile(filename, content, 0644)
+	err := os.WriteFile(filename, content, 0o644)
 	if err != nil {
 		return fmt.Errorf("writing contents to file: %w", err)
 	}
@@ -204,7 +204,7 @@ func skipSeCertsVerification(patchFile string) error {
 	}
 	content := string(data)
 	content = strings.Replace(content, "false", "true", -1)
-	err = os.WriteFile(patchFile, []byte(content), 0644)
+	err = os.WriteFile(patchFile, []byte(content), 0o644)
 	if err != nil {
 		return fmt.Errorf("failed to write file: %v", err)
 	}
@@ -219,13 +219,13 @@ func createPVonTargetWorkerNode(pvFilePath, nodeName string, cfg *envconf.Config
 	content := string(data)
 	content = strings.Replace(content, "${IBM_SE_CREDS_DIR}", "/root/ibmse", -1)
 	content = strings.Replace(content, "${NODE_NAME}", nodeName, -1)
-	err = os.WriteFile(pvFilePath, []byte(content), 0644)
+	err = os.WriteFile(pvFilePath, []byte(content), 0o644)
 	if err != nil {
 		return fmt.Errorf("failed to write file: %v", err)
 	}
 
 	cmd := exec.Command("kubectl", "apply", "-f", pvFilePath)
-	cmd.Env = append(os.Environ(), fmt.Sprintf("KUBECONFIG="+cfg.KubeconfigFile()))
+	cmd.Env = append(os.Environ(), "KUBECONFIG="+cfg.KubeconfigFile())
 	stdoutStderr, err := cmd.CombinedOutput()
 	log.Tracef("%v, output: %s", cmd, stdoutStderr)
 	if err != nil {
@@ -504,8 +504,8 @@ func (p *KeyBrokerService) SetSecret(resourcePath string, secret []byte) error {
 
 	defer os.RemoveAll(tempDir)
 
-	var secretFilePath = filepath.Join(tempDir, path.Base(resourcePath))
-	err := os.WriteFile(secretFilePath, secret, 0644)
+	secretFilePath := filepath.Join(tempDir, path.Base(resourcePath))
+	err := os.WriteFile(secretFilePath, secret, 0o644)
 	if err != nil {
 		return err
 	}