From 3f50fc44be35042a251841ca9ebed6348f06fd56 Mon Sep 17 00:00:00 2001 From: Valentinolucas Date: Thu, 7 Jul 2022 13:07:50 +0100 Subject: [PATCH 1/9] APM-2321 add producer manual approval for prod --- azure/common/apigee-deployment.yml | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/azure/common/apigee-deployment.yml b/azure/common/apigee-deployment.yml index 915f60084..aa5da63e8 100644 --- a/azure/common/apigee-deployment.yml +++ b/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 @@ -163,12 +167,20 @@ extends: apigee_deployments: - ${{ each apigee_deployment in parameters.apigee_deployments }}: - ${{ if and(eq(apigee_deployment.environment, 'prod'), parameters.prod_requires_approval) }}: - - environment: manual-approval - stage_name: manual_approval - depends_on: [] - manual_approval_prod: true - ${{ each var in parameters._scoped_pipeline_vars }}: - ${{ var }}: ${{ parameters[var] }} + ${{ if and(eq(apigee_deployment.environment, 'prod'), parameters.prod_producer_approval) }}: + - environment: ${{ parameters.service_name }} + stage_name: manual_approval + depends_on: [] + manual_approval_prod: true + ${{ each var in parameters._scoped_pipeline_vars }}: + ${{ var }}: ${{ parameters[var] }} + ${{ if and(eq(apigee_deployment.environment, 'prod'), not(parameters.prod_producer_approval)) }}: + - environment: manual-approval + stage_name: manual_approval + depends_on: [] + manual_approval_prod: true + ${{ each var in parameters._scoped_pipeline_vars }}: + ${{ var }}: ${{ parameters[var] }} - ${{ each apigee_deployment in parameters.apigee_deployments }}: - environment: ${{ apigee_deployment.environment }} stage_name: ${{ replace(coalesce (apigee_deployment.stage_name, apigee_deployment.environment), '-', '_') }} From 2738f4b4284590daecb81e3ba6a54d61d6cffab4 Mon Sep 17 00:00:00 2001 From: Valentinolucas Date: Thu, 7 Jul 2022 13:25:54 +0100 Subject: [PATCH 2/9] APM-2321 add param --- azure/common/deploy-stages.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/azure/common/deploy-stages.yml b/azure/common/deploy-stages.yml index c8652e0cc..b5348a251 100644 --- a/azure/common/deploy-stages.yml +++ b/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: From e332bb4a4fe75009ba550db52ee97379796c9f53 Mon Sep 17 00:00:00 2001 From: Valentinolucas Date: Thu, 7 Jul 2022 14:39:14 +0100 Subject: [PATCH 3/9] APM-2321 add param to deploy-stages --- azure/common/deploy-stages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure/common/deploy-stages.yml b/azure/common/deploy-stages.yml index b5348a251..4bcdb980b 100644 --- a/azure/common/deploy-stages.yml +++ b/azure/common/deploy-stages.yml @@ -23,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 From 13c5aff1de9d98842ec1d407453b41cac1d935ee Mon Sep 17 00:00:00 2001 From: Valentinolucas Date: Thu, 7 Jul 2022 16:21:20 +0100 Subject: [PATCH 4/9] APM-2321 fix typo --- azure/common/apigee-deployment.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure/common/apigee-deployment.yml b/azure/common/apigee-deployment.yml index aa5da63e8..57ff616c7 100644 --- a/azure/common/apigee-deployment.yml +++ b/azure/common/apigee-deployment.yml @@ -167,14 +167,14 @@ extends: apigee_deployments: - ${{ each apigee_deployment in parameters.apigee_deployments }}: - ${{ if and(eq(apigee_deployment.environment, 'prod'), parameters.prod_requires_approval) }}: - ${{ if and(eq(apigee_deployment.environment, 'prod'), parameters.prod_producer_approval) }}: + - ${{ if and(eq(apigee_deployment.environment, 'prod'), parameters.prod_producer_approval) }}: - environment: ${{ parameters.service_name }} stage_name: manual_approval depends_on: [] manual_approval_prod: true ${{ each var in parameters._scoped_pipeline_vars }}: ${{ var }}: ${{ parameters[var] }} - ${{ if and(eq(apigee_deployment.environment, 'prod'), not(parameters.prod_producer_approval)) }}: + - ${{ if and(eq(apigee_deployment.environment, 'prod'), not(parameters.prod_producer_approval)) }}: - environment: manual-approval stage_name: manual_approval depends_on: [] From f0471a21a3fdf9494caf54191c6d0b67d2e509e9 Mon Sep 17 00:00:00 2001 From: Valentinolucas Date: Thu, 7 Jul 2022 16:40:09 +0100 Subject: [PATCH 5/9] APM-2321 fix --- azure/common/apigee-deployment.yml | 1 + azure/common/release.yml | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/azure/common/apigee-deployment.yml b/azure/common/apigee-deployment.yml index 57ff616c7..442179e51 100644 --- a/azure/common/apigee-deployment.yml +++ b/azure/common/apigee-deployment.yml @@ -172,6 +172,7 @@ extends: stage_name: manual_approval depends_on: [] manual_approval_prod: true + producer_approval: true ${{ each var in parameters._scoped_pipeline_vars }}: ${{ var }}: ${{ parameters[var] }} - ${{ if and(eq(apigee_deployment.environment, 'prod'), not(parameters.prod_producer_approval)) }}: diff --git a/azure/common/release.yml b/azure/common/release.yml index b50d69c54..b43485e0f 100644 --- a/azure/common/release.yml +++ b/azure/common/release.yml @@ -57,6 +57,9 @@ parameters: - name: manual_approval_prod type: boolean default: false + - name: producer_approval + type: boolean + default: false stages: - ${{ if eq(parameters.environment, 'manual-approval') }}: @@ -64,7 +67,9 @@ stages: 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 }} From 3b574a873a983d4daea27927cacfcf40a213703f Mon Sep 17 00:00:00 2001 From: Valentinolucas Date: Thu, 7 Jul 2022 16:55:18 +0100 Subject: [PATCH 6/9] APM-2321 revert changes --- azure/common/apigee-deployment.yml | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/azure/common/apigee-deployment.yml b/azure/common/apigee-deployment.yml index 442179e51..17a0eeea2 100644 --- a/azure/common/apigee-deployment.yml +++ b/azure/common/apigee-deployment.yml @@ -167,21 +167,13 @@ extends: apigee_deployments: - ${{ each apigee_deployment in parameters.apigee_deployments }}: - ${{ if and(eq(apigee_deployment.environment, 'prod'), parameters.prod_requires_approval) }}: - - ${{ if and(eq(apigee_deployment.environment, 'prod'), parameters.prod_producer_approval) }}: - - environment: ${{ parameters.service_name }} - stage_name: manual_approval - depends_on: [] - manual_approval_prod: true - producer_approval: true - ${{ each var in parameters._scoped_pipeline_vars }}: - ${{ var }}: ${{ parameters[var] }} - - ${{ if and(eq(apigee_deployment.environment, 'prod'), not(parameters.prod_producer_approval)) }}: - - environment: manual-approval - stage_name: manual_approval - depends_on: [] - manual_approval_prod: true - ${{ each var in parameters._scoped_pipeline_vars }}: - ${{ var }}: ${{ parameters[var] }} + - environment: manual-approval + stage_name: manual_approval + depends_on: [] + manual_approval_prod: true + producer_approval: ${{ paramaters.prod_producer_approval }} + ${{ each var in parameters._scoped_pipeline_vars }}: + ${{ var }}: ${{ parameters[var] }} - ${{ each apigee_deployment in parameters.apigee_deployments }}: - environment: ${{ apigee_deployment.environment }} stage_name: ${{ replace(coalesce (apigee_deployment.stage_name, apigee_deployment.environment), '-', '_') }} From 124ebf8d8496d70b75dd810928e0a614f84e9113 Mon Sep 17 00:00:00 2001 From: Valentinolucas Date: Thu, 7 Jul 2022 16:56:11 +0100 Subject: [PATCH 7/9] APM-2321 revert changes --- azure/common/apigee-deployment.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/azure/common/apigee-deployment.yml b/azure/common/apigee-deployment.yml index 17a0eeea2..15d596b17 100644 --- a/azure/common/apigee-deployment.yml +++ b/azure/common/apigee-deployment.yml @@ -167,13 +167,13 @@ extends: apigee_deployments: - ${{ each apigee_deployment in parameters.apigee_deployments }}: - ${{ if and(eq(apigee_deployment.environment, 'prod'), parameters.prod_requires_approval) }}: - - environment: manual-approval - stage_name: manual_approval - depends_on: [] - manual_approval_prod: true - producer_approval: ${{ paramaters.prod_producer_approval }} - ${{ each var in parameters._scoped_pipeline_vars }}: - ${{ var }}: ${{ parameters[var] }} + - environment: manual-approval + stage_name: manual_approval + depends_on: [] + manual_approval_prod: true + producer_approval: ${{ paramaters.prod_producer_approval }} + ${{ each var in parameters._scoped_pipeline_vars }}: + ${{ var }}: ${{ parameters[var] }} - ${{ each apigee_deployment in parameters.apigee_deployments }}: - environment: ${{ apigee_deployment.environment }} stage_name: ${{ replace(coalesce (apigee_deployment.stage_name, apigee_deployment.environment), '-', '_') }} From df1d7ef3a75ad7c1543aaa5e1751bbd8b87f7154 Mon Sep 17 00:00:00 2001 From: Valentinolucas Date: Thu, 7 Jul 2022 16:58:09 +0100 Subject: [PATCH 8/9] APM-2321 fix typo --- azure/common/apigee-deployment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure/common/apigee-deployment.yml b/azure/common/apigee-deployment.yml index 15d596b17..0376f7066 100644 --- a/azure/common/apigee-deployment.yml +++ b/azure/common/apigee-deployment.yml @@ -171,7 +171,7 @@ extends: stage_name: manual_approval depends_on: [] manual_approval_prod: true - producer_approval: ${{ paramaters.prod_producer_approval }} + producer_approval: ${{ parameters.prod_producer_approval }} ${{ each var in parameters._scoped_pipeline_vars }}: ${{ var }}: ${{ parameters[var] }} - ${{ each apigee_deployment in parameters.apigee_deployments }}: From 7890c60db18f88039794c0e7a54b1078f59ac864 Mon Sep 17 00:00:00 2001 From: Valentinolucas Date: Thu, 7 Jul 2022 16:59:52 +0100 Subject: [PATCH 9/9] APM-2321 fix typo --- azure/common/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure/common/release.yml b/azure/common/release.yml index b43485e0f..8ba293e18 100644 --- a/azure/common/release.yml +++ b/azure/common/release.yml @@ -81,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 }}