Skip to content

Commit 3ef548f

Browse files
authored
Merge pull request #35199 from showwin/f-aws_rds_integration
New Resource aws_rds_integration
2 parents 00d5f3b + 6d7e4ed commit 3ef548f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+1700
-1373
lines changed

.changelog/35199.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:new-resource
2+
aws_rds_integration
3+
```

.teamcity/scripts/provider_tests/acceptance_tests.sh

+1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ TF_ACC=1 go test \
4848
./internal/json/... \
4949
./internal/logging/... \
5050
./internal/maps/... \
51+
./internal/namevaluesfilters/... \
5152
./internal/provider/... \
5253
./internal/retry/... \
5354
./internal/sdkv2/... \

.teamcity/scripts/provider_tests/unit_tests.sh

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ go test \
2020
./internal/json/... \
2121
./internal/logging/... \
2222
./internal/maps/... \
23+
./internal/namevaluesfilters/... \
2324
./internal/provider/... \
2425
./internal/retry/... \
2526
./internal/sdkv2/... \

internal/generate/common/generator.go

+8-4
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"bytes"
88
"fmt"
99
"go/format"
10+
"maps"
1011
"os"
1112
"path"
1213
"strings"
@@ -58,7 +59,7 @@ type Destination interface {
5859
CreateDirectories() error
5960
Write() error
6061
WriteBytes(body []byte) error
61-
WriteTemplate(templateName, templateBody string, templateData any) error
62+
WriteTemplate(templateName, templateBody string, templateData any, funcMaps ...template.FuncMap) error
6263
WriteTemplateSet(templates *template.Template, templateData any) error
6364
}
6465

@@ -129,8 +130,8 @@ func (d *baseDestination) WriteBytes(body []byte) error {
129130
return err
130131
}
131132

132-
func (d *baseDestination) WriteTemplate(templateName, templateBody string, templateData any) error {
133-
body, err := parseTemplate(templateName, templateBody, templateData)
133+
func (d *baseDestination) WriteTemplate(templateName, templateBody string, templateData any, funcMaps ...template.FuncMap) error {
134+
body, err := parseTemplate(templateName, templateBody, templateData, funcMaps...)
134135

135136
if err != nil {
136137
return err
@@ -144,7 +145,7 @@ func (d *baseDestination) WriteTemplate(templateName, templateBody string, templ
144145
return d.WriteBytes(body)
145146
}
146147

147-
func parseTemplate(templateName, templateBody string, templateData any) ([]byte, error) {
148+
func parseTemplate(templateName, templateBody string, templateData any, funcMaps ...template.FuncMap) ([]byte, error) {
148149
funcMap := template.FuncMap{
149150
// FirstUpper returns a string with the first character as upper case.
150151
"FirstUpper": func(s string) string {
@@ -157,6 +158,9 @@ func parseTemplate(templateName, templateBody string, templateData any) ([]byte,
157158
// Title returns a string with the first character of each word as upper case.
158159
"Title": cases.Title(language.Und, cases.NoLower).String,
159160
}
161+
for _, v := range funcMaps {
162+
maps.Copy(funcMap, v) // Extras overwrite defaults.
163+
}
160164
tmpl, err := template.New(templateName).Funcs(funcMap).Parse(templateBody)
161165

162166
if err != nil {

internal/generate/namevaluesfilters/README.md

-24
This file was deleted.

internal/generate/namevaluesfilters/generators/servicefilters/README.md

-42
This file was deleted.

internal/generate/namevaluesfilters/generators/servicefilters/main.go

-128
This file was deleted.

0 commit comments

Comments
 (0)