Allow .api.aws endpoints (#758)

* Allow .api.aws endpoints

* Change common api prefixes to function calls

* Address comments

---------

Co-authored-by: Dean Shaw <shwdean@amazon.com>

Author: shwdean

aws/aws-service-bundler/src/main/java/software/amazon/smithy/java/aws/servicebundle/bundler/ApiStandardTerminology.java

@@ -5,6 +5,7 @@
 
 package software.amazon.smithy.java.aws.servicebundle.bundler;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
@@ -40,8 +41,18 @@ final class ApiStandardTerminology {
             "Untag",
             "Update");
 
-    static final Set<String> READ_ONLY_API_PREFIXES = withCommonsPrefixes(READ_ONLY_TERMS);
-    static final Set<String> WRITE_API_PREFIXES = withCommonsPrefixes(WRITE_TERMS);
+    private static final Set<String> READ_ONLY_API_PREFIXES = withCommonsPrefixes(READ_ONLY_TERMS);
+    private static final Set<String> WRITE_API_PREFIXES = withCommonsPrefixes(WRITE_TERMS);
+
+    @SuppressFBWarnings(value = "MS", justification = "Internal representation already immutable")
+    public static Set<String> getReadOnlyApiPrefixes() {
+        return READ_ONLY_API_PREFIXES;
+    }
+
+    @SuppressFBWarnings(value = "MS", justification = "Internal representation already immutable")
+    public static Set<String> getWriteApiPrefixes() {
+        return WRITE_API_PREFIXES;
+    }
 
     private ApiStandardTerminology() {}
 

aws/aws-service-bundler/src/main/java/software/amazon/smithy/java/aws/servicebundle/bundler/AwsServiceBundler.java

@@ -109,8 +109,8 @@ public Builder blockedOperations(Set<String> blockedOperations) {
         }
 
         public Builder readOnlyOperations() {
-            this.allowedPrefixes(ApiStandardTerminology.READ_ONLY_API_PREFIXES);
-            this.blockedPrefixes(ApiStandardTerminology.WRITE_API_PREFIXES);
+            this.allowedPrefixes(ApiStandardTerminology.getReadOnlyApiPrefixes());
+            this.blockedPrefixes(ApiStandardTerminology.getWriteApiPrefixes());
             return this;
         }
 
@@ -239,8 +239,10 @@ Map<String, String> parseEndpoints(ObjectNode endpointTests) {
                 continue;
             }
 
-            if (endpoint.startsWith("https://") && endpoint.endsWith(region + ".amazonaws.com")) {
-                if (endpoint.endsWith(region + ".amazonaws.com") || endpoint.contains(region + ".amazonaws.com.")) {
+            if (endpoint.startsWith("https://")) {
+                if (endpoint.endsWith(region + ".amazonaws.com")
+                        || endpoint.contains(region + ".amazonaws.com.")
+                        || endpoint.endsWith(region + ".api.aws")) {
                     var prev = endpoints.put(region, endpoint);
                     if (prev != null && !endpoint.equals(prev)) {
                         throw new RuntimeException(

aws/aws-service-bundler/src/test/java/software/amazon/smithy/java/aws/servicebundle/bundler/AwsServiceBundlerTest.java

@@ -64,8 +64,8 @@ public void testReadAndWritePrefixes() {
         var bundler = AwsServiceBundler.builder()
                 .serviceName("dynamodb")
                 .resolver(serviceName -> getModel("dynamodb-2012-08-10.json"))
-                .allowedPrefixes(ApiStandardTerminology.READ_ONLY_API_PREFIXES)
-                .blockedPrefixes(ApiStandardTerminology.WRITE_API_PREFIXES)
+                .allowedPrefixes(ApiStandardTerminology.getReadOnlyApiPrefixes())
+                .blockedPrefixes(ApiStandardTerminology.getWriteApiPrefixes())
                 .build();
         var bundle = bundler.bundle();
         var bundleModel = new ModelAssembler().addUnparsedModel("model.json", bundle.getModel())