conditional services enable

OpenTOSCA · Jan 7, 2024 · f104b82 · f104b82
1 parent 0df0fa3
commit f104b82
Show file tree

Hide file tree

Showing 28 changed files with 171 additions and 88 deletions.
diff --git a/examples/unfurl-artifacts/lib/shop_app.yaml b/examples/unfurl-artifacts/lib/shop_app.yaml
@@ -166,7 +166,7 @@ node_types:
                                 #
                                 ###################################################
 
-                                - name: active service account
+                                - name: Activate service account
                                   shell: 'gcloud auth activate-service-account --key-file {{ SELF.credentials }} --project {{ SELF.project }}'
                                   when: SELF.deployment_mode == "GCP"
 
@@ -262,7 +262,7 @@ node_types:
                                 #
                                 ###################################################
 
-                                - name: active service account
+                                - name: Activate service account
                                   shell: 'gcloud auth activate-service-account --key-file {{ SELF.credentials }} --project {{ SELF.project }}'
                                   when: SELF.deployment_mode == "GCP"
 

diff --git a/examples/unfurl-aware/lib/gcp_runtime.yaml b/examples/unfurl-aware/lib/gcp_runtime.yaml
@@ -41,15 +41,27 @@ node_types:
                         inputs:
                             playbook:
                                 q:
-                                    -   name: active service account
+                                    -   name: Activate service account
                                         shell: 'gcloud auth activate-service-account --key-file {{ SELF.service_account_file }} --project {{ SELF.project }}'
 
                                     # https://cloud.google.com/sql/docs/mysql/connect-instance-cloud-shell
                                     -   name: Enable Cloud Build API
-                                        shell: 'gcloud services enable cloudbuild.googleapis.com'
+                                        shell: |
+                                            GCP_SERVICE=cloudbuild.googleapis.com
+                                            
+                                            GCP_SERVICE_ENABLED=$(gcloud services list --filter ${GCP_SERVICE} --format json --enabled | jq length)
+                                            if [ ${GCP_SERVICE_ENABLED} == 0 ]; then
+                                                gcloud services enable ${GCP_SERVICE}
+                                            fi
 
                                     -   name: Enable appengine.googleapis.com
-                                        shell: 'gcloud services enable appengine.googleapis.com'
+                                        shell: |
+                                            GCP_SERVICE=appengine.googleapis.com
+                                            
+                                            GCP_SERVICE_ENABLED=$(gcloud services list --filter ${GCP_SERVICE} --format json --enabled | jq length)
+                                            if [ ${GCP_SERVICE_ENABLED} == 0 ]; then
+                                                gcloud services enable ${GCP_SERVICE}
+                                            fi
 
                                     # https://cloud.google.com/sdk/gcloud/reference/app/create
                                     -   name: Create App

diff --git a/examples/unfurl-aware/lib/shop_component.yaml b/examples/unfurl-aware/lib/shop_component.yaml
@@ -207,7 +207,7 @@ node_types:
                                 #
                                 ###################################################
 
-                                -   name: active service account
+                                -   name: Activate service account
                                     shell: 'gcloud auth activate-service-account --key-file {{ SELF.gcp_service_account_file }} --project {{ SELF.gcp_project }}'
                                     when: SELF.deployment_mode[0] == "GCP"
 
@@ -263,7 +263,7 @@ node_types:
                                 #
                                 ###################################################
 
-                                -   name: active service account
+                                -   name: Activate service account
                                     shell: 'gcloud auth activate-service-account --key-file {{ SELF.gcp_service_account_file }} --project {{ SELF.gcp_project }}'
                                     when: SELF.deployment_mode[0] == "GCP"
 

diff --git a/examples/unfurl-aware/lib/shop_database.yaml b/examples/unfurl-aware/lib/shop_database.yaml
@@ -98,7 +98,7 @@ node_types:
                                 #
                                 ###################################################
 
-                                - name: active service account
+                                - name: Activate service account
                                   shell: 'gcloud auth activate-service-account --key-file {{ SELF.gcp_service_account_file }} --project {{ SELF.gcp_project }}'
                                   when: SELF.deployment_mode == "GCP"
 

