Skip to content

Commit eaf1660

Browse files
committed
fix broken things from rebase
1 parent b8b37a6 commit eaf1660

4 files changed

Lines changed: 11 additions & 3 deletions

File tree

cmd/tfplugindocs/testdata/scripts/schema-json/generate/framework_provider_success_generic_templates.txtar

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ rendering "functions/example.md.tmpl"
4545
rendering "index.md.tmpl"
4646
rendering "list-resources/example.md.tmpl"
4747
rendering "resources/example.md.tmpl"
48-
-- expected-unlinked-action.md --
48+
-- expected-action.md --
4949
# Data Fields
5050

5151
Name: scaffolding_example

cmd/tfplugindocs/testdata/scripts/schema-json/generate/framework_provider_success_no_templates_multiple_examples.txtar

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ generating new template for function "no-variadic"
2727
generating missing ephemeral resource content
2828
generating new template for "scaffolding_example"
2929
generating missing action content
30+
generating missing list resource content
3031
generating missing provider content
3132
generating new template for "terraform-provider-scaffolding"
3233
rendering static website

cmd/tfplugindocs/testdata/scripts/schema-json/generate/framework_provider_success_no_templates_single_example.txtar

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ generating new template for function "no-variadic"
2929
generating missing ephemeral resource content
3030
generating new template for "scaffolding_example"
3131
generating missing action content
32+
generating new template for "scaffolding_example"
3233
generating missing list resource content
3334
generating new template for "scaffolding_example"
3435
generating missing provider content
@@ -361,7 +362,7 @@ action "scaffolding_example" "example" {
361362
required_attr = "some-value"
362363
}
363364
}
364-
-- examples/list-resources/scaffolding_example/list.tfquery.hcl --
365+
-- examples/list-resources/scaffolding_example/list-resource.tfquery.hcl --
365366
list "scaffolding_example" "example" {
366367
provider = scaffolding
367368

internal/provider/generate.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -886,10 +886,16 @@ func (g *generator) renderStaticWebsite(providerSchema *tfjson.ProviderSchema) e
886886
case "list-resources/":
887887
resSchema, resName := resourceSchema(providerSchema.ListResourceSchemas, shortName, relFile)
888888
exampleFilePath := filepath.Join(g.ProviderExamplesDir(), "list-resources", resName, "list.tfquery.hcl")
889+
exampleFilesPattern := filepath.Join(g.ProviderExamplesDir(), "list-resources", resName, "list-resource*.tfquery.hcl")
890+
exampleFiles, err := filepath.Glob(exampleFilesPattern)
891+
892+
if err != nil {
893+
return fmt.Errorf("unable to glob example files with pattern %q: %w", exampleFilesPattern, err)
894+
}
889895

890896
if resSchema != nil {
891897
tmpl := resourceTemplate(tmplData)
892-
render, err := tmpl.Render(g.providerDir, resName, g.providerName, g.renderedProviderName, "List Resource", exampleFilePath, "", "", "", resSchema, nil)
898+
render, err := tmpl.Render(g.providerDir, resName, g.providerName, g.renderedProviderName, "List Resource", exampleFilePath, exampleFiles, "", "", "", resSchema, nil)
893899
if err != nil {
894900
return fmt.Errorf("unable to render list resource template %q: %w", rel, err)
895901
}

0 commit comments

Comments
 (0)