From 690e5cc960a2e593ab9d5656d1b3427fa9734cbb Mon Sep 17 00:00:00 2001 From: Jon Schneider Date: Fri, 29 Mar 2019 18:00:53 -0500 Subject: [PATCH 1/2] fix(provider/cf): Fix target impedance validator for clone server group stage --- .../pipeline/config/validation/cfTargetImpedance.validator.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/scripts/modules/cloudfoundry/src/pipeline/config/validation/cfTargetImpedance.validator.ts b/app/scripts/modules/cloudfoundry/src/pipeline/config/validation/cfTargetImpedance.validator.ts index 90a30fd5891..18b3b5e5e9b 100644 --- a/app/scripts/modules/cloudfoundry/src/pipeline/config/validation/cfTargetImpedance.validator.ts +++ b/app/scripts/modules/cloudfoundry/src/pipeline/config/validation/cfTargetImpedance.validator.ts @@ -42,7 +42,7 @@ export class CfTargetImpedanceValidator implements IStageOrTriggerValidator { }); } else if ( toTest.type === 'cloneServerGroup' && - toTest.targetCluster === stage.cluster && + NameUtils.getClusterName(toTest.application, toTest.stack, toTest.freeFormDetails) === stage.cluster && toTest.region === region ) { regionFound = true; From 048d21d50d1e23b33682524156e73cd97c039b51 Mon Sep 17 00:00:00 2001 From: Jon Schneider Date: Fri, 29 Mar 2019 18:09:50 -0500 Subject: [PATCH 2/2] fix(pipeline): Fix target impedance validation for clone server groups for non-CF providers --- .../pipeline/config/validation/targetImpedance.validator.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/scripts/modules/core/src/pipeline/config/validation/targetImpedance.validator.ts b/app/scripts/modules/core/src/pipeline/config/validation/targetImpedance.validator.ts index d03d988fbd7..aef0ce3210b 100644 --- a/app/scripts/modules/core/src/pipeline/config/validation/targetImpedance.validator.ts +++ b/app/scripts/modules/core/src/pipeline/config/validation/targetImpedance.validator.ts @@ -42,7 +42,8 @@ export class TargetImpedanceValidator implements IStageOrTriggerValidator { }); } else if ( toTest.type === 'cloneServerGroup' && - toTest['targetCluster'] === stage['cluster'] && + NameUtils.getClusterName(toTest['application'], toTest['stack'], toTest['freeFormDetails']) === + stage['cluster'] && toTest['region'] === region ) { regionFound = true;