Skip to content

CLOUDP-380507-cluster: update schema and handler implementation #1622

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
maastha wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

CLOUDP-380507-cluster: update schema and handler implementation #1622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
236 changes: 155 additions & 81 deletions cfn-resources/cluster/cmd/resource/mappings.go
View file
Open in desktop

Large diffs are not rendered by default.

36 changes: 18 additions & 18 deletions cfn-resources/cluster/cmd/resource/mappings_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,44 +22,44 @@ import (
"github.com/mongodb/mongodbatlas-cloudformation-resources/util"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
admin20231115014 "go.mongodb.org/atlas-sdk/v20231115014/admin"
"go.mongodb.org/atlas-sdk/v20250312013/admin"
)

func TestAddReplicationSpecIDs(t *testing.T) {
testCases := map[string]struct {
from []admin20231115014.ReplicationSpec
to []admin20231115014.ReplicationSpec
from []admin.ReplicationSpec20240805
to []admin.ReplicationSpec20240805
expectedIDs []string
}{
"emptyIsOk": {[]admin20231115014.ReplicationSpec{}, []admin20231115014.ReplicationSpec{}, []string{}},
"emptyIsOk": {[]admin.ReplicationSpec20240805{}, []admin.ReplicationSpec20240805{}, []string{}},
"zoneNameMatch": {
[]admin20231115014.ReplicationSpec{{Id: util.StringPtr("id1"), ZoneName: util.StringPtr("z1")}},
[]admin20231115014.ReplicationSpec{{ZoneName: util.StringPtr("z1")}},
[]admin.ReplicationSpec20240805{{Id: util.StringPtr("id1"), ZoneName: util.StringPtr("z1")}},
[]admin.ReplicationSpec20240805{{ZoneName: util.StringPtr("z1")}},
[]string{"id1"},
},
"providerRegionMatch": {
[]admin20231115014.ReplicationSpec{{Id: util.StringPtr("id1"), RegionConfigs: regionConfig("AWS", "US_EAST_1")}},
[]admin20231115014.ReplicationSpec{{RegionConfigs: regionConfig("AWS", "US_EAST_1")}},
[]admin.ReplicationSpec20240805{{Id: util.StringPtr("id1"), RegionConfigs: regionConfig("AWS", "US_EAST_1")}},
[]admin.ReplicationSpec20240805{{RegionConfigs: regionConfig("AWS", "US_EAST_1")}},
[]string{"id1"},
},
"noMatchRegion": {
[]admin20231115014.ReplicationSpec{{Id: util.StringPtr("id1"), RegionConfigs: regionConfig("AWS", "US_EAST_1")}},
[]admin20231115014.ReplicationSpec{{RegionConfigs: regionConfig("AWS", "US_EAST_2")}},
[]admin.ReplicationSpec20240805{{Id: util.StringPtr("id1"), RegionConfigs: regionConfig("AWS", "US_EAST_1")}},
[]admin.ReplicationSpec20240805{{RegionConfigs: regionConfig("AWS", "US_EAST_2")}},
[]string{""},
},
"noMatchZone": {
[]admin20231115014.ReplicationSpec{{Id: util.StringPtr("id1"), ZoneName: util.StringPtr("z1")}},
[]admin20231115014.ReplicationSpec{{ZoneName: util.StringPtr("z2")}},
[]admin.ReplicationSpec20240805{{Id: util.StringPtr("id1"), ZoneName: util.StringPtr("z1")}},
[]admin.ReplicationSpec20240805{{ZoneName: util.StringPtr("z2")}},
[]string{""},
},
"existingId": {
[]admin20231115014.ReplicationSpec{{Id: util.StringPtr("id1"), ZoneName: util.StringPtr("z1")}},
[]admin20231115014.ReplicationSpec{{Id: util.StringPtr("existing"), ZoneName: util.StringPtr("z1")}},
[]admin.ReplicationSpec20240805{{Id: util.StringPtr("id1"), ZoneName: util.StringPtr("z1")}},
[]admin.ReplicationSpec20240805{{Id: util.StringPtr("existing"), ZoneName: util.StringPtr("z1")}},
[]string{"existing"},
},
"idMatchedOnlyOnce": {
[]admin20231115014.ReplicationSpec{{Id: util.StringPtr("id1"), ZoneName: util.StringPtr("z1"), RegionConfigs: regionConfig("AWS", "US_EAST_1")}},
[]admin20231115014.ReplicationSpec{{ZoneName: util.StringPtr("z1")}, {RegionConfigs: regionConfig("AWS", "US_EAST_1")}},
[]admin.ReplicationSpec20240805{{Id: util.StringPtr("id1"), ZoneName: util.StringPtr("z1"), RegionConfigs: regionConfig("AWS", "US_EAST_1")}},
[]admin.ReplicationSpec20240805{{ZoneName: util.StringPtr("z1")}, {RegionConfigs: regionConfig("AWS", "US_EAST_1")}},
[]string{"id1", ""},
},
}
Expand All @@ -75,8 +75,8 @@ func TestAddReplicationSpecIDs(t *testing.T) {
}
}

func regionConfig(provider, region string) *[]admin20231115014.CloudRegionConfig {
return &[]admin20231115014.CloudRegionConfig{{
func regionConfig(provider, region string) *[]admin.CloudRegionConfig20240805 {
return &[]admin.CloudRegionConfig20240805{{
RegionName: &region,
ProviderName: &provider,
}}
Expand Down
81 changes: 44 additions & 37 deletions cfn-resources/cluster/cmd/resource/model.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading