#29 - refactoring

cmd/cluster.go

@@ -107,7 +107,7 @@ func createClusterCTLConfigFile(output []byte) (string, error) {
 		return "", err
 	}
 
-	return util.CreateTempYAMLFile("/tmp", clusterCTL.Metadata["name"], data)
+	return util.CreateTempYAMLFile(os.TempDir(), clusterCTL.Metadata["name"], data)
 }
 
 func (cc *ClusterCommands) getClusterCTLConfig() (string, string, error) {
@@ -174,7 +174,7 @@ func (cc *ClusterCommands) mergeKubeConfigs(clusterContext []byte) error {
 		return err
 	}
 
-	file, err := createManifestFile(object, "/tmp", cc.Conf.Name+"-"+cc.Conf.ClusterProvider+"-kubeconfig")
+	file, err := createManifestFile(object, os.TempDir(), cc.Conf.Name+"-"+cc.Conf.ClusterProvider+"-kubeconfig")
 	if err != nil {
 		return err
 	}

cmd/cluster_capa.go

@@ -80,7 +80,7 @@ func NewAWSClusterStaticIdentityConfig(ac *aws_provider.AwsConfigure) *AWSCluste
 		},
 		AWSIAMControllerSecret:   v1.Secret(awsIAMControllerSecret, awsClusterStaticIdentityNamespace),
 		SecretApplyConfiguration: v1.Secret(awsClusterStaticIdentitySecret, awsClusterStaticIdentityNamespace),
-		ManifestFilesDir:         filepath.Join("/tmp", awsClusterStaticIdentityName),
+		ManifestFilesDir:         filepath.Join(os.TempDir(), awsClusterStaticIdentityName),
 	}
 
 	profile, err := ac.RenderAWSConfigProfile(awsIAMControllerCredentialsTemplate)

cmd/cluster_capg.go

@@ -28,7 +28,7 @@ type GCPClusterIdentityConfig struct {
 func NewGCPClusterIdentityConfig(gcp *google_provider.GCPConfigure) *GCPClusterIdentityConfig {
 	gcpcc := &GCPClusterIdentityConfig{
 		SecretApplyConfiguration: v1.Secret(gcpClusterIdentitySecret, gcpClusterIdentityNamespace),
-		ManifestFilesDir:         filepath.Join("/tmp", gcpClusterIdentityName),
+		ManifestFilesDir:         filepath.Join(os.TempDir(), gcpClusterIdentityName),
 	}
 
 	gcpcc.SecretApplyConfiguration.Type = &gcpClusterIdentitySecretType

cmd/cluster_capz.go

@@ -77,7 +77,7 @@ func NewAzureClusterIdentityConfig(ac *azure_provider.AzureConfigure) *AzureClus
 			},
 		},
 		SecretApplyConfiguration: v1.Secret(azureClusterIdentitySecret, azureClusterIdentityNamespace),
-		ManifestFilesDir:         filepath.Join("/tmp", azureClusterIdentityName),
+		ManifestFilesDir:         filepath.Join(os.TempDir(), azureClusterIdentityName),
 	}
 
 	acic.SecretApplyConfiguration.Type = &azureClusterIdentitySecretType

cmd/flags.go

