APIE-812: Add GCP support in connect artifact commands

internal/connect/command_artifact_create.go

@@ -34,7 +34,7 @@
 	}
 
 	cmd.Flags().String("artifact-file", "", "Connect artifact JAR file or ZIP file.")
-	pcmd.AddCloudAwsAzureFlag(cmd)
+	pcmd.AddCloudFlag(cmd)
 	pcmd.AddEnvironmentFlag(cmd, c.AuthenticatedCLICommand)
 	cmd.Flags().String("description", "", "Specify the Connect artifact description.")
 	pcmd.AddContextFlag(cmd, c.CLICommand)
@@ -47,7 +47,7 @@
 	return cmd
 }
 
 func (c *artifactCommand) createArtifact(cmd *cobra.Command, args []string) error {
 	displayName := args[0]
 	artifactFile, err := cmd.Flags().GetString("artifact-file")
 	if err != nil {
@@ -80,9 +80,9 @@
 		Environment:   camv1.PtrString(environment),
 	}
 
-	supportedClouds := []string{"aws", "azure"}
+	supportedClouds := []string{"aws", "azure", "gcp"}
 	if !slices.Contains(supportedClouds, strings.ToLower(cloud)) {
-		return fmt.Errorf("only clouds supported are `AWS` and `AZURE`")
+		return fmt.Errorf("only clouds supported are `AWS`, `AZURE` and `GCP`")
 	}
 
 	resp, err := c.V2Client.GetArtifactPresignedUrl(request)
@@ -94,6 +94,10 @@
 		if err := utils.UploadFileToAzureBlob(resp.GetUploadUrl(), artifactFile, strings.ToLower(resp.GetContentFormat())); err != nil {
 			return err
 		}
+	} else if strings.ToLower(cloud) == "gcp" {
+		if err := utils.UploadFileToGoogleCloudStorage(resp.GetUploadUrl(), artifactFile, strings.ToLower(resp.GetContentFormat())); err != nil {
+			return err
+		}
 	} else {
 		if err := utils.UploadFile(resp.GetUploadUrl(), artifactFile, resp.GetUploadFormData()); err != nil {
 			return err

internal/connect/command_artifact_delete.go

@@ -25,7 +25,7 @@ func (c *artifactCommand) newDeleteCommand() *cobra.Command {
 		),
 	}
 
-	pcmd.AddCloudAwsAzureFlag(cmd)
+	pcmd.AddCloudFlag(cmd)
 	pcmd.AddEnvironmentFlag(cmd, c.AuthenticatedCLICommand)
 	pcmd.AddContextFlag(cmd, c.CLICommand)
 	pcmd.AddForceFlag(cmd)

internal/connect/command_artifact_describe.go

@@ -23,7 +23,7 @@ func (c *artifactCommand) newDescribeCommand() *cobra.Command {
 		),
 	}
 
-	pcmd.AddCloudAwsAzureFlag(cmd)
+	pcmd.AddCloudFlag(cmd)
 	pcmd.AddEnvironmentFlag(cmd, c.AuthenticatedCLICommand)
 	pcmd.AddContextFlag(cmd, c.CLICommand)
 	pcmd.AddOutputFlag(cmd)

internal/connect/command_artifact_list.go

@@ -24,7 +24,7 @@ func (c *artifactCommand) newListCommand() *cobra.Command {
 		),
 	}
 
-	pcmd.AddCloudAwsAzureFlag(cmd)
+	pcmd.AddCloudFlag(cmd)
 	pcmd.AddEnvironmentFlag(cmd, c.AuthenticatedCLICommand)
 	pcmd.AddContextFlag(cmd, c.CLICommand)
 	pcmd.AddOutputFlag(cmd)

test/connect_test.go

