Merge pull request noobaa#1856 from naveenpaul1/azure_sts_cli

STS | Azure backing and namespace store CLI changes

Author: naveenpaul1

pkg/backingstore/backingstore.go

@@ -579,24 +579,27 @@ func RunCreateAzureSTS(cmd *cobra.Command, args []string) {
 		log.Fatalf(`❌ Missing expected arguments: <backing-store-name> %s`, cmd.UsageString())
 	}
 	createCommon(cmd, args, nbv1.StoreTypeAzureBlob, func(backStore *nbv1.BackingStore, secret *corev1.Secret) {
-		targetBlobContainer := util.GetFlagStringOrPrompt(cmd, "target-blob-container")
-		azureSTSAccountName := util.GetFlagStringOrPromptPassword(cmd, "account-name")
-		azureSTSTenantID := util.GetFlagStringOrPrompt(cmd, "tenant-id")
-		azureSTSClientID := util.GetFlagStringOrPrompt(cmd, "client-id")
-		if err := validations.ValidateAzureSTSCredsPresent(&targetBlobContainer, &azureSTSAccountName, &azureSTSTenantID, &azureSTSClientID); err != nil {
-			log.Fatalf(`❌ %v %s`, err, cmd.UsageString())
-		}
-		secretName, _ := cmd.Flags().GetString("secret-name")
-		mandatoryProperties := []string{"AccountName", "azure_tenant_id", "azure_client_id"}
 
+		secretName, _ := cmd.Flags().GetString("secret-name")
+		targetBlobContainer := util.GetFlagStringOrPrompt(cmd, "target-blob-container")
+		azureSTSClientID := ""
 		if secretName == "" {
+			azureSTSAccountName := util.GetFlagStringOrPromptPassword(cmd, "account-name")
+			azureSTSTenantID := util.GetFlagStringOrPrompt(cmd, "tenant-id")
+			azureSTSClientID = util.GetFlagStringOrPrompt(cmd, "client-id")
+			if err := validations.ValidateAzureSTSCredsPresent(&targetBlobContainer, &azureSTSAccountName, &azureSTSTenantID, &azureSTSClientID); err != nil {
+				log.Fatalf(`❌ %v %s`, err, cmd.UsageString())
+			}
 			secret.StringData["AccountName"] = azureSTSAccountName
 			secret.StringData["azure_tenant_id"] = azureSTSTenantID
 			secret.StringData["azure_client_id"] = azureSTSClientID
 		} else {
+			mandatoryProperties := []string{"AccountName", "azure_tenant_id", "azure_client_id"}
 			util.VerifyCredsInSecret(secretName, options.Namespace, mandatoryProperties)
 			secret.Name = secretName
 			secret.Namespace = options.Namespace
+			util.KubeCheck(secret)
+			azureSTSClientID = secret.StringData["azure_client_id"]
 		}
 
 		backStore.Spec.AzureBlob = &nbv1.AzureBlobSpec{

pkg/namespacestore/namespacestore.go

@@ -429,7 +429,7 @@ func createCommon(cmd *cobra.Command, args []string, storeType nbv1.NSType, popu
 		log.Fatalf(`❌ %s %s`, validationErr, cmd.UsageString())
 	}
 
-	// Create namespace store CR 
+	// Create namespace store CR
 	util.Panic(controllerutil.SetControllerReference(sys, namespaceStore, scheme.Scheme))
 	if !util.KubeCreateFailExisting(namespaceStore) {
 		log.Fatalf(`❌ Could not create NamespaceStore %q in Namespace %q (conflict)`, namespaceStore.Name, namespaceStore.Namespace)
@@ -703,20 +703,22 @@ func RunCreateAzureSTSBlob(cmd *cobra.Command, args []string) {
 		log.Fatalf(`❌ Missing expected arguments: <namespace-store-name> %s`, cmd.UsageString())
 	}
 	createCommon(cmd, args, nbv1.NSStoreTypeAzureBlob, func(namespaceStore *nbv1.NamespaceStore, secret *corev1.Secret) {
-		targetBlobContainer := util.GetFlagStringOrPrompt(cmd, "target-blob-container")
-		azureSTSClientID := util.GetFlagStringOrPrompt(cmd, "client-id")
-		azureSTSTenantID := util.GetFlagStringOrPrompt(cmd, "tenant-id")
-		if err := validations.ValidateAzureSTSRequiredFlags(targetBlobContainer, azureSTSClientID, azureSTSTenantID); err != nil {
-			log.Fatalf(`❌ %s %s`, err, cmd.UsageString())
-		}
 		secretName, _ := cmd.Flags().GetString("secret-name")
-		accountName, _ := cmd.Flags().GetString("account-name")
-
+		targetBlobContainer := util.GetFlagStringOrPrompt(cmd, "target-blob-container")
+		azureSTSClientID := ""
 		if secretName != "" {
 			util.VerifyCredsInSecret(secretName, options.Namespace, []string{"azure_tenant_id", "azure_client_id"})
 			secret.Name = secretName
 			secret.Namespace = options.Namespace
+			util.KubeCheck(secret)
+			azureSTSClientID = secret.StringData["azure_client_id"]
 		} else {
+			azureSTSClientID = util.GetFlagStringOrPrompt(cmd, "client-id")
+			azureSTSTenantID := strings.TrimSpace(util.GetFlagStringOrPrompt(cmd, "tenant-id"))
+			accountName := util.GetFlagStringOrPrompt(cmd, "account-name")
+			if err := validations.ValidateAzureSTSRequiredFlags(targetBlobContainer, azureSTSClientID, azureSTSTenantID, accountName); err != nil {
+				log.Fatalf(`❌ %s %s`, err, cmd.UsageString())
+			}
 			secret.StringData["azure_tenant_id"] = strings.TrimSpace(azureSTSTenantID)
 			secret.StringData["azure_client_id"] = strings.TrimSpace(azureSTSClientID)
 			if strings.TrimSpace(accountName) != "" {

pkg/validations/namespacestore_validations.go

@@ -207,7 +207,7 @@ func ValidateNsStoreAzureBlob(nsStore *nbv1.NamespaceStore) error {
 }
 
 // ValidateAzureSTSRequiredFlags validates that required Azure STS CLI/flag values are non-empty (target blob container, client ID, tenant ID).
-func ValidateAzureSTSRequiredFlags(targetBlobContainer, clientID, tenantID string) error {
+func ValidateAzureSTSRequiredFlags(targetBlobContainer, clientID, tenantID, accountName string) error {
 	if strings.TrimSpace(targetBlobContainer) == "" {
 		return util.ValidationError{Msg: "target-blob-container is required and must be non-empty"}
 	}
@@ -217,6 +217,9 @@ func ValidateAzureSTSRequiredFlags(targetBlobContainer, clientID, tenantID strin
 	if strings.TrimSpace(tenantID) == "" {
 		return util.ValidationError{Msg: "tenant-id is required and must be non-empty"}
 	}
+	if strings.TrimSpace(accountName) == "" {
+		return util.ValidationError{Msg: "account-name is required and must be non-empty"}
+	}
 	return nil
 }