@@ -86,7 +86,7 @@ func flagsConfig() []cli.Flag {
 		altsrc.NewStringFlag(
 			&cli.StringFlag{
 				Name:    "cluster-provider",
-				Usage:   "select cluster provider to provision clusters",
+				Usage:   "cluster provider for provisioning",
 				Aliases: []string{"cp"},
 				EnvVars: []string{"RMK_CLUSTER_PROVIDER"},
 				Value:   util.LocalClusterProvider,
@@ -107,7 +107,7 @@ func flagsConfig() []cli.Flag {
 		&cli.StringFlag{
 			Category: gcpFlagsCategory,
 			Name:     "google-application-credentials",
-			Usage:    "GCP service account credentials file path in JSON format",
+			Usage:    "path to GCP service account credentials JSON file",
 			Aliases:  []string{"gac"},
 			EnvVars:  []string{"RMK_GOOGLE_APPLICATION_CREDENTIALS", "GOOGLE_APPLICATION_CREDENTIALS"},
 		},

cmd/k3d.go

@@ -81,7 +81,7 @@ func (k *K3DCommands) createDeleteK3DCluster() error {
 			k.Ctx.Command.Category, k.SpecCMD.StderrBuf.String())
 	}
 
-	k3dConfig, err := util.CreateTempYAMLFile("/tmp", k.Ctx.Command.Category+"-config", k.SpecCMD.StdoutBuf.Bytes())
+	k3dConfig, err := util.CreateTempYAMLFile("os.TempDir()", k.Ctx.Command.Category+"-config", k.SpecCMD.StdoutBuf.Bytes())
 	if err != nil {
 		return err
 	}

providers/aws_provider/aws.go

@@ -343,7 +343,7 @@ func (a *AwsConfigure) GetAWSClusterContext(clusterName string) ([]byte, error)
 	client := eks.NewFromConfig(cfg)
 	cluster, err := client.DescribeCluster(a.Ctx, &eks.DescribeClusterInput{Name: aws.String(clusterName)})
 	if err != nil {
-		return nil, fmt.Errorf("kubecontext to %s provider's for cluster %s not found",
+		return nil, fmt.Errorf("kubecontext for %s provider's %s cluster not found",
 			strings.ToUpper(AWSClusterProvider), clusterName)
 	}
 
@@ -390,7 +390,7 @@ func (a *AwsConfigure) generateUserKubeconfig(cluster *eksType.Cluster) ([]byte,
 
 	out, err := clientcmd.Write(*cfg)
 	if err != nil {
-		return nil, fmt.Errorf("failed to serialize kubeconfig to yaml: %w", err)
+		return nil, fmt.Errorf("failed to serialize kubeconfig to YAML: %w", err)
 	}
 
 	return out, nil

providers/azure_provider/azure.go

@@ -141,15 +141,15 @@ func (ac *AzureConfigure) GetAzureClusterContext(groupName, clusterName string)
 
 	credentials, err := ac.ManagedClustersClient.ListClusterAdminCredentials(ac.Ctx, groupName, clusterName, nil)
 	if err != nil {
-		return nil, fmt.Errorf("kubecontext to %s provider's for cluster %s not found",
+		return nil, fmt.Errorf("kubecontext for %s provider's %s cluster not found",
 			cpTitle, clusterName)
 	}
 
 	if len(credentials.CredentialResults.Kubeconfigs) == 1 {
 		return credentials.CredentialResults.Kubeconfigs[0].Value, nil
 	}
 
-	return nil, fmt.Errorf("kubecontext to %s provider's for cluster %s not found",
+	return nil, fmt.Errorf("kubecontext for %s provider's %s cluster not found",
 		cpTitle, clusterName)
 }
 

providers/google_provider/gcp.go

@@ -92,7 +92,7 @@ func (gcp *GCPConfigure) GetGCPClusterContext(clusterName string) ([]byte, error
 		return gcp.generateUserKubeconfig(cluster)
 	}
 
-	return nil, fmt.Errorf("kubecontext to %s provider's for cluster %s not found",
+	return nil, fmt.Errorf("kubecontext for %s provider's %s cluster not found",
 		strings.ToUpper(GoogleClusterProvider), clusterName)
 }
 
@@ -130,7 +130,7 @@ func (gcp *GCPConfigure) generateUserKubeconfig(cluster *container.Cluster) ([]b
 
 	out, err := clientcmd.Write(*cfg)
 	if err != nil {
-		return nil, fmt.Errorf("failed to serialize kubeconfig to yaml: %w", err)
+		return nil, fmt.Errorf("failed to serialize kubeconfig to YAML: %w", err)
 	}
 
 	return out, nil