Removing deprecated shapes and operations

Removing deprecated shapes and operations

Author: spfink

codegen/src/main/java/software/amazon/awssdk/codegen/AddOperations.java

@@ -17,6 +17,7 @@
 
 import static software.amazon.awssdk.codegen.internal.Utils.unCapitalize;
 
+import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 import software.amazon.awssdk.codegen.model.intermediate.ExceptionModel;
@@ -43,11 +44,13 @@ final class AddOperations {
     private final ServiceModel serviceModel;
     private final NamingStrategy namingStrategy;
     private final Map<String, PaginatorDefinition> paginators;
+    private final List<String> deprecatedShapes;
 
     AddOperations(IntermediateModelBuilder builder) {
         this.serviceModel = builder.getService();
         this.namingStrategy = builder.getNamingStrategy();
         this.paginators = builder.getPaginators().getPaginators();
+        this.deprecatedShapes = builder.getCustomConfig().getDeprecatedShapes();
     }
 
     private static boolean isAuthenticated(Operation op) {
@@ -191,10 +194,12 @@ public Map<String, OperationModel> constructOperations() {
 
                     Integer httpStatusCode = getHttpStatusCode(error, c2jShapes.get(error.getShape()));
 
-                    operationModel.addException(
+                    if (!deprecatedShapes.contains(error.getShape())) {
+                        operationModel.addException(
                             new ExceptionModel(namingStrategy.getExceptionName(error.getShape()))
-                                    .withDocumentation(documentation)
-                                    .withHttpStatusCode(httpStatusCode));
+                                .withDocumentation(documentation)
+                                .withHttpStatusCode(httpStatusCode));
+                    }
                 }
             }
 

codegen/src/main/java/software/amazon/awssdk/codegen/IntermediateModelBuilder.java

@@ -111,6 +111,9 @@ public IntermediateModel build() {
                                             Collections.unmodifiableMap(shapes)));
         }
 
+        // Remove deprecated operations
+        operations.entrySet().removeIf(e -> customConfig.getDeprecatedOperations().contains(e.getKey()));
+
         log.info("{} shapes found in total.", shapes.size());
 
         IntermediateModel fullModel = new IntermediateModel(
@@ -122,6 +125,8 @@ public IntermediateModel build() {
         log.info("{} shapes remained after applying customizations.", fullModel.getShapes().size());
 
         Map<String, ShapeModel> trimmedShapes = removeUnusedShapes(fullModel);
+        // Remove deprecated shapes
+        trimmedShapes.entrySet().removeIf(e -> customConfig.getDeprecatedShapes().contains(e.getKey()));
 
         log.info("{} shapes remained after removing unused shapes.", trimmedShapes.size());
 

codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/CustomizationConfig.java

@@ -104,6 +104,10 @@ public class CustomizationConfig {
      */
     private List<String> verifiedSimpleMethods = new ArrayList<>();
 
+    private List<String> deprecatedOperations = new ArrayList<>();
+
+    private List<String> deprecatedShapes = new ArrayList<>();
+
     private String sdkRequestBaseClassName;
 
     private String sdkResponseBaseClassName;
@@ -266,6 +270,22 @@ public void setVerifiedSimpleMethods(List<String> verifiedSimpleMethods) {
         this.verifiedSimpleMethods = verifiedSimpleMethods;
     }
 
+    public List<String> getDeprecatedOperations() {
+        return deprecatedOperations;
+    }
+
+    public void setDeprecatedOperations(List<String> deprecatedOperations) {
+        this.deprecatedOperations = deprecatedOperations;
+    }
+
+    public List<String> getDeprecatedShapes() {
+        return deprecatedShapes;
+    }
+
+    public void setDeprecatedShapes(List<String> deprecatedShapes) {
+        this.deprecatedShapes = deprecatedShapes;
+    }
+
     public String getSdkRequestBaseClassName() {
         return sdkRequestBaseClassName;
     }

services/applicationdiscovery/src/main/resources/codegen-resources/customization.config

@@ -11,5 +11,9 @@
     "blacklistedSimpleMethods" : [
         "startContinuousExport",
         "describeContinuousExports"
+    ],
+    "deprecatedOperations": [
+        "DescribeExportConfigurations",
+        "ExportConfigurations"
     ]
 }

services/cloudtrail/src/main/resources/codegen-resources/customization.config

@@ -0,0 +1,5 @@
+{
+    "deprecatedShapes": [
+        "KmsKeyDisabledException"
+    ]
+}

services/directconnect/src/main/resources/codegen-resources/customization.config

@@ -5,5 +5,11 @@
         "describeDirectConnectGatewayAttachments",
         "describeDirectConnectGatewayAssociations"
     ],
-    "verifiedSimpleMethods" : ["describeInterconnects"]
+    "verifiedSimpleMethods" : ["describeInterconnects"],
+    "deprecatedOperations": [
+        "AllocateConnectionOnInterconnect",
+        "DescribeConnectionLoa",
+        "DescribeConnectionsOnInterconnect",
+        "DescribeInterconnectLoa"
+    ]
 }

services/elastictranscoder/src/main/resources/codegen-resources/customization.config

@@ -0,0 +1,5 @@
+{
+    "deprecatedOperations": [
+        "TestRole"
+    ]
+}

services/emr/src/main/resources/codegen-resources/customization.config

@@ -14,5 +14,8 @@
         "cancelSteps",
         "modifyInstanceGroups",
         "describeJobFlows"
+    ],
+    "deprecatedOperations": [
+        "DescribeJobFlows"
     ]
 }

services/iot/src/main/resources/codegen-resources/customization.config

@@ -19,5 +19,11 @@
     "getV2LoggingOptions",
     "listAuditFindings",
     "listV2LoggingLevels"
+  ],
+  "deprecatedOperations": [
+    "AttachPrincipalPolicy",
+    "DetachPrincipalPolicy",
+    "ListPolicyPrincipals",
+    "ListPrincipalPolicies"
   ]
 }

services/lambda/src/main/resources/codegen-resources/customization.config

@@ -0,0 +1,5 @@
+{
+    "deprecatedOperations": [
+        "InvokeAsync"
+    ]
+}

services/mediapackage/src/main/resources/codegen-resources/customization.config

@@ -0,0 +1,5 @@
+{
+    "deprecatedOperations" : [
+        "RotateChannelCredentials"
+    ]
+}

services/rds/src/main/resources/codegen-resources/customization.config

@@ -24,5 +24,8 @@
         }
 
     },
-    "blacklistedSimpleMethods" : ["failoverDBCluster"]
+    "blacklistedSimpleMethods" : ["failoverDBCluster"],
+    "deprecatedShapes" : [
+        "BackupPolicyNotFoundFault"
+    ]
 }

services/route53/src/main/resources/codegen-resources/customization.config

@@ -0,0 +1,5 @@
+{
+    "deprecatedShapes" : [
+        "HealthCheckInUse"
+    ]
+}

services/s3/src/main/resources/codegen-resources/customization.config

@@ -31,5 +31,11 @@
         "SelectObjectContent" : {
             "exclude": true
         }
-    }
+    },
+    "deprecatedOperations": [
+        "GetBucketLifecycle",
+        "GetBucketNotification",
+        "PutBucketLifecycle",
+        "PutBucketNotification"
+    ]
 }

services/shield/src/main/resources/codegen-resources/customization.config

@@ -11,5 +11,8 @@
         "updateSubscription",
         "describeDRTAccess",
         "describeEmergencyContactSettings"
+     ],
+     "deprecatedOperations" : [
+        "DeleteSubscription"
      ]
 }