From b9963e293f2e83044ac7641273915922d48c1271 Mon Sep 17 00:00:00 2001
From: sbiscigl <sbiscigl@amazon.com>
Date: Thu, 21 Aug 2025 13:54:07 -0400
Subject: [PATCH] dont generate enum values for reserved core errors

---
 .../generators/cpp/ErrorFormatter.java        | 44 +++++++++++++++----
 1 file changed, 36 insertions(+), 8 deletions(-)

diff --git a/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/generators/cpp/ErrorFormatter.java b/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/generators/cpp/ErrorFormatter.java
index f32b3d6ae56..66ccf14c9b9 100644
--- a/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/generators/cpp/ErrorFormatter.java
+++ b/tools/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/generators/cpp/ErrorFormatter.java
@@ -7,21 +7,49 @@
 
 import com.amazonaws.util.awsclientgenerator.domainmodels.codegeneration.Error;
 import com.google.common.base.CaseFormat;
+import com.google.common.collect.ImmutableSet;
 
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 public class ErrorFormatter {
 
+    static private final Set<String> CORE_ERROR_CONSTANTS = ImmutableSet.of(
+            "INCOMPLETE_SIGNATURE",
+            "INTERNAL_FAILURE",
+            "INVALID_ACTION",
+            "INVALID_CLIENT_TOKEN_ID",
+            "INVALID_PARAMETER_COMBINATION",
+            "INVALID_QUERY_PARAMETER",
+            "INVALID_PARAMETER_VALUE",
+            "MISSING_ACTION",
+            "MISSING_AUTHENTICATION_TOKEN",
+            "MISSING_PARAMETER",
+            "OPT_IN_REQUIRED",
+            "REQUEST_EXPIRED",
+            "SERVICE_UNAVAILABLE",
+            "THROTTLING",
+            "VALIDATION",
+            "ACCESS_DENIED",
+            "RESOURCE_NOT_FOUND",
+            "UNRECOGNIZED_CLIENT",
+            "MALFORMED_QUERY_STRING",
+            "SLOW_DOWN",
+            "REQUEST_TIME_TOO_SKEWED",
+            "INVALID_SIGNATURE",
+            "SIGNATURE_DOES_NOT_MATCH",
+            "INVALID_ACCESS_KEY_ID",
+            "REQUEST_TIMEOUT",
+            "NETWORK_CONNECTION"
+    );
+
     public List<String> formatErrorConstNames(Collection<Error> errors) {
-        List<String> formattedErrors = new ArrayList<>();
-        for (Error error : errors) {
-            formattedErrors.add(formatErrorConstName(error.getName()));
-        }
-        Collections.sort(formattedErrors);
-        return formattedErrors;
+        return errors.stream().map(error -> formatErrorConstName(error.getName()))
+                .filter(name -> !CORE_ERROR_CONSTANTS.contains(name))
+                .sorted()
+                .collect(Collectors.toList());
     }
 
     public static String formatErrorConstName(String errorName) {