Fix override clean routes (#831)

* add step on spinnaker pipeline do remove unused deployments routes

Signed-off-by: Cassio Godinho <cassiopgodinho@gmail.com>

* spinnaker pipeline add step to remove unused components from istio routes

Signed-off-by: Cassio Godinho <cassiopgodinho@gmail.com>

* add proxy overrides field to octo payload

Signed-off-by: Cassio Godinho <cassiopgodinho@gmail.com>

* fix unused component proxy rules and tests

Signed-off-by: Cassio Godinho <cassiopgodinho@gmail.com>

* add unused proxy undeployment field to octo struct

Signed-off-by: Cassio Godinho <cassiopgodinho@gmail.com>

* fix mock assertion order

TODO: put orderBy clause on findActiveComponents
Signed-off-by: Cassio Godinho <cassiopgodinho@gmail.com>

* write test for spinnaker pipeline

Signed-off-by: Cassio Godinho <cassiopgodinho@gmail.com>

* use right property on unused proxy undeployment method

Signed-off-by: Cassio Godinho <cassiopgodinho@gmail.com>

* fix wrong property access on unused proxy deployments

Signed-off-by: Cassio Godinho <cassiopgodinho@gmail.com>

* add more tests to spinnaker pipeline

Signed-off-by: Cassio Godinho <cassiopgodinho@gmail.com>

* add more tests to unusedComponentProxy function

Signed-off-by: Cassio Godinho <cassiopgodinho@gmail.com>

* improve test description

Signed-off-by: Cassio Godinho <cassiopgodinho@gmail.com>

Co-authored-by: Lucas Borges Fernandes <lucasbfernandes94@gmail.com>
Co-authored-by: Mônica Ribeiro <monica.ribeiro@zup.com.br>

butler/src/app/v2/core/integrations/octopipe/interfaces/octopipe-deployment.interface.ts

@@ -32,7 +32,8 @@ export interface OctopipeDeploymentRequest {
   namespace: string;
   deployments: OctopipeDeployment[],
   unusedDeployments: OctopipeDeployment[],
-  proxyDeployments: K8sManifest[]
+  proxyDeployments: K8sManifest[],
+  unusedProxyDeployments: K8sManifest[],
   callbackUrl: string
   clusterConfig?: IEKSClusterConfig | IGenericClusterConfig | null
 }

butler/src/app/v2/core/integrations/octopipe/request-builder.ts

@@ -21,7 +21,7 @@ import { UrlUtils } from '../../utils/url.utils'
 import { ConnectorConfiguration } from '../interfaces/connector-configuration.interface'
 import { K8sManifest } from '../interfaces/k8s-manifest.interface'
 import { CommonTemplateUtils } from '../spinnaker/utils/common-template.utils'
-import { componentsToBeRemoved, DeploymentUtils } from '../utils/deployment.utils'
+import { componentsToBeRemoved, DeploymentUtils, unusedComponentProxy } from '../utils/deployment.utils'
 import { IstioDeploymentManifestsUtils } from '../utils/istio-deployment-manifests.utils'
 import { IstioUndeploymentManifestsUtils } from '../utils/istio-undeployment-manifests.utils'
 import { HelmConfig, HelmRepositoryConfig } from './interfaces/helm-config.interface'
@@ -47,7 +47,8 @@ export class OctopipeRequestBuilder {
       unusedDeployments: this.getUnusedDeploymentsArray(deployment, activeComponents),
       proxyDeployments: this.getProxyDeploymentsArray(deployment, activeComponents),
       callbackUrl: UrlUtils.getDeploymentNotificationUrl(configuration.executionId),
-      clusterConfig: this.getClusterConfig(deployment.cdConfiguration.configurationData as OctopipeConfigurationData)
+      clusterConfig: this.getClusterConfig(deployment.cdConfiguration.configurationData as OctopipeConfigurationData),
+      unusedProxyDeployments: this.overrideUnusedRules(deployment, activeComponents)
     }
   }
 
@@ -161,6 +162,28 @@ export class OctopipeRequestBuilder {
     })
   }
 
