Skip to content

Fix double introduction of import syntax #553

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
OJFord wants to merge 1 commit into
base: main
Choose a base branch
from
+2 −71
Open

Fix double introduction of import syntax #553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions ...stdata/scripts/provider-build/generate/framework_provider_success_generic_templates.txtar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,6 @@ upper: RESOURCE
printf codefile:
## Import

Import is supported using the following syntax:

{{codefile "shell" "$WORK/examples/resources/scaffolding_example/import.sh"}}

printf tffile:
Expand All @@ -192,8 +190,6 @@ printf tffile:
codefile:
## Import

Import is supported using the following syntax:

```shell
terraform import scaffolding_example.example "id-123"
```
Expand Down Expand Up @@ -236,8 +232,6 @@ printf codefile:
{{ if .HasImport -}}
## Import

Import is supported using the following syntax:

{{ printf "{{codefile \"shell\" %q}}" .ImportFile }}
{{- end }}

Expand All @@ -252,8 +246,6 @@ codefile:
{{ if .HasImport -}}
## Import

Import is supported using the following syntax:

{{codefile "shell" .ImportFile }}
{{- end }}

Expand Down Expand Up @@ -332,8 +324,6 @@ printf codefile:
{{ if .HasImport -}}
## Import

Import is supported using the following syntax:

{{ printf "{{codefile \"shell\" %q}}" .ImportFile }}
{{- end }}

Expand All @@ -348,8 +338,6 @@ codefile:
{{ if .HasImport -}}
## Import

Import is supported using the following syntax:

{{codefile "shell" .ImportFile }}
{{- end }}

Expand Down
12 changes: 0 additions & 12 deletions ...testdata/scripts/provider-build/generate/framework_provider_success_named_templates.txtar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,6 @@ upper: RESOURCE
printf codefile:
## Import

Import is supported using the following syntax:

{{codefile "shell" "$WORK/examples/resources/scaffolding_example/import.sh"}}

printf tffile:
Expand All @@ -206,8 +204,6 @@ printf tffile:
codefile:
## Import

Import is supported using the following syntax:

```shell
terraform import scaffolding_example.example "id-123"
```
Expand Down Expand Up @@ -250,8 +246,6 @@ printf codefile:
{{ if .HasImport -}}
## Import

Import is supported using the following syntax:

{{ printf "{{codefile \"shell\" %q}}" .ImportFile }}
{{- end }}

Expand All @@ -266,8 +260,6 @@ codefile:
{{ if .HasImport -}}
## Import

Import is supported using the following syntax:

{{codefile "shell" .ImportFile }}
{{- end }}

Expand Down Expand Up @@ -349,8 +341,6 @@ printf codefile:
{{ if .HasImport -}}
## Import

Import is supported using the following syntax:

{{ printf "{{codefile \"shell\" %q}}" .ImportFile }}
{{- end }}

Expand All @@ -365,8 +355,6 @@ codefile:
{{ if .HasImport -}}
## Import

Import is supported using the following syntax:

{{codefile "shell" .ImportFile }}
{{- end }}

