Merge pull request #35199 from showwin/f-aws_rds_integration

New Resource aws_rds_integration
hashicorp · Aug 2, 2024 · 3ef548f · 3ef548f
2 parents 00d5f3b + 6d7e4ed
commit 3ef548f
Show file tree

Hide file tree

Showing 56 changed files with 1,700 additions and 1,373 deletions.
diff --git a/.changelog/35199.txt b/.changelog/35199.txt
@@ -0,0 +1,3 @@
+```release-note:new-resource
+aws_rds_integration
+```
diff --git a/.teamcity/scripts/provider_tests/acceptance_tests.sh b/.teamcity/scripts/provider_tests/acceptance_tests.sh
@@ -48,6 +48,7 @@ TF_ACC=1 go test \
  ./internal/json/... \
  ./internal/logging/... \
  ./internal/maps/... \
+ ./internal/namevaluesfilters/... \
  ./internal/provider/... \
  ./internal/retry/... \
  ./internal/sdkv2/... \

diff --git a/.teamcity/scripts/provider_tests/unit_tests.sh b/.teamcity/scripts/provider_tests/unit_tests.sh
@@ -20,6 +20,7 @@ go test \
  ./internal/json/... \
  ./internal/logging/... \
  ./internal/maps/... \
+ ./internal/namevaluesfilters/... \
  ./internal/provider/... \
  ./internal/retry/... \
  ./internal/sdkv2/... \

diff --git a/internal/generate/common/generator.go b/internal/generate/common/generator.go
@@ -7,6 +7,7 @@ import (
  "bytes"
  "fmt"
  "go/format"
+ "maps"
  "os"
  "path"
  "strings"
@@ -58,7 +59,7 @@ type Destination interface {
  CreateDirectories() error
  Write() error
  WriteBytes(body []byte) error
- WriteTemplate(templateName, templateBody string, templateData any) error
+ WriteTemplate(templateName, templateBody string, templateData any, funcMaps ...template.FuncMap) error
  WriteTemplateSet(templates *template.Template, templateData any) error
 }
 
@@ -129,8 +130,8 @@ func (d *baseDestination) WriteBytes(body []byte) error {
  return err
 }
 
-func (d *baseDestination) WriteTemplate(templateName, templateBody string, templateData any) error {
- body, err := parseTemplate(templateName, templateBody, templateData)
+func (d *baseDestination) WriteTemplate(templateName, templateBody string, templateData any, funcMaps ...template.FuncMap) error {
+ body, err := parseTemplate(templateName, templateBody, templateData, funcMaps...)
 
  if err != nil {
  return err
@@ -144,7 +145,7 @@ func (d *baseDestination) WriteTemplate(templateName, templateBody string, templ
  return d.WriteBytes(body)
 }
 
-func parseTemplate(templateName, templateBody string, templateData any) ([]byte, error) {
+func parseTemplate(templateName, templateBody string, templateData any, funcMaps ...template.FuncMap) ([]byte, error) {
  funcMap := template.FuncMap{
  // FirstUpper returns a string with the first character as upper case.
  "FirstUpper": func(s string) string {
@@ -157,6 +158,9 @@ func parseTemplate(templateName, templateBody string, templateData any) ([]byte,
  // Title returns a string with the first character of each word as upper case.
  "Title": cases.Title(language.Und, cases.NoLower).String,
  }
+ for _, v := range funcMaps {
+ maps.Copy(funcMap, v) // Extras overwrite defaults.
+ }
  tmpl, err := template.New(templateName).Funcs(funcMap).Parse(templateBody)
 
  if err != nil {

diff --git a/internal/generate/namevaluesfilters/README.md b/internal/generate/namevaluesfilters/README.md
diff --git a/internal/generate/namevaluesfilters/generators/servicefilters/README.md b/internal/generate/namevaluesfilters/generators/servicefilters/README.md
diff --git a/internal/generate/namevaluesfilters/generators/servicefilters/main.go b/internal/generate/namevaluesfilters/generators/servicefilters/main.go