From cffd5479a49be7f8fbfb34d0eed843d3028a0130 Mon Sep 17 00:00:00 2001 From: Jose Vazquez Date: Wed, 29 Nov 2023 11:33:09 +0100 Subject: [PATCH] CLOUDP-212108: Fix Net Peerings part 2 Signed-off-by: Jose Vazquez --- tools/clean/atlas/atlas.go | 6 ++++++ tools/clean/atlas/network_peering.go | 8 ++------ tools/clean/atlas/projects.go | 6 +++++- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/tools/clean/atlas/atlas.go b/tools/clean/atlas/atlas.go index eb3e7c33ff..537dca2d62 100644 --- a/tools/clean/atlas/atlas.go +++ b/tools/clean/atlas/atlas.go @@ -18,6 +18,12 @@ const ( CloudProviderAZURE = "AZURE" ) +var ( + SupportedProviders = []string{CloudProviderAWS, CloudProviderGCP, CloudProviderAZURE} + + GovSupportedProviders = []string{CloudProviderAWS} +) + type Cleaner struct { client *admin.APIClient aws *provider.AWS diff --git a/tools/clean/atlas/network_peering.go b/tools/clean/atlas/network_peering.go index 87beea61d3..1b94d898af 100644 --- a/tools/clean/atlas/network_peering.go +++ b/tools/clean/atlas/network_peering.go @@ -8,13 +8,9 @@ import ( "go.mongodb.org/atlas-sdk/v20231001002/admin" ) -var ( - SupportedProviders = []string{"AWS", "AZURE", "GCP"} -) - -func (c *Cleaner) listNetworkPeering(ctx context.Context, projectID string) []admin.BaseNetworkPeeringConnectionSettings { +func (c *Cleaner) listNetworkPeering(ctx context.Context, projectID string, providers []string) []admin.BaseNetworkPeeringConnectionSettings { peers := []admin.BaseNetworkPeeringConnectionSettings{} - for _, providerName := range SupportedProviders { + for _, providerName := range providers { peers = append(peers, c.listNetworkPeeringForProvider(ctx, projectID, providerName)...) } if len(peers) == 0 { diff --git a/tools/clean/atlas/projects.go b/tools/clean/atlas/projects.go index cf08e82ebe..6d3cce39ba 100644 --- a/tools/clean/atlas/projects.go +++ b/tools/clean/atlas/projects.go @@ -49,7 +49,11 @@ func (c *Cleaner) GetProjectDependencies(ctx context.Context, projectID string, go func() { defer wg.Done() - deps.NetworkPeering = c.listNetworkPeering(ctx, projectID) + providers := SupportedProviders + if isGov { + providers = GovSupportedProviders + } + deps.NetworkPeering = c.listNetworkPeering(ctx, projectID, providers) }() go func() {