updated storage cleaner to use latest msg keys

Signed-off-by: Nir Rozenbaum <[email protected]>
stolostron · Dec 14, 2021 · 5e8704e · 5e8704e
1 parent 347b630
commit 5e8704e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/tools/simulation-cleaner/go.mod b/tools/simulation-cleaner/go.mod
@@ -3,8 +3,7 @@ module simulation-cleaner
 go 1.16
 
 require (
-	github.com/golang/glog v1.0.0 // indirect
-	github.com/open-cluster-management/hub-of-hubs-data-types v0.1.1-0.20210918105435-6b6919d6ef52
+	github.com/open-cluster-management/hub-of-hubs-data-types v0.2.3-0.20211214083058-1e32ce1444ff
 	github.com/open-horizon/edge-sync-service-client v0.0.0-20190711093406-dc3a19905da2
 	github.com/open-horizon/edge-utilities v0.0.0-20190711093331-0908b45a7152 // indirect
 )
diff --git a/tools/simulation-cleaner/go.sum b/tools/simulation-cleaner/go.sum
@@ -331,9 +331,8 @@ github.com/gogo/protobuf v1.2.2-0.20190730201129-28a6bbf47e48/go.mod h1:SlYgWuQ5
 github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
 github.com/golang-migrate/migrate/v4 v4.6.2/go.mod h1:JYi6reN3+Z734VZ0akNuyOJNcrg45ZL7LDBMW3WGJL0=
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/glog v1.0.0 h1:nfP3RFugxnNRyKgeWd4oI1nYvXpxrx8ck8ZrcizshdQ=
-github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4=
 github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -615,10 +614,8 @@ github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoT
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/open-cluster-management/api v0.0.0-20200610161514-939cead3902c/go.mod h1:+vUECYB7WkfCb52r0J7rxgD1mseSGAqGi8rTLLRcbgw=
 github.com/open-cluster-management/governance-policy-propagator v0.0.0-20210520203318-a78632de1e26/go.mod h1:7gzDyC7PddcuInXS+kLrfYmto/ImSORibXwy8RGjNM8=
-github.com/open-cluster-management/hub-of-hubs-data-types v0.1.0 h1:w7DbcYX27W6qCnumAj0rQbvsLVwFY0ggy6ZXpbqPsus=
-github.com/open-cluster-management/hub-of-hubs-data-types v0.1.0/go.mod h1:OOI0mxL5BOSq0TN6dVBfHiA6PUeapn+sMBXm9fLNaw8=
-github.com/open-cluster-management/hub-of-hubs-data-types v0.1.1-0.20210918105435-6b6919d6ef52 h1:CviaU5oOqjlx2zskRbifHxom2hMcuFN+2K4ZbBVAQBU=
-github.com/open-cluster-management/hub-of-hubs-data-types v0.1.1-0.20210918105435-6b6919d6ef52/go.mod h1:Th2t5lukBfvPb5tvNCMROedinKR4s64sK5hgMt8Er7w=
+github.com/open-cluster-management/hub-of-hubs-data-types v0.2.3-0.20211214083058-1e32ce1444ff h1:NrYFP5xNhYo1NQ0fSZyTVOccnFfOzWKRX3cQnws7/ME=
+github.com/open-cluster-management/hub-of-hubs-data-types v0.2.3-0.20211214083058-1e32ce1444ff/go.mod h1:rLtZFQ8YdGQ2XHHKJFBOtQwnP63UDxaalhlQG8anP90=
 github.com/open-horizon/edge-sync-service-client v0.0.0-20190711093406-dc3a19905da2 h1:ZmX/tuCgFVbe07pqObNWf14cAYpHN8gVRSkWnbtSUW4=
 github.com/open-horizon/edge-sync-service-client v0.0.0-20190711093406-dc3a19905da2/go.mod h1:rKW01VtqwtwaUQ+zkJ80X5EeGqsTblQE4J9HxPUtTAQ=
 github.com/open-horizon/edge-utilities v0.0.0-20190711093331-0908b45a7152 h1:YEvNOMo3ANOQ3AwsU0cCcBA4nKHDLUlyUCRWk5rBf68=

diff --git a/tools/simulation-cleaner/main.go b/tools/simulation-cleaner/main.go
@@ -86,12 +86,14 @@ func cleanObjects(client *client.SyncServiceClient, leafHubName string) {
 	objectIDs := []string{
 		fmt.Sprintf("%s.%s", leafHubName, datatypes.ManagedClustersMsgKey),
 		fmt.Sprintf("%s.%s", leafHubName, datatypes.ClustersPerPolicyMsgKey),
-		// TODO remove PolicyComplianceMsgKey entry after removing it from datatypes
-		fmt.Sprintf("%s.%s", leafHubName, datatypes.PolicyComplianceMsgKey),
 		fmt.Sprintf("%s.%s", leafHubName, datatypes.PolicyCompleteComplianceMsgKey),
 		fmt.Sprintf("%s.%s", leafHubName, datatypes.PolicyDeltaComplianceMsgKey),
 		fmt.Sprintf("%s.%s", leafHubName, datatypes.MinimalPolicyComplianceMsgKey),
 		fmt.Sprintf("%s.%s", leafHubName, datatypes.ControlInfoMsgKey),
+		fmt.Sprintf("%s.%s", leafHubName, datatypes.LocalPlacementRulesMsgKey),
+		fmt.Sprintf("%s.%s", leafHubName, datatypes.LocalClustersPerPolicyMsgKey),
+		fmt.Sprintf("%s.%s", leafHubName, datatypes.LocalPolicyCompleteComplianceMsgKey),
+		fmt.Sprintf("%s.%s", leafHubName, datatypes.LocalPolicySpecMsgKey),
 	}
 
 	for _, objectID := range objectIDs {