mirror of
https://github.com/letic/terraform-provider-google.git
synced 2024-07-09 03:28:29 +00:00
Add docs for new cloud composer beta fields and use beta api everywhere (#2573)
This commit is contained in:
parent
1bafe6b8e0
commit
076571c882
|
@ -6,7 +6,7 @@ import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/hashicorp/terraform/helper/resource"
|
"github.com/hashicorp/terraform/helper/resource"
|
||||||
composer "google.golang.org/api/composer/v1"
|
composer "google.golang.org/api/composer/v1beta1"
|
||||||
)
|
)
|
||||||
|
|
||||||
type ComposerOperationWaiter struct {
|
type ComposerOperationWaiter struct {
|
||||||
|
|
|
@ -25,7 +25,7 @@ import (
|
||||||
"google.golang.org/api/cloudkms/v1"
|
"google.golang.org/api/cloudkms/v1"
|
||||||
"google.golang.org/api/cloudresourcemanager/v1"
|
"google.golang.org/api/cloudresourcemanager/v1"
|
||||||
resourceManagerV2Beta1 "google.golang.org/api/cloudresourcemanager/v2beta1"
|
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"
|
computeBeta "google.golang.org/api/compute/v0.beta"
|
||||||
"google.golang.org/api/compute/v1"
|
"google.golang.org/api/compute/v1"
|
||||||
"google.golang.org/api/container/v1"
|
"google.golang.org/api/container/v1"
|
||||||
|
|
|
@ -9,7 +9,7 @@ import (
|
||||||
|
|
||||||
"github.com/hashicorp/terraform/helper/schema"
|
"github.com/hashicorp/terraform/helper/schema"
|
||||||
"github.com/hashicorp/terraform/helper/validation"
|
"github.com/hashicorp/terraform/helper/validation"
|
||||||
"google.golang.org/api/composer/v1"
|
"google.golang.org/api/composer/v1beta1"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
|
|
@ -12,7 +12,7 @@ import (
|
||||||
"github.com/hashicorp/terraform/helper/acctest"
|
"github.com/hashicorp/terraform/helper/acctest"
|
||||||
"github.com/hashicorp/terraform/helper/resource"
|
"github.com/hashicorp/terraform/helper/resource"
|
||||||
"github.com/hashicorp/terraform/terraform"
|
"github.com/hashicorp/terraform/terraform"
|
||||||
"google.golang.org/api/composer/v1"
|
"google.golang.org/api/composer/v1beta1"
|
||||||
"google.golang.org/api/storage/v1"
|
"google.golang.org/api/storage/v1"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -272,6 +272,20 @@ The `software_config` block supports:
|
||||||
SQL_USER
|
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
|
## Attributes Reference
|
||||||
|
|
||||||
In addition to the arguments listed above, the following computed attributes are exported:
|
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
|
The URI of the Apache Airflow Web UI hosted within this
|
||||||
environment.
|
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
|
## Timeouts
|
||||||
|
|
||||||
This resource provides the following
|
This resource provides the following
|
||||||
|
|
Loading…
Reference in New Issue
Block a user