Fix test and add handling for resource APIs

Author: adwsingh

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

@@ -8,6 +8,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.io.InputStreamReader;
 import java.util.Objects;
@@ -17,6 +18,8 @@
 import software.amazon.smithy.model.loader.ModelAssembler;
 import software.amazon.smithy.model.node.Node;
 import software.amazon.smithy.model.shapes.ModelSerializer;
+import software.amazon.smithy.model.shapes.OperationShape;
+import software.amazon.smithy.model.shapes.ShapeId;
 
 public class AwsServiceBundlerTest {
 
@@ -35,14 +38,37 @@ public void accessAnalyzer() {
         assertNotEquals(0, config.getEndpoints().size());
     }
 
+    @Test
+    public void resourceApis() {
+        var bundler = AwsServiceBundler.builder()
+                .serviceName("access-analyzer")
+                .resolver(serviceName -> getModel("accessanalyzer-2019-11-01.json"))
+                .readOnlyOperations()
+                .build();
+        var bundle = bundler.bundle();
+        var bundleModel = new ModelAssembler().addUnparsedModel("model.json", bundle.getModel())
+                .disableValidation()
+                .putProperty(ModelAssembler.ALLOW_UNKNOWN_TRAITS, true)
+                .assemble()
+                .unwrap();
+        //read resource APIS "GET", "LIST" should be present
+        assertNotNull(bundleModel.expectShape(ShapeId.from("com.amazonaws.accessanalyzer#GetAnalyzer"),
+                OperationShape.class));
+        assertNotNull(bundleModel.expectShape(ShapeId.from("com.amazonaws.accessanalyzer#ListAnalyzers"),
+                OperationShape.class));
+
+        //Write APIs should not be present.
+        assertThat(bundleModel.getShape(ShapeId.from("com.amazonaws.accessanalyzer#DeleteAnalyzer"))).isEmpty();
+    }
+
     @Test
     public void testFilteringApis() {
         var filteredOperations = Set.of("GetFindingsStatistics", "GetFindingRecommendation");
         var bundler = AwsServiceBundler.builder()
                 .serviceName("access-analyzer")
                 .resolver(serviceName -> getModel("accessanalyzer-2019-11-01.json"))
                 .exposedOperations(filteredOperations)
-                .build();;
+                .build();
         var bundle = bundler.bundle();
         var bundleModel = new ModelAssembler().addUnparsedModel("model.json", bundle.getModel())
                 .disableValidation()
@@ -106,14 +132,26 @@ void testOnlyOneServiceRetained() {
                 .blockedPrefixes(ApiStandardTerminology.getWriteApiPrefixes())
                 .build();
         var bundle = bundler.bundle();
-        var bundleModel = new ModelAssembler().addUnparsedModel("model.json", bundle.getModel())
+        var bundleModel = new ModelAssembler().addUnparsedModel("bundle.json", bundle.getModel())
                 .disableValidation()
                 .putProperty(ModelAssembler.ALLOW_UNKNOWN_TRAITS, true)
                 .assemble()
                 .unwrap();
         assertThat(bundleModel.getServiceShapes()).hasSize(1);
+
+        var serviceShape = bundleModel.getServiceShapes().iterator().next();
+
+        assertThat(serviceShape.getId().toString()).isEqualTo(bundle.getServiceName());
+        //We do not know which service gets picked because AwsServiceBundle chooses the first one it finds.
+        String excludedNamespace;
+        if (bundle.getServiceName().equals("com.amazonaws.accessanalyzer#AccessAnalyzer")) {
+            excludedNamespace = "com.amazonaws.dynamodb";
+        } else {
+            excludedNamespace = "com.amazonaws.accessanalyzer";
+        }
+
         assertThat(bundleModel.getShapeIds()).hasSizeLessThan(totalShapes)
-                .filteredOn(i -> i.toString().startsWith("com.amazonaws.accessanalyzer"))
+                .filteredOn(i -> i.toString().startsWith(excludedNamespace))
                 .isEmpty();
     }
 

model-bundle/model-bundle-api/src/main/java/software/amazon/smithy/modelbundle/api/ModelBundler.java

@@ -14,6 +14,7 @@
 import java.util.stream.Collectors;
 import software.amazon.smithy.java.logging.InternalLogger;
 import software.amazon.smithy.model.Model;
+import software.amazon.smithy.model.knowledge.TopDownIndex;
 import software.amazon.smithy.model.shapes.AbstractShapeBuilder;
 import software.amazon.smithy.model.shapes.OperationShape;
 import software.amazon.smithy.model.shapes.ServiceShape;
@@ -54,16 +55,17 @@ protected static Model cleanAndFilterModel(
             Set<String> allowedWords,
             Set<String> blockedWords
     ) {
-        var builder = model.toBuilder();
         var allowedService = model.expectShape(allowedServiceId, ServiceShape.class);
         var serviceBuilder = allowedService.toBuilder();
-        var operations = allowedService.getOperations();
+
+        var builder = model.toBuilder();
         for (var serviceShape : model.getServiceShapes()) {
             if (!serviceShape.toShapeId().equals(allowedService.toShapeId())) {
                 builder.removeShape(serviceShape.toShapeId());
             }
         }
-        for (var op : model.getOperationShapes()) {
+        //This needs to be the TopDownIndex because we need to also consider the resource operations.
+        for (var op : TopDownIndex.of(model).getContainedOperations(allowedService.toShapeId())) {
             var name = op.getId().getName();
             var allowed = isAllowed(name, allowedOperations, blockedOperations, allowedWords, blockedWords);
             if (allowed) {
@@ -78,7 +80,8 @@ protected static Model cleanAndFilterModel(
         var service = serviceBuilder.build();
         builder.addShape(service);
         cleanDocumentation(service, builder);
-        return ModelTransformer.create().removeUnreferencedShapes(builder.build());
+        var transformer = ModelTransformer.create();
+        return transformer.removeUnreferencedShapes(transformer.removeUnreferencedTraitDefinitions(builder.build()));
     }
 
     static boolean isAllowed(