From 052bd0a40fe3b326267f2adb1a8eff78db7ad3c0 Mon Sep 17 00:00:00 2001 From: Dana Hoffman Date: Mon, 16 Sep 2019 18:33:18 +0000 Subject: [PATCH] image_version and python_version are ga in composer Signed-off-by: Modular Magician --- google-beta/resource_composer_environment_test.go | 4 ++-- website/docs/r/composer_environment.html.markdown | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/google-beta/resource_composer_environment_test.go b/google-beta/resource_composer_environment_test.go index 486d003e3c..94bc43cafe 100644 --- a/google-beta/resource_composer_environment_test.go +++ b/google-beta/resource_composer_environment_test.go @@ -419,8 +419,8 @@ data "google_composer_image_versions" "all" { } resource "google_composer_environment" "test" { - name = "%s" - region = "us-central1" + name = "%s" + region = "us-central1" config { software_config { image_version = "${data.google_composer_image_versions.all.image_versions.0.image_version_id}" diff --git a/website/docs/r/composer_environment.html.markdown b/website/docs/r/composer_environment.html.markdown index 55446e5d7e..cd1f46624e 100644 --- a/website/docs/r/composer_environment.html.markdown +++ b/website/docs/r/composer_environment.html.markdown @@ -275,17 +275,16 @@ The `software_config` block supports: SQL_USER ``` -* `image_version` (Optional, [Beta](https://terraform.io/docs/providers/google/provider_versions.html)) - +* `image_version` (Optional) - The version of the software running in the environment. This encapsulates both the version of Cloud Composer functionality and the version of Apache Airflow. It must match the regular expression `composer-[0-9]+\.[0-9]+(\.[0-9]+)?-airflow-[0-9]+\.[0-9]+(\.[0-9]+.*)?`. The Cloud Composer portion of the version is a semantic version. The portion of the image version following 'airflow-' is an official Apache Airflow repository release name. See [documentation](https://cloud.google.com/composer/docs/reference/rest/v1beta1/projects.locations.environments#softwareconfig) - for allowed release names. This field can only be set in the [Beta](https://terraform.io/docs/providers/google/provider_versions.html)) - provider, but is an output-only attribute in the GA provider. + for allowed release names. -* `python_version` (Optional, [Beta](https://terraform.io/docs/providers/google/provider_versions.html)) - +* `python_version` (Optional) - The major version of Python used to run the Apache Airflow scheduler, worker, and webserver processes. Can be set to '2' or '3'. If not specified, the default is '2'. Cannot be updated.