public/terraform-provider-google
0
0
Fork 0
mirror of https://github.com/letic/terraform-provider-google.git synced 2024-07-03 08:42:39 +00:00
Code Issues Projects Releases Wiki Activity

Add docs for new cloud composer beta fields and use beta api everywhere (#2573)

Browse Source
This commit is contained in:
The Magician 2018-12-05 10:28:50 -08:00 committed by Nathan McKinley
parent 1bafe6b8e0
commit 076571c882
5 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
google/composer_operation.go
View File

@ -6,7 +6,7 @@ import (
"time"
"github.com/hashicorp/terraform/helper/resource"
composer "google.golang.org/api/composer/v1"
composer "google.golang.org/api/composer/v1beta1"
)
type ComposerOperationWaiter struct {

2
google/config.go
View File

@ -25,7 +25,7 @@ import (
"google.golang.org/api/cloudkms/v1"
"google.golang.org/api/cloudresourcemanager/v1"
resourceManagerV2Beta1 "google.golang.org/api/cloudresourcemanager/v2beta1"
"google.golang.org/api/composer/v1"
"google.golang.org/api/composer/v1beta1"
computeBeta "google.golang.org/api/compute/v0.beta"
"google.golang.org/api/compute/v1"
"google.golang.org/api/container/v1"

2
google/resource_composer_environment.go
View File

@ -9,7 +9,7 @@ import (
"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation"
"google.golang.org/api/composer/v1"
"google.golang.org/api/composer/v1beta1"
)
const (

2
google/resource_composer_environment_test.go
View File

@ -12,7 +12,7 @@ import (
"github.com/hashicorp/terraform/helper/acctest"
"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform"
"google.golang.org/api/composer/v1"
"google.golang.org/api/composer/v1beta1"
"google.golang.org/api/storage/v1"
)

21
website/docs/r/composer_environment.html.markdown
View File

@ -272,6 +272,20 @@ The `software_config` block supports:
SQL_USER
```
* `image_version` (Optional, [Beta](https://terraform.io/docs/providers/google/provider_versions.html)) -
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.
* `python_version` (Optional, [Beta](https://terraform.io/docs/providers/google/provider_versions.html)) -
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.
## Attributes Reference
In addition to the arguments listed above, the following computed attributes are exported:
@ -290,13 +304,6 @@ In addition to the arguments listed above, the following computed attributes are
The URI of the Apache Airflow Web UI hosted within this
environment.
* `config.software_config.image_version` -
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.
## Timeouts
This resource provides the following