Throw ModelInvalidException for bearerAuth issues

codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/BaseClientBuilderClass.java

@@ -63,6 +63,10 @@
 import software.amazon.awssdk.codegen.poet.rules.EndpointParamsKnowledgeIndex;
 import software.amazon.awssdk.codegen.poet.rules.EndpointRulesSpecUtils;
 import software.amazon.awssdk.codegen.utils.AuthUtils;
+import software.amazon.awssdk.codegen.validation.ModelInvalidException;
+import software.amazon.awssdk.codegen.validation.ValidationEntry;
+import software.amazon.awssdk.codegen.validation.ValidationErrorId;
+import software.amazon.awssdk.codegen.validation.ValidationErrorSeverity;
 import software.amazon.awssdk.core.SdkPlugin;
 import software.amazon.awssdk.core.checksums.RequestChecksumCalculation;
 import software.amazon.awssdk.core.checksums.RequestChecksumCalculationResolver;
@@ -320,11 +324,21 @@ private MethodSpec mergeServiceDefaultsMethod() {
 
     private void configureEnvironmentBearerToken(MethodSpec.Builder builder) {
         if (!authSchemeSpecUtils.useSraAuth()) {
-            throw new IllegalStateException("The enableEnvironmentBearerToken customization requires SRA Auth.");
+            ValidationEntry entry = ValidationEntry.create(ValidationErrorId.INVALID_CODEGEN_CUSTOMIZATION,
+                                                           ValidationErrorSeverity.DANGER,
+                                                           "The enableEnvironmentBearerToken customization requires"
+                                                           + " the SRA Auth customization.");
+
+            throw ModelInvalidException.fromEntry(entry);
         }
         if (!AuthUtils.usesBearerAuth(model)) {
-            throw new IllegalStateException("The enableEnvironmentBearerToken customization requires the service to model and "
-                                            + "support smithy.api#httpBearerAuth.");
+            ValidationEntry entry =
+                ValidationEntry.create(ValidationErrorId.INVALID_CODEGEN_CUSTOMIZATION,
+                                       ValidationErrorSeverity.DANGER,
+                                        "The enableEnvironmentBearerToken customization requires the service to model"
+                                        + " and support smithy.api#httpBearerAuth.");
+
+            throw ModelInvalidException.fromEntry(entry);
         }
 
         builder.addStatement("$T tokenFromEnv = new $T().getStringValue()",

codegen/src/main/java/software/amazon/awssdk/codegen/validation/ModelInvalidException.java

@@ -38,6 +38,10 @@ public static Builder builder() {
         return new Builder();
     }
 
+    public static ModelInvalidException fromEntry(ValidationEntry entry) {
+        return builder().validationEntries(Collections.singletonList(entry)).build();
+    }
+
     public static class Builder {
         private List<ValidationEntry> validationEntries;
 

codegen/src/main/java/software/amazon/awssdk/codegen/validation/ValidationEntry.java

@@ -61,6 +61,10 @@ public ValidationEntry withDetailMessage(String detailMessage) {
         return this;
     }
 
+    public static ValidationEntry create(ValidationErrorId errorId, ValidationErrorSeverity severity, String detailMessage) {
+        return new ValidationEntry().withErrorId(errorId).withSeverity(severity).withDetailMessage(detailMessage);
+    }
+
     @Override
     public String toString() {
         return ToString.builder("ValidationEntry")

codegen/src/main/java/software/amazon/awssdk/codegen/validation/ValidationErrorId.java

@@ -22,6 +22,9 @@ public enum ValidationErrorId {
     ),
     UNKNOWN_SHAPE_MEMBER("The model references an unknown shape member."),
     REQUEST_URI_NOT_FOUND("The request URI does not exist."),
+
+    INVALID_CODEGEN_CUSTOMIZATION("A customization is enabled for this service that cannot be applied for the given service "
+                                  + "model.")
     ;
 
     private final String description;