Skip to content

Commit d129781

Browse files
roothorproothorp
committed
fix tests
1 parent 77240b9 commit d129781

File tree

6 files changed

+191
-65
lines changed

6 files changed

+191
-65
lines changed

‎internal/controller/atlasdatabaseuser/databaseuser_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -188,15 +188,15 @@ func TestHandleDatabaseUser(t *testing.T) {
188188
projectAPI.EXPECT().GetProjectExecute(mock.AnythingOfType("admin.GetProjectApiRequest")).
189189
Return(&admin.Group{Id: pointer.MakePtr("project-id")}, nil, nil)
190190

191-
userAPI := mockadminv20241113001.NewDatabaseUsersApi(t)
191+
userAPI := mockadmin.NewDatabaseUsersApi(t)
192192
userAPI.EXPECT().GetDatabaseUser(context.Background(), "project-id", "admin", "user1").
193-
Return(adminv20241113001.GetDatabaseUserApiRequest{ApiService: userAPI})
193+
Return(admin.GetDatabaseUserApiRequest{ApiService: userAPI})
194194
userAPI.EXPECT().GetDatabaseUserExecute(mock.AnythingOfType("admin.GetDatabaseUserApiRequest")).
195195
Return(nil, nil, nil)
196196
userAPI.EXPECT().CreateDatabaseUser(context.Background(), "project-id", mock.AnythingOfType("*admin.CloudDatabaseUser")).
197-
Return(adminv20241113001.CreateDatabaseUserApiRequest{ApiService: userAPI})
197+
Return(admin.CreateDatabaseUserApiRequest{ApiService: userAPI})
198198
userAPI.EXPECT().CreateDatabaseUserExecute(mock.AnythingOfType("admin.CreateDatabaseUserApiRequest")).
199-
Return(&adminv20241113001.CloudDatabaseUser{}, nil, nil)
199+
Return(&admin.CloudDatabaseUser{}, nil, nil)
200200

201201
clusterAPI := mockadmin.NewClustersApi(t)
202202

@@ -2261,15 +2261,15 @@ func DefaultTestProvider(t *testing.T) *atlasmock.TestProvider {
22612261
return false
22622262
},
22632263
SdkClientSetFunc: func(ctx context.Context, creds *atlas.Credentials, log *zap.SugaredLogger) (*atlas.ClientSet, error) {
2264-
userAPI := mockadminv20241113001.NewDatabaseUsersApi(t)
2264+
userAPI := mockadmin.NewDatabaseUsersApi(t)
22652265
userAPI.EXPECT().GetDatabaseUser(context.Background(), "my-project", "admin", "user1").
2266-
Return(adminv20241113001.GetDatabaseUserApiRequest{ApiService: userAPI})
2266+
Return(admin.GetDatabaseUserApiRequest{ApiService: userAPI})
22672267
userAPI.EXPECT().GetDatabaseUserExecute(mock.AnythingOfType("admin.GetDatabaseUserApiRequest")).
22682268
Return(nil, nil, nil)
22692269
userAPI.EXPECT().CreateDatabaseUser(context.Background(), "my-project", mock.AnythingOfType("*admin.CloudDatabaseUser")).
2270-
Return(adminv20241113001.CreateDatabaseUserApiRequest{ApiService: userAPI})
2270+
Return(admin.CreateDatabaseUserApiRequest{ApiService: userAPI})
22712271
userAPI.EXPECT().CreateDatabaseUserExecute(mock.AnythingOfType("admin.CreateDatabaseUserApiRequest")).
2272-
Return(&adminv20241113001.CloudDatabaseUser{}, nil, nil)
2272+
Return(&admin.CloudDatabaseUser{}, nil, nil)
22732273

22742274
clusterAPI := mockadmin.NewClustersApi(t)
22752275

‎internal/controller/atlasdeployment/atlasdeployment_controller_test.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -406,8 +406,7 @@ func TestRegularClusterReconciliation(t *testing.T) {
406406
StateName: pointer.MakePtr("IDLE"),
407407
ReplicationSpecs: &[]admin.ReplicationSpec20240805{
408408
{
409-
ZoneName: pointer.MakePtr("Zone 1"),
410-
NumShards: pointer.MakePtr(1),
409+
ZoneName: pointer.MakePtr("Zone 1"),
411410
RegionConfigs: &[]admin.CloudRegionConfig20240805{
412411
{
413412
ProviderName: pointer.MakePtr("AWS"),
@@ -948,8 +947,7 @@ func TestDeletionReconciliation(t *testing.T) {
948947
StateName: pointer.MakePtr("IDLE"),
949948
ReplicationSpecs: &[]admin.ReplicationSpec20240805{
950949
{
951-
ZoneName: pointer.MakePtr("Zone 1"),
952-
NumShards: pointer.MakePtr(1),
950+
ZoneName: pointer.MakePtr("Zone 1"),
953951
RegionConfigs: &[]admin.CloudRegionConfig20240805{
954952
{
955953
ProviderName: pointer.MakePtr("AWS"),

‎internal/translation/deployment/compare_test.go

Lines changed: 137 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,17 @@ func TestSpecAreEqual(t *testing.T) {
615615
},
616616
},
617617
atlas: &admin.ClusterDescription20240805{
618-
DiskSizeGB: pointer.MakePtr(10.0),
618+
ReplicationSpecs: &[]admin.ReplicationSpec20240805{
619+
{
620+
RegionConfigs: &[]admin.CloudRegionConfig20240805{
621+
{
622+
ElectableSpecs: &admin.HardwareSpec20240805{
623+
DiskSizeGB: pointer.MakePtr(10.0),
624+
},
625+
},
626+
},
627+
},
628+
},
619629
},
620630
},
621631
"should return false when encryption at rest config are different": {
@@ -717,7 +727,7 @@ func TestSpecAreEqual(t *testing.T) {
717727
atlas: &admin.ClusterDescription20240805{
718728
ReplicationSpecs: &[]admin.ReplicationSpec20240805{
719729
{
720-
NumShards: pointer.MakePtr(1),
730+
Id: pointer.MakePtr("abc123"),
721731
},
722732
},
723733
},
@@ -743,7 +753,6 @@ func TestSpecAreEqual(t *testing.T) {
743753
atlas: &admin.ClusterDescription20240805{
744754
ReplicationSpecs: &[]admin.ReplicationSpec20240805{
745755
{
746-
NumShards: pointer.MakePtr(1),
747756
RegionConfigs: &[]admin.CloudRegionConfig20240805{
748757
{
749758
ProviderName: pointer.MakePtr("AWS"),
@@ -783,7 +792,6 @@ func TestSpecAreEqual(t *testing.T) {
783792
atlas: &admin.ClusterDescription20240805{
784793
ReplicationSpecs: &[]admin.ReplicationSpec20240805{
785794
{
786-
NumShards: pointer.MakePtr(1),
787795
RegionConfigs: &[]admin.CloudRegionConfig20240805{
788796
{
789797
ProviderName: pointer.MakePtr("AWS"),
@@ -871,7 +879,6 @@ func TestSpecAreEqual(t *testing.T) {
871879
ClusterType: pointer.MakePtr("REPLICASET"),
872880
ReplicationSpecs: &[]admin.ReplicationSpec20240805{
873881
{
874-
NumShards: pointer.MakePtr(1),
875882
RegionConfigs: &[]admin.CloudRegionConfig20240805{
876883
{
877884
ProviderName: pointer.MakePtr("TENANT"),
@@ -887,13 +894,129 @@ func TestSpecAreEqual(t *testing.T) {
887894
},
888895
expected: false,
889896
},
897+
"should return true when sharded cluster are the same": {
898+
ako: &akov2.AtlasDeployment{
899+
Spec: akov2.AtlasDeploymentSpec{
900+
DeploymentSpec: &akov2.AdvancedDeploymentSpec{
901+
Name: "cluster0",
902+
ClusterType: "SHARDED",
903+
BackupEnabled: pointer.MakePtr(true),
904+
DiskSizeGB: pointer.MakePtr(20),
905+
Labels: []common.LabelSpec{
906+
{
907+
Key: "label1",
908+
Value: "label1",
909+
},
910+
},
911+
MongoDBMajorVersion: "7.0",
912+
PitEnabled: pointer.MakePtr(true),
913+
RootCertType: "ISRGROOTX1",
914+
Tags: []*akov2.TagSpec{
915+
{
916+
Key: "tag1",
917+
Value: "tag1",
918+
},
919+
},
920+
VersionReleaseSystem: "LTS",
921+
TerminationProtectionEnabled: false,
922+
ReplicationSpecs: []*akov2.AdvancedReplicationSpec{
923+
{
924+
NumShards: 3,
925+
RegionConfigs: []*akov2.AdvancedRegionConfig{
926+
{
927+
ProviderName: "AWS",
928+
RegionName: "US_EAST_1",
929+
Priority: pointer.MakePtr(7),
930+
ReadOnlySpecs: &akov2.Specs{
931+
InstanceSize: "M10",
932+
NodeCount: pointer.MakePtr(5),
933+
},
934+
},
935+
},
936+
},
937+
},
938+
},
939+
},
940+
},
941+
atlas: &admin.ClusterDescription20240805{
942+
Name: pointer.MakePtr("cluster0"),
943+
ClusterType: pointer.MakePtr("SHARDED"),
944+
BackupEnabled: pointer.MakePtr(true),
945+
EncryptionAtRestProvider: pointer.MakePtr("NONE"),
946+
Paused: pointer.MakePtr(false),
947+
Labels: &[]admin.ComponentLabel{
948+
{
949+
Key: pointer.MakePtr("label1"),
950+
Value: pointer.MakePtr("label1"),
951+
},
952+
},
953+
MongoDBMajorVersion: pointer.MakePtr("7.0"),
954+
MongoDBVersion: pointer.MakePtr("7.1.5"),
955+
PitEnabled: pointer.MakePtr(true),
956+
RootCertType: pointer.MakePtr("ISRGROOTX1"),
957+
Tags: &[]admin.ResourceTag{
958+
{
959+
Key: "tag1",
960+
Value: "tag1",
961+
},
962+
},
963+
VersionReleaseSystem: pointer.MakePtr("LTS"),
964+
TerminationProtectionEnabled: pointer.MakePtr(false),
965+
ReplicationSpecs: &[]admin.ReplicationSpec20240805{
966+
{
967+
RegionConfigs: &[]admin.CloudRegionConfig20240805{
968+
{
969+
ProviderName: pointer.MakePtr("AWS"),
970+
RegionName: pointer.MakePtr("US_EAST_1"),
971+
Priority: pointer.MakePtr(7),
972+
ReadOnlySpecs: &admin.DedicatedHardwareSpec20240805{
973+
InstanceSize: pointer.MakePtr("M10"),
974+
NodeCount: pointer.MakePtr(5),
975+
DiskSizeGB: pointer.MakePtr(20.0),
976+
},
977+
},
978+
},
979+
},
980+
{
981+
RegionConfigs: &[]admin.CloudRegionConfig20240805{
982+
{
983+
ProviderName: pointer.MakePtr("AWS"),
984+
RegionName: pointer.MakePtr("US_EAST_1"),
985+
Priority: pointer.MakePtr(7),
986+
ReadOnlySpecs: &admin.DedicatedHardwareSpec20240805{
987+
InstanceSize: pointer.MakePtr("M10"),
988+
NodeCount: pointer.MakePtr(5),
989+
DiskSizeGB: pointer.MakePtr(20.0),
990+
},
991+
},
992+
},
993+
},
994+
{
995+
RegionConfigs: &[]admin.CloudRegionConfig20240805{
996+
{
997+
ProviderName: pointer.MakePtr("AWS"),
998+
RegionName: pointer.MakePtr("US_EAST_1"),
999+
Priority: pointer.MakePtr(7),
1000+
ReadOnlySpecs: &admin.DedicatedHardwareSpec20240805{
1001+
InstanceSize: pointer.MakePtr("M10"),
1002+
NodeCount: pointer.MakePtr(5),
1003+
DiskSizeGB: pointer.MakePtr(20.0),
1004+
},
1005+
},
1006+
},
1007+
},
1008+
},
1009+
},
1010+
expected: true,
1011+
},
8901012
"should return true when cluster are the same": {
8911013
ako: &akov2.AtlasDeployment{
8921014
Spec: akov2.AtlasDeploymentSpec{
8931015
DeploymentSpec: &akov2.AdvancedDeploymentSpec{
8941016
Name: "cluster0",
8951017
ClusterType: "REPLICASET",
8961018
BackupEnabled: pointer.MakePtr(true),
1019+
DiskSizeGB: pointer.MakePtr(20),
8971020
Labels: []common.LabelSpec{
8981021
{
8991022
Key: "label1",
@@ -940,7 +1063,6 @@ func TestSpecAreEqual(t *testing.T) {
9401063
BackupEnabled: pointer.MakePtr(true),
9411064
EncryptionAtRestProvider: pointer.MakePtr("NONE"),
9421065
Paused: pointer.MakePtr(false),
943-
DiskSizeGB: pointer.MakePtr(10.0),
9441066
Labels: &[]admin.ComponentLabel{
9451067
{
9461068
Key: pointer.MakePtr("label1"),
@@ -961,7 +1083,6 @@ func TestSpecAreEqual(t *testing.T) {
9611083
TerminationProtectionEnabled: pointer.MakePtr(false),
9621084
ReplicationSpecs: &[]admin.ReplicationSpec20240805{
9631085
{
964-
NumShards: pointer.MakePtr(1),
9651086
RegionConfigs: &[]admin.CloudRegionConfig20240805{
9661087
{
9671088
ProviderName: pointer.MakePtr("AWS"),
@@ -970,10 +1091,12 @@ func TestSpecAreEqual(t *testing.T) {
9701091
ElectableSpecs: &admin.HardwareSpec20240805{
9711092
InstanceSize: pointer.MakePtr("M10"),
9721093
NodeCount: pointer.MakePtr(3),
1094+
DiskSizeGB: pointer.MakePtr(20.0),
9731095
},
9741096
ReadOnlySpecs: &admin.DedicatedHardwareSpec20240805{
9751097
InstanceSize: pointer.MakePtr("M10"),
9761098
NodeCount: pointer.MakePtr(5),
1099+
DiskSizeGB: pointer.MakePtr(20.0),
9771100
},
9781101
},
9791102
},
@@ -1043,7 +1166,6 @@ func TestSpecAreEqual(t *testing.T) {
10431166
BackupEnabled: pointer.MakePtr(true),
10441167
EncryptionAtRestProvider: pointer.MakePtr("NONE"),
10451168
Paused: pointer.MakePtr(false),
1046-
DiskSizeGB: pointer.MakePtr(10.0),
10471169
Labels: &[]admin.ComponentLabel{
10481170
{
10491171
Key: pointer.MakePtr("label1"),
@@ -1064,7 +1186,6 @@ func TestSpecAreEqual(t *testing.T) {
10641186
TerminationProtectionEnabled: pointer.MakePtr(false),
10651187
ReplicationSpecs: &[]admin.ReplicationSpec20240805{
10661188
{
1067-
NumShards: pointer.MakePtr(1),
10681189
RegionConfigs: &[]admin.CloudRegionConfig20240805{
10691190
{
10701191
ProviderName: pointer.MakePtr("AWS"),
@@ -1073,10 +1194,12 @@ func TestSpecAreEqual(t *testing.T) {
10731194
ElectableSpecs: &admin.HardwareSpec20240805{
10741195
InstanceSize: pointer.MakePtr("M10"),
10751196
NodeCount: pointer.MakePtr(3),
1197+
DiskSizeGB: pointer.MakePtr(10.0),
10761198
},
10771199
ReadOnlySpecs: &admin.DedicatedHardwareSpec20240805{
10781200
InstanceSize: pointer.MakePtr("M10"),
10791201
NodeCount: pointer.MakePtr(5),
1202+
DiskSizeGB: pointer.MakePtr(10.0),
10801203
},
10811204
AutoScaling: &admin.AdvancedAutoScalingSettings{
10821205
Compute: &admin.AdvancedComputeAutoScaling{
@@ -1175,7 +1298,7 @@ func TestSpecAreEqual(t *testing.T) {
11751298
BackupEnabled: pointer.MakePtr(true),
11761299
EncryptionAtRestProvider: pointer.MakePtr("NONE"),
11771300
Paused: pointer.MakePtr(false),
1178-
DiskSizeGB: pointer.MakePtr(10.0),
1301+
11791302
Labels: &[]admin.ComponentLabel{
11801303
{
11811304
Key: pointer.MakePtr("label1"),
@@ -1196,7 +1319,6 @@ func TestSpecAreEqual(t *testing.T) {
11961319
TerminationProtectionEnabled: pointer.MakePtr(false),
11971320
ReplicationSpecs: &[]admin.ReplicationSpec20240805{
11981321
{
1199-
NumShards: pointer.MakePtr(1),
12001322
RegionConfigs: &[]admin.CloudRegionConfig20240805{
12011323
{
12021324
ProviderName: pointer.MakePtr("AWS"),
@@ -1205,10 +1327,12 @@ func TestSpecAreEqual(t *testing.T) {
12051327
ElectableSpecs: &admin.HardwareSpec20240805{
12061328
InstanceSize: pointer.MakePtr("M10"),
12071329
NodeCount: pointer.MakePtr(3),
1330+
DiskSizeGB: pointer.MakePtr(10.0),
12081331
},
12091332
ReadOnlySpecs: &admin.DedicatedHardwareSpec20240805{
12101333
InstanceSize: pointer.MakePtr("M10"),
12111334
NodeCount: pointer.MakePtr(5),
1335+
DiskSizeGB: pointer.MakePtr(10.0),
12121336
},
12131337
AutoScaling: &admin.AdvancedAutoScalingSettings{
12141338
Compute: &admin.AdvancedComputeAutoScaling{
@@ -1226,10 +1350,12 @@ func TestSpecAreEqual(t *testing.T) {
12261350
ElectableSpecs: &admin.HardwareSpec20240805{
12271351
InstanceSize: pointer.MakePtr("M10"),
12281352
NodeCount: pointer.MakePtr(3),
1353+
DiskSizeGB: pointer.MakePtr(10.0),
12291354
},
12301355
ReadOnlySpecs: &admin.DedicatedHardwareSpec20240805{
12311356
InstanceSize: pointer.MakePtr("M10"),
12321357
NodeCount: pointer.MakePtr(5),
1358+
DiskSizeGB: pointer.MakePtr(10.0),
12331359
},
12341360
AutoScaling: &admin.AdvancedAutoScalingSettings{
12351361
Compute: &admin.AdvancedComputeAutoScaling{

‎internal/translation/deployment/conversion.go

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,6 @@ func replicaSetFromAtlas(replicationSpecs []admin.ReplicationSpec20240805) []sta
622622
}
623623

624624
func diskSizeFromAtlas(cluster *admin.ClusterDescription20240805) *int {
625-
626625
var value float64
627626

628627
if specs := cluster.GetReplicationSpecs(); len(specs) > 0 {
@@ -777,14 +776,6 @@ func processArgsFromAtlas(config *admin.ClusterDescriptionProcessArgs20240805) *
777776
return &args
778777
}
779778

780-
func diskSizeToAtlas(value *int) *float64 {
781-
if value != nil {
782-
return pointer.MakePtr(float64(*value))
783-
}
784-
785-
return nil
786-
}
787-
788779
func biConnectToAtlas(conn *akov2.BiConnectorSpec) *admin.BiConnector {
789780
if conn == nil {
790781
return nil
@@ -932,7 +923,7 @@ func replicationSpecToAtlas(replicationSpecs []*akov2.AdvancedReplicationSpec, d
932923
)
933924
}
934925

935-
for len(specs) != replicationSpecs[0].NumShards {
926+
for range replicationSpecs[0].NumShards {
936927
specs = append(specs, specs[0])
937928
}
938929

0 commit comments

Comments
 (0)