diff --git a/examples/unfurl-motivation/lib/gcp.yaml b/examples/unfurl-motivation/lib/gcp.yaml
@@ -78,7 +78,13 @@ node_types:
                         implementation: |
                             set -e
                             gcloud --no-user-output-enabled auth activate-service-account --key-file {{ SELF.service_account_file }} --project {{ SELF.project }}
-                            gcloud services enable sqladmin.googleapis.com >/dev/null                                      
+                            
+                            GCP_SERVICE=sqladmin.googleapis.com
+                            GCP_SERVICE_ENABLED=$(gcloud services list --filter ${GCP_SERVICE} --format json --enabled | jq length)
+                            if [ ${GCP_SERVICE_ENABLED} == 0 ]; then
+                                gcloud services enable ${GCP_SERVICE} >/dev/null
+                            fi
+
                             gcloud sql instances create {{ SELF.instance_name }} --tier {{ SELF.instance_tier }} --region {{ SELF.region }} --database-version={{ SELF.database_version }} --authorized-networks {{ SELF.authorized_networks }} --timeout unlimited >/dev/null
                             gcloud sql users set-password root --host=% --instance {{ SELF.instance_name }} --password {{ SELF.password }} >/dev/null
                             gcloud sql instances describe {{ SELF.instance_name }} --format=json
@@ -199,8 +205,19 @@ node_types:
                         implementation: |
                             set -e
                             gcloud auth activate-service-account --key-file {{ SELF.service_account_file }} --project {{ SELF.project }}
-                            gcloud services enable cloudbuild.googleapis.com || true
-                            gcloud services enable appengine.googleapis.com || true
+                            
+                            GCP_SERVICE=cloudbuild.googleapis.com
+                            GCP_SERVICE_ENABLED=$(gcloud services list --filter ${GCP_SERVICE} --format json --enabled | jq length)
+                            if [ ${GCP_SERVICE_ENABLED} == 0 ]; then
+                                gcloud services enable ${GCP_SERVICE}
+                            fi
+                
+                            GCP_SERVICE=appengine.googleapis.com
+                            GCP_SERVICE_ENABLED=$(gcloud services list --filter ${GCP_SERVICE} --format json --enabled | jq length)
+                            if [ ${GCP_SERVICE_ENABLED} == 0 ]; then
+                                gcloud services enable ${GCP_SERVICE}
+                            fi
+
                             gcloud app create --region {{ SELF.region }} || true
                         inputs:
                             keeplines: true
diff --git a/examples/unfurl-motivation/lib/node.yaml b/examples/unfurl-motivation/lib/node.yaml
@@ -139,7 +139,7 @@ node_types:
                                     cd {{ SELF.application_directory }}
                                     sudo npm install --unsafe-perm
                                     sudo pm2 start --name {{ SELF.application_name }} start.sh
-                                EOF
+                            EOF
                                 exit 0
                             fi
 

diff --git a/examples/unfurl-motivation/scripts/configuration.env b/examples/unfurl-motivation/scripts/configuration.env
@@ -1,3 +1,3 @@
 TEMPLATE_NAME="motivation"
 VINTNER="yarn vintner"
-DEPLOYMENT_VARIANT="prod"
+DEPLOYMENT_VARIANT="dev"
diff --git a/examples/xopera-motivation/lib/gcp/appengine/engine/playbooks/create.yaml b/examples/xopera-motivation/lib/gcp/appengine/engine/playbooks/create.yaml
@@ -1,22 +1,34 @@
 ---
-- name: Create GCP App Engine
-  hosts: all
-  gather_facts: false
-  tasks:
-      - name: active service account
-        shell: 'gcloud auth activate-service-account --key-file {{ service_account_file }} --project {{ project }}'
+-   name: Create GCP App Engine
+    hosts: all
+    gather_facts: false
+    tasks:
+        -   name: Activate service account
+            shell: 'gcloud auth activate-service-account --key-file {{ service_account_file }} --project {{ project }}'
 
