Skip to content
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

Release staging v1.5.0 #901

Merged
merged 17 commits into from
Nov 3, 2022
Merged

Release staging v1.5.0 #901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
c729899
INTMDB-405: [Terraform] Add cluster label to advanced clusters (#857)
martinstibbe Oct 20, 2022
f1db66c
Relying on atlas api for unit validation on alert configuration (#862)
evertsd Oct 25, 2022
56885d9
INTMDB-334: privatelink endpoint service configurable timeout (#859)
evertsd Oct 25, 2022
21fc5f0
INTMDB-373: Add new notification parameters to the mongodbatlas_alert…
martinstibbe Oct 26, 2022
d65aebc
encryption_at_rest M10+ limit doc update (#886)
Zuhairahmed Oct 27, 2022
bf64bb6
INTMDB-224: [Terraform] Support AtlasGov with Terraform (#865)
martinstibbe Oct 28, 2022
72b7dd8
INTMDB-370 -- PIT Restore Example (#870)
evertsd Oct 29, 2022
7a80b75
Correct example in test to use arrays and minGram parameter error (#891)
martinstibbe Nov 1, 2022
1934a4c
INTMDB-378: Add link for How To Guide for existing container ID (#883)
martinstibbe Nov 1, 2022
e0edf10
Update CHANGELOG.md
martinstibbe Nov 2, 2022
ed37f30
Update CHANGELOG.md
martinstibbe Nov 2, 2022
3ce1092
INTMDB-314 Cluster Tenant Upgrade (#874)
evertsd Nov 2, 2022
6ca031f
Update CHANGELOG.md
martinstibbe Nov 2, 2022
4928672
Merge branch 'release-staging-v1.5.0' of https://github.com/mongodb/t…
martinstibbe Nov 2, 2022
65aa27e
Add additional secret to workflow
martinstibbe Nov 3, 2022
6dc8195
Fix failing cluster paused test (#900)
evertsd Nov 3, 2022
222b3ed
Merge branch 'master' into release-staging-v1.5.0
martinstibbe Nov 3, 2022
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
4 changes: 1 addition & 3 deletions mongodbatlas/resource_mongodbatlas_advanced_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1134,9 +1134,7 @@ func getUpgradeRequest(d *schema.ResourceData) *matlas.Cluster {
updatedRegion := updatedSpecs[0].RegionConfigs[0]
currentSize := currentRegion.ElectableSpecs.InstanceSize

if currentRegion.ElectableSpecs.InstanceSize == updatedRegion.ElectableSpecs.InstanceSize || !(currentSize == "M0" ||
currentSize == "M2" ||
currentSize == "M5") {
if currentRegion.ElectableSpecs.InstanceSize == updatedRegion.ElectableSpecs.InstanceSize || !isSharedTier(currentSize) {
return nil
}

Expand Down
16 changes: 6 additions & 10 deletions mongodbatlas/resource_mongodbatlas_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -900,8 +900,6 @@ func resourceMongoDBAtlasClusterUpdate(ctx context.Context, d *schema.ResourceDa
}
}

var didUnpauseCluster = false

if isUpgradeRequired(d) {
updatedCluster, _, err := upgradeCluster(ctx, conn, cluster, projectID, clusterName)

Expand All @@ -925,8 +923,6 @@ func resourceMongoDBAtlasClusterUpdate(ctx context.Context, d *schema.ResourceDa
}

_, _, err = updateCluster(ctx, conn, clusterRequest, projectID, clusterName)

didUnpauseCluster = true
}

if err != nil {
Expand Down Expand Up @@ -957,7 +953,7 @@ func resourceMongoDBAtlasClusterUpdate(ctx context.Context, d *schema.ResourceDa
}
}

if didUnpauseCluster {
if d.Get("paused").(bool) && !isSharedTier(d.Get("provider_instance_size_name").(string)) {
clusterRequest := &matlas.Cluster{
Paused: pointy.Bool(true),
}
Expand Down Expand Up @@ -1240,14 +1236,14 @@ func flattenProviderSettings(d *schema.ResourceData, settings *matlas.ProviderSe
}
}

func isSharedTier(instanceSize string) bool {
return instanceSize == "M0" || instanceSize == "M2" || instanceSize == "M5"
}

func isUpgradeRequired(d *schema.ResourceData) bool {
currentSize, updatedSize := d.GetChange("provider_instance_size_name")

if currentSize == updatedSize {
return false
}

return currentSize == "M0" || currentSize == "M2" || currentSize == "M5"
return currentSize != updatedSize && isSharedTier(currentSize.(string))
}

func expandReplicationSpecs(d *schema.ResourceData) ([]matlas.ReplicationSpec, error) {
Expand Down