Merge branch 'main' into fix-set-pipeline

ci/autoscaler/scripts/cleanup-autoscaler.sh

@@ -10,12 +10,12 @@ function main() {
   bosh_login
   cf_login
 
+  cleanup_apps
   cleanup_acceptance_run
   cleanup_service_broker
   cleanup_bosh_deployment
   delete_releases
   cleanup_credhub
-  cleanup_apps
 }
 
 [ "${BASH_SOURCE[0]}" == "${0}" ] && main "$@"

ci/autoscaler/scripts/common.sh

@@ -81,8 +81,20 @@ function cleanup_credhub(){
 }
 
 function cleanup_apps(){
+	step "cleaning up apps"
+  local mtar_app
+  local space_guid
+
   cf_target "${autoscaler_org}" "${autoscaler_space}"
-  cf undeploy com.github.cloudfoundry.app-autoscaler-release -f
+
+	space_guid="$(cf space --guid "${autoscaler_space}")"
+  mtar_app="$(curl --header "Authorization: $(cf oauth-token)" "deploy-service.${system_domain}/api/v2/spaces/${space_guid}/mtas"  | jq ". | .[] | .metadata | .id" -r)"
+
+  if [ -n "${mtar_app}" ]; then
+    cf undeploy "${mtar_app}" -f
+  else
+     echo "No app to undeploy"
+  fi
 
   if ! cf spaces | grep --quiet --regexp="^${AUTOSCALER_SPACE}$"; then
     cf delete-space -f "${AUTOSCALER_SPACE}"

src/autoscaler/metricsforwarder/manager/policyManager.go

@@ -118,6 +118,9 @@ func (pm *PolicyManager) RefreshAllowedMetricCache(policies map[string]*models.A
 				pm.logger.Error("Error updating allowedMetricCache", err)
 				return err
 			}
+		} else {
+			//If the policy is not present in the cache, remove the entry from the cache
+			pm.allowedMetricCache.Delete(applicationId)
 		}
 	}
 	return nil

src/autoscaler/metricsforwarder/manager/policyManager_test.go

@@ -92,7 +92,7 @@ var _ = Describe("PolicyManager", func() {
 			policyManager.Stop()
 		})
 
-		Context("when allowedMetricCache has already filled with metricstype details of the same appilication", func() {
+		When("allowedMetricCache has already filled with metricstype details of the same appilication", func() {
 
 			BeforeEach(func() {
 				scalingPolicy = &models.ScalingPolicy{
@@ -114,22 +114,41 @@ var _ = Describe("PolicyManager", func() {
 				Expect(found).To(BeTrue())
 				Expect(maps).Should(HaveKey("queuelength"))
 
-				database.RetrievePoliciesStub = func() ([]*models.PolicyJson, error) {
-					return []*models.PolicyJson{{AppId: testAppId, PolicyStr: policyStr}}, nil
-				}
-
 			})
-			It("should be able refresh allowed metrics cache", func() {
-				Eventually(database.RetrievePoliciesCallCount).Should(Equal(1))
-				clock.Increment(1 * testPolicyPollerInterval)
-				Eventually(database.RetrievePoliciesCallCount).Should(Equal(2))
-
-				res, found := allowedMetricCache.Get(testAppId)
-				maps := res.(map[string]struct{})
 
-				Expect(found).To(BeTrue())
-				Expect(maps).Should(HaveKey("test-metric-name"))
-				Expect(maps).ShouldNot(HaveKey("queuelength"))
+			When("the policy is updated", func() {
+				BeforeEach(func() {
+					database.RetrievePoliciesStub = func() ([]*models.PolicyJson, error) {
+						return []*models.PolicyJson{{AppId: testAppId, PolicyStr: policyStr}}, nil
+					}
+				})
+				It("should refresh the allowed metrics cache", func() {
+					Eventually(database.RetrievePoliciesCallCount).Should(Equal(1))
+					clock.Increment(1 * testPolicyPollerInterval)
+					Eventually(database.RetrievePoliciesCallCount).Should(Equal(2))
+
+					res, found := allowedMetricCache.Get(testAppId)
+					maps := res.(map[string]struct{})
+
+					Expect(found).To(BeTrue())
+					Expect(maps).Should(HaveKey("test-metric-name"))
+					Expect(maps).ShouldNot(HaveKey("queuelength"))
+				})
+			})
+			When("the policy is deleted", func() {
+				BeforeEach(func() {
+					database.RetrievePoliciesStub = func() ([]*models.PolicyJson, error) {
+						return []*models.PolicyJson{}, nil
+					}
+				})
+				It("should refresh the allowed metrics cache", func() {
+					Eventually(database.RetrievePoliciesCallCount).Should(Equal(1))
+					clock.Increment(1 * testPolicyPollerInterval)
+					Eventually(database.RetrievePoliciesCallCount).Should(Equal(2))
+
+					_, found := allowedMetricCache.Get(testAppId)
+					Expect(found).To(BeFalse())
+				})
 			})
 		})
 	})