-      # https://cloud.google.com/sql/docs/mysql/connect-instance-cloud-shell
-      - name: Enable Cloud Build API
-        shell: 'gcloud services enable cloudbuild.googleapis.com'
+        # https://cloud.google.com/sql/docs/mysql/connect-instance-cloud-shell
+        -   name: Enable Cloud Build API
+            shell: |
+                GCP_SERVICE=cloudbuild.googleapis.com
+                
+                GCP_SERVICE_ENABLED=$(gcloud services list --filter ${GCP_SERVICE} --format json --enabled | jq length)
+                if [ ${GCP_SERVICE_ENABLED} == 0 ]; then
+                    gcloud services enable ${GCP_SERVICE}
+                fi
 
-      - name: Enable appengine.googleapis.com
-        shell: 'gcloud services enable appengine.googleapis.com'
+        -   name: Enable appengine.googleapis.com
+            shell: |
+                GCP_SERVICE=appengine.googleapis.com
+                
+                GCP_SERVICE_ENABLED=$(gcloud services list --filter ${GCP_SERVICE} --format json --enabled | jq length)
+                if [ ${GCP_SERVICE_ENABLED} == 0 ]; then
+                    gcloud services enable ${GCP_SERVICE}
+                fi
 
-      # https://cloud.google.com/sdk/gcloud/reference/app/create
-      - name: Create App
-        shell: 'gcloud app create --region {{ region }}'
-        register: app_create_command
-        failed_when:
-            - "'Created' not in app_create_command.stderr"
-            - "'already contains' not in app_create_command.stderr"
+        # https://cloud.google.com/sdk/gcloud/reference/app/create
+        -   name: Create App
+            shell: 'gcloud app create --region {{ region }}'
+            register: app_create_command
+            failed_when:
+                - "'Created' not in app_create_command.stderr"
+                - "'already contains' not in app_create_command.stderr"
diff --git a/examples/xopera-motivation/lib/gcp/sql/db/playbooks/create.yaml b/examples/xopera-motivation/lib/gcp/sql/db/playbooks/create.yaml
@@ -3,7 +3,7 @@
   hosts: all
   gather_facts: false
   tasks:
-      - name: active service account
+      - name: Activate service account
         shell: 'gcloud auth activate-service-account --key-file {{ service_account_file }} --project {{ project }}'
 
       # https://cloud.google.com/sql/docs/mysql/create-manage-databases

diff --git a/examples/xopera-motivation/lib/gcp/sql/db/playbooks/delete.yaml b/examples/xopera-motivation/lib/gcp/sql/db/playbooks/delete.yaml
@@ -3,7 +3,7 @@
   hosts: all
   gather_facts: false
   tasks:
-      - name: active service account
+      - name: Activate service account
         shell: 'gcloud auth activate-service-account --key-file {{ service_account_file }} --project {{ project }}'
 
       # https://cloud.google.com/sql/docs/mysql/create-manage-databases

diff --git a/examples/xopera-motivation/lib/gcp/sql/dbms/playbooks/create.yaml b/examples/xopera-motivation/lib/gcp/sql/dbms/playbooks/create.yaml
@@ -3,12 +3,18 @@
   hosts: all
   gather_facts: false
   tasks:
-      - name: active service account
+      - name: Activate service account
         shell: 'gcloud auth activate-service-account --key-file {{ service_account_file }} --project {{ project }}'
 
       # https://cloud.google.com/sql/docs/mysql/connect-instance-cloud-shell
       - name: Enable Cloud SQL Admin API
-        shell: 'gcloud services enable sqladmin.googleapis.com'
+        shell: |
+            GCP_SERVICE=sqladmin.googleapis.com
+            
+            GCP_SERVICE_ENABLED=$(gcloud services list --filter ${GCP_SERVICE} --format json --enabled | jq length)
+            if [ ${GCP_SERVICE_ENABLED} == 0 ]; then
+                gcloud services enable ${GCP_SERVICE}
+            fi
 
       # https://cloud.google.com/sql/docs/mysql/create-instance
       - name: Create Instance

diff --git a/examples/xopera-motivation/lib/gcp/sql/dbms/playbooks/delete.yaml b/examples/xopera-motivation/lib/gcp/sql/dbms/playbooks/delete.yaml
@@ -3,7 +3,7 @@
   hosts: all
   gather_facts: false
   tasks:
-      - name: active service account
+      - name: Activate service account
         shell: 'gcloud auth activate-service-account --key-file {{ service_account_file }}'
 
       - name: Delete Instnace

diff --git a/examples/xopera-motivation/lib/node/application/playbooks/gcp.create.yaml b/examples/xopera-motivation/lib/node/application/playbooks/gcp.create.yaml
@@ -3,7 +3,7 @@
   hosts: all
   gather_facts: false
   tasks:
-      - name: active service account
+      - name: Activate service account
         shell: 'gcloud auth activate-service-account --key-file {{ gcp_service_account_file }} --project {{ gcp_project }}'
 
       - name: Create working directory

diff --git a/examples/xopera-motivation/lib/node/application/playbooks/gcp.delete.yaml b/examples/xopera-motivation/lib/node/application/playbooks/gcp.delete.yaml
@@ -3,7 +3,7 @@
   hosts: all
   gather_facts: false
   tasks:
-      - name: active service account
+      - name: Activate service account
         shell: 'gcloud auth activate-service-account --key-file {{ gcp_service_account_file }} --project {{ gcp_project }}'
 
       - name: Create App

diff --git a/examples/xopera-pruning-consistent-loose/lib/gcp/database/create.yaml b/examples/xopera-pruning-consistent-loose/lib/gcp/database/create.yaml
@@ -3,7 +3,7 @@
   hosts: all
   gather_facts: false
   tasks:
-      - name: active service account
+      - name: Activate service account
         shell: 'gcloud auth activate-service-account --key-file {{ service_account_file }} --project {{ project }}'
 
       # https://cloud.google.com/sql/docs/mysql/create-manage-databases

diff --git a/examples/xopera-pruning-consistent-loose/lib/gcp/database/delete.yaml b/examples/xopera-pruning-consistent-loose/lib/gcp/database/delete.yaml
@@ -3,7 +3,7 @@
   hosts: all
   gather_facts: false
   tasks:
-      - name: active service account
+      - name: Activate service account
         shell: 'gcloud auth activate-service-account --key-file {{ service_account_file }} --project {{ project }}'
 
       # https://cloud.google.com/sql/docs/mysql/create-manage-databases

diff --git a/examples/xopera-pruning-consistent-loose/lib/gcp/dbms/create.yaml b/examples/xopera-pruning-consistent-loose/lib/gcp/dbms/create.yaml
@@ -3,12 +3,18 @@
   hosts: all
   gather_facts: false
   tasks:
-      - name: active service account
+      - name: Activate service account
         shell: 'gcloud auth activate-service-account --key-file {{ service_account_file }} --project {{ project }}'
 
       # https://cloud.google.com/sql/docs/mysql/connect-instance-cloud-shell
       - name: Enable Cloud SQL Admin API
-        shell: 'gcloud services enable sqladmin.googleapis.com'
+        shell: |
+            GCP_SERVICE=sqladmin.googleapis.com
+            
+            GCP_SERVICE_ENABLED=$(gcloud services list --filter ${GCP_SERVICE} --format json --enabled | jq length)
+            if [ ${GCP_SERVICE_ENABLED} == 0 ]; then
+                gcloud services enable ${GCP_SERVICE}
+            fi
 
       # https://cloud.google.com/sql/docs/mysql/create-instance
       # https://cloud.google.com/sdk/gcloud/reference/sql/instances/create

diff --git a/examples/xopera-pruning-consistent-loose/lib/gcp/dbms/delete.yaml b/examples/xopera-pruning-consistent-loose/lib/gcp/dbms/delete.yaml
@@ -3,7 +3,7 @@
   hosts: all
   gather_facts: false
   tasks:
-      - name: active service account
+      - name: Activate service account
         shell: 'gcloud auth activate-service-account --key-file {{ service_account_file }}'
 
       - name: Delete Instnace

diff --git a/examples/xopera-pruning-consistent-loose/lib/gcp/runtime/create.yaml b/examples/xopera-pruning-consistent-loose/lib/gcp/runtime/create.yaml
@@ -1,22 +1,34 @@
 ---
-- name: Create GCP App Engine
-  hosts: all
-  gather_facts: false
-  tasks:
-      - name: active service account
-        shell: 'gcloud auth activate-service-account --key-file {{ service_account_file }} --project {{ project }}'
+-   name: Create GCP App Engine
+    hosts: all
+    gather_facts: false
+    tasks:
+        -   name: Activate service account
+            shell: 'gcloud auth activate-service-account --key-file {{ service_account_file }} --project {{ project }}'
 
-      # https://cloud.google.com/sql/docs/mysql/connect-instance-cloud-shell
-      - name: Enable Cloud Build API
-        shell: 'gcloud services enable cloudbuild.googleapis.com'
+        # https://cloud.google.com/sql/docs/mysql/connect-instance-cloud-shell
+        -   name: Enable Cloud Build API
+            shell: |
+                GCP_SERVICE=cloudbuild.googleapis.com
+                
+                GCP_SERVICE_ENABLED=$(gcloud services list --filter ${GCP_SERVICE} --format json --enabled | jq length)
+                if [ ${GCP_SERVICE_ENABLED} == 0 ]; then
+                    gcloud services enable ${GCP_SERVICE}
+                fi
 
-      - name: Enable appengine.googleapis.com
-        shell: 'gcloud services enable appengine.googleapis.com'
+        -   name: Enable appengine.googleapis.com
+            shell: |
+                GCP_SERVICE=appengine.googleapis.com
+                
+                GCP_SERVICE_ENABLED=$(gcloud services list --filter ${GCP_SERVICE} --format json --enabled | jq length)
+                if [ ${GCP_SERVICE_ENABLED} == 0 ]; then
+                    gcloud services enable ${GCP_SERVICE}
+                fi
 
-      # https://cloud.google.com/sdk/gcloud/reference/app/create
-      - name: Create App
-        shell: 'gcloud app create --region {{ region }}'
-        register: app_create_command
-        failed_when:
-            - "'Created' not in app_create_command.stderr"
-            - "'already contains' not in app_create_command.stderr"
+        # https://cloud.google.com/sdk/gcloud/reference/app/create
+        -   name: Create App
+            shell: 'gcloud app create --region {{ region }}'
+            register: app_create_command
+            failed_when:
+                - "'Created' not in app_create_command.stderr"
+                - "'already contains' not in app_create_command.stderr"
diff --git a/examples/xopera-pruning-consistent-loose/lib/shop/component/gcp.create.yaml b/examples/xopera-pruning-consistent-loose/lib/shop/component/gcp.create.yaml
@@ -3,7 +3,7 @@
   hosts: all
   gather_facts: false
   tasks:
-      - name: active service account
+      - name: Activate service account
         shell: 'gcloud auth activate-service-account --key-file {{ gcp_service_account_file }} --project {{ gcp_project }}'
 
       - name: Create working directory

diff --git a/examples/xopera-pruning-consistent-loose/lib/shop/component/gcp.delete.yaml b/examples/xopera-pruning-consistent-loose/lib/shop/component/gcp.delete.yaml
@@ -3,7 +3,7 @@
   hosts: all
   gather_facts: false
   tasks:
-      - name: active service account
+      - name: Activate service account
         shell: 'gcloud auth activate-service-account --key-file {{ gcp_service_account_file }} --project {{ gcp_project }}'
 
       - name: Create App

diff --git a/examples/xopera-pruning/lib/gcp/database/create.yaml b/examples/xopera-pruning/lib/gcp/database/create.yaml
@@ -3,7 +3,7 @@
   hosts: all
   gather_facts: false
   tasks:
-      - name: active service account
+      - name: Activate service account
         shell: 'gcloud auth activate-service-account --key-file {{ service_account_file }} --project {{ project }}'
 
       # https://cloud.google.com/sql/docs/mysql/create-manage-databases

diff --git a/examples/xopera-pruning/lib/gcp/database/delete.yaml b/examples/xopera-pruning/lib/gcp/database/delete.yaml
@@ -3,7 +3,7 @@
   hosts: all
   gather_facts: false
   tasks:
-      - name: active service account
+      - name: Activate service account
         shell: 'gcloud auth activate-service-account --key-file {{ service_account_file }} --project {{ project }}'
 
       # https://cloud.google.com/sql/docs/mysql/create-manage-databases