From 2ba35c6766dabfb7655a1da9a4be718eb3e39338 Mon Sep 17 00:00:00 2001 From: The Magician Date: Mon, 24 Feb 2025 12:13:07 -0800 Subject: [PATCH] Promote Major Version Upgrade Feature to GA (#13166) (#9403) [upstream:318bad996671a524e8883e0d84ab030b31cbcdfa] Signed-off-by: Modular Magician --- .changelog/13166.txt | 3 +++ google-beta/services/alloydb/resource_alloydb_cluster.go | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) create mode 100644 .changelog/13166.txt diff --git a/.changelog/13166.txt b/.changelog/13166.txt new file mode 100644 index 0000000000..b8418c2b8e --- /dev/null +++ b/.changelog/13166.txt @@ -0,0 +1,3 @@ +```release-note: enhancement +alloydb: promote Major Version Upgrade feature to GA +``` \ No newline at end of file diff --git a/google-beta/services/alloydb/resource_alloydb_cluster.go b/google-beta/services/alloydb/resource_alloydb_cluster.go index 2df8eaec75..f6f61d7105 100644 --- a/google-beta/services/alloydb/resource_alloydb_cluster.go +++ b/google-beta/services/alloydb/resource_alloydb_cluster.go @@ -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" @@ -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.")