container: added release_channel_upgrade_target_version to google_container_engine_versions data source (#14287) (#10221)

[upstream:d71fd28fcf606af23884257a83d89ef033013e79]

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/14287.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+container: added `release_channel_upgrade_target_version` to `google_container_engine_versions` data source
+```

google-beta/services/container/data_source_google_container_engine_versions.go

@@ -74,6 +74,11 @@ func DataSourceGoogleContainerEngineVersions() *schema.Resource {
 				Computed: true,
 				Elem:     &schema.Schema{Type: schema.TypeString},
 			},
+			"release_channel_upgrade_target_version": {
+				Type:     schema.TypeMap,
+				Computed: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+			},
 		},
 	}
 }
@@ -142,8 +147,10 @@ func dataSourceGoogleContainerEngineVersionsRead(d *schema.ResourceData, meta in
 
 	releaseChannelDefaultVersion := map[string]string{}
 	releaseChannelLatestVersion := map[string]string{}
+	releaseChannelUpgradeTargetVersion := map[string]string{}
 	for _, channelResp := range resp.Channels {
 		releaseChannelDefaultVersion[channelResp.Channel] = channelResp.DefaultVersion
+		releaseChannelUpgradeTargetVersion[channelResp.Channel] = channelResp.UpgradeTargetVersion
 		for _, v := range channelResp.ValidVersions {
 			if strings.HasPrefix(v, d.Get("version_prefix").(string)) {
 				releaseChannelLatestVersion[channelResp.Channel] = v
@@ -158,6 +165,9 @@ func dataSourceGoogleContainerEngineVersionsRead(d *schema.ResourceData, meta in
 	if err := d.Set("release_channel_latest_version", releaseChannelLatestVersion); err != nil {
 		return fmt.Errorf("Error setting release_channel_latest_version: %s", err)
 	}
+	if err := d.Set("release_channel_upgrade_target_version", releaseChannelUpgradeTargetVersion); err != nil {
+		return fmt.Errorf("Error setting release_channel_upgrade_target_version: %s", err)
+	}
 
 	d.SetId(time.Now().UTC().String())
 	return nil

google-beta/services/container/data_source_google_container_engine_versions_test.go

@@ -138,6 +138,11 @@ func testAccCheckGoogleContainerEngineVersionsMeta(n string) resource.TestCheckF
 			return errors.New("failed to read latest STABLE version")
 		}
 
+		_, ok = rs.Primary.Attributes["release_channel_upgrade_target_version.STABLE"]
+		if !ok {
+			return errors.New("failed to read latest STABLE version")
+		}
+
 		return nil
 	}
 }

website/docs/d/container_engine_versions.html.markdown

@@ -86,3 +86,4 @@ The following attributes are exported:
 * `default_cluster_version` - Version of Kubernetes the service deploys by default.
 * `release_channel_default_version` - A map from a release channel name to the channel's default version. See the docs on [available release channel names](https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1/projects.locations.clusters#Cluster.Channel_1) for more details.
 * `release_channel_latest_version` - A map from a release channel name to the channel's latest version. See the docs on [available release channel names](https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1/projects.locations.clusters#Cluster.Channel_1) for more details.
+* `release_channel_upgrade_target_version` - A map from a release channel name to the channel's auto upgrade target version. See the docs on [available release channel names](https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1/projects.locations.clusters#Cluster.Channel_1) for more details.