Skip to content

Commit

Permalink
PR comments
Browse files Browse the repository at this point in the history
  • Loading branch information
@gssbzn
gssbzn committed Mar 28, 2024
1 parent beb7321 commit a60fabd
Show file tree
Hide file tree
Showing 14 changed files with 99 additions and 99 deletions.
2 changes: 1 addition & 1 deletion .golangci.yml
View file
Expand Up @@ -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
Expand Down
28 changes: 14 additions & 14 deletions internal/kubernetes/operator/datafederation/datafederation.go
View file
Expand Up @@ -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 (
Expand All @@ -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{
Expand All @@ -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(),
Expand All @@ -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{}
}
Expand All @@ -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{}
}
Expand All @@ -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{}
}
Expand All @@ -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{}
}
Expand All @@ -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{}
}
Expand All @@ -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{}
}
Expand All @@ -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{}
}
Expand All @@ -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{}
}
Expand Down
28 changes: 14 additions & 14 deletions internal/kubernetes/operator/datafederation/datafederation_test.go
View file
Expand Up @@ -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 (
Expand All @@ -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"),
Expand All @@ -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"),
Expand All @@ -94,7 +94,7 @@ func Test_BuildAtlasDataFederation(t *testing.T) {
},
},
},
Stores: &[]admin.DataLakeStoreSettings{
Stores: &[]atlasv2.DataLakeStoreSettings{
{
Name: pointer.Get("TestName"),
Provider: "TestProvider",
Expand All @@ -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{
Expand Down
6 changes: 3 additions & 3 deletions internal/kubernetes/operator/dbusers/dbusers.go
View file
Expand Up @@ -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"
Expand Down Expand Up @@ -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{
Expand Down
10 changes: 5 additions & 5 deletions internal/kubernetes/operator/dbusers/dbusers_test.go
View file
Expand Up @@ -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"
Expand Down Expand Up @@ -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{
Expand Down Expand Up @@ -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{
Expand Down
18 changes: 9 additions & 9 deletions internal/kubernetes/operator/deployment/deployment.go
View file
Expand Up @@ -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 (
Expand Down Expand Up @@ -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{
Expand Down Expand Up @@ -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{
Expand All @@ -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{
Expand Down Expand Up @@ -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{
Expand Down
18 changes: 9 additions & 9 deletions internal/kubernetes/operator/deployment/deployment_test.go
View file
Expand Up @@ -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"
Expand Down Expand Up @@ -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{
Expand Down Expand Up @@ -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{
Expand All @@ -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{
Expand Down Expand Up @@ -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{
Expand Down

0 comments on commit a60fabd

Please sign in to comment.