Expand Down
2 changes: 0 additions & 2 deletions ...cs/testdata/scripts/provider-build/generate/framework_provider_success_no_templates.txtar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,6 @@ resource "scaffolding_example" "example" {

## Import

Import is supported using the following syntax:

In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute, for example:

```terraform
Expand Down
4 changes: 0 additions & 4 deletions cmd/tfplugindocs/testdata/scripts/provider-build/generate/null_provider_success.txtar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,6 @@ description: |-
{{ if .HasImport -}}
## Import

Import is supported using the following syntax:

{{ printf "{{codefile \"shell\" %q}}" .ImportFile }}
{{- end }}
-- templates/index.md.tmpl --
Expand Down Expand Up @@ -112,8 +110,6 @@ description: |-
{{ if .HasImport -}}
## Import

Import is supported using the following syntax:

{{ printf "{{codefile \"shell\" %q}}" .ImportFile }}
{{- end }}

Expand Down
16 changes: 0 additions & 16 deletions .../testdata/scripts/schema-json/generate/framework_provider_success_generic_templates.txtar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,8 +339,6 @@ upper: RESOURCE
printf codefile:
## Import

Import is supported using the following syntax:

{{codefile "shell" "$WORK/examples/resources/scaffolding_example/import.sh"}}

printf tffile:
Expand All @@ -351,8 +349,6 @@ printf tffile:
codefile:
## Import

Import is supported using the following syntax:

```shell
terraform import scaffolding_example.example "id-123"
```
Expand Down Expand Up @@ -528,8 +524,6 @@ printf codefile:
{{ if .HasImport -}}
## Import

Import is supported using the following syntax:

{{ printf "{{codefile \"shell\" %q}}" .ImportFile }}
{{- end }}

Expand All @@ -544,8 +538,6 @@ codefile:
{{ if .HasImport -}}
## Import

Import is supported using the following syntax:

{{codefile "shell" .ImportFile }}
{{- end }}

Expand Down Expand Up @@ -666,8 +658,6 @@ printf codefile:
{{ if .HasImport -}}
## Import

Import is supported using the following syntax:

{{ printf "{{codefile \"shell\" %q}}" .ImportFile }}
{{- end }}

Expand All @@ -682,8 +672,6 @@ codefile:
{{ if .HasImport -}}
## Import

Import is supported using the following syntax:

{{codefile "shell" .ImportFile }}
{{- end }}

Expand Down Expand Up @@ -723,8 +711,6 @@ printf codefile:
{{ if .HasImport -}}
## Import

Import is supported using the following syntax:

{{ printf "{{codefile \"shell\" %q}}" .ImportFile }}
{{- end }}

Expand All @@ -739,8 +725,6 @@ codefile:
{{ if .HasImport -}}
## Import

Import is supported using the following syntax:

{{codefile "shell" .ImportFile }}
{{- end }}

Expand Down
16 changes: 0 additions & 16 deletions ...cs/testdata/scripts/schema-json/generate/framework_provider_success_named_templates.txtar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,8 +352,6 @@ upper: RESOURCE
printf codefile:
## Import

Import is supported using the following syntax:

{{codefile "shell" "$WORK/examples/resources/scaffolding_example/import.sh"}}

printf tffile:
Expand All @@ -364,8 +362,6 @@ printf tffile:
codefile:
## Import

Import is supported using the following syntax:

```shell
terraform import scaffolding_example.example "id-123"
```
Expand Down Expand Up @@ -541,8 +537,6 @@ printf codefile:
{{ if .HasImport -}}
## Import

Import is supported using the following syntax:

{{ printf "{{codefile \"shell\" %q}}" .ImportFile }}
{{- end }}

Expand All @@ -557,8 +551,6 @@ codefile:
{{ if .HasImport -}}
## Import

Import is supported using the following syntax:

{{codefile "shell" .ImportFile }}
{{- end }}

Expand Down Expand Up @@ -682,8 +674,6 @@ printf codefile:
{{ if .HasImport -}}
## Import

Import is supported using the following syntax:

{{ printf "{{codefile \"shell\" %q}}" .ImportFile }}
{{- end }}

Expand All @@ -698,8 +688,6 @@ codefile:
{{ if .HasImport -}}
## Import

Import is supported using the following syntax:

{{codefile "shell" .ImportFile }}
{{- end }}

Expand Down Expand Up @@ -739,8 +727,6 @@ printf codefile:
{{ if .HasImport -}}
## Import

Import is supported using the following syntax:

{{ printf "{{codefile \"shell\" %q}}" .ImportFile }}
{{- end }}

Expand All @@ -755,8 +741,6 @@ codefile:
{{ if .HasImport -}}
## Import

Import is supported using the following syntax:

{{codefile "shell" .ImportFile }}
{{- end }}

Expand Down
2 changes: 1 addition & 1 deletion ...ipts/schema-json/generate/framework_provider_success_no_templates_multiple_examples.txtar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,4 +625,4 @@ resource "scaffolding_example" "example" {
}
}
}
}
}
4 changes: 1 addition & 3 deletions ...scripts/schema-json/generate/framework_provider_success_no_templates_single_example.txtar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,8 +271,6 @@ resource "scaffolding_example" "example" {

## Import

Import is supported using the following syntax:

In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute, for example:

```terraform
Expand Down Expand Up @@ -621,4 +619,4 @@ resource "scaffolding_example" "example" {
}
}
}
}
}
4 changes: 0 additions & 4 deletions cmd/tfplugindocs/testdata/scripts/schema-json/generate/null_provider_success.txtar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,6 @@ description: |-
{{ if .HasImport -}}
## Import

Import is supported using the following syntax:

{{ printf "{{codefile \"shell\" %q}}" .ImportFile }}
{{- end }}
-- templates/index.md.tmpl --
Expand Down Expand Up @@ -107,8 +105,6 @@ description: |-
{{ if .HasImport -}}
## Import

Import is supported using the following syntax:

{{ printf "{{codefile \"shell\" %q}}" .ImportFile }}
{{- end }}

Expand Down
1 change: 0 additions & 1 deletion internal/provider/template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,6 @@ description: |-

## Import

Import is supported using the following syntax:
{{- end }}
{{- if .HasImportIdentityConfig }}

Expand Down
Loading