Skip to content

Commit e324aa1

Browse files
committed
correct non-standardized "Ldap" names
When doing the AmazonMQ controller, I noticed a number of type defs and CRD fields were named with the (non-Go-best-practice) "Ldap" prefix instead of the capitalized LDAP for exported names and "ldap" for unexported names.
1 parent d16d5ac commit e324aa1

File tree

3 files changed

+25
-23
lines changed

3 files changed

+25
-23
lines changed

pkg/generate/code/set_sdk_test.go

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1460,46 +1460,46 @@ func TestSetSDK_MQ_Broker_Create(t *testing.T) {
14601460
if r.ko.Spec.HostInstanceType != nil {
14611461
res.SetHostInstanceType(*r.ko.Spec.HostInstanceType)
14621462
}
1463-
if r.ko.Spec.LdapServerMetadata != nil {
1463+
if r.ko.Spec.LDAPServerMetadata != nil {
14641464
f10 := &svcsdk.LdapServerMetadataInput{}
1465-
if r.ko.Spec.LdapServerMetadata.Hosts != nil {
1465+
if r.ko.Spec.LDAPServerMetadata.Hosts != nil {
14661466
f10f0 := []*string{}
1467-
for _, f10f0iter := range r.ko.Spec.LdapServerMetadata.Hosts {
1467+
for _, f10f0iter := range r.ko.Spec.LDAPServerMetadata.Hosts {
14681468
var f10f0elem string
14691469
f10f0elem = *f10f0iter
14701470
f10f0 = append(f10f0, &f10f0elem)
14711471
}
14721472
f10.SetHosts(f10f0)
14731473
}
1474-
if r.ko.Spec.LdapServerMetadata.RoleBase != nil {
1475-
f10.SetRoleBase(*r.ko.Spec.LdapServerMetadata.RoleBase)
1474+
if r.ko.Spec.LDAPServerMetadata.RoleBase != nil {
1475+
f10.SetRoleBase(*r.ko.Spec.LDAPServerMetadata.RoleBase)
14761476
}
1477-
if r.ko.Spec.LdapServerMetadata.RoleName != nil {
1478-
f10.SetRoleName(*r.ko.Spec.LdapServerMetadata.RoleName)
1477+
if r.ko.Spec.LDAPServerMetadata.RoleName != nil {
1478+
f10.SetRoleName(*r.ko.Spec.LDAPServerMetadata.RoleName)
14791479
}
1480-
if r.ko.Spec.LdapServerMetadata.RoleSearchMatching != nil {
1481-
f10.SetRoleSearchMatching(*r.ko.Spec.LdapServerMetadata.RoleSearchMatching)
1480+
if r.ko.Spec.LDAPServerMetadata.RoleSearchMatching != nil {
1481+
f10.SetRoleSearchMatching(*r.ko.Spec.LDAPServerMetadata.RoleSearchMatching)
14821482
}
1483-
if r.ko.Spec.LdapServerMetadata.RoleSearchSubtree != nil {
1484-
f10.SetRoleSearchSubtree(*r.ko.Spec.LdapServerMetadata.RoleSearchSubtree)
1483+
if r.ko.Spec.LDAPServerMetadata.RoleSearchSubtree != nil {
1484+
f10.SetRoleSearchSubtree(*r.ko.Spec.LDAPServerMetadata.RoleSearchSubtree)
14851485
}
1486-
if r.ko.Spec.LdapServerMetadata.ServiceAccountPassword != nil {
1487-
f10.SetServiceAccountPassword(*r.ko.Spec.LdapServerMetadata.ServiceAccountPassword)
1486+
if r.ko.Spec.LDAPServerMetadata.ServiceAccountPassword != nil {
1487+
f10.SetServiceAccountPassword(*r.ko.Spec.LDAPServerMetadata.ServiceAccountPassword)
14881488
}
1489-
if r.ko.Spec.LdapServerMetadata.ServiceAccountUsername != nil {
1490-
f10.SetServiceAccountUsername(*r.ko.Spec.LdapServerMetadata.ServiceAccountUsername)
1489+
if r.ko.Spec.LDAPServerMetadata.ServiceAccountUsername != nil {
1490+
f10.SetServiceAccountUsername(*r.ko.Spec.LDAPServerMetadata.ServiceAccountUsername)
14911491
}
1492-
if r.ko.Spec.LdapServerMetadata.UserBase != nil {
1493-
f10.SetUserBase(*r.ko.Spec.LdapServerMetadata.UserBase)
1492+
if r.ko.Spec.LDAPServerMetadata.UserBase != nil {
1493+
f10.SetUserBase(*r.ko.Spec.LDAPServerMetadata.UserBase)
14941494
}
1495-
if r.ko.Spec.LdapServerMetadata.UserRoleName != nil {
1496-
f10.SetUserRoleName(*r.ko.Spec.LdapServerMetadata.UserRoleName)
1495+
if r.ko.Spec.LDAPServerMetadata.UserRoleName != nil {
1496+
f10.SetUserRoleName(*r.ko.Spec.LDAPServerMetadata.UserRoleName)
14971497
}
1498-
if r.ko.Spec.LdapServerMetadata.UserSearchMatching != nil {
1499-
f10.SetUserSearchMatching(*r.ko.Spec.LdapServerMetadata.UserSearchMatching)
1498+
if r.ko.Spec.LDAPServerMetadata.UserSearchMatching != nil {
1499+
f10.SetUserSearchMatching(*r.ko.Spec.LDAPServerMetadata.UserSearchMatching)
15001500
}
1501-
if r.ko.Spec.LdapServerMetadata.UserSearchSubtree != nil {
1502-
f10.SetUserSearchSubtree(*r.ko.Spec.LdapServerMetadata.UserSearchSubtree)
1501+
if r.ko.Spec.LDAPServerMetadata.UserSearchSubtree != nil {
1502+
f10.SetUserSearchSubtree(*r.ko.Spec.LDAPServerMetadata.UserSearchSubtree)
15031503
}
15041504
res.SetLdapServerMetadata(f10)
15051505
}

pkg/names/names.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ var (
9696
{"Json", "JSON", "json", nil},
9797
{"Jwt", "JWT", "jwt", nil},
9898
{"Kms", "KMS", "kms", nil},
99+
{"Ldap", "LDAP", "ldap", nil},
99100
{"Mfa", "MFA", "mfa", nil},
100101
{"Sdk", "SDK", "sdk", nil},
101102
{"Sha256", "SHA256", "sha256", nil},

pkg/names/names_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ func TestNames(t *testing.T) {
4949
{"Ip", "IP", "ip", "ip"},
5050
{"MultipartUpload", "MultipartUpload", "multipartUpload", "multipart_upload"},
5151
{"Package", "Package", "package_", "package_"},
52+
{"LdapServerMetadata", "LDAPServerMetadata", "ldapServerMetadata", "ldap_server_metadata"},
5253
}
5354
for _, tc := range testCases {
5455
n := names.New(tc.original)

0 commit comments

Comments
 (0)