Update AMI entry to prevent replacement in Family, Dynamic, Camila and others (#169)

Issue N/A

Description of changes:
- Update AMI entry to prevent replacement in `Family`, `Dynamic`, `Camila` and others

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

Author: a-hilaly

pkg/names/names.go

@@ -67,8 +67,10 @@ var (
 		{"MD5Of", "MD5Of", "md5Of", regexp.MustCompile("M[dD]5Of", regexp.None)},
 		// Prevent "MultipartUpload" from becoming "MultIPartUpload"
 		{"Ip", "IP", "ip", regexp.MustCompile("Ip(?!art)", regexp.None)},
-		// Prevent "Family" from becoming "FAMIly"
-		{"Ami", "AMI", "ami", regexp.MustCompile("(?!f)ami(?!ly)|(Ami)", regexp.None)},
+		// Model fields containing AMI will always capitalize the 'A' hence we don't
+		// have to look for words starting with a lowercase 'A'
+		{"Amis", "AMIs", "amis", regexp.MustCompile("Amis", regexp.None)},
+		{"Ami", "AMI", "ami", regexp.MustCompile("Ami", regexp.None)},
 		// Easy find-and-replacements...
 		{"Acl", "ACL", "acl", nil},
 		{"Acp", "ACP", "acp", nil},

pkg/names/names_test.go

@@ -36,6 +36,14 @@ func TestNames(t *testing.T) {
 		{"Id", "ID", "id", "id"},
 		{"ID", "ID", "id", "id"},
 		{"Family", "Family", "family", "family"},
+		{"Examine", "Examine", "examine", "examine"},
+		{"Dynamic", "Dynamic", "dynamic", "dynamic"},
+		{"Camila", "Camila", "camila", "camila"},
+		{"Amis", "AMIs", "amis", "amis"},
+		{"AmiType", "AMIType", "amiType", "ami_type"},
+		{"AmiLaunchIndex", "AMILaunchIndex", "amiLaunchIndex", "ami_launch_index"},
+		{"NumberOfAmiToKeep", "NumberOfAMIToKeep", "numberOfAMIToKeep", "number_of_ami_to_keep"},
+		{"RequestedAmiVersion", "RequestedAMIVersion", "requestedAMIVersion", "requested_ami_version"},
 		{"KeyIdentifier", "KeyIdentifier", "keyIdentifier", "key_identifier"},
 		{"KeyId", "KeyID", "keyID", "key_id"},
 		{"KeyID", "KeyID", "keyID", "key_id"},