Skip to content

Commit

Permalink
Drop recommendation to use -provider= on import (#3894) (#2417)
Browse files Browse the repository at this point in the history
* Drop recommendation to use -provider= on import

This was deprecated in 0.12 and is removed in 0.13.

* Cleanup remaining references

Signed-off-by: Modular Magician <magic-modules@google.com>
  • Loading branch information
modular-magician authored Aug 25, 2020
1 parent 83cb843 commit abf1195
Show file tree
Hide file tree
Showing 212 changed files with 98 additions and 722 deletions.
3 changes: 3 additions & 0 deletions .changelog/3894.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:note
Drop recommendation to use -provider= on import in documentation
```
2 changes: 1 addition & 1 deletion website/docs/guides/provider_versions.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ with the `-provider` flag, similarly to if you were using a provider alias.


```bash
terraform import -provider=google-beta google_compute_instance.beta-instance my-instance
terraform import google_compute_instance.beta-instance my-instance
```

## Converting resources between versions
Expand Down
3 changes: 0 additions & 3 deletions website/docs/r/access_approval_folder_settings.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,3 @@ FolderSettings can be imported using any of these accepted formats:
$ terraform import google_folder_access_approval_settings.default folders/{{folder_id}}/accessApprovalSettings
$ terraform import google_folder_access_approval_settings.default {{folder_id}}
```

-> If you're importing a resource with beta features, make sure to include `-provider=google-beta`
as an argument so that Terraform uses the correct provider to import your resource.
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,3 @@ OrganizationSettings can be imported using any of these accepted formats:
$ terraform import google_organization_access_approval_settings.default organizations/{{organization_id}}/accessApprovalSettings
$ terraform import google_organization_access_approval_settings.default {{organization_id}}
```

-> If you're importing a resource with beta features, make sure to include `-provider=google-beta`
as an argument so that Terraform uses the correct provider to import your resource.
3 changes: 0 additions & 3 deletions website/docs/r/access_approval_project_settings.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,6 @@ $ terraform import google_project_access_approval_settings.default projects/{{pr
$ terraform import google_project_access_approval_settings.default {{project}}
```

-> If you're importing a resource with beta features, make sure to include `-provider=google-beta`
as an argument so that Terraform uses the correct provider to import your resource.

## User Project Overrides

This resource supports [User Project Overrides](https://www.terraform.io/docs/providers/google/guides/provider_reference.html#user_project_override).
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,3 @@ AccessLevel can be imported using any of these accepted formats:
```
$ terraform import google_access_context_manager_access_level.default {{name}}
```

-> If you're importing a resource with beta features, make sure to include `-provider=google-beta`
as an argument so that Terraform uses the correct provider to import your resource.
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,3 @@ AccessLevels can be imported using any of these accepted formats:
$ terraform import google_access_context_manager_access_levels.default {{parent}}/accessLevels
$ terraform import google_access_context_manager_access_levels.default {{parent}}
```

-> If you're importing a resource with beta features, make sure to include `-provider=google-beta`
as an argument so that Terraform uses the correct provider to import your resource.
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,3 @@ AccessPolicy can be imported using any of these accepted formats:
```
$ terraform import google_access_context_manager_access_policy.default {{name}}
```

-> If you're importing a resource with beta features, make sure to include `-provider=google-beta`
as an argument so that Terraform uses the correct provider to import your resource.
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,3 @@ ServicePerimeter can be imported using any of these accepted formats:
```
$ terraform import google_access_context_manager_service_perimeter.default {{name}}
```

-> If you're importing a resource with beta features, make sure to include `-provider=google-beta`
as an argument so that Terraform uses the correct provider to import your resource.
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,3 @@ ServicePerimeterResource can be imported using any of these accepted formats:
```
$ terraform import google_access_context_manager_service_perimeter_resource.default {{perimeter_name}}/{{resource}}
```

-> If you're importing a resource with beta features, make sure to include `-provider=google-beta`
as an argument so that Terraform uses the correct provider to import your resource.
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,3 @@ ServicePerimeters can be imported using any of these accepted formats:
$ terraform import google_access_context_manager_service_perimeters.default {{parent}}/servicePerimeters
$ terraform import google_access_context_manager_service_perimeters.default {{parent}}
```

-> If you're importing a resource with beta features, make sure to include `-provider=google-beta`
as an argument so that Terraform uses the correct provider to import your resource.
3 changes: 0 additions & 3 deletions website/docs/r/active_directory_domain.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,6 @@ Domain can be imported using any of these accepted formats:
$ terraform import google_active_directory_domain.default {{name}}
```

-> If you're importing a resource with beta features, make sure to include `-provider=google-beta`
as an argument so that Terraform uses the correct provider to import your resource.

## User Project Overrides

This resource supports [User Project Overrides](https://www.terraform.io/docs/providers/google/guides/provider_reference.html#user_project_override).
3 changes: 0 additions & 3 deletions website/docs/r/active_directory_domain_trust.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,6 @@ $ terraform import google_active_directory_domain_trust.default {{project}}/{{do
$ terraform import google_active_directory_domain_trust.default {{domain}}/{{target_domain_name}}
```

-> If you're importing a resource with beta features, make sure to include `-provider=google-beta`
as an argument so that Terraform uses the correct provider to import your resource.

## User Project Overrides

This resource supports [User Project Overrides](https://www.terraform.io/docs/providers/google/guides/provider_reference.html#user_project_override).
Original file line number Diff line number Diff line change
Expand Up @@ -144,9 +144,6 @@ ApplicationUrlDispatchRules can be imported using any of these accepted formats:
$ terraform import google_app_engine_application_url_dispatch_rules.default {{project}}
```

-> If you're importing a resource with beta features, make sure to include `-provider=google-beta`
as an argument so that Terraform uses the correct provider to import your resource.

## User Project Overrides

This resource supports [User Project Overrides](https://www.terraform.io/docs/providers/google/guides/provider_reference.html#user_project_override).
3 changes: 0 additions & 3 deletions website/docs/r/app_engine_domain_mapping.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,6 @@ $ terraform import google_app_engine_domain_mapping.default {{project}}/{{domain
$ terraform import google_app_engine_domain_mapping.default {{domain_name}}
```

-> If you're importing a resource with beta features, make sure to include `-provider=google-beta`
as an argument so that Terraform uses the correct provider to import your resource.

## User Project Overrides

This resource supports [User Project Overrides](https://www.terraform.io/docs/providers/google/guides/provider_reference.html#user_project_override).
3 changes: 0 additions & 3 deletions website/docs/r/app_engine_firewall_rule.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,6 @@ $ terraform import google_app_engine_firewall_rule.default {{project}}/{{priorit
$ terraform import google_app_engine_firewall_rule.default {{priority}}
```

-> If you're importing a resource with beta features, make sure to include `-provider=google-beta`
as an argument so that Terraform uses the correct provider to import your resource.

## User Project Overrides

This resource supports [User Project Overrides](https://www.terraform.io/docs/providers/google/guides/provider_reference.html#user_project_override).
3 changes: 0 additions & 3 deletions website/docs/r/app_engine_flexible_app_version.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -754,9 +754,6 @@ $ terraform import google_app_engine_flexible_app_version.default {{project}}/{{
$ terraform import google_app_engine_flexible_app_version.default {{service}}/{{version_id}}
```

-> If you're importing a resource with beta features, make sure to include `-provider=google-beta`
as an argument so that Terraform uses the correct provider to import your resource.

## User Project Overrides

This resource supports [User Project Overrides](https://www.terraform.io/docs/providers/google/guides/provider_reference.html#user_project_override).
3 changes: 0 additions & 3 deletions website/docs/r/app_engine_service_split_traffic.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,6 @@ $ terraform import google_app_engine_service_split_traffic.default {{project}}/{
$ terraform import google_app_engine_service_split_traffic.default {{service}}
```

-> If you're importing a resource with beta features, make sure to include `-provider=google-beta`
as an argument so that Terraform uses the correct provider to import your resource.

## User Project Overrides

This resource supports [User Project Overrides](https://www.terraform.io/docs/providers/google/guides/provider_reference.html#user_project_override).
3 changes: 0 additions & 3 deletions website/docs/r/app_engine_standard_app_version.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -444,9 +444,6 @@ $ terraform import google_app_engine_standard_app_version.default {{project}}/{{
$ terraform import google_app_engine_standard_app_version.default {{service}}/{{version_id}}
```

-> If you're importing a resource with beta features, make sure to include `-provider=google-beta`
as an argument so that Terraform uses the correct provider to import your resource.

## User Project Overrides

This resource supports [User Project Overrides](https://www.terraform.io/docs/providers/google/guides/provider_reference.html#user_project_override).
11 changes: 4 additions & 7 deletions website/docs/r/artifact_registry_repository.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -182,15 +182,12 @@ This resource provides the following
Repository can be imported using any of these accepted formats:

```
$ terraform import -provider=google-beta google_artifact_registry_repository.default projects/{{project}}/locations/{{location}}/repositories/{{repository_id}}
$ terraform import -provider=google-beta google_artifact_registry_repository.default {{project}}/{{location}}/{{repository_id}}
$ terraform import -provider=google-beta google_artifact_registry_repository.default {{location}}/{{repository_id}}
$ terraform import -provider=google-beta google_artifact_registry_repository.default {{repository_id}}
$ terraform import google_artifact_registry_repository.default projects/{{project}}/locations/{{location}}/repositories/{{repository_id}}
$ terraform import google_artifact_registry_repository.default {{project}}/{{location}}/{{repository_id}}
$ terraform import google_artifact_registry_repository.default {{location}}/{{repository_id}}
$ terraform import google_artifact_registry_repository.default {{repository_id}}
```

-> If you're importing a resource with beta features, make sure to include `-provider=google-beta`
as an argument so that Terraform uses the correct provider to import your resource.

## User Project Overrides

This resource supports [User Project Overrides](https://www.terraform.io/docs/providers/google/guides/provider_reference.html#user_project_override).
7 changes: 2 additions & 5 deletions website/docs/r/artifact_registry_repository_iam.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ Artifact Registry repository IAM resources can be imported using the resource id

IAM member imports use space-delimited identifiers: the resource in question, the role, and the member identity, e.g.
```
$ terraform import -provider=google-beta google_artifact_registry_repository_iam_member.editor "projects/{{project}}/locations/{{location}}/repositories/{{repository}} roles/viewer user:jane@example.com"
$ terraform import google_artifact_registry_repository_iam_member.editor "projects/{{project}}/locations/{{location}}/repositories/{{repository}} roles/viewer user:jane@example.com"
```

IAM binding imports use space-delimited identifiers: the resource in question and the role, e.g.
Expand All @@ -140,12 +140,9 @@ $ terraform import google_artifact_registry_repository_iam_binding.editor "proje

IAM policy imports use the identifier of the resource in question, e.g.
```
$ terraform import -provider=google-beta google_artifact_registry_repository_iam_policy.editor projects/{{project}}/locations/{{location}}/repositories/{{repository}}
$ terraform import google_artifact_registry_repository_iam_policy.editor projects/{{project}}/locations/{{location}}/repositories/{{repository}}
```

-> If you're importing a resource with beta features, make sure to include `-provider=google-beta`
as an argument so that Terraform uses the correct provider to import your resource.

-> **Custom Roles**: If you're importing a IAM resource with a custom role, make sure to use the
full name of the custom role, e.g. `[projects/my-project|organizations/my-org]/roles/my-custom-role`.

Expand Down
5 changes: 1 addition & 4 deletions website/docs/r/bigquery_connection.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -240,12 +240,9 @@ This resource provides the following
Connection can be imported using any of these accepted formats:

```
$ terraform import -provider=google-beta google_bigquery_connection.default {{name}}
$ terraform import google_bigquery_connection.default {{name}}
```

-> If you're importing a resource with beta features, make sure to include `-provider=google-beta`
as an argument so that Terraform uses the correct provider to import your resource.

## User Project Overrides

This resource supports [User Project Overrides](https://www.terraform.io/docs/providers/google/guides/provider_reference.html#user_project_override).
3 changes: 0 additions & 3 deletions website/docs/r/bigquery_data_transfer_config.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -167,9 +167,6 @@ Config can be imported using any of these accepted formats:
$ terraform import google_bigquery_data_transfer_config.default {{name}}
```

-> If you're importing a resource with beta features, make sure to include `-provider=google-beta`
as an argument so that Terraform uses the correct provider to import your resource.

## User Project Overrides

This resource supports [User Project Overrides](https://www.terraform.io/docs/providers/google/guides/provider_reference.html#user_project_override).
3 changes: 0 additions & 3 deletions website/docs/r/bigquery_dataset.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -300,9 +300,6 @@ $ terraform import google_bigquery_dataset.default {{project}}/{{dataset_id}}
$ terraform import google_bigquery_dataset.default {{dataset_id}}
```

-> If you're importing a resource with beta features, make sure to include `-provider=google-beta`
as an argument so that Terraform uses the correct provider to import your resource.

## User Project Overrides

This resource supports [User Project Overrides](https://www.terraform.io/docs/providers/google/guides/provider_reference.html#user_project_override).
3 changes: 0 additions & 3 deletions website/docs/r/bigquery_job.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -934,9 +934,6 @@ $ terraform import google_bigquery_job.default {{project}}/{{job_id}}
$ terraform import google_bigquery_job.default {{job_id}}
```

-> If you're importing a resource with beta features, make sure to include `-provider=google-beta`
as an argument so that Terraform uses the correct provider to import your resource.

## User Project Overrides

This resource supports [User Project Overrides](https://www.terraform.io/docs/providers/google/guides/provider_reference.html#user_project_override).
9 changes: 3 additions & 6 deletions website/docs/r/bigquery_reservation.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -107,14 +107,11 @@ This resource provides the following
Reservation can be imported using any of these accepted formats:

```
$ terraform import -provider=google-beta google_bigquery_reservation.default projects/{{project}}/locations/{{location}}/reservations/{{name}}
$ terraform import -provider=google-beta google_bigquery_reservation.default {{project}}/{{location}}/{{name}}
$ terraform import -provider=google-beta google_bigquery_reservation.default {{location}}/{{name}}
$ terraform import google_bigquery_reservation.default projects/{{project}}/locations/{{location}}/reservations/{{name}}
$ terraform import google_bigquery_reservation.default {{project}}/{{location}}/{{name}}
$ terraform import google_bigquery_reservation.default {{location}}/{{name}}
```

-> If you're importing a resource with beta features, make sure to include `-provider=google-beta`
as an argument so that Terraform uses the correct provider to import your resource.

## User Project Overrides

This resource supports [User Project Overrides](https://www.terraform.io/docs/providers/google/guides/provider_reference.html#user_project_override).
3 changes: 0 additions & 3 deletions website/docs/r/bigquery_table_iam.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -215,9 +215,6 @@ IAM policy imports use the identifier of the resource in question, e.g.
$ terraform import google_bigquery_table_iam_policy.editor projects/{{project}}/datasets/{{dataset_id}}/tables/{{table_id}}
```

-> If you're importing a resource with beta features, make sure to include `-provider=google-beta`
as an argument so that Terraform uses the correct provider to import your resource.

-> **Custom Roles**: If you're importing a IAM resource with a custom role, make sure to use the
full name of the custom role, e.g. `[projects/my-project|organizations/my-org]/roles/my-custom-role`.

Expand Down
3 changes: 0 additions & 3 deletions website/docs/r/bigtable_app_profile.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,6 @@ $ terraform import google_bigtable_app_profile.default {{project}}/{{instance}}/
$ terraform import google_bigtable_app_profile.default {{instance}}/{{app_profile_id}}
```

-> If you're importing a resource with beta features, make sure to include `-provider=google-beta`
as an argument so that Terraform uses the correct provider to import your resource.

## User Project Overrides

This resource supports [User Project Overrides](https://www.terraform.io/docs/providers/google/guides/provider_reference.html#user_project_override).
5 changes: 1 addition & 4 deletions website/docs/r/billing_budget.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -365,8 +365,5 @@ This resource provides the following
Budget can be imported using any of these accepted formats:

```
$ terraform import -provider=google-beta google_billing_budget.default {{name}}
$ terraform import google_billing_budget.default {{name}}
```

-> If you're importing a resource with beta features, make sure to include `-provider=google-beta`
as an argument so that Terraform uses the correct provider to import your resource.
3 changes: 0 additions & 3 deletions website/docs/r/binary_authorization_attestor.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -267,9 +267,6 @@ $ terraform import google_binary_authorization_attestor.default {{project}}/{{na
$ terraform import google_binary_authorization_attestor.default {{name}}
```

-> If you're importing a resource with beta features, make sure to include `-provider=google-beta`
as an argument so that Terraform uses the correct provider to import your resource.

## User Project Overrides

This resource supports [User Project Overrides](https://www.terraform.io/docs/providers/google/guides/provider_reference.html#user_project_override).
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,6 @@ IAM policy imports use the identifier of the resource in question, e.g.
$ terraform import google_binary_authorization_attestor_iam_policy.editor projects/{{project}}/attestors/{{attestor}}
```

-> If you're importing a resource with beta features, make sure to include `-provider=google-beta`
as an argument so that Terraform uses the correct provider to import your resource.

-> **Custom Roles**: If you're importing a IAM resource with a custom role, make sure to use the
full name of the custom role, e.g. `[projects/my-project|organizations/my-org]/roles/my-custom-role`.

Expand Down
3 changes: 0 additions & 3 deletions website/docs/r/binary_authorization_policy.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -232,9 +232,6 @@ $ terraform import google_binary_authorization_policy.default projects/{{project
$ terraform import google_binary_authorization_policy.default {{project}}
```

-> If you're importing a resource with beta features, make sure to include `-provider=google-beta`
as an argument so that Terraform uses the correct provider to import your resource.

## User Project Overrides

This resource supports [User Project Overrides](https://www.terraform.io/docs/providers/google/guides/provider_reference.html#user_project_override).
3 changes: 0 additions & 3 deletions website/docs/r/cloud_asset_folder_feed.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -188,9 +188,6 @@ $ terraform import google_cloud_asset_folder_feed.default folders/{{folder_id}}/
$ terraform import google_cloud_asset_folder_feed.default {{folder_id}}/{{name}}
```

-> If you're importing a resource with beta features, make sure to include `-provider=google-beta`
as an argument so that Terraform uses the correct provider to import your resource.

## User Project Overrides

This resource supports [User Project Overrides](https://www.terraform.io/docs/providers/google/guides/provider_reference.html#user_project_override).
3 changes: 0 additions & 3 deletions website/docs/r/cloud_asset_organization_feed.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -178,9 +178,6 @@ $ terraform import google_cloud_asset_organization_feed.default organizations/{{
$ terraform import google_cloud_asset_organization_feed.default {{org_id}}/{{name}}
```

-> If you're importing a resource with beta features, make sure to include `-provider=google-beta`
as an argument so that Terraform uses the correct provider to import your resource.

## User Project Overrides

This resource supports [User Project Overrides](https://www.terraform.io/docs/providers/google/guides/provider_reference.html#user_project_override).
3 changes: 0 additions & 3 deletions website/docs/r/cloud_asset_project_feed.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,6 @@ $ terraform import google_cloud_asset_project_feed.default {{project}}/{{name}}
$ terraform import google_cloud_asset_project_feed.default {{name}}
```

-> If you're importing a resource with beta features, make sure to include `-provider=google-beta`
as an argument so that Terraform uses the correct provider to import your resource.

## User Project Overrides

This resource supports [User Project Overrides](https://www.terraform.io/docs/providers/google/guides/provider_reference.html#user_project_override).
Loading

0 comments on commit abf1195

Please sign in to comment.