Auto format code generated clients

Author: sbaluja

tools/scripts/codegen/format_util.py

@@ -0,0 +1,40 @@
+#!/usr/bin/env python3
+
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0.
+
+"""
+Utility for formatting generated C++ code using clang-format
+"""
+import os
+import pathlib
+import re
+from subprocess import list2cmdline, run
+from tempfile import NamedTemporaryFile
+
+CLANG_FORMAT_VERSION = '18.1.6'
+CLANG_FORMAT_INCLUDE_REGEX = re.compile(r'^.*\.(cpp|h)$')
+
+
+def format_directories(directory_list):
+    """Format C++ files in the given directories using clang-format"""
+    filepaths_file = NamedTemporaryFile(delete=False)
+    
+    for root_dir in directory_list:
+        if os.path.exists(root_dir):
+            for dirpath, dirnames, filenames in os.walk(root_dir):
+                for filename in filenames:
+                    filepath = pathlib.Path(dirpath, filename).as_posix()
+                    if CLANG_FORMAT_INCLUDE_REGEX.match(filename):
+                        filepaths_file.write(f"{filepath}\n".encode())
+    
+    filepaths_file.close()
+
+    cmd = ['pipx', 'run', f'clang-format=={CLANG_FORMAT_VERSION}',
+           f'--files={filepaths_file.name}', '-i', '-style=file:.clang-format']
+    
+    print(f"Formatting generated files: {list2cmdline(cmd)}")
+    run(cmd)
+    
+    # Clean up temp file
+    os.unlink(filepaths_file.name)

tools/scripts/codegen/legacy_c2j_cpp_gen.py

@@ -16,6 +16,7 @@
 from concurrent.futures import ProcessPoolExecutor, wait, FIRST_COMPLETED, ALL_COMPLETED
 from pathlib import Path
 
+from codegen.format_util import format_directories
 from codegen.include_tests_util import IncludeTestsUtil
 from codegen.model_utils import ServiceModel
 
@@ -141,6 +142,13 @@ def generate(self, executor: ProcessPoolExecutor, max_workers: int, args: dict)
             return -1
 
         print(f"Code generation done, (re)generated {len(done)} packages.")  # Including defaults and partitions
+        
+        # Format generated client code
+        generated_clients = [service for service in self.c2j_models.keys()]
+        if generated_clients:
+            client_dirs = [f"{self.output_location}/src/aws-cpp-sdk-{client}" for client in generated_clients]
+            format_directories(client_dirs)
+        
         return 0
 
     def _init_common_java_cli(self,

tools/scripts/codegen/protocol_tests_gen.py

@@ -13,8 +13,8 @@
 import sys
 from concurrent.futures import ProcessPoolExecutor, wait, FIRST_COMPLETED, ALL_COMPLETED
 from subprocess import list2cmdline, run
-from tempfile import NamedTemporaryFile
 
+from codegen.format_util import format_directories
 from codegen.legacy_c2j_cpp_gen import LegacyC2jCppGen
 from codegen.model_utils import SERVICE_MODEL_FILENAME_PATTERN, ServiceModel, ModelUtils
 
@@ -31,9 +31,6 @@
 UNSUPPORTED_CLIENTS = {}
 UNSUPPORTED_TESTS = {}
 
-CLANG_FORMAT_VERSION = '18.1.6'
-CLANG_FORMAT_INCLUDE_REGEX = re.compile(r'^.*\.(cpp|h)$')
-
 # Regexp to parse C2J model filename to extract service name and date version
 TEST_DEFINITION_FILENAME_PATTERN = re.compile(
     "^"
@@ -93,7 +90,7 @@ def generate(self, executor: ProcessPoolExecutor, max_workers: int):
         if self._generate_test_clients(executor, max_workers) == 0:
             result = self._generate_tests(executor, max_workers)
             if result == 0:
-                self._format_generated_files()
+                format_directories([self.generated_test_clients_dir, self.generated_tests_dir])
             return result
         return -1
 
@@ -316,22 +313,3 @@ def _generate_single_protocol_test(self, models: ProtocolTestModel):
                                                                         dir_to_extract, dir_to_delete)
 
         return name_for_logging, status
-
-    def _format_generated_files(self):
-        """Format generated C++ files using clang-format"""
-        filepaths_file = NamedTemporaryFile(delete=False)
-        
-        for root_dir in [self.generated_test_clients_dir, self.generated_tests_dir]:
-            for dirpath, dirnames, filenames in os.walk(root_dir):
-                for filename in filenames:
-                    filepath = pathlib.Path(dirpath, filename).as_posix()
-                    if CLANG_FORMAT_INCLUDE_REGEX.match(filename):
-                        filepaths_file.write(f"{filepath}\n".encode())
-        
-        filepaths_file.close()
-        
-        cmd = ['pipx', 'run', f'clang-format=={CLANG_FORMAT_VERSION}',
-               f'--files={filepaths_file.name}', '-i', '-style=file:.clang-format']
-        
-        print(f"Formatting generated files: {list2cmdline(cmd)}")
-        run(cmd)