Skip to content
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

Jump to bottom

Do not error if data source or resource not found in schemas #151

Merged
merged 6 commits into from Jun 14, 2022
Merged

Do not error if data source or resource not found in schemas #151

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c868d89
Do not error if data source or resource not found in schemas
bendbennett Jun 14, 2022
b66d667
Log message when schema not found
bendbennett Jun 14, 2022
2a52777
Fixing tests
bendbennett Jun 14, 2022
deeffc0
Update internal/provider/generate.go
bendbennett Jun 14, 2022
9a0ccb2
Update internal/provider/generate.go
bendbennett Jun 14, 2022
964bd15
Updating CHANGELOG.md
bendbennett Jun 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
52 changes: 24 additions & 28 deletions internal/provider/generate.go
View file
Open in desktop
Expand Up @@ -415,38 +415,34 @@ func (g *generator) renderStaticWebsite(providerName string, providerSchema *tfj
switch relDir {
case "data-sources/":
resSchema, resName := resourceSchema(providerSchema.DataSourceSchemas, shortName, relFile)
if resSchema == nil {
return fmt.Errorf("unable to find resource for provider (%s) and template (%s)", shortName, relFile)
}

tmpl := resourceTemplate(tmplData)
render, err := tmpl.Render(resName, providerName, g.renderedProviderName, "Data Source", "", "", resSchema)
if err != nil {
return fmt.Errorf("unable to render data source template %q: %w", rel, err)
}
_, err = out.WriteString(render)
if err != nil {
return fmt.Errorf("unable to write rendered string: %w", err)
if resSchema != nil {
tmpl := resourceTemplate(tmplData)
render, err := tmpl.Render(resName, providerName, g.renderedProviderName, "Data Source", "", "", resSchema)
if err != nil {
return fmt.Errorf("unable to render data source template %q: %w", rel, err)
}
_, err = out.WriteString(render)
if err != nil {
return fmt.Errorf("unable to write rendered string: %w", err)
}
return nil
}
return nil
g.warnf("data source entitled %q, or %q does not exist", shortName, resName)
case "resources/":
// spew.Dump(providerSchema.ResourceSchemas, shortName)
resSchema, resName := resourceSchema(providerSchema.ResourceSchemas, shortName, relFile)
// spew.Dump(resName, resSchema)
if resSchema == nil {
return fmt.Errorf("unable to find resource for provider (%s) and template (%s)", shortName, relFile)
}

tmpl := resourceTemplate(tmplData)
render, err := tmpl.Render(resName, providerName, g.renderedProviderName, "Resource", "", "", resSchema)
if err != nil {
return fmt.Errorf("unable to render resource template %q: %w", rel, err)
}
_, err = out.WriteString(render)
if err != nil {
return fmt.Errorf("unable to write regindered string: %w", err)
if resSchema != nil {
tmpl := resourceTemplate(tmplData)
render, err := tmpl.Render(resName, providerName, g.renderedProviderName, "Resource", "", "", resSchema)
if err != nil {
return fmt.Errorf("unable to render resource template %q: %w", rel, err)
}
_, err = out.WriteString(render)
if err != nil {
return fmt.Errorf("unable to write regindered string: %w", err)
}
return nil
}
return nil
g.warnf("resource entitled %q, or %q does not exist", shortName, resName)
case "": // provider
if relFile == "index.md.tmpl" {
tmpl := providerTemplate(tmplData)
Expand Down
2 changes: 1 addition & 1 deletion internal/provider/util.go
View file
Open in desktop
Expand Up @@ -68,7 +68,7 @@ func resourceSchema(schemas map[string]*tfjson.Schema, providerShortName, templa
return schema, resName
}

return nil, ""
return nil, resName
}

func writeFile(path string, data string) error {
Expand Down
4 changes: 2 additions & 2 deletions internal/provider/util_test.go
View file
Open in desktop
Expand Up @@ -31,7 +31,7 @@ func Test_resourceSchema(t *testing.T) {
providerShortName: "tls",
templateFileName: "http.md.tmpl",
expectedSchema: nil,
expectedResourceName: "",
expectedResourceName: "tls_http",
},
"provider short name concatenated with template file name matches schema name": {
schemas: map[string]*tfjson.Schema{
Expand All @@ -49,7 +49,7 @@ func Test_resourceSchema(t *testing.T) {
providerShortName: "tls",
templateFileName: "not_found.md.tmpl",
expectedSchema: nil,
expectedResourceName: "",
expectedResourceName: "tls_not_found",
},
"provider short name concatenated with same template file name matches schema name": {
schemas: map[string]*tfjson.Schema{
Expand Down