Skip to content

Commit

Permalink
Promote Major Version Upgrade Feature to GA (#13166) (hashicorp#9403)
Browse files Browse the repository at this point in the history
[upstream:318bad996671a524e8883e0d84ab030b31cbcdfa]

Signed-off-by: Modular Magician <[email protected]>
  • Loading branch information
modular-magician authored Feb 24, 2025
1 parent ed5a9ee commit 2ba35c6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
3 changes: 3 additions & 0 deletions .changelog/13166.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note: enhancement
alloydb: promote Major Version Upgrade feature to GA
```
4 changes: 0 additions & 4 deletions google-beta/services/alloydb/resource_alloydb_cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -1245,8 +1245,6 @@ func resourceAlloydbClusterUpdate(d *schema.ResourceData, meta interface{}) erro
if err != nil {
return err
}
//

// Implementation for cluster upgrade
if d.HasChange("database_version") && !tpgresource.IsEmptyValue(reflect.ValueOf(d.Get("database_version"))) {
upgradeUrl := strings.Split(url, "?updateMask")[0] + ":upgrade"
Expand Down Expand Up @@ -1302,8 +1300,6 @@ func resourceAlloydbClusterUpdate(d *schema.ResourceData, meta interface{}) erro
}
}

//

// Restrict setting secondary_config if cluster_type is PRIMARY
if d.Get("cluster_type") == "PRIMARY" && !tpgresource.IsEmptyValue(reflect.ValueOf(d.Get("secondary_config"))) {
return fmt.Errorf("Can not set secondary config for primary cluster.")
Expand Down

0 comments on commit 2ba35c6

Please sign in to comment.