edit noobaa cli short of creation of aws-sts in bs and ns

1. edit noobaa cli short of creation of noobaa backingstore create aws-sts. 2. add validation of the aws-sts-arn that passed. 3. add the above changes to noobaa namespacestore create aws-sts. Signed-off-by: shirady <[email protected]>
noobaa · Nov 9, 2023 · 51297a5 · 51297a5
1 parent c5aa88b
commit 51297a5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/pkg/backingstore/backingstore.go b/pkg/backingstore/backingstore.go
@@ -16,6 +16,7 @@ import (
 	"github.com/noobaa/noobaa-operator/v5/pkg/util"
 	"github.com/noobaa/noobaa-operator/v5/pkg/validations"
 
+	"github.com/aws/aws-sdk-go/aws/arn"
 	"github.com/spf13/cobra"
 	corev1 "k8s.io/api/core/v1"
 	storagev1 "k8s.io/api/storage/v1"
@@ -72,7 +73,7 @@ func CmdCreate() *cobra.Command {
 func CmdCreateAWSSTSS3() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "aws-sts-s3 <backing-store-name>",
-		Short: "Create aws-sts-s3 backing store",
+		Short: "Create aws-s3 backing store (using STS, short-lived credentials)",
 		Run:   RunCreateAWSSTSS3,
 	}
 	cmd.Flags().String(
@@ -94,7 +95,7 @@ func CmdCreateAWSSTSS3() *cobra.Command {
 func CmdCreateAWSS3() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "aws-s3 <backing-store-name>",
-		Short: "Create aws-s3 backing store",
+		Short: "Create aws-s3 backing store (using long-lived credentials)",
 		Run:   RunCreateAWSS3,
 	}
 	cmd.Flags().String(
@@ -481,6 +482,9 @@ func RunCreateAWSSTSS3(cmd *cobra.Command, args []string) {
 		log.Fatalf(`❌ BackingStore %q already exists in namespace %q`, backStore.Name, backStore.Namespace)
 	}
 	awsSTSARN := util.GetFlagStringOrPrompt(cmd, "aws-sts-arn")
+	if !arn.IsARN(awsSTSARN) {
+		log.Fatalf(`❌ aws-sts-arn %q is invalid`, awsSTSARN)
+	}
 	targetBucket := util.GetFlagStringOrPrompt(cmd, "target-bucket")
 	region, _ := cmd.Flags().GetString("region")
 	backStore.Spec.AWSS3 = &nbv1.AWSS3Spec{

diff --git a/pkg/namespacestore/namespacestore.go b/pkg/namespacestore/namespacestore.go
@@ -16,6 +16,7 @@ import (
 	"github.com/noobaa/noobaa-operator/v5/pkg/util"
 	"github.com/noobaa/noobaa-operator/v5/pkg/validations"
 
+	"github.com/aws/aws-sdk-go/aws/arn"
 	"github.com/spf13/cobra"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -69,7 +70,7 @@ func CmdCreate() *cobra.Command {
 func CmdCreateAWSS3() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "aws-s3 <namespace-store-name>",
-		Short: "Create aws-s3 namespace store",
+		Short: "Create aws-s3 namespace store (using long-lived credentials)",
 		Run:   RunCreateAWSS3,
 	}
 	cmd.Flags().String(
@@ -103,7 +104,7 @@ func CmdCreateAWSS3() *cobra.Command {
 func CmdCreateAWSSTSS3() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "aws-sts-s3 <namespace-store-name>",
-		Short: "Create aws-sts-s3 namespace store",
+		Short: "Create aws-s3 namespace store (using STS, short-lived credentials)",
 		Run:   RunCreateAWSSTSS3,
 	}
 	cmd.Flags().String(
@@ -491,6 +492,9 @@ func RunCreateAWSSTSS3(cmd *cobra.Command, args []string) {
 		log.Fatalf(`❌ NamespaceStore %q already exists in namespace %q`, namespaceStore.Name, namespaceStore.Namespace)
 	}
 	awsSTSARN := util.GetFlagStringOrPrompt(cmd, "aws-sts-arn")
+	if !arn.IsARN(awsSTSARN) {
+		log.Fatalf(`❌ aws-sts-arn %q is invalid`, awsSTSARN)
+	}
 	targetBucket := util.GetFlagStringOrPrompt(cmd, "target-bucket")
 	region, _ := cmd.Flags().GetString("region")
 	namespaceStore.Spec.AWSS3 = &nbv1.AWSS3Spec{