Bump Kubefirst API SDK version.

konstructio · Sep 18, 2024 · f80b57d · f80b57d
1 parent e557ba8
commit f80b57d
Show file tree

Hide file tree

Showing 18 changed files with 236 additions and 96 deletions.
diff --git a/cmd/aws/create.go b/cmd/aws/create.go
@@ -58,9 +58,13 @@ func createAws(cmd *cobra.Command, _ []string) error {
 	}
 
 	// Validate aws region
-	awsClient := &awsinternal.AWSConfiguration{
-		Config: awsinternal.NewAwsV2(cloudRegionFlag),
+	config, err := awsinternal.NewAwsV2(cloudRegionFlag)
+	if err != nil {
+		progress.Error(err.Error())
+		return fmt.Errorf("failed to validate AWS region: %w", err)
 	}
+
+	awsClient := &awsinternal.Configuration{Config: config}
 	creds, err := awsClient.Config.Credentials.Retrieve(aws.BackgroundContext())
 	if err != nil {
 		progress.Error(err.Error())

diff --git a/cmd/aws/quota.go b/cmd/aws/quota.go
@@ -47,9 +47,12 @@ func evalAwsQuota(cmd *cobra.Command, _ []string) error {
 		return fmt.Errorf("failed to get cloud region flag: %w", err)
 	}
 
-	awsClient := &awsinternal.AWSConfiguration{
-		Config: awsinternal.NewAwsV2(cloudRegionFlag),
+	config, err := awsinternal.NewAwsV2(cloudRegionFlag)
+	if err != nil {
+		return fmt.Errorf("failed to create new aws config: %w", err)
 	}
+
+	awsClient := &awsinternal.Configuration{Config: config}
 	quotaDetails, err := awsClient.GetServiceQuotas([]string{"eks", "vpc"})
 	if err != nil {
 		return fmt.Errorf("failed to get service quotas: %w", err)

diff --git a/cmd/civo/backup.go b/cmd/civo/backup.go
@@ -37,7 +37,7 @@ func backupCivoSSL(_ *cobra.Command, _ []string) error {
 		return fmt.Errorf("invalid git provider option: %q", gitProvider)
 	}
 
-	config := providerConfigs.GetConfig(
+	config, err := providerConfigs.GetConfig(
 		clusterName,
 		domainName,
 		gitProvider,
@@ -46,6 +46,9 @@ func backupCivoSSL(_ *cobra.Command, _ []string) error {
 		os.Getenv("CF_API_TOKEN"),
 		os.Getenv("CF_ORIGIN_CA_ISSUER_API_TOKEN"),
 	)
+	if err != nil {
+		return fmt.Errorf("failed to get config: %w", err)
+	}
 
 	if _, err := os.Stat(config.SSLBackupDir + "/certificates"); os.IsNotExist(err) {
 		// path/to/whatever does not exist
@@ -62,7 +65,7 @@ func backupCivoSSL(_ *cobra.Command, _ []string) error {
 		}
 	}
 
-	err := ssl.Backup(config.SSLBackupDir, domainName, config.K1Dir, config.Kubeconfig)
+	err = ssl.Backup(config.SSLBackupDir, config.Kubeconfig)
 	if err != nil {
 		return fmt.Errorf("error backing up SSL resources: %w", err)
 	}

diff --git a/cmd/info.go b/cmd/info.go
@@ -22,8 +22,11 @@ var infoCmd = &cobra.Command{
 	Use:   "info",
 	Short: "provides general Kubefirst setup data",
 	Long:  `Provides machine data, files and folders paths`,
-	Run: func(_ *cobra.Command, _ []string) {
-		config := configs.ReadConfig()
+	RunE: func(_ *cobra.Command, _ []string) error {
+		config, err := configs.ReadConfig()
+		if err != nil {
+			return err
+		}
 
 		var buf bytes.Buffer
 
@@ -43,6 +46,7 @@ var infoCmd = &cobra.Command{
 		fmt.Fprintf(tw, "Kubefirst Version\t%s\n", configs.K1Version)
 
 		progress.Success(buf.String())
+		return nil
 	},
 }