+  private overrideUnusedRules(deployment: Deployment, activeComponents: Component[]) {
+    if (!deployment.components) {
+      return []
+    }
+
+    if (deployment.defaultCircle) {
+      return []
+    }
+
+    const proxyUndeployments: K8sManifest[] = []
+    const unused = unusedComponentProxy(deployment, activeComponents)
+    unused.forEach(component => {
+      const activeByName: Component[] = DeploymentUtils.getActiveComponentsByName(activeComponents, component.name)
+      proxyUndeployments.push(IstioUndeploymentManifestsUtils.getDestinationRulesManifest(deployment, component, activeByName))
+      proxyUndeployments.push(activeByName.length > 1 ?
+        IstioUndeploymentManifestsUtils.getVirtualServiceManifest(deployment, component, activeByName) :
+        IstioUndeploymentManifestsUtils.getEmptyVirtualServiceManifest(deployment, component)
+      )
+    })
+    return proxyUndeployments
+  }
+
   private getHelmRepositoryConfig(component: DeploymentComponent, cdConfiguration: CdConfiguration): HelmRepositoryConfig {
     return {
       type: (cdConfiguration.configurationData as OctopipeConfigurationData).gitProvider,

butler/src/app/v2/core/integrations/spinnaker/pipeline-builder.ts

@@ -39,7 +39,7 @@ import {
 import { DeploymentTemplateUtils } from './utils/deployment-template.utils'
 import { UndeploymentTemplateUtils } from './utils/undeployment-template.utils'
 import { ConnectorConfiguration } from '../interfaces/connector-configuration.interface'
-import { componentsToBeRemoved, DeploymentUtils } from '../utils/deployment.utils'
+import { componentsToBeRemoved, DeploymentUtils, unusedComponentProxy } from '../utils/deployment.utils'
 import { DeploymentComponent } from '../../../api/deployments/interfaces/deployment.interface'
 
 export class SpinnakerPipelineBuilder {
@@ -87,6 +87,7 @@ export class SpinnakerPipelineBuilder {
       ...this.getProxyDeploymentsEvaluationStage(deployment.components),
       ...this.getRollbackDeploymentsStage(deployment, activeComponents),
       ...this.getUnusedVersions(deployment, activeComponents),
+      ...this.getProxyUnusedStages(deployment, activeComponents),
       ...this.getFailureWebhookStage(deployment, configuration),
       ...this.getSuccessWebhookStage(deployment, configuration)
     ]
@@ -142,6 +143,34 @@ export class SpinnakerPipelineBuilder {
     return proxyStages
   }
 
+  private getProxyUnusedStages(deployment: Deployment, activeComponents: Component[]): Stage[] {
+    if (!deployment?.components) {
+      return []
+    }
+
+    if (deployment.defaultCircle) {
+      return []
+    }
+    const unusedComponentsProxies = unusedComponentProxy(deployment, activeComponents)
+
+    if (unusedComponentsProxies.length === 0) {
+      return []
+    }
+    const proxyStages: Stage[] = []
+    const evalStageId: number = DeploymentTemplateUtils.getProxyEvalStageId(deployment.components)
+
+    unusedComponentsProxies.forEach(component => {
+      const activeByName: Component[] = DeploymentUtils.getActiveComponentsByName(activeComponents, component.name)
+      proxyStages.push(getUndeploymentDestinationRulesStage(component, deployment, activeByName, this.currentStageId++, evalStageId))
+      proxyStages.push(activeByName.length > 1 ?
+        getUndeploymentVirtualServiceStage(component, deployment, activeByName, this.currentStageId++) :
+        getUndeploymentEmptyVirtualServiceStage(component, deployment, this.currentStageId++)
+      )
+    })
+
+    return proxyStages
+  }
+
   private getDeploymentsEvaluationStage(components: DeploymentComponent[] | undefined): Stage[] {
     return components && components.length ?
       [getDeploymentsEvaluationStage(components, this.currentStageId++)] :

butler/src/app/v2/core/integrations/spinnaker/templates/undeployment/undeploy-destination-rules-stage.ts

@@ -24,7 +24,8 @@ export const getUndeploymentDestinationRulesStage = (
   component: DeploymentComponent,
   deployment: Deployment,
   activeComponents: Component[],
-  stageId: number
+  stageId: number,
+  evalStageId?: number
 ): Stage => ({
   account: `${(deployment.cdConfiguration.configurationData as ISpinnakerConfigurationData).account}`,
   cloudProvider: 'kubernetes',
@@ -39,7 +40,7 @@ export const getUndeploymentDestinationRulesStage = (
   },
   name: `Undeploy Destination Rules ${component.name}`,
   refId: `${stageId}`,
-  requisiteStageRefIds: [],
+  requisiteStageRefIds: evalStageId ?  [`${evalStageId}`] : [],
   skipExpressionEvaluation: false,
   source: 'text',
   trafficManagement: {

butler/src/app/v2/core/integrations/utils/deployment.utils.ts

@@ -59,6 +59,15 @@ export const componentsToBeRemoved = (deployment: Deployment, activeComponents:
   })
 }
 
+export const unusedComponentProxy = (deployment: Deployment, activeComponents: Component[]): DeploymentComponent[] => {
+  if (componentsToBeRemoved(deployment, activeComponents).length === 0) {
+    return []
+  }
+  const sameCircleComponents = activeComponents.filter(c => c.deployment.circleId === deployment.circleId)
+
+  return sameCircleComponents.filter(c => !deployment.components?.map(dc => dc.name).includes(c.name))
+}
+
 const removedComponents = (deploymentComponents: DeploymentComponent[] | undefined, activeComponent: Component) => {
   return !deploymentComponents?.some(dc => isSameName(dc, activeComponent))
 }