chore: clean-up code after fetching all pages

Author: andrpac

internal/store/integrations.go

@@ -38,23 +38,3 @@ func (s *Store) Integrations(projectID string) ([]atlasv2.ThirdPartyIntegration,
 		return page.GetResults(), nil
 	})
 }
-
-type getPageFn[T any] func(int, int) ([]T, error)
-
-func AllPages[T any](getPageFn getPageFn[T]) ([]T, error) {
-	allPages := []T{}
-	pageNum := 1
-	itemsPerPage := MaxAPIPageSize
-	for {
-		page, err := getPageFn(pageNum, itemsPerPage)
-		if err != nil {
-			return nil, fmt.Errorf("failed to get all pages: %w", err)
-		}
-		allPages = append(allPages, page...)
-		if len(page) < itemsPerPage {
-			break
-		}
-		pageNum += 1
-	}
-	return allPages, nil
-}

internal/store/network_containers.go

@@ -21,10 +21,6 @@ import (
 	atlasv2 "go.mongodb.org/atlas-sdk/v20241113004/admin"
 )
 
-const (
-	MaxAPIPageSize = 1 // To increase once done testing!!
-)
-
 var (
 	supportedCloudProviders = []akov2provider.ProviderName{
 		akov2provider.ProviderAWS,

internal/store/operator.go

@@ -21,17 +21,6 @@ package store
 //go:generate mockgen -destination=../mocks/mock_atlas_operator_org_store.go -package=mocks github.com/mongodb/atlas-cli-plugin-kubernetes/internal/store OperatorOrgStore
 //go:generate mockgen -destination=../mocks/mock_atlas_generic_store.go -package=mocks github.com/mongodb/atlas-cli-plugin-kubernetes/internal/store OperatorGenericStore
 
-type ListOptions struct {
-	PageNum      int
-	ItemsPerPage int
-	IncludeCount bool
-}
-
-type ContainersListOptions struct {
-	ListOptions
-	ProviderName string
-}
-
 type OperatorProjectStore interface {
 	OperatorTeamsStore
 	ProjectDescriber

internal/store/store.go

@@ -37,6 +37,10 @@ const (
 	cloudGovServiceURL = "https://cloud.mongodbgov.com/"
 )
 
+const (
+	MaxAPIPageSize = 10
+)
+
 var errUnsupportedService = errors.New("unsupported service")
 
 type Store struct {
@@ -291,3 +295,25 @@ func New(opts ...Option) (*Store, error) {
 
 	return store, nil
 }
+
+// AllPages should be used to retrive all the occurences of a resource
+// when listing. If not used, Atlas SDK will fallback to a default amount.
+type getPageFn[T any] func(int, int) ([]T, error)
+
+func AllPages[T any](getPageFn getPageFn[T]) ([]T, error) {
+	allPages := []T{}
+	pageNum := 1
+	itemsPerPage := MaxAPIPageSize
+	for {
+		page, err := getPageFn(pageNum, itemsPerPage)
+		if err != nil {
+			return nil, fmt.Errorf("failed to get all pages: %w", err)
+		}
+		allPages = append(allPages, page...)
+		if len(page) < itemsPerPage {
+			break
+		}
+		pageNum += 1
+	}
+	return allPages, nil
+}

test/e2e/helper_test.go

@@ -716,7 +716,7 @@ func deleteStreamsInstance(t *testing.T, projectID, name string) error {
 	cmd := exec.Command(
 		cliPath,
 		streamsEntity,
-		"instance",
+		"instances",
 		"delete",
 		name,
 		"--projectId", projectID,
@@ -727,7 +727,6 @@ func deleteStreamsInstance(t *testing.T, projectID, name string) error {
 	if err != nil {
 		return fmt.Errorf("%s (%w)", string(resp), err)
 	}
-
 	return nil
 }
 
@@ -934,6 +933,7 @@ func generateTestAtlasIPAccessList(t *testing.T, projectID string, resourceType,
 	require.NoError(t, err, string(resp))
 
 	t.Cleanup(func() {
+		t.Logf("Deleting IP access list: %s", address)
 		deleteCmd := exec.Command(cliPath,
 			accessListEntity, "delete", address,
 			"--projectId", projectID, "--force")
@@ -959,6 +959,74 @@ func findTestAtlasIPAccessList(objects []rt.Object, projectID string, address st
 	return nil
 }
 
+func generateTestAtlasAlertConfiguration(t *testing.T, projectID, marker string) string {
+	t.Helper()
+	cliPath, err := AtlasCLIBin()
+	require.NoError(t, err)
+
+	cmd := exec.Command(cliPath,
+		alertsEntity, configEntity, "create",
+		"--projectId", projectID,
+		"--event", "OUTSIDE_METRIC_THRESHOLD",
+		"--enabled",
+		"--metricName", "ASSERT_REGULAR",
+		"--metricOperator", "GREATER_THAN",
+		"--metricThreshold", "0",
+		"--metricUnits", "RAW",
+		"--metricMode", "AVERAGE",
+		"--notificationIntervalMin", "42",
+		"--notificationEmailAddress", "abc@example.com",
+		"--notificationType", "EMAIL",
+		"--notificationRegion", "US",
+		"--matcherFieldName", "HOSTNAME",
+		"--matcherOperator", "EQUALS",
+		"--matcherValue", marker,
+		"-o=json")
+	cmd.Env = os.Environ()
+
+	resp, err := test.RunAndGetStdOut(cmd)
+	require.NoError(t, err)
+
+	var result struct {
+		ID string `json:"id"`
+	}
+	require.NoError(t, json.Unmarshal(resp, &result))
+
+	t.Cleanup(func() {
+		t.Logf("Deleting test alert configuration: %s", result.ID)
+		deleteCmd := exec.Command(cliPath,
+			alertsEntity, configEntity, "delete",
+			result.ID, "--projectId", projectID, "--force")
+		deleteCmd.Env = os.Environ()
+		_, _ = test.RunAndGetStdOut(deleteCmd)
+	})
+
+	return marker
+}
+
+func findTestAtlasAlertConfiguration(objects []rt.Object, projectName string, marker string) *akov2.AtlasProject {
+	for _, obj := range objects {
+		project, ok := obj.(*akov2.AtlasProject)
+		if !ok {
+			continue
+		}
+
+		if project.Spec.Name != projectName {
+			continue
+		}
+
+		for _, alert := range project.Spec.AlertConfigurations {
+			for _, matcher := range alert.Matchers {
+				if strings.EqualFold(matcher.FieldName, "HOSTNAME") &&
+					strings.EqualFold(matcher.Value, marker) {
+					return project
+				}
+			}
+		}
+	}
+	return nil
+}
+
 func generateTestAtlasIntegration(t *testing.T, projectID string, integrationType string) {
 	t.Helper()
 	cliPath, err := AtlasCLIBin()
@@ -1016,6 +1084,7 @@ func generateTestAtlasDatabaseUser(t *testing.T, projectID string, username stri
 	require.NoError(t, err)
 
 	t.Cleanup(func() {
+		t.Logf("Deleting test DB user: %s", username)
 		cmd := exec.Command(cliPath,
 			dbusersEntity, "delete",
 			username,
@@ -1040,65 +1109,14 @@ func findTestAtlasDatabaseUser(objects []rt.Object, projectID string, username s
 	return nil
 }
 
-func generateTestAtlasIdentityProvider(t *testing.T, federationSettingsID string, displayName string) string {
-	t.Helper()
-	cliPath, err := AtlasCLIBin()
-	require.NoError(t, err)
-
-	args := []string{
-		federatedAuthenticationEntity, federationSettingsEntity, identityProviderEntity, "create", "oidc", displayName,
-		"--audience", fmt.Sprintf("https://accounts-%s.google.com", displayName),
-		"--authorizationType", "GROUP",
-		"--desc", fmt.Sprintf("OIDC provider for %s", displayName),
-		"--federationSettingsId", federationSettingsID,
-		"--groupsClaim", fmt.Sprintf("group-%s", displayName),
-		"--userClaim", fmt.Sprintf("email-%s", displayName),
-		"--idpType", "WORKLOAD",
-		"--issuerUri", "https://accounts.google.com",
-		"-o=json",
-	}
-	cmd := exec.Command(cliPath, args...)
-	cmd.Env = os.Environ()
-	resp, err := test.RunAndGetStdOut(cmd)
-	require.NoError(t, err)
-
-	var result struct {
-		Id string `json:"id"`
-	}
-	require.NoError(t, json.Unmarshal(resp, &result))
-
-	t.Cleanup(func() {
-		deleteCmd := exec.Command(cliPath,
-			federatedAuthenticationEntity, federationSettingsEntity, identityProviderEntity, "delete",
-			result.Id, "--federationSettingsId", federationSettingsID, "--force")
-		deleteCmd.Env = os.Environ()
-		_, _ = test.RunAndGetStdOut(deleteCmd)
-	})
-
-	return result.Id
-}
-
-func findTestAtlasIdentityProvider(objects []rt.Object, idpID string) *akov2.AtlasFederatedAuth {
-	for _, obj := range objects {
-		if fed, ok := obj.(*akov2.AtlasFederatedAuth); ok && fed.Spec.DataAccessIdentityProviders != nil {
-			for _, listed := range *fed.Spec.DataAccessIdentityProviders {
-				if listed == idpID {
-					return fed
-				}
-			}
-		}
-	}
-	return nil
-}
-
 func generateTestAtlasStreamInstance(t *testing.T, projectID string, instanceName string) string {
 	cliPath, err := AtlasCLIBin()
 	require.NoError(t, err)
 
 	cmd := exec.Command(
 		cliPath,
 		streamsEntity,
-		"instance",
+		"instances",
 		"create",
 		instanceName,
 		"--projectId", projectID,
@@ -1111,6 +1129,7 @@ func generateTestAtlasStreamInstance(t *testing.T, projectID string, instanceNam
 	require.NoError(t, err)
 
 	t.Cleanup(func() {
+		t.Logf("Deleting test Stream Instance: %s", instanceName)
 		deleteStreamsInstance(t, projectID, instanceName)
 	})
 
@@ -1147,7 +1166,8 @@ func generateTestAtlasAdvancedDeployment(t *testing.T, projectID string, cluster
 	require.NoError(t, err)
 
 	t.Cleanup(func() {
-		_ = deleteClusterForProject(projectID, clusterName)
+		t.Logf("Deleting test Advanced Deployment: %s", clusterName)
+		deleteClusterForProject(projectID, clusterName)
 	})
 
 	return clusterName
@@ -1185,7 +1205,8 @@ func generateTestAtlasFlexCluster(t *testing.T, projectID string, clusterName st
 	require.NoError(t, err)
 
 	t.Cleanup(func() {
-		_ = deleteClusterForProject(projectID, clusterName)
+		t.Logf("Deleting test Advanced Deployment: %s", clusterName)
+		deleteClusterForProject(projectID, clusterName)
 	})
 
 	return clusterName

test/e2e/kubernetes_config_generate_test.go

@@ -3082,6 +3082,13 @@ func TestGenerateMany(t *testing.T) {
 		ipAccessList[i] = generateTestAtlasIPAccessList(t, projectID, "ip", ip)
 	}
 
+	// Test alertConfigurations with pagination (25 entries)
+	alertMarkers := make([]string, 25)
+	for i := range alertMarkers {
+		marker := fmt.Sprintf("alert-marker-%02d-%s", i+1, randSuffix(t))
+		alertMarkers[i] = generateTestAtlasAlertConfiguration(t, projectID, marker)
+	}
+
 	// Test databaseUsers with pagination (25 entries)
 	dbUsers := make([]string, 25)
 	for i := range dbUsers {
@@ -3142,14 +3149,18 @@ func TestGenerateMany(t *testing.T) {
 		assert.NotNil(t, findTestAtlasIPAccessList(objects, projectID, ip), "IP access list %d with ID %s not found", i+1, ip)
 	}
 
-	for i, typ := range []string{datadogEntity, opsgenieEntity, victoropsEntity, pagerdutyEntity, webhookEntity} {
-		assert.NotNil(t, findTestAtlasIntegration(objects, projectID, typ), "Integration %d of type %s not found", i+1, typ)
+	for i, marker := range alertMarkers {
+		assert.NotNil(t, findTestAtlasAlertConfiguration(objects, projectName, marker), "Alert configuration %d with marker %s not found", i+1, marker)
 	}
 
 	for i, name := range dbUsers {
 		assert.NotNil(t, findTestAtlasDatabaseUser(objects, projectID, name), "DB user %d with username %s not found", i+1, name)
 	}
 
+	for i, typ := range []string{datadogEntity, opsgenieEntity, victoropsEntity, pagerdutyEntity, webhookEntity} {
+		assert.NotNil(t, findTestAtlasIntegration(objects, projectID, typ), "Integration %d of type %s not found", i+1, typ)
+	}
+
 	for i, name := range streams {
 		assert.NotNil(t, findTestAtlasStreamInstance(objects, projectName, name), "Stream instance %d with name %s not found", i+1, name)
 	}