Merge remote-tracking branch 'origin/main' into gh_pages

Author: srinandan

internal/client/connections/connectors.go

@@ -40,6 +40,7 @@ type listconnections struct {
 
 type connection struct {
 	Name                   *string             `json:"name,omitempty"`
+	Labels                 *map[string]string  `json:"labels,omitempty"`
 	Description            string              `json:"description,omitempty"`
 	ConnectorVersion       *string             `json:"connectorVersion,omitempty"`
 	ConnectorDetails       *connectorDetails   `json:"connectorDetails,omitempty"`

internal/cmd/utils/utils.go

@@ -145,7 +145,7 @@ customActions:
 - name: render-%s-integration
   containers:
   - name: render
-    image: us-docker.pkg.dev/appintegration-toolkit/images/integrationcli:%s
+    image: us-docker.pkg.dev/appintegration-toolkit/images/integrationcli:v%s
     command: ['sh']
     args:
       - '-c'
@@ -154,7 +154,7 @@ customActions:
 - name: deploy-%s-integration
   containers:
   - name: deploy
-    image: us-docker.pkg.dev/appintegration-toolkit/images/integrationcli:%s
+    image: us-docker.pkg.dev/appintegration-toolkit/images/integrationcli:v%s
     command: ['sh']
     args:
       - '-c'
@@ -186,7 +186,7 @@ permissions: read-all
 on: push
 
 env:
-  ENVIRONMENT: 'dev'
+  ENVIRONMENT: ${{ vars.ENVIRONMENT }}
   PROJECT_ID: ${{ vars.PROJECT_ID }}
   REGION: ${{ vars.REGION }}
   WORKLOAD_IDENTITY_PROVIDER_NAME: ${{ vars.PROVIDER_NAME }}
@@ -225,7 +225,7 @@ jobs:
         id: 'publish-integration'
         uses: docker://us-docker.pkg.dev/appintegration-toolkit/images/integrationcli:%s #pin to version of choice
         with:
-          args: integrations apply --env=${{ env.ENVIRONMENT}} --folder=. --userlabel=${{ steps.calc-vars.outputs.SHORT_SHA }} --wait=true --proj=${{ env.PROJECT_ID }} --reg=${{ env.REGION }} --token ${{ steps.gcp-auth.outputs.access_token }}`
+          args: integrations apply --env=${{ env.ENVIRONMENT}} --folder=. --userlabel=${{ steps.calc-vars.outputs.SHORT_SHA }} --run-tests=true --wait=true --proj=${{ env.PROJECT_ID }} --reg=${{ env.REGION }} --token ${{ steps.gcp-auth.outputs.access_token }}`
 
 func GetCloudDeployYaml(integrationName string, env string) string {
 	if env == "" {

samples/scaffold-sample/release.sh

@@ -1,2 +1,3 @@
 #!/bin/sh
-gcloud deploy releases create test-release-$((RANDOM % 900 + 100)) --project=${PROJECT_ID} --region=${LOCATION} --to-target=dev-env --delivery-pipeline=appint-sample-pipeline
+RELEASE_NAME=test-release
+gcloud deploy releases create $RELEASE_NAME--$(date +'%Y%m%d%H%M%S') --project=${PROJECT_ID} --region=${LOCATION} --to-target=dev --delivery-pipeline=appint-sample-pipeline