Skip to content

Commit c6651c2

Browse files
authored
Correct IdempotencyToken and OID initialism errors (#389)
Prevents IdempotencyToken from becoming IDempotencyToken and Oid from becoming oID. Signed-off-by: Jay Pipes <[email protected]> By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent 1b20baf commit c6651c2

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

pkg/names/names.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,10 @@ var (
4444
// camel-cased "Ids" refers to a set of Identifiers, so the correct
4545
// uppercase representation is "IDs"
4646
{"Ids", "IDs", "ids", nil},
47-
// Need to prevent "Identifier" from becoming "IDentifier",
48-
// and "Idle" from becoming "IDle"
49-
{"Id", "ID", "id", regexp.MustCompile("Id(?!entifier|le|entity)", regexp.None)},
47+
// Need to prevent "Identifier" from becoming "IDentifier", and "Idle"
48+
// from becoming "IDle" and "IdempotencyToken" from becoming
49+
// "IDempotencyToken"
50+
{"Id", "ID", "id", regexp.MustCompile("Id(?!entifier|le|entity|empotency)", regexp.None)},
5051
// Need to prevent "DbInstance" from becoming "dbinstance" when lower
5152
// prefix-converted (should be dbInstance). Amazingly, even within just
5253
// the RDS API, there are fields named "DbiResourceId",
@@ -120,6 +121,8 @@ var (
120121
{"Mfa", "MFA", "mfa", nil},
121122
// Prevent "Native" from becoming "NATive"
122123
{"Nat", "NAT", "nat", regexp.MustCompile("Nat(?!i)", regexp.None)},
124+
// Prevent Oid from becoming oID
125+
{"Oid", "OID", "oid", nil},
123126
{"Oidc", "OIDC", "oidc", nil},
124127
{"Ocsp", "OCSP", "ocsp", nil},
125128
// Capitalize the 'd' following RAM in certain cases
@@ -229,7 +232,8 @@ func goName(original string, lowerFirst bool, snake bool) (result string) {
229232
//
230233
// Examples:
231234
//
232-
// original | lowerFirst | output
235+
// original | lowerFirst | output
236+
//
233237
// ------------+ ---------- + -------------------------
234238
// Identifier | true | Identifier
235239
// Identifier | false | Identifier

pkg/names/names_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ func TestNames(t *testing.T) {
5252
{"Family", "Family", "family", "family"},
5353
{"Id", "ID", "id", "id"},
5454
{"ID", "ID", "id", "id"},
55+
{"IdempotencyToken", "IdempotencyToken", "idempotencyToken", "idempotency_token"},
5556
{"Identifier", "Identifier", "identifier", "identifier"},
5657
{"IoPerformance", "IOPerformance", "ioPerformance", "io_performance"},
5758
{"Iops", "IOPS", "iops", "iops"},
@@ -69,6 +70,7 @@ func TestNames(t *testing.T) {
6970
{"NatGateway", "NATGateway", "natGateway", "nat_gateway"},
7071
{"NativeAuditFieldsIncluded", "NativeAuditFieldsIncluded", "nativeAuditFieldsIncluded", "native_audit_fields_included"},
7172
{"NumberOfAmiToKeep", "NumberOfAMIToKeep", "numberOfAMIToKeep", "number_of_ami_to_keep"},
73+
{"OID", "OID", "oid", "oid"},
7274
{"Package", "Package", "package_", "package_"},
7375
{"Param", "Param", "param", "param"},
7476
{"Ram", "RAM", "ram", "ram"},

0 commit comments

Comments
 (0)