Do not render empty code choosers on generated index page

pkg/tfgen/convert_cli.go

@@ -45,6 +45,10 @@ import (
 	"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfgen/internal/autofill"
 )
 
+const (
+	exampleUnavailable = "Example currently unavailable in this language\n"
+)
+
 func cliConverterEnabled() bool {
 	return cmdutil.IsTruthy(os.Getenv("PULUMI_CONVERT"))
 }
@@ -645,14 +649,14 @@ func (cc *cliConverter) singleExampleFromHCLToPCL(path, hclCode string) (transla
 func (cc *cliConverter) singleExampleFromPCLToLanguage(example translatedExample, lang string) (string, error) {
 	var err error
 
-	if example.PCL == "" {
-		return "", nil
-	}
 	source, diags, _ := cc.convertPCL(example.PCL, lang)
 	diags = cc.postProcessDiagnostics(diags.Extend(example.Diagnostics))
 	if diags.HasErrors() {
-		source = "Example currently unavailable in this language\n"
-		err = fmt.Errorf("failed to convert an example: %s", diags.Error())
+		err = fmt.Errorf("conversion errors: %s", diags.Error())
+	}
+
+	if source == "" {
+		source = exampleUnavailable
 	}
 	source = "```" + lang + "\n" + source + "```"
 	return source, err

pkg/tfgen/installation_docs.go

@@ -66,6 +66,12 @@
 		return nil, err
 	}
 
+	// If the code translation resulted in an empty examples section, remove it
+	contentStr, err = removeEmptyExamples(contentStr)
+	if err != nil {
+		return nil, err
+	}
+
 	// Apply post-code translation edit rules. This applies all default edit rules and provider-supplied edit rules in
 	// the post-code translation phase.
 	contentBytes, err = g.editRules.apply(docFile.FileName, []byte(contentStr), info.PostCodeTranslation)
@@ -221,9 +227,6 @@
 
 // This function renders the Pulumi.yaml config file for a given language if configuration is included in the example.
 func processConfigYaml(pulumiYAML, lang string) string {
-	if pulumiYAML == "" {
-		return pulumiYAML
-	}
 	// Replace the project name from the default `/` to a more descriptive name
 	nameRegex := regexp.MustCompile(`name: /*`)
 	pulumiYAMLFile := nameRegex.ReplaceAllString(pulumiYAML, "name: configuration-example")
@@ -253,30 +256,53 @@
 		return "", err
 	}
 
+	// If both PCL and PulumiYAML fields are empty, we can return.
+	if pclExample.PulumiYAML == "" && pclExample.PCL == "" {
+		return "", nil
+	}
+
+	// If we have a valid provider config but no additional code, we only render a YAML configuration block
+	// with no choosers and an empty language runtime field
+	if pclExample.PulumiYAML != "" && pclExample.PCL == "" {
+		if pclExample.PCL == "" {
+			return processConfigYaml(pclExample.PulumiYAML, ""), nil
+		}
+	}
+
 	langs := genLanguageToSlice(g.language)
 	const (
 		chooserStart = `{{< chooser language "typescript,python,go,csharp,java,yaml" >}}` + "\n"
 		chooserEnd   = "{{< /chooser >}}\n"
 		choosableEnd = "\n{{% /choosable %}}\n"
 	)
 	exampleContent := chooserStart
+	successfulConversion := false
 
 	// Generate each language in turn and mark up the output with the correct Hugo shortcodes.
 	for _, lang := range langs {
 		choosableStart := fmt.Sprintf("{{%% choosable language %s %%}}\n", lang)
 
 		// Generate the Pulumi.yaml config file for each language
-		configFile := pclExample.PulumiYAML
-		pulumiYAML := processConfigYaml(configFile, lang)
+		var pulumiYAML string
+		if pclExample.PulumiYAML != "" {
+			pulumiYAML = processConfigYaml(pclExample.PulumiYAML, lang)
+		}
+
 		// Generate language example
 		convertedLang, err := converter.singleExampleFromPCLToLanguage(pclExample, lang)
 		if err != nil {
 			g.warn(err.Error())
 		}
+		if convertedLang != exampleUnavailable {
+			successfulConversion = true
+		}
 		exampleContent += choosableStart + pulumiYAML + convertedLang + choosableEnd
 	}
-	exampleContent += chooserEnd
-	return exampleContent, nil
+
+	if successfulConversion {
+		return exampleContent + chooserEnd, nil
+	}
+	return "", nil
 }
 
 type titleRemover struct{}
@@ -477,3 +503,39 @@
 	capitalize := cases.Title(language.English)
 	return capitalize.String(providerName)
 }
+
+func removeEmptyExamples(contentStr string) (string, error) {
+	if checkExamplesEmpty(contentStr) {
+		mybytes, err := SkipSectionByHeaderContent([]byte(contentStr), func(headerText string) bool {
+			return headerText == "Example Usage"
+		})
+		contentStr = string(mybytes)
+		return contentStr, err
+	}
+	return contentStr, nil
+
+}
+
+func checkExamplesEmpty(contentStr string) bool {
+
+	gm := goldmark.New(goldmark.WithExtensions(parse.TFRegistryExtension))
+	astNode := gm.Parser().Parse(text.NewReader([]byte(contentStr)))
+
+	isEmpty := false
+
+	err := ast.Walk(astNode, func(n ast.Node, entering bool) (ast.WalkStatus, error) {
+		if section, ok := n.(*section.Section); ok && entering {
+			sectionText := section.Text([]byte(contentStr))
+			// A little confusingly, we check if the section text _only_ contains the title, "Example Usage".
+			// Non-empty sections contain the title + content, so if we see only the title, the section is empty.
+			if string(sectionText) == "Example Usage" {
+				isEmpty = true
+				return ast.WalkStop, nil
+			}
+		}
+		return ast.WalkContinue, nil
+	})
+	contract.AssertNoErrorf(err, "impossible: ast.Walk should never error")
+
+	return isEmpty
+}

pkg/tfgen/installation_docs_test.go

@@ -449,32 +449,78 @@ func TestTranslateCodeBlocks(t *testing.T) {
 	}
 	pclsMap := make(map[string]translatedExample)
 
-	tc := testCase{
-		name:       "Translates HCL from examples ",
-		contentStr: readfile(t, "test_data/installation-docs/configuration.md"),
-		expected:   readfile(t, "test_data/installation-docs/configuration-expected.md"),
-		g: &Generator{
-			sink: mockSink{},
-			cliConverterState: &cliConverter{
-				info: p,
-				pcls: pclsMap,
+	testCases := []testCase{
+		{
+			name:       "Translates HCL from examples ",
+			contentStr: readfile(t, "test_data/installation-docs/configuration.md"),
+			expected:   readfile(t, "test_data/installation-docs/configuration-expected.md"),
+			g: &Generator{
+				sink: mockSink{},
+				cliConverterState: &cliConverter{
+					info: p,
+					pcls: pclsMap,
+				},
+				language: RegistryDocs,
+			},
+		},
+		{
+			name:       "Does not translate an invalid example and leaves example block blank",
+			contentStr: readfile(t, "test_data/installation-docs/invalid-example.md"),
+			expected:   readfile(t, "test_data/installation-docs/invalid-example-expected.md"),
+			g: &Generator{
+				sink: mockSink{},
+				cliConverterState: &cliConverter{
+					info: p,
+					pcls: pclsMap,
+				},
+				language: RegistryDocs,
+			},
+		},
+		{
+			name:       "Translates standalone provider config into Pulumi config YAML",
+			contentStr: readfile(t, "test_data/installation-docs/provider-config-only.md"),
+			expected:   readfile(t, "test_data/installation-docs/provider-config-only-expected.md"),
+			g: &Generator{
+				sink: mockSink{},
+				cliConverterState: &cliConverter{
+					info: p,
+					pcls: pclsMap,
+				},
+				language: RegistryDocs,
+			},
+		},
+		{
+			name:       "Translates standalone example into languages",
+			contentStr: readfile(t, "test_data/installation-docs/example-only.md"),
+			expected:   readfile(t, "test_data/installation-docs/example-only-expected.md"),
+			g: &Generator{
+				sink: mockSink{},
+				cliConverterState: &cliConverter{
+					info: p,
+					pcls: pclsMap,
+				},
+				language: RegistryDocs,
 			},
-			language: RegistryDocs,
 		},
 	}
-	t.Run(tc.name, func(t *testing.T) {
-		if runtime.GOOS == "windows" {
-			// Currently there is a test issue in CI/test setup:
-			//
-			// convertViaPulumiCLI: failed to clean up temp bridge-examples.json file: The
-			// process cannot access the file because it is being used by another process.
-			t.Skipf("Skipping on Windows due to a test setup issue")
-		}
-		t.Setenv("PULUMI_CONVERT", "1")
-		actual, err := translateCodeBlocks(tc.contentStr, tc.g)
-		require.NoError(t, err)
-		require.Equal(t, tc.expected, actual)
-	})
+
+	for _, tt := range testCases {
+		tt := tt
+
+		t.Run(tt.name, func(t *testing.T) {
+			if runtime.GOOS == "windows" {
+				// Currently there is a test issue in CI/test setup:
+				//
+				// convertViaPulumiCLI: failed to clean up temp bridge-examples.json file: The
+				// process cannot access the file because it is being used by another process.
+				t.Skipf("Skipping on Windows due to a test setup issue")
+			}
+			t.Setenv("PULUMI_CONVERT", "1")
+			actual, err := translateCodeBlocks(tt.contentStr, tt.g)
+			require.NoError(t, err)
+			require.Equal(t, tt.expected, actual)
+		})
+	}
 }
 
 func TestSkipSectionHeadersByContent(t *testing.T) {
@@ -617,3 +663,25 @@ func assertEqualHTML(t *testing.T, expected, actual string) bool {
 	}
 	return assert.Equal(t, expectedBuf.String(), outputBuf.String())
 }
+
+func TestRemoveEmptyExamples(t *testing.T) {
+	t.Parallel()
+	type testCase struct {
+		name     string
+		input    string
+		expected string
+	}
+
+	tc := testCase{
+		name:     "An empty Example Usage section is skipped",
+		input:    readTestFile(t, "skip-empty-examples/input.md"),
+		expected: readTestFile(t, "skip-empty-examples/expected.md"),
+	}
+
+	t.Run(tc.name, func(t *testing.T) {
+		t.Parallel()
+		actual, err := removeEmptyExamples(tc.input)
+		require.NoError(t, err)
+		assertEqualHTML(t, tc.expected, actual)
+	})
+}