diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index fb840ce3860..5487b0d90d3 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -35,8 +35,8 @@ Replace ec2 with the service package corresponding to your tests. For more information on the `-run` flag, see the `go test` documentation at https://tip.golang.org/cmd/go/#hdr-Testing_flags. --> -``` -$ make testacc TESTS=TestAccXXX PKG=ec2 +```console +% make testacc TESTS=TestAccXXX PKG=ec2 ... ``` diff --git a/skaff/resource/websitedoc.tmpl b/skaff/resource/websitedoc.tmpl index 2a3fc903658..44269d7cd09 100644 --- a/skaff/resource/websitedoc.tmpl +++ b/skaff/resource/websitedoc.tmpl @@ -62,8 +62,17 @@ This resource exports the following attributes in addition to the arguments abov ## Import -Import {{ .HumanFriendlyService }} {{ .HumanResourceName }} using the `example_id_arg`. For example: +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import {{ .HumanFriendlyService }} {{ .HumanResourceName }} using the `example_id_arg`. For example: +```terraform +import { + to = aws_{{ .ServicePackage }}_{{ .ResourceSnake }}.example + id = "{{ .ResourceSnake }}-id-12345678" +} ``` -$ terraform import aws_{{ .ServicePackage }}_{{ .ResourceSnake }}.example rft-8012925589 + +Using `terraform import`, import {{ .HumanFriendlyService }} {{ .HumanResourceName }} using the `example_id_arg`. For example: + +```console +% terraform import aws_{{ .ServicePackage }}_{{ .ResourceSnake }}.example {{ .ResourceSnake }}-id-12345678 ```