Skip to content

Commit 0df193f

Browse files
hermanschaafhermanschaaf
authored
fix: Remove underscores in ec_2, s_3 and others (#1998)
Generating names without underscores separating numbers seems like a better default. I'm on the fence about `sha1` and `sha256` maybe needing underscores, but I don't think it's worth making exceptions for those one or two columns 🤷
1 parent f0066a9 commit 0df193f

26 files changed

+63
-44
lines changed

‎plugins/source/aws/codegen/recipes/base.go‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import (
77
"go/format"
88
"os"
99
"path"
10+
"reflect"
11+
"regexp"
1012
"runtime"
1113
"strings"
1214
"text/template"
@@ -54,6 +56,22 @@ var defaultRegionalColumns = []codegen.ColumnDefinition{
5456
},
5557
}
5658

59+
func awsNameTransformer(f reflect.StructField) (string, error) {
60+
name, err := codegen.DefaultNameTransformer(f)
61+
if err != nil {
62+
return name, err
63+
}
64+
// replace occurrences with <underscore-number> with <number>
65+
66+
// (this is codegen, no need to hyper-optimize by pre-compiling regular expressions)
67+
r, err := regexp.Compile(`_(\d+)`)
68+
if err != nil {
69+
return "", err
70+
}
71+
72+
return r.ReplaceAllString(name, `$1`), nil
73+
}
74+
5775
func (r *Resource) Generate() error {
5876
_, filename, _, ok := runtime.Caller(0)
5977
if !ok {
@@ -65,6 +83,7 @@ func (r *Resource) Generate() error {
6583
opts := []codegen.TableOptions{
6684
codegen.WithSkipFields(r.SkipFields),
6785
codegen.WithExtraColumns(r.ExtraColumns),
86+
codegen.WithNameTransformer(awsNameTransformer),
6887
}
6988
if r.UnwrapEmbeddedStructs {
7089
opts = append(opts, codegen.WithUnwrapAllEmbeddedStructs())

‎plugins/source/aws/resources/services/cloudtrail/trails.go‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎plugins/source/aws/resources/services/config/conformance_packs.go‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎plugins/source/aws/resources/services/directconnect/connections.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎plugins/source/aws/resources/services/directconnect/lags.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎plugins/source/aws/resources/services/directconnect/virtual_interfaces.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎plugins/source/aws/resources/services/ec2/eips.go‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎plugins/source/aws/resources/services/ec2/instances.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎plugins/source/aws/resources/services/ec2/network_interfaces.go‎

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎plugins/source/aws/resources/services/ec2/subnets.go‎

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)