@@ -51,7 +51,7 @@ func (s *CLITestSuite) TestConnectArtifact() {
 	tests := []CLITest{
 		{args: `connect artifact create my-connect-artifact-jar --artifact-file "test/fixtures/input/connect/artifact-example.jar" --cloud aws --environment env-123456 --description new-jar-artifact`, fixture: "connect/artifact/create-jar.golden"},
 		{args: `connect artifact create my-connect-artifact-zip --artifact-file "test/fixtures/input/connect/artifact-example.zip" --cloud aws --environment env-123456 --description new-zip-artifact`, fixture: "connect/artifact/create-zip.golden"},
-		{args: `connect artifact create my-connect-artifact --artifact-file "test/fixtures/input/connect/artifact-example.zip" --cloud gcp --environment env-123456 --description new-invalid-artifact`, fixture: "connect/artifact/create-invalid-cloud-type.golden", exitCode: 1},
+		{args: `connect artifact create my-connect-artifact --artifact-file "test/fixtures/input/connect/artifact-example.zip" --cloud invalid --environment env-123456 --description new-invalid-artifact`, fixture: "connect/artifact/create-invalid-cloud-type.golden", exitCode: 1},
 		{args: `connect artifact create my-connect-artifact --artifact-file "test/fixtures/input/connect/artifact-example.jpg" --cloud aws --environment env-123456 --description new-invalid-artifact`, fixture: "connect/artifact/create-invalid-file-type.golden", exitCode: 1},
 		{args: "connect artifact list --cloud aws --environment env-123456", fixture: "connect/artifact/list.golden"},
 		{args: "connect artifact list --cloud aws --environment env-123456 -o json", fixture: "connect/artifact/list-json.golden"},
@@ -76,6 +76,19 @@ func (s *CLITestSuite) TestConnectArtifact() {
 		{args: "connect artifact describe cfa-azure-jar123 --cloud azure --environment env-123456 -o yaml", fixture: "connect/artifact/describe-azure-yaml.golden"},
 		{args: "connect artifact delete cfa-azure-zip123 --cloud azure --environment env-123456 --force", fixture: "connect/artifact/delete-azure-force.golden"},
 		{args: "connect artifact delete cfa-azure-zip123 --cloud azure --environment env-123456", input: "y\n", fixture: "connect/artifact/delete-azure-prompt.golden"},
+
+		// GCP tests
+		{args: `connect artifact create my-connect-artifact-gcp-jar --artifact-file "test/fixtures/input/connect/artifact-example.jar" --cloud gcp --environment env-123456 --description new-jar-artifact`, fixture: "connect/artifact/create-gcp-jar.golden"},
+		{args: `connect artifact create my-connect-artifact-gcp-zip --artifact-file "test/fixtures/input/connect/artifact-example.zip" --cloud gcp --environment env-123456 --description new-zip-artifact`, fixture: "connect/artifact/create-gcp-zip.golden"},
+		{args: "connect artifact list --cloud gcp --environment env-123456", fixture: "connect/artifact/list-gcp.golden"},
+		{args: "connect artifact list --cloud gcp --environment env-123456 -o json", fixture: "connect/artifact/list-gcp-json.golden"},
+		{args: "connect artifact list --cloud gcp --environment env-123456 -o yaml", fixture: "connect/artifact/list-gcp-yaml.golden"},
+		{args: "connect artifact describe cfa-gcp-zip123 --cloud gcp --environment env-123456", fixture: "connect/artifact/describe-gcp-zip.golden"},
+		{args: "connect artifact describe cfa-gcp-jar123 --cloud gcp --environment env-123456", fixture: "connect/artifact/describe-gcp-jar.golden"},
+		{args: "connect artifact describe cfa-gcp-jar123 --cloud gcp --environment env-123456 -o json", fixture: "connect/artifact/describe-gcp-json.golden"},
+		{args: "connect artifact describe cfa-gcp-jar123 --cloud gcp --environment env-123456 -o yaml", fixture: "connect/artifact/describe-gcp-yaml.golden"},
+		{args: "connect artifact delete cfa-gcp-zip123 --cloud gcp --environment env-123456 --force", fixture: "connect/artifact/delete-gcp-force.golden"},
+		{args: "connect artifact delete cfa-gcp-zip123 --cloud gcp --environment env-123456", input: "y\n", fixture: "connect/artifact/delete-gcp-prompt.golden"},
 	}
 
 	for _, test := range tests {

test/fixtures/output/connect/artifact/create-gcp-jar.golden

@@ -0,0 +1,9 @@
++----------------+-----------------------------+
+| ID             | cfa-gcp-jar123              |
+| Name           | my-connect-artifact-gcp-jar |
+| Description    | new-jar-artifact            |
+| Cloud          | GCP                         |
+| Environment    | env-123456                  |
+| Content Format | JAR                         |
+| Status         | PROCESSING                  |
++----------------+-----------------------------+

test/fixtures/output/connect/artifact/create-gcp-zip.golden

@@ -0,0 +1,9 @@
++----------------+-----------------------------+
+| ID             | cfa-gcp-zip123              |
+| Name           | my-connect-artifact-gcp-zip |
+| Description    | new-zip-artifact            |
+| Cloud          | GCP                         |
+| Environment    | env-123456                  |
+| Content Format | ZIP                         |
+| Status         | PROCESSING                  |
++----------------+-----------------------------+

test/fixtures/output/connect/artifact/create-help.golden

@@ -10,7 +10,7 @@ Create Connect artifact "my-connect-artifact".
 
 Flags:
       --artifact-file string   REQUIRED: Connect artifact JAR file or ZIP file.
-      --cloud string           REQUIRED: Specify the cloud provider as "aws" or "azure".
+      --cloud string           REQUIRED: Specify the cloud provider as "aws", "azure", or "gcp".
       --environment string     Environment ID.
       --description string     Specify the Connect artifact description.
       --context string         CLI context name.

test/fixtures/output/connect/artifact/create-invalid-cloud-type.golden

@@ -1 +1 @@
-Error: only clouds supported are `AWS` and `AZURE`
+Error: only clouds supported are `AWS`, `AZURE` and `GCP`

test/fixtures/output/connect/artifact/delete-gcp-force.golden

@@ -0,0 +1 @@
+Deleted Connect Artifact "cfa-gcp-zip123".

test/fixtures/output/connect/artifact/delete-gcp-prompt.golden

@@ -0,0 +1 @@
+Are you sure you want to delete Connect Artifact "cfa-gcp-zip123"? (y/n): Deleted Connect Artifact "cfa-gcp-zip123".

test/fixtures/output/connect/artifact/delete-help.golden

@@ -9,7 +9,7 @@ Delete Connect artifact.
   $ confluent connect artifact delete cfa-abc123 --cloud aws --environment env-abc123
 
 Flags:
-      --cloud string         REQUIRED: Specify the cloud provider as "aws" or "azure".
+      --cloud string         REQUIRED: Specify the cloud provider as "aws", "azure", or "gcp".
       --environment string   Environment ID.
       --context string       CLI context name.
       --force                Skip the deletion confirmation prompt.

test/fixtures/output/connect/artifact/describe-gcp-jar.golden

@@ -0,0 +1,9 @@
++----------------+-----------------------------+
+| ID             | cfa-gcp-jar123              |
+| Name           | my-connect-artifact-gcp-jar |
+| Description    | new-jar-artifact            |
+| Cloud          | GCP                         |
+| Environment    | env-123456                  |
+| Content Format | JAR                         |
+| Status         | READY                       |
++----------------+-----------------------------+

test/fixtures/output/connect/artifact/describe-gcp-json.golden

@@ -0,0 +1,9 @@
+{
+  "id": "cfa-gcp-jar123",
+  "name": "my-connect-artifact-gcp-jar",
+  "description": "new-jar-artifact",
+  "cloud": "GCP",
+  "environment": "env-123456",
+  "content_format": "JAR",
+  "status": "READY"
+}

test/fixtures/output/connect/artifact/describe-gcp-yaml.golden

@@ -0,0 +1,7 @@
+id: cfa-gcp-jar123
+name: my-connect-artifact-gcp-jar
+description: new-jar-artifact
+cloud: GCP
+environment: env-123456
+content_format: JAR
+status: READY

test/fixtures/output/connect/artifact/describe-gcp-zip.golden

@@ -0,0 +1,9 @@
++----------------+-----------------------------+
+| ID             | cfa-gcp-zip123              |
+| Name           | my-connect-artifact-gcp-zip |
+| Description    | new-zip-artifact            |
+| Cloud          | GCP                         |
+| Environment    | env-123456                  |
+| Content Format | ZIP                         |
+| Status         | PROCESSING                  |
++----------------+-----------------------------+

test/fixtures/output/connect/artifact/describe-help.golden

@@ -9,7 +9,7 @@ Describe a Connect artifact.
   $ confluent connect artifact describe cfa-abc123 --cloud aws --environment env-abc123
 
 Flags:
-      --cloud string         REQUIRED: Specify the cloud provider as "aws" or "azure".
+      --cloud string         REQUIRED: Specify the cloud provider as "aws", "azure", or "gcp".
       --environment string   Environment ID.
       --context string       CLI context name.
   -o, --output string        Specify the output format as "human", "json", or "yaml". (default "human")

test/fixtures/output/connect/artifact/list-gcp-json.golden

@@ -0,0 +1,20 @@
+[
+  {
+    "id": "cfa-gcp-jar123",
+    "name": "my-connect-artifact-gcp-jar",
+    "description": "new-jar-artifact",
+    "cloud": "GCP",
+    "environment": "env-123456",
+    "content_format": "JAR",
+    "status": "READY"
+  },
+  {
+    "id": "cfa-gcp-zip123",
+    "name": "my-connect-artifact-gcp-zip",
+    "description": "new-zip-artifact",
+    "cloud": "GCP",
+    "environment": "env-123456",
+    "content_format": "ZIP",
+    "status": "PROCESSING"
+  }
+]

test/fixtures/output/connect/artifact/list-gcp-yaml.golden

@@ -0,0 +1,14 @@
+- id: cfa-gcp-jar123
+  name: my-connect-artifact-gcp-jar
+  description: new-jar-artifact
+  cloud: GCP
+  environment: env-123456
+  content_format: JAR
+  status: READY
+- id: cfa-gcp-zip123
+  name: my-connect-artifact-gcp-zip
+  description: new-zip-artifact
+  cloud: GCP
+  environment: env-123456
+  content_format: ZIP
+  status: PROCESSING

test/fixtures/output/connect/artifact/list-gcp.golden

@@ -0,0 +1,4 @@
+        ID       |            Name             |   Description    | Cloud | Environment | Content Format |   Status    
+-----------------+-----------------------------+------------------+-------+-------------+----------------+-------------
+  cfa-gcp-jar123 | my-connect-artifact-gcp-jar | new-jar-artifact | GCP   | env-123456  | JAR            | READY       
+  cfa-gcp-zip123 | my-connect-artifact-gcp-zip | new-zip-artifact | GCP   | env-123456  | ZIP            | PROCESSING  

test/fixtures/output/connect/artifact/list-help.golden

@@ -9,7 +9,7 @@ List Connect artifacts.
   $ confluent connect artifact list --cloud aws --environment env-abc123
 
 Flags:
-      --cloud string         REQUIRED: Specify the cloud provider as "aws" or "azure".
+      --cloud string         REQUIRED: Specify the cloud provider as "aws", "azure", or "gcp".
       --environment string   Environment ID.
       --context string       CLI context name.
   -o, --output string        Specify the output format as "human", "json", or "yaml". (default "human")

test/test-server/connect_handler.go

@@ -169,7 +169,7 @@
 var artifactStore = make(map[string]camv1.CamV1ConnectArtifact)
 
 // Handler for: "/api/cam/v1/connect-artifacts"
 func handleConnectArtifacts(t *testing.T) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		switch r.Method {
 		case http.MethodPost:
@@ -180,17 +180,23 @@
 
 			switch artifact.Spec.GetDisplayName() {
 			case "my-connect-artifact-jar":
 				artifact.SetId("cfa-jar123")
 				artifact.Spec.SetContentFormat("JAR")
 			case "my-connect-artifact-zip":
 				artifact.SetId("cfa-zip123")
 				artifact.Spec.SetContentFormat("ZIP")
 			case "my-connect-artifact-azure-jar":
 				artifact.SetId("cfa-azure-jar123")
 				artifact.Spec.SetContentFormat("JAR")
 			case "my-connect-artifact-azure-zip":
 				artifact.SetId("cfa-azure-zip123")
 				artifact.Spec.SetContentFormat("ZIP")
+			case "my-connect-artifact-gcp-jar":
+				artifact.SetId("cfa-gcp-jar123")
+				artifact.Spec.SetContentFormat("JAR")
+			case "my-connect-artifact-gcp-zip":
+				artifact.SetId("cfa-gcp-zip123")
+				artifact.Spec.SetContentFormat("ZIP")
 			}
 
 			artifact.Status = &camv1.CamV1ConnectArtifactStatus{
@@ -227,7 +233,7 @@
 				if cloud != "" && strings.ToUpper(artifact.Spec.GetCloud()) != cloud {
 					continue
 				}
-				if artifact.GetId() == "cfa-jar123" || artifact.GetId() == "cfa-azure-jar123" {
+				if artifact.GetId() == "cfa-jar123" || artifact.GetId() == "cfa-azure-jar123" || artifact.GetId() == "cfa-gcp-jar123" {
 					artifact.Status = &camv1.CamV1ConnectArtifactStatus{
 						Phase: "READY",
 					}
@@ -242,7 +248,7 @@
 }
 
 // Handler for: "/api/cam/v1/connect-artifacts/{id}"
 func handleConnectArtifactId(t *testing.T) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		switch r.Method {
 		case http.MethodGet:
@@ -256,7 +262,7 @@
 				return
 			}
 
-			if id == "cfa-jar123" || id == "cfa-azure-jar123" {
+			if id == "cfa-jar123" || id == "cfa-azure-jar123" || id == "cfa-gcp-jar123" {
 				artifact.Status = &camv1.CamV1ConnectArtifactStatus{
 					Phase: "READY",
 				}
@@ -273,7 +279,7 @@
 				return
 			}
 
-			if id == "cfa-zip123" || id == "cfa-azure-zip123" {
+			if id == "cfa-zip123" || id == "cfa-azure-zip123" || id == "cfa-gcp-zip123" {
 				w.WriteHeader(http.StatusNoContent)
 			}
 		}