add stable order for smoke tests + restoring client codegen

tools/code-generation/smithy/codegen/cpp-smoke-tests-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/CppImportContainer.java

@@ -11,9 +11,12 @@
  import software.amazon.smithy.codegen.core.Symbol;
 
  import java.util.Collections;
+ import java.util.Comparator;
  import java.util.HashSet;
  import java.util.Set;
  import java.util.Map;
+ import java.util.List;
+ import java.util.stream.Collectors;
 
 public final class CppImportContainer implements ImportContainer {
 
@@ -81,19 +84,26 @@ public void importSymbol(Symbol symbol, String alias) {
             dynamicHeaders.add(containerHeaderMap.get(symbol.getName()));
         }
      }
+
+
+    private static List<String> setToSortedList(Set<String> set) {
+        return set.stream()
+                  .sorted(Comparator.comparing(elem -> elem))
+                  .collect(Collectors.toList());
+    }
 
      @Override
      public String toString() {
         StringBuilder sb = new StringBuilder();
 
-        coreHeaders.forEach(
+        setToSortedList(coreHeaders).forEach(
             elem -> sb.append(String.format("#include <%s>\n",elem))
         );
 
-        unitTestHeaders.forEach(
+        setToSortedList(unitTestHeaders).forEach(
             elem -> sb.append(String.format("#include <%s>\n",elem))
         );
-        dynamicHeaders.forEach(
+        setToSortedList(dynamicHeaders).forEach(
             elem -> sb.append(String.format("#include <%s>\n",elem))
         );
 

tools/code-generation/smithy/codegen/cpp-smoke-tests-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/SmokeTestsParser.java

@@ -25,6 +25,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Set;
+import java.util.Comparator;
 
 import software.amazon.smithy.build.PluginContext;
 import software.amazon.smithy.aws.smoketests.model.AwsSmokeTestModel;
@@ -280,6 +281,7 @@ public Map<ServiceShape, List<SmokeTestData> > extractServiceSmokeTests()
         filter(operationShape -> operationShape.getInput().isPresent()).
         filter(operationShape -> operationShape.getTrait(SmokeTestsTrait.class).isPresent() ).
         filter(operationShape ->  operationToServiceMap.containsKey(operationShape.getId()) ).
+        sorted(Comparator.comparing(OperationShape::getId)).
         forEach(operationShape -> {
             SmokeTestsTrait smokeTestsTrait = operationShape.getTrait(SmokeTestsTrait.class).get();
             //get serviceShape

tools/scripts/run_code_generation.py

@@ -155,9 +155,13 @@ def collect_available_models(models_dir: str, endpoint_rules_dir: str, legacy_ma
         with open(models_dir + "/" + model_file_date[0], 'r') as json_file:
             model = json.load(json_file)
             #get service id. It has to exist, else continue
-            if ("metadata" in model and "serviceId" in model["metadata"]):
+            if ("metadata" in model and (("serviceId" in model["metadata"]) or ("serviceFullName" in model["metadata"])) ):
                 if key not in legacy_mapped_services:
-                    key = model["metadata"]["serviceId"] 
+                    if "serviceId" in model["metadata"]:
+                        key = model["metadata"]["serviceId"] 
+                    else:
+                        key = model["metadata"]["serviceFullName"]
+
                     #convert into smithy case convention
                     key = key.lower().replace(' ', '-')