APM-2321 Add prod-producer approval

azure/common/apigee-deployment.yml

@@ -78,6 +78,10 @@ parameters:
     displayName: Requires manual approval
     type: boolean
     default: true
+  - name: prod_producer_approval
+    displayName: Requires producer manual approval
+    type: boolean
+    default: false
   - name: manual_approval_env
     displayName: Custom manual approval env overwrite
     type: string
@@ -167,6 +171,7 @@ extends:
                   stage_name: manual_approval
                   depends_on: []
                   manual_approval_prod: true
+                  producer_approval: ${{ parameters.prod_producer_approval }}
                   ${{ each var in parameters._scoped_pipeline_vars }}:
                       ${{ var }}: ${{ parameters[var] }}
             - ${{ each apigee_deployment in parameters.apigee_deployments }}:

azure/common/deploy-stages.yml

@@ -12,6 +12,9 @@ parameters:
   - name: prod_requires_approval
   - name: manual_approval_env
     type: string
+  - name: prod_producer_approval
+    type: boolean
+
 
 
 stages:
@@ -20,7 +23,7 @@ stages:
       parameters:
         ${{ insert }}: ${{ apigee_deployment }}
         ${{ each param in parameters }}:
-          ${{ if notIn(param.key, 'deploy_template', 'apigee_deployments', 'deploy_review_sandbox', 'prod_requires_approval') }}:
+          ${{ if notIn(param.key, 'deploy_template', 'apigee_deployments', 'deploy_review_sandbox', 'prod_requires_approval', 'prod_producer_approval') }}:
             ${{ param.key }}: ${{ param.value }}
 
         # Compute the apigee organization & org level part of the AWS secret/config path

azure/common/release.yml

@@ -57,14 +57,19 @@ parameters:
   - name: manual_approval_prod
     type: boolean
     default: false
+  - name: producer_approval
+    type: boolean
+    default: false
 
 stages:
   - ${{ if eq(parameters.environment, 'manual-approval') }}:
     - template: ./deploy-manual-approval.yml
       parameters:
         stage_name: ${{ parameters.stage_name }}
         depends_on: ${{ parameters.depends_on }}
-        ${{ if eq(true, parameters.manual_approval_prod) }}:
+        ${{ if and(eq(true, parameters.manual_approval_prod), eq(true, parameters.producer_approval)) }}:
+          manual_approval_env: ${{ parameters.service_name }}
+        ${{ if and(eq(true, parameters.manual_approval_prod), eq(false, parameters.producer_approval)) }}:
           manual_approval_env: manual-approval-prod
         ${{ if eq(false, parameters.manual_approval_prod) }}:
           manual_approval_env: ${{ parameters.manual_approval_env }}
@@ -76,5 +81,5 @@ stages:
         ${{ if ne('', parameters.fully_qualified_service_name) }}:
           fully_qualified_service_name: ${{ parameters.fully_qualified_service_name }}
         ${{ each param in parameters }}:
-          ${{ if notIn(param.key, 'fully_qualified_service_name', 'manual_approval_env', 'manual_approval_prod') }}:
+          ${{ if notIn(param.key, 'fully_qualified_service_name', 'manual_approval_env', 'manual_approval_prod', 'producer_approval') }}:
             ${{ param.key }}: ${{ param.value }}