Skip to content

Commit

Permalink
Catch up Terraform providers (hashicorp#507)
Browse files Browse the repository at this point in the history
<!-- This change is generated by MagicModules. -->
/cc @rileykarson
  • Loading branch information
modular-magician authored and rileykarson committed Mar 7, 2019
1 parent 201d545 commit 165e0ce
Show file tree
Hide file tree
Showing 13 changed files with 38 additions and 26 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ resource "kubernetes_secret" "google-application-credentials" {

The following arguments are supported:

* `account_id` - (Required) The Service account id.
* `account_id` - (Required) The Service account id. (This is the part of the service account's email field that comes before the @ symbol.)

* `project` - (Optional) The ID of the project that the service account will be created in.
Defaults to the provider project configuration.
Expand Down
2 changes: 1 addition & 1 deletion website/docs/d/google_folder.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ The following arguments are supported:
The following attributes are exported:

* `id` - The Folder ID.
* `name` - The resource name of the Folder in the form `folders/{organization_id}`.
* `name` - The resource name of the Folder in the form `folders/{folder_id}`.
* `parent` - The resource name of the parent Folder or Organization.
* `display_name` - The folder's display name.
* `create_time` - Timestamp when the Organization was created. A timestamp in RFC3339 UTC "Zulu" format, accurate to nanoseconds. Example: "2014-10-02T15:01:23.045123456Z".
Expand Down
8 changes: 4 additions & 4 deletions website/docs/d/google_iam_policy.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ data "google_iam_policy" "admin" {
log_type = "DATA_READ",
exempted_members = ["user:[email protected]"]
}
audit_log_configs {
"logType": "DATA_WRITE",
log_type = "DATA_WRITE",
}
audit_log_configs {
"logType": "ADMIN_READ",
log_type = "ADMIN_READ",
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/app_engine_application.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ resource "google_project" "my_project" {
resource "google_app_engine_application" "app" {
project = "${google_project.my_project.project_id}"
location_id = "us-central'
location_id = "us-central"
}
```

Expand Down
2 changes: 2 additions & 0 deletions website/docs/r/bigquery_dataset.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ The following arguments are supported:
The `access` block supports the following fields (exactly one of `domain`,
`group_by_email`, `special_group`, `user_by_email`, or `view` must be set,
even though they are marked optional):

* `role` - (Required unless `view` is set) Describes the rights granted to
the user specified by the other member of the access object. The following
string values are supported: `READER`, `WRITER`, `OWNER`.
Expand All @@ -134,6 +135,7 @@ even though they are marked optional):
via an update operation. Structure is documented below.

The `access.view` block supports:

* `dataset_id` - (Required) The ID of the dataset containing this table.

* `project_id` - (Required) The ID of the project containing this table.
Expand Down
4 changes: 2 additions & 2 deletions website/docs/r/cloudfunctions_function.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ The `failure_policy` block supports:

* `retry` - (Required) Whether the function should be retried on failure. Defaults to `false`.

The `source_reposoitory` block supports:
The `source_repository` block supports:

* `url` - (Required) The URL pointing to the hosted repository where the function is defined. There are supported Cloud Source Repository URLs in the following formats:

Expand All @@ -111,7 +111,7 @@ exported:

* `https_trigger_url` - URL which triggers function execution. Returned only if `trigger_http` is used.

* `source_reposoitory.0.deployed_url` - The URL pointing to the hosted repository where the function was defined at the time of deployment.
* `source_repository.0.deployed_url` - The URL pointing to the hosted repository where the function was defined at the time of deployment.

* `project` - Project of the function. If it is not provided, the provider project is used.

Expand Down
16 changes: 9 additions & 7 deletions website/docs/r/compute_instance.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -214,11 +214,10 @@ The `network_interface` block supports:

* `access_config` - (Optional) Access configurations, i.e. IPs via which this
instance can be accessed via the Internet. Omit to ensure that the instance
is not accessible from the Internet (this means that ssh provisioners will
not work unless you are running Terraform can send traffic to the instance's
network (e.g. via tunnel or because it is running on another cloud instance
on that network). This block can be repeated multiple times. Structure
documented below.
is not accessible from the Internet. If omitted, ssh provisioners will not
work unless Terraform can send traffic to the instance's network (e.g. via
tunnel or because it is running on another cloud instance on that network).
This block can be repeated multiple times. Structure documented below.

* `alias_ip_range` - (Optional) An
array of alias IP ranges for this network interface. Can only be specified for network
Expand Down Expand Up @@ -262,14 +261,17 @@ The `service_account` block supports:

The `scheduling` block supports:

* `preemptible` - (Optional) Is the instance preemptible.
* `preemptible` - (Optional) Specifies if the instance is preemptible.
If this field is set to true, then `automatic_restart` must be
set to false. Defaults to false.

* `on_host_maintenance` - (Optional) Describes maintenance behavior for the
instance. Can be MIGRATE or TERMINATE, for more info, read
[here](https://cloud.google.com/compute/docs/instances/setting-instance-scheduling-options)
[here](https://cloud.google.com/compute/docs/instances/setting-instance-scheduling-options).

* `automatic_restart` - (Optional) Specifies if the instance should be
restarted if it was terminated by Compute Engine (not a user).
Defaults to true.

The `guest_accelerator` block supports:

Expand Down
5 changes: 5 additions & 0 deletions website/docs/r/compute_instance_template.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,11 @@ The `service_account` block supports:
short names are supported. To allow full access to all Cloud APIs, use the
`cloud-platform` scope. See a complete list of scopes [here](https://cloud.google.com/sdk/gcloud/reference/alpha/compute/instances/set-scopes#--scopes).

The [service accounts documentation](https://cloud.google.com/compute/docs/access/service-accounts#accesscopesiam)
explains that access scopes are the legacy method of specifying permissions for your instance.
If you are following best practices and using IAM roles to grant permissions to service accounts,
then you can define this field as an empty list.

The `scheduling` block supports:

* `automatic_restart` - (Optional) Specifies whether the instance should be
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/container_cluster.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ The `addons_config` block supports:
* `network_policy_config` - (Optional) Whether we should enable the network policy addon
for the master. This must be enabled in order to enable network policy for the nodes.
It can only be disabled if the nodes already do not have network policies enabled.
Set `disabled = true` to disable.
Defaults to disabled; set `disabled = false` to enable.

* `istio_config` - (Optional, [Beta](https://terraform.io/docs/providers/google/provider_versions.html)).
Structure is documented below.
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/container_node_pool.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ resource "google_container_cluster" "primary" {

The `autoscaling` block supports:

* `min_node_count` - (Required) Minimum number of nodes in the NodePool. Must be >=1 and
* `min_node_count` - (Required) Minimum number of nodes in the NodePool. Must be >=0 and
<= `max_node_count`.

* `max_node_count` - (Required) Maximum number of nodes in the NodePool. Must be >= min_node_count.
Expand Down
10 changes: 5 additions & 5 deletions website/docs/r/dataproc_cluster.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -442,20 +442,20 @@ The `encryption_config` block supports:
In addition to the arguments listed above, the following computed attributes are
exported:

* `cluster_config.master_config.instance_names` - List of master instance names which
* `cluster_config.0.master_config.0.instance_names` - List of master instance names which
have been assigned to the cluster.

* `cluster_config.worker_config.instance_names` - List of worker instance names which have been assigned
* `cluster_config.0.worker_config.0.instance_names` - List of worker instance names which have been assigned
to the cluster.

* `cluster_config.preemptible_worker_config.instance_names` - List of preemptible instance names which have been assigned
* `cluster_config.0.preemptible_worker_config.0.instance_names` - List of preemptible instance names which have been assigned
to the cluster.

* `cluster_config.bucket` - The name of the cloud storage bucket ultimately used to house the staging data
* `cluster_config.0.bucket` - The name of the cloud storage bucket ultimately used to house the staging data
for the cluster. If `staging_bucket` is specified, it will contain this value, otherwise
it will be the auto generated name.

* `cluster_config.software_config.properties` - A list of the properties used to set the daemon config files.
* `cluster_config.0.software_config.0.properties` - A list of the properties used to set the daemon config files.
This will include any values supplied by the user via `cluster_config.software_config.override_properties`

## Timeouts
Expand Down
6 changes: 4 additions & 2 deletions website/docs/r/dns_record_set.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,10 @@ resource "google_dns_managed_zone" "prod" {
```

### Adding a CNAME record

The list of `rrdatas` should only contain a single string corresponding to the Canonical Name intended.
```hcl

```hcl
resource "google_dns_record_set" "cname" {
name = "frontend.${google_dns_managed_zone.prod.dns_name}"
managed_zone = "${google_dns_managed_zone.prod.name}"
Expand All @@ -144,7 +146,7 @@ The following arguments are supported:
* `name` - (Required) The DNS name this record set will apply to.

* `rrdatas` - (Required) The string data for the records in this record set
whose meaning depends on the DNS type. For TXT record, if the string data contains spaces, add surrounding `\"` if you don't want your string to get split on spaces.
whose meaning depends on the DNS type. For TXT record, if the string data contains spaces, add surrounding `\"` if you don't want your string to get split on spaces. To specify a single record value longer than 255 characters such as a TXT record for DKIM, add `\"\"` inside the Terraform configuration string (e.g. `"first255characters\"\"morecharacters"`).

* `ttl` - (Required) The time-to-live of this record set (seconds).

Expand Down
3 changes: 2 additions & 1 deletion website/docs/r/sql_database_instance.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,8 @@ The optional `settings.database_flags` sublist supports:
The optional `settings.backup_configuration` subblock supports:

* `binary_log_enabled` - (Optional) True if binary logging is enabled. If
`logging` is false, this must be as well. Cannot be used with Postgres.
`settings.backup_configuration.enabled` is false, this must be as well.
Cannot be used with Postgres.

* `enabled` - (Optional) True if backup configuration is enabled.

Expand Down

0 comments on commit 165e0ce

Please sign in to comment.