From a60fabd2cbf69ad4c9160a50a79150f64c57f83e Mon Sep 17 00:00:00 2001 From: Gustavo Bazan Date: Thu, 28 Mar 2024 15:15:02 +0000 Subject: [PATCH] PR comments --- .golangci.yml | 2 +- .../operator/datafederation/datafederation.go | 28 ++++++++--------- .../datafederation/datafederation_test.go | 28 ++++++++--------- .../kubernetes/operator/dbusers/dbusers.go | 6 ++-- .../operator/dbusers/dbusers_test.go | 10 +++---- .../operator/deployment/deployment.go | 18 +++++------ .../operator/deployment/deployment_test.go | 18 +++++------ .../kubernetes/operator/install_resources.go | 4 +-- .../kubernetes/operator/project/project.go | 10 +++---- .../operator/project/project_test.go | 26 ++++++++-------- .../kubernetes/operator/secrets/secrets.go | 6 ++-- .../e2e/atlas/kubernetes_config_apply_test.go | 8 ++--- .../atlas/kubernetes_config_generate_test.go | 30 +++++++++---------- .../atlas/kubernetes_operator_install_test.go | 4 +-- 14 files changed, 99 insertions(+), 99 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index cfd5e8bc31..4785f229c6 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -26,7 +26,7 @@ linters-settings: - pkg: github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/project alias: akov2project - pkg: k8s.io/apimachinery/pkg/apis/meta/v1 - alias: apisv1 + alias: metav1 - pkg: k8s.io/api/apps/v1 alias: appsv1 - pkg: k8s.io/api/core/v1 diff --git a/internal/kubernetes/operator/datafederation/datafederation.go b/internal/kubernetes/operator/datafederation/datafederation.go index e63dfb19cc..4b55b2430b 100644 --- a/internal/kubernetes/operator/datafederation/datafederation.go +++ b/internal/kubernetes/operator/datafederation/datafederation.go @@ -23,8 +23,8 @@ import ( akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" akov2common "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/common" akov2status "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/status" - "go.mongodb.org/atlas-sdk/v20231115008/admin" - apisv1 "k8s.io/apimachinery/pkg/apis/meta/v1" + atlasv2 "go.mongodb.org/atlas-sdk/v20231115008/admin" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) const ( @@ -41,11 +41,11 @@ func BuildAtlasDataFederation(dataFederationStore store.DataFederationStore, dat return nil, nil } atlasDataFederation := &akov2.AtlasDataFederation{ - TypeMeta: apisv1.TypeMeta{ + TypeMeta: metav1.TypeMeta{ APIVersion: "atlas.mongodb.com/v1", Kind: "AtlasDataFederation", }, - ObjectMeta: apisv1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Name: resources.NormalizeAtlasName(fmt.Sprintf("%s-%s", projectName, dataFederation.GetName()), dictionary), Namespace: targetNamespace, Labels: map[string]string{ @@ -62,12 +62,12 @@ func BuildAtlasDataFederation(dataFederationStore store.DataFederationStore, dat return atlasDataFederation, nil } -func isDataFederationExportable(dataFederation *admin.DataLakeTenant) bool { +func isDataFederationExportable(dataFederation *atlasv2.DataLakeTenant) bool { state := dataFederation.GetState() return state != DeletingState && state != DeletedState } -func getDataFederationSpec(dataFederationSpec *admin.DataLakeTenant, targetNamespace, projectName string) akov2.DataFederationSpec { +func getDataFederationSpec(dataFederationSpec *atlasv2.DataLakeTenant, targetNamespace, projectName string) akov2.DataFederationSpec { return akov2.DataFederationSpec{ Project: akov2common.ResourceRefNamespaced{Name: projectName, Namespace: targetNamespace}, Name: dataFederationSpec.GetName(), @@ -77,7 +77,7 @@ func getDataFederationSpec(dataFederationSpec *admin.DataLakeTenant, targetNames } } -func getCloudProviderConfig(cloudProviderConfig *admin.DataLakeCloudProviderConfig) *akov2.CloudProviderConfig { +func getCloudProviderConfig(cloudProviderConfig *atlasv2.DataLakeCloudProviderConfig) *akov2.CloudProviderConfig { if cloudProviderConfig == nil { return &akov2.CloudProviderConfig{} } @@ -89,7 +89,7 @@ func getCloudProviderConfig(cloudProviderConfig *admin.DataLakeCloudProviderConf } } -func getDataProcessRegion(dataProcessRegion *admin.DataLakeDataProcessRegion) *akov2.DataProcessRegion { +func getDataProcessRegion(dataProcessRegion *atlasv2.DataLakeDataProcessRegion) *akov2.DataProcessRegion { if dataProcessRegion == nil { return &akov2.DataProcessRegion{} } @@ -99,7 +99,7 @@ func getDataProcessRegion(dataProcessRegion *admin.DataLakeDataProcessRegion) *a } } -func getStorage(storage *admin.DataLakeStorage) *akov2.Storage { +func getStorage(storage *atlasv2.DataLakeStorage) *akov2.Storage { if storage == nil { return &akov2.Storage{} } @@ -109,7 +109,7 @@ func getStorage(storage *admin.DataLakeStorage) *akov2.Storage { } } -func getDatabases(database []admin.DataLakeDatabaseInstance) []akov2.Database { +func getDatabases(database []atlasv2.DataLakeDatabaseInstance) []akov2.Database { if database == nil { return []akov2.Database{} } @@ -126,7 +126,7 @@ func getDatabases(database []admin.DataLakeDatabaseInstance) []akov2.Database { return result } -func getCollection(collections []admin.DataLakeDatabaseCollection) []akov2.Collection { +func getCollection(collections []atlasv2.DataLakeDatabaseCollection) []akov2.Collection { if collections == nil { return []akov2.Collection{} } @@ -141,7 +141,7 @@ func getCollection(collections []admin.DataLakeDatabaseCollection) []akov2.Colle return result } -func getDataSources(dataSources []admin.DataLakeDatabaseDataSourceSettings) []akov2.DataSource { +func getDataSources(dataSources []atlasv2.DataLakeDatabaseDataSourceSettings) []akov2.DataSource { if dataSources == nil { return []akov2.DataSource{} } @@ -164,7 +164,7 @@ func getDataSources(dataSources []admin.DataLakeDatabaseDataSourceSettings) []ak return result } -func getViews(views []admin.DataLakeApiBase) []akov2.View { +func getViews(views []atlasv2.DataLakeApiBase) []akov2.View { if views == nil { return []akov2.View{} } @@ -180,7 +180,7 @@ func getViews(views []admin.DataLakeApiBase) []akov2.View { return result } -func getStores(stores []admin.DataLakeStoreSettings) []akov2.Store { +func getStores(stores []atlasv2.DataLakeStoreSettings) []akov2.Store { if stores == nil { return []akov2.Store{} } diff --git a/internal/kubernetes/operator/datafederation/datafederation_test.go b/internal/kubernetes/operator/datafederation/datafederation_test.go index e3c4f6cfa6..6e283f55f1 100644 --- a/internal/kubernetes/operator/datafederation/datafederation_test.go +++ b/internal/kubernetes/operator/datafederation/datafederation_test.go @@ -29,8 +29,8 @@ import ( akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" akov2common "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/common" akov2status "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/status" - "go.mongodb.org/atlas-sdk/v20231115008/admin" - apisv1 "k8s.io/apimachinery/pkg/apis/meta/v1" + atlasv2 "go.mongodb.org/atlas-sdk/v20231115008/admin" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) const ( @@ -47,26 +47,26 @@ func Test_BuildAtlasDataFederation(t *testing.T) { dictionary := resources.AtlasNameToKubernetesName() t.Run("Can import Data Federations", func(t *testing.T) { - dataFederation := &admin.DataLakeTenant{ - CloudProviderConfig: &admin.DataLakeCloudProviderConfig{ - Aws: admin.DataLakeAWSCloudProviderConfig{ + dataFederation := &atlasv2.DataLakeTenant{ + CloudProviderConfig: &atlasv2.DataLakeCloudProviderConfig{ + Aws: atlasv2.DataLakeAWSCloudProviderConfig{ RoleId: "TestRoleID", TestS3Bucket: "TestBucket", }, }, - DataProcessRegion: &admin.DataLakeDataProcessRegion{ + DataProcessRegion: &atlasv2.DataLakeDataProcessRegion{ CloudProvider: "TestProvider", Region: "TestRegion", }, Hostnames: &[]string{"TestHostname"}, Name: pointer.Get(dataFederationName), State: pointer.Get("TestState"), - Storage: &admin.DataLakeStorage{ - Databases: &[]admin.DataLakeDatabaseInstance{ + Storage: &atlasv2.DataLakeStorage{ + Databases: &[]atlasv2.DataLakeDatabaseInstance{ { - Collections: &[]admin.DataLakeDatabaseCollection{ + Collections: &[]atlasv2.DataLakeDatabaseCollection{ { - DataSources: &[]admin.DataLakeDatabaseDataSourceSettings{ + DataSources: &[]atlasv2.DataLakeDatabaseDataSourceSettings{ { AllowInsecure: pointer.Get(true), Collection: pointer.Get("TestCollection"), @@ -85,7 +85,7 @@ func Test_BuildAtlasDataFederation(t *testing.T) { }, MaxWildcardCollections: pointer.Get(10), Name: pointer.Get("TestName"), - Views: &[]admin.DataLakeApiBase{ + Views: &[]atlasv2.DataLakeApiBase{ { Name: pointer.Get("TestName"), Pipeline: pointer.Get("TestPipeline"), @@ -94,7 +94,7 @@ func Test_BuildAtlasDataFederation(t *testing.T) { }, }, }, - Stores: &[]admin.DataLakeStoreSettings{ + Stores: &[]atlasv2.DataLakeStoreSettings{ { Name: pointer.Get("TestName"), Provider: "TestProvider", @@ -113,11 +113,11 @@ func Test_BuildAtlasDataFederation(t *testing.T) { dataFederationStore.EXPECT().DataFederation(projectID, dataFederationName).Return(dataFederation, nil) expected := &akov2.AtlasDataFederation{ - TypeMeta: apisv1.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "AtlasDataFederation", APIVersion: "atlas.mongodb.com/v1", }, - ObjectMeta: apisv1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Name: resources.NormalizeAtlasName(fmt.Sprintf("%s-%s", projectName, dataFederation.GetName()), dictionary), Namespace: targetNamespace, Labels: map[string]string{ diff --git a/internal/kubernetes/operator/dbusers/dbusers.go b/internal/kubernetes/operator/dbusers/dbusers.go index 02c8fd4810..5431a2e9de 100644 --- a/internal/kubernetes/operator/dbusers/dbusers.go +++ b/internal/kubernetes/operator/dbusers/dbusers.go @@ -28,7 +28,7 @@ import ( akov2status "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/status" atlasv2 "go.mongodb.org/atlas-sdk/v20231115008/admin" corev1 "k8s.io/api/core/v1" - apisv1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) const timeFormatISO8601 = "2006-01-02T15:04:05.999Z" @@ -57,11 +57,11 @@ func BuildDBUsers(provider store.OperatorDBUsersStore, projectID, projectName, t scopes := convertUserScopes(user) mappedUsers[resourceName] = &akov2.AtlasDatabaseUser{ - TypeMeta: apisv1.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "AtlasDatabaseUser", APIVersion: "atlas.mongodb.com/v1", }, - ObjectMeta: apisv1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Name: resourceName, Namespace: targetNamespace, Labels: map[string]string{ diff --git a/internal/kubernetes/operator/dbusers/dbusers_test.go b/internal/kubernetes/operator/dbusers/dbusers_test.go index 7d70d65d80..3f7c360d8b 100644 --- a/internal/kubernetes/operator/dbusers/dbusers_test.go +++ b/internal/kubernetes/operator/dbusers/dbusers_test.go @@ -38,7 +38,7 @@ import ( "github.com/stretchr/testify/assert" atlasv2 "go.mongodb.org/atlas-sdk/v20231115008/admin" corev1 "k8s.io/api/core/v1" - apisv1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) const resourceVersion = "x.y.z" @@ -103,11 +103,11 @@ func Test_buildUserSecret(t *testing.T) { } expectedSecret := &corev1.Secret{ - TypeMeta: apisv1.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Secret", APIVersion: "v1", }, - ObjectMeta: apisv1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Name: strings.ToLower(fmt.Sprintf("%s-%s", projectName, atlasUser.Username)), Namespace: "TestNamespace", Labels: map[string]string{ @@ -181,11 +181,11 @@ func TestBuildDBUsers(t *testing.T) { } expectedUser := &akov2.AtlasDatabaseUser{ - TypeMeta: apisv1.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "AtlasDatabaseUser", APIVersion: "atlas.mongodb.com/v1", }, - ObjectMeta: apisv1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Name: resources.NormalizeAtlasName(fmt.Sprintf("%s-%s", projectName, user.Username), dictionary), Namespace: targetNamespace, Labels: map[string]string{ diff --git a/internal/kubernetes/operator/deployment/deployment.go b/internal/kubernetes/operator/deployment/deployment.go index ff7a9e9210..3243569009 100644 --- a/internal/kubernetes/operator/deployment/deployment.go +++ b/internal/kubernetes/operator/deployment/deployment.go @@ -27,7 +27,7 @@ import ( akov2provider "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/provider" akov2status "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/status" atlasv2 "go.mongodb.org/atlas-sdk/v20231115008/admin" - apisv1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) const ( @@ -110,11 +110,11 @@ func BuildAtlasAdvancedDeployment(deploymentStore store.OperatorClusterStore, va } atlasDeployment := &akov2.AtlasDeployment{ - TypeMeta: apisv1.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "AtlasDeployment", APIVersion: "atlas.mongodb.com/v1", }, - ObjectMeta: apisv1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Name: resources.NormalizeAtlasName(fmt.Sprintf("%s-%s", projectName, clusterID), dictionary), Namespace: targetNamespace, Labels: map[string]string{ @@ -296,11 +296,11 @@ func buildBackups(backupsProvider store.ScheduleDescriber, projectName, projectI }) } policies = append(policies, &akov2.AtlasBackupPolicy{ - TypeMeta: apisv1.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "AtlasBackupPolicy", APIVersion: "atlas.mongodb.com/v1", }, - ObjectMeta: apisv1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Name: resources.NormalizeAtlasName(fmt.Sprintf("%s-%s-backuppolicy", projectName, clusterName), dictionary), Namespace: targetNamespace, Labels: map[string]string{ @@ -323,11 +323,11 @@ func buildBackups(backupsProvider store.ScheduleDescriber, projectName, projectI } schedule := &akov2.AtlasBackupSchedule{ - TypeMeta: apisv1.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "AtlasBackupSchedule", APIVersion: "atlas.mongodb.com/v1", }, - ObjectMeta: apisv1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Name: resources.NormalizeAtlasName(fmt.Sprintf("%s-%s-backupschedule", projectName, clusterName), dictionary), Namespace: targetNamespace, Labels: map[string]string{ @@ -476,11 +476,11 @@ func BuildServerlessDeployments(deploymentStore store.OperatorClusterStore, vali atlasName := fmt.Sprintf("%s-%s", projectName, store.StringOrEmpty(deployment.Name)) atlasDeployment := &akov2.AtlasDeployment{ - TypeMeta: apisv1.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "AtlasDeployment", APIVersion: "atlas.mongodb.com/v1", }, - ObjectMeta: apisv1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Name: resources.NormalizeAtlasName(atlasName, dictionary), Namespace: targetNamespace, Labels: map[string]string{ diff --git a/internal/kubernetes/operator/deployment/deployment_test.go b/internal/kubernetes/operator/deployment/deployment_test.go index ca745e29c9..eaf5933c52 100644 --- a/internal/kubernetes/operator/deployment/deployment_test.go +++ b/internal/kubernetes/operator/deployment/deployment_test.go @@ -35,7 +35,7 @@ import ( akov2provider "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/provider" akov2status "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/status" atlasv2 "go.mongodb.org/atlas-sdk/v20231115008/admin" - apisv1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) const resourceVersion = "x.y.z" @@ -206,11 +206,11 @@ func TestBuildAtlasAdvancedDeployment(t *testing.T) { clusterStore.EXPECT().DescribeSchedule(projectName, clusterName).Return(backupSchedule, nil) expectCluster := &akov2.AtlasDeployment{ - TypeMeta: apisv1.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "AtlasDeployment", APIVersion: "atlas.mongodb.com/v1", }, - ObjectMeta: apisv1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Name: strings.ToLower(fmt.Sprintf("%s-%s", projectName, clusterName)), Namespace: targetNamespace, Labels: map[string]string{ @@ -331,11 +331,11 @@ func TestBuildAtlasAdvancedDeployment(t *testing.T) { expectPolicies := []*akov2.AtlasBackupPolicy{ { - TypeMeta: apisv1.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "AtlasBackupPolicy", APIVersion: "atlas.mongodb.com/v1", }, - ObjectMeta: apisv1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Name: strings.ToLower(fmt.Sprintf("%s-%s-backuppolicy", projectName, clusterName)), Namespace: targetNamespace, Labels: map[string]string{ @@ -357,11 +357,11 @@ func TestBuildAtlasAdvancedDeployment(t *testing.T) { } expectSchedule := &akov2.AtlasBackupSchedule{ - TypeMeta: apisv1.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "AtlasBackupSchedule", APIVersion: "atlas.mongodb.com/v1", }, - ObjectMeta: apisv1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Name: strings.ToLower(fmt.Sprintf("%s-%s-backupschedule", projectName, clusterName)), Namespace: targetNamespace, Labels: map[string]string{ @@ -467,11 +467,11 @@ func TestBuildServerlessDeployments(t *testing.T) { clusterStore.EXPECT().ServerlessPrivateEndpoints(projectName, clusterName).Return(spe, nil) expected := &akov2.AtlasDeployment{ - TypeMeta: apisv1.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "AtlasDeployment", APIVersion: "atlas.mongodb.com/v1", }, - ObjectMeta: apisv1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Name: strings.ToLower(fmt.Sprintf("%s-%s", projectName, clusterName)), Namespace: targetNamespace, Labels: map[string]string{ diff --git a/internal/kubernetes/operator/install_resources.go b/internal/kubernetes/operator/install_resources.go index 0e9e3d563a..f575e22c80 100644 --- a/internal/kubernetes/operator/install_resources.go +++ b/internal/kubernetes/operator/install_resources.go @@ -29,7 +29,7 @@ import ( corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" - apisv1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/kubernetes/scheme" ) @@ -156,7 +156,7 @@ func (ir *InstallResources) InstallCredentials(ctx context.Context, namespace, o } obj := &corev1.Secret{ - ObjectMeta: apisv1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Name: name, Namespace: namespace, Labels: map[string]string{ diff --git a/internal/kubernetes/operator/project/project.go b/internal/kubernetes/operator/project/project.go index 0042136482..ca3258356f 100644 --- a/internal/kubernetes/operator/project/project.go +++ b/internal/kubernetes/operator/project/project.go @@ -30,7 +30,7 @@ import ( akov2status "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/status" atlasv2 "go.mongodb.org/atlas-sdk/v20231115008/admin" corev1 "k8s.io/api/core/v1" - apisv1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" k8snames "k8s.io/apiserver/pkg/storage/names" ) @@ -192,11 +192,11 @@ func BuildAtlasProject(projectStore store.OperatorProjectStore, validator featur func newAtlasProject(project *atlasv2.Group, dictionary map[string]string, targetNamespace string, version string) *akov2.AtlasProject { return &akov2.AtlasProject{ - TypeMeta: apisv1.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "AtlasProject", APIVersion: "atlas.mongodb.com/v1", }, - ObjectMeta: apisv1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Name: resources.NormalizeAtlasName(project.Name, dictionary), Namespace: targetNamespace, Labels: map[string]string{ @@ -908,11 +908,11 @@ func buildTeams(teamsProvider store.OperatorTeamsStore, orgID, projectID, projec } atlasTeamCRs = append(atlasTeamCRs, &akov2.AtlasTeam{ - TypeMeta: apisv1.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "AtlasTeam", APIVersion: "atlas.mongodb.com/v1", }, - ObjectMeta: apisv1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Name: crName, Namespace: targetNamespace, Labels: map[string]string{ diff --git a/internal/kubernetes/operator/project/project_test.go b/internal/kubernetes/operator/project/project_test.go index 8537800cf9..f9739622ac 100644 --- a/internal/kubernetes/operator/project/project_test.go +++ b/internal/kubernetes/operator/project/project_test.go @@ -39,7 +39,7 @@ import ( "github.com/stretchr/testify/assert" atlasv2 "go.mongodb.org/atlas-sdk/v20231115008/admin" corev1 "k8s.io/api/core/v1" - apisv1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) const ( @@ -380,11 +380,11 @@ func TestBuildAtlasProject(t *testing.T) { teamsName := store.StringOrEmpty(teams.Name) expectedTeams := []*akov2.AtlasTeam{ { - TypeMeta: apisv1.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "AtlasTeam", APIVersion: "atlas.mongodb.com/v1", }, - ObjectMeta: apisv1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Name: fmt.Sprintf("%s-team-%s", strings.ToLower(p.Name), strings.ToLower(teamsName)), Namespace: targetNamespace, Labels: map[string]string{ @@ -403,11 +403,11 @@ func TestBuildAtlasProject(t *testing.T) { }, } expectedProject := &akov2.AtlasProject{ - TypeMeta: apisv1.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "AtlasProject", APIVersion: "atlas.mongodb.com/v1", }, - ObjectMeta: apisv1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Name: resources.NormalizeAtlasName(p.Name, dictionary), Namespace: targetNamespace, Labels: map[string]string{ @@ -585,11 +585,11 @@ func TestBuildProjectConnectionSecret(t *testing.T) { orgID, true, dictionary) expected := &corev1.Secret{ - TypeMeta: apisv1.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Secret", APIVersion: "v1", }, - ObjectMeta: apisv1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Name: strings.ToLower(fmt.Sprintf("%s-credentials", name)), Namespace: namespace, Labels: map[string]string{ @@ -615,11 +615,11 @@ func TestBuildProjectConnectionSecret(t *testing.T) { orgID, false, dictionary) expected := &corev1.Secret{ - TypeMeta: apisv1.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Secret", APIVersion: "v1", }, - ObjectMeta: apisv1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Name: strings.ToLower(fmt.Sprintf("%s-credentials", name)), Namespace: namespace, Labels: map[string]string{ @@ -953,11 +953,11 @@ func Test_buildIntegrations(t *testing.T) { expectedSecrets := []*corev1.Secret{ { - TypeMeta: apisv1.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Secret", APIVersion: "v1", }, - ObjectMeta: apisv1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Name: fmt.Sprintf("%s-integration-%s", strings.ToLower(projectID), strings.ToLower(ints.GetResults()[0].GetType())), @@ -1018,11 +1018,11 @@ func Test_buildIntegrations(t *testing.T) { expectedSecrets := []*corev1.Secret{ { - TypeMeta: apisv1.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Secret", APIVersion: "v1", }, - ObjectMeta: apisv1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Name: fmt.Sprintf("%s-integration-%s", strings.ToLower(projectID), strings.ToLower(ints.GetResults()[0].GetType())), diff --git a/internal/kubernetes/operator/secrets/secrets.go b/internal/kubernetes/operator/secrets/secrets.go index d5904ad27f..2905cc29d6 100644 --- a/internal/kubernetes/operator/secrets/secrets.go +++ b/internal/kubernetes/operator/secrets/secrets.go @@ -17,7 +17,7 @@ package secrets import ( "github.com/mongodb/mongodb-atlas-cli/atlascli/internal/kubernetes/operator/resources" corev1 "k8s.io/api/core/v1" - apisv1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) const ( @@ -38,11 +38,11 @@ type AtlasSecretBuilder func() (*corev1.Secret, map[string]string) func NewAtlasSecretBuilder(name, namespace string, dictionary map[string]string) AtlasSecretBuilder { return func() (*corev1.Secret, map[string]string) { secret := &corev1.Secret{ - TypeMeta: apisv1.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Secret", APIVersion: "v1", }, - ObjectMeta: apisv1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Name: resources.NormalizeAtlasName(name, dictionary), Namespace: namespace, Labels: map[string]string{ diff --git a/test/e2e/atlas/kubernetes_config_apply_test.go b/test/e2e/atlas/kubernetes_config_apply_test.go index 0bb57265c3..8873d57f09 100644 --- a/test/e2e/atlas/kubernetes_config_apply_test.go +++ b/test/e2e/atlas/kubernetes_config_apply_test.go @@ -30,7 +30,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" - apisv1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" ) @@ -70,7 +70,7 @@ func TestKubernetesConfigApply(t *testing.T) { }) e2eNamespace := &corev1.Namespace{ - ObjectMeta: apisv1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Name: "e2e-autodetect-parameters", }, } @@ -104,7 +104,7 @@ func TestKubernetesConfigApply(t *testing.T) { }) e2eNamespace := &corev1.Namespace{ - ObjectMeta: apisv1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Name: "e2e-autodetect-operator-version", }, } @@ -138,7 +138,7 @@ func TestKubernetesConfigApply(t *testing.T) { }) e2eNamespace := &corev1.Namespace{ - ObjectMeta: apisv1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Name: "e2e-export-atlas-resource", }, } diff --git a/test/e2e/atlas/kubernetes_config_generate_test.go b/test/e2e/atlas/kubernetes_config_generate_test.go index 2e124c9975..919aa11f94 100644 --- a/test/e2e/atlas/kubernetes_config_generate_test.go +++ b/test/e2e/atlas/kubernetes_config_generate_test.go @@ -42,7 +42,7 @@ import ( "github.com/stretchr/testify/require" atlasv2 "go.mongodb.org/atlas-sdk/v20231115008/admin" corev1 "k8s.io/api/core/v1" - apisv1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/yaml" "k8s.io/client-go/kubernetes/scheme" @@ -838,11 +838,11 @@ func referenceTeam(name, namespace string, users []akov2.TeamUser, projectName s dictionary := resources.AtlasNameToKubernetesName() return &akov2.AtlasTeam{ - TypeMeta: apisv1.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "AtlasTeam", APIVersion: "atlas.mongodb.com/v1", }, - ObjectMeta: apisv1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Name: resources.NormalizeAtlasName(fmt.Sprintf("%s-team-%s", projectName, name), dictionary), Namespace: namespace, Labels: labels, @@ -899,11 +899,11 @@ func checkProject(t *testing.T, output []runtime.Object, expected *akov2.AtlasPr func referenceProject(name, namespace string, labels map[string]string) *akov2.AtlasProject { dictionary := resources.AtlasNameToKubernetesName() return &akov2.AtlasProject{ - TypeMeta: apisv1.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "AtlasProject", APIVersion: "atlas.mongodb.com/v1", }, - ObjectMeta: apisv1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Name: resources.NormalizeAtlasName(name, dictionary), Namespace: namespace, Labels: labels, @@ -960,11 +960,11 @@ func referenceProject(name, namespace string, labels map[string]string) *akov2.A func referenceAdvancedCluster(name, region, namespace, projectName string, labels map[string]string) *akov2.AtlasDeployment { dictionary := resources.AtlasNameToKubernetesName() return &akov2.AtlasDeployment{ - TypeMeta: apisv1.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "AtlasDeployment", APIVersion: "atlas.mongodb.com/v1", }, - ObjectMeta: apisv1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Name: resources.NormalizeAtlasName(fmt.Sprintf("%s-%s", projectName, name), dictionary), Namespace: namespace, Labels: labels, @@ -1050,11 +1050,11 @@ func referenceAdvancedCluster(name, region, namespace, projectName string, label func referenceServerless(name, region, namespace, projectName string, labels map[string]string) *akov2.AtlasDeployment { dictionary := resources.AtlasNameToKubernetesName() return &akov2.AtlasDeployment{ - TypeMeta: apisv1.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "AtlasDeployment", APIVersion: "atlas.mongodb.com/v1", }, - ObjectMeta: apisv1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Name: resources.NormalizeAtlasName(fmt.Sprintf("%s-%s", projectName, name), dictionary), Namespace: namespace, Labels: labels, @@ -1159,11 +1159,11 @@ func defaultMaintenanceWindowAlertConfigs() []akov2.AlertConfiguration { func referenceBackupSchedule(namespace, projectName, clusterName string, labels map[string]string) *akov2.AtlasBackupSchedule { dictionary := resources.AtlasNameToKubernetesName() return &akov2.AtlasBackupSchedule{ - TypeMeta: apisv1.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "AtlasBackupSchedule", APIVersion: "atlas.mongodb.com/v1", }, - ObjectMeta: apisv1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Name: resources.NormalizeAtlasName(fmt.Sprintf("%s-%s-backupschedule", projectName, clusterName), dictionary), Namespace: namespace, Labels: labels, @@ -1183,11 +1183,11 @@ func referenceBackupSchedule(namespace, projectName, clusterName string, labels func referenceBackupPolicy(namespace, projectName, clusterName string, labels map[string]string) *akov2.AtlasBackupPolicy { dictionary := resources.AtlasNameToKubernetesName() return &akov2.AtlasBackupPolicy{ - TypeMeta: apisv1.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "AtlasBackupPolicy", APIVersion: "atlas.mongodb.com/v1", }, - ObjectMeta: apisv1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Name: resources.NormalizeAtlasName(fmt.Sprintf("%s-%s-backuppolicy", projectName, clusterName), dictionary), Namespace: namespace, Labels: labels, @@ -1567,11 +1567,11 @@ func atlasBackupSchedule(objects []runtime.Object) (*akov2.AtlasBackupSchedule, func referenceDataFederation(name, namespace, projectName string, labels map[string]string) *akov2.AtlasDataFederation { dictionary := resources.AtlasNameToKubernetesName() return &akov2.AtlasDataFederation{ - TypeMeta: apisv1.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "AtlasDataFederation", APIVersion: "atlas.mongodb.com/v1", }, - ObjectMeta: apisv1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Name: resources.NormalizeAtlasName(fmt.Sprintf("%s-%s", projectName, name), dictionary), Namespace: namespace, Labels: labels, diff --git a/test/e2e/atlas/kubernetes_operator_install_test.go b/test/e2e/atlas/kubernetes_operator_install_test.go index 8c86fe6fa1..12b6c47c3c 100644 --- a/test/e2e/atlas/kubernetes_operator_install_test.go +++ b/test/e2e/atlas/kubernetes_operator_install_test.go @@ -32,7 +32,7 @@ import ( atlasv2 "go.mongodb.org/atlas-sdk/v20231115008/admin" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" - apisv1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" ) @@ -323,7 +323,7 @@ func setupCluster(t *testing.T, name string, namespaces ...string) *operatorHelp for _, namespace := range namespaces { operatorNamespace := &corev1.Namespace{ - ObjectMeta: apisv1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Name: namespace, }, }