Merge pull request #36792 from hashicorp/td-generate-tagtests-config

Generate configs for tagging tests from template

.github/workflows/copyright.yml

@@ -15,7 +15,7 @@ on:
       - .goreleaser.yml
 
 jobs:
-  go_generate:
+  copywrite:
     name: add headers check
     runs-on: ubuntu-latest
     steps:

GNUmakefile

@@ -187,6 +187,7 @@ gen: prereq-go ## Run all Go generators
 	rm -f internal/provider/*_gen.go
 	rm -f internal/service/**/*_gen.go
 	rm -f internal/service/**/*_gen_test.go
+	rm -f internal/service/**/*_gen.tf
 	rm -f names/caps.md
 	rm -f names/*_gen.go
 	rm -f website/docs/guides/custom-service-endpoints.html.md

internal/generate/common/generator.go

@@ -57,6 +57,7 @@ type Destination interface {
 	Write() error
 	WriteBytes(body []byte) error
 	WriteTemplate(templateName, templateBody string, templateData any) error
+	WriteTemplateSet(templates *template.Template, templateData any) error
 }
 
 func (g *Generator) NewGoFileDestination(filename string) Destination {
@@ -133,17 +134,12 @@ func (d *baseDestination) WriteTemplate(templateName, templateBody string, templ
 		return err
 	}
 
-	if d.formatter != nil {
-		unformattedBody := body
-		body, err = d.formatter(unformattedBody)
-
-		if err != nil {
-			return fmt.Errorf("formatting parsed template:\n%s\n%w", unformattedBody, err)
-		}
+	body, err = d.format(body)
+	if err != nil {
+		return err
 	}
 
-	_, err = d.buffer.Write(body)
-	return err
+	return d.WriteBytes(body)
 }
 
 func parseTemplate(templateName, templateBody string, templateData any) ([]byte, error) {
@@ -156,12 +152,44 @@ func parseTemplate(templateName, templateBody string, templateData any) ([]byte,
 		return nil, fmt.Errorf("parsing function template: %w", err)
 	}
 
+	return executeTemplate(tmpl, templateData)
+}
+
+func executeTemplate(tmpl *template.Template, templateData any) ([]byte, error) {
 	var buffer bytes.Buffer
-	err = tmpl.Execute(&buffer, templateData)
+	err := tmpl.Execute(&buffer, templateData)
 
 	if err != nil {
 		return nil, fmt.Errorf("executing template: %w", err)
 	}
 
 	return buffer.Bytes(), nil
 }
+
+func (d *baseDestination) WriteTemplateSet(templates *template.Template, templateData any) error {
+	body, err := executeTemplate(templates, templateData)
+	if err != nil {
+		return err
+	}
+
+	body, err = d.format(body)
+	if err != nil {
+		return err
+	}
+
+	return d.WriteBytes(body)
+}
+
+func (d *baseDestination) format(body []byte) ([]byte, error) {
+	if d.formatter == nil {
+		return body, nil
+	}
+
+	unformattedBody := body
+	body, err := d.formatter(unformattedBody)
+	if err != nil {
+		return nil, fmt.Errorf("formatting parsed template:\n%s\n%w", unformattedBody, err)
+	}
+
+	return body, nil
+}