Added dependency on the apim repo. Fixed parameters passed between pipelines

Author: robertnovac1

azure/new_pipelines/azure-pr-new-int-pipeline.yml

@@ -1,19 +1,29 @@
 trigger: none
 pr: none
 
+resources:
+  repositories:
+    - repository: common
+      type: github
+      name: NHSDigital/api-management-utils
+      ref: refs/heads/edge
+      endpoint: NHSDigital
+      
 stages:
   - stage: GreenDeploy
     displayName: "Deploy to Green"
     jobs:
       - template: templates/deploy-int-job.yml
         parameters:
-          environmentName: green-env
-  - stage: BlueDeploy
-    displayName: "Deploy to Blue"
-    dependsOn: GreenDeploy
-    jobs:
-      - template: templates/deploy-int-job.yml
-        parameters:
-          environmentName: blue-env
+          tf_environment: green
+          tf_dir: "terraform_old"
+  # - stage: BlueDeploy
+  #   displayName: "Deploy to Blue"
+  #   dependsOn: GreenDeploy
+  #   jobs:
+  #     - template: templates/deploy-int-job.yml
+  #       parameters:
+  #         tf_environment: blue
+  #         tf_dir: "terraform_old"
 
 

azure/new_pipelines/deploy-int-job.yml

@@ -1,35 +1,30 @@
 parameters:
-  - name: aws_dev
-    default: aws --profile=apim-dev
   - name: is_ptl
     default: true
-  - name: 'aws_account_type'
-    type: string
   - name: tf_dir
     type: string
-    default: "terraform"
+    default: "terraform_old"
   - name: tf_environment
     type: string
     default: "green"
 
 steps:
-  - ${{ if parameters.is_ptl }}:
-    - template: "azure/components/aws-assume-role.yml@common"
-      parameters:
-        role: "auto-ops"
-        profile: "apm_ptl"
-
-    - template: "azure/components/get-aws-secrets-and-ssm-params.yml@common"
-      parameters:
-        secret_file_ids:
-          - ptl/app-credentials/jwt_testing/non-prod/JWT_TESTING_PRIVATE_KEY
-        secret_ids:
-          - ptl/app-credentials/immunisation-fhir-api-testing-app/non-prod/INTROSPECTION_CLIENT_ID
-          - ptl/app-credentials/immunisation-fhir-api-testing-app/non-prod/INTROSPECTION_CLIENT_SECRET
-          - ptl/app-credentials/immunisation-fhir-api-testing-app/non-prod/INTROSPECTION_CLIENT_ID_INT
-          - ptl/app-credentials/immunisation-fhir-api-testing-app/non-prod/INTROSPECTION_CLIENT_SECRET_INT
-          - ptl/app-credentials/immunisation-fhir-api-testing-app/non-prod/INT_CLIENT_ID
-          - ptl/app-credentials/immunisation-fhir-api-testing-app/non-prod/INT_CLIENT_SECRET
+  - template: "azure/components/aws-assume-role.yml@common"
+    parameters:
+      role: "auto-ops"
+      profile: "apm_ptl"
+
+  - template: "azure/components/get-aws-secrets-and-ssm-params.yml@common"
+    parameters:
+      secret_file_ids:
+        - ptl/app-credentials/jwt_testing/non-prod/JWT_TESTING_PRIVATE_KEY
+      secret_ids:
+        - ptl/app-credentials/immunisation-fhir-api-testing-app/non-prod/INTROSPECTION_CLIENT_ID
+        - ptl/app-credentials/immunisation-fhir-api-testing-app/non-prod/INTROSPECTION_CLIENT_SECRET
+        - ptl/app-credentials/immunisation-fhir-api-testing-app/non-prod/INTROSPECTION_CLIENT_ID_INT
+        - ptl/app-credentials/immunisation-fhir-api-testing-app/non-prod/INTROSPECTION_CLIENT_SECRET_INT
+        - ptl/app-credentials/immunisation-fhir-api-testing-app/non-prod/INT_CLIENT_ID
+        - ptl/app-credentials/immunisation-fhir-api-testing-app/non-prod/INT_CLIENT_SECRET
 
   - bash: |
       make install-python
@@ -50,13 +45,14 @@ steps:
         aws_account_no="$(aws sts get-caller-identity --query Account --output text)"
 
         service_name=$(FULLY_QUALIFIED_SERVICE_NAME)
-
-        pr_no=$(echo $service_name | { grep -oE '[0-9]+$' || true; })
-        if [ -z $pr_no ]; then
-          workspace=${{ parameters.tf_environment }}
-        else
-          workspace=pr-$pr_no
-        fi
+        # pr_no=$(echo $service_name | { grep -oE '[0-9]+$' || true; })
+        # if [ -z $pr_no ]; then
+        #   workspace=${{ parameters.tf_environment }}
+        # else
+        #   workspace=pr-$pr_no
+        # fi
+
+        workspace=${{ parameters.tf_environment }}
 
         echo sandbox with following parameters:
         echo service_name: $service_name