Making the add and check headers scripts use git diff and patches

Author: Fabiana Severin

scripts/add-headers.sh

@@ -4,39 +4,45 @@
 
 set -e
 
-# Find files missing copyright headers
-files=$(git ls-files 'bin/**' 'scripts/**' 'src/**' 'test/**' | \
-  grep -E '\.(js|ts|mjs|mts|jsx|tsx|c|cpp|h)$' | \
-  xargs grep -L 'Copyright.*Amazon\.com' || true)
-
-if [ -z "$files" ]; then
+# Create patch file
+patch_file=$(mktemp)
+trap "rm -f $patch_file" EXIT
+
+# Generate patch for missing headers
+files_count=0
+git ls-files 'bin/**' 'scripts/**' 'src/**' 'test/**' | \
+  grep -E '\.(js|ts|mjs|mts|jsx|tsx|c|cpp|h|sh)$' | \
+  while read file; do
+    if ! grep -q 'Copyright.*Amazon\.com' "$file"; then
+      files_count=$((files_count + 1))
+      
+      if [[ "$file" == *.sh ]]; then
+        header="#!/bin/bash\n# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n# SPDX-License-Identifier: Apache-2.0\n\n"
+      else
+        header="/*\nCopyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\nSPDX-License-Identifier: Apache-2.0\n*/\n\n"
+      fi
+      
+      # Get first line for context
+      first_line=$(head -n1 "$file" 2>/dev/null || echo "")
+      
+      # Create patch entry
+      echo "--- a/$file" >> "$patch_file"
+      echo "+++ b/$file" >> "$patch_file"
+      echo "@@ -1,1 +1,$(echo -e "$header" | wc -l) @@" >> "$patch_file"
+      echo -e "$header" | sed 's/^/+/' >> "$patch_file"
+      if [ -n "$first_line" ]; then
+        echo " $first_line" >> "$patch_file"
+      fi
+    fi
+  done
+
+if [ ! -s "$patch_file" ]; then
   echo "✓ All files already have copyright headers"
   exit 0
 fi
 
-echo "Found $(echo "$files" | wc -l) files missing headers"
-
-# Add headers
-for file in $files; do
-  if [[ "$file" == *.sh ]]; then
-    header="#!/bin/bash
-# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-# SPDX-License-Identifier: Apache-2.0
-
-"
-  else
-    header="/*
-Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-SPDX-License-Identifier: Apache-2.0
-*/
-
-"
-  fi
-  
-  echo "$header$(cat "$file")" > "$file"
-  echo "✓ Added header to $file"
-done
+echo "Applying copyright header patch..."
+git apply "$patch_file"
 
-echo
-echo "✓ All copyright headers added successfully"
-echo "Run 'git diff' to review changes before committing"
+echo "✓ Copyright headers added successfully"
+echo "Run 'git diff --cached' or 'git diff' to review changes"

scripts/check-headers.sh

@@ -4,17 +4,35 @@
 
 set -e
 
-# Find files missing copyright headers
-files=$(git ls-files 'bin/**' 'scripts/**' 'src/**' 'test/**' | \
+# Create temporary patch to see what would be added
+patch_file=$(mktemp)
+trap "rm -f $patch_file" EXIT
+
+# Generate patch for missing headers
+git ls-files 'bin/**' 'scripts/**' 'src/**' 'test/**' | \
   grep -E '\.(js|ts|mjs|mts|jsx|tsx|c|cpp|h|sh)$' | \
-  xargs grep -L 'Copyright.*Amazon\.com' || true)
+  while read file; do
+    if ! grep -q 'Copyright.*Amazon\.com' "$file"; then
+      if [[ "$file" == *.sh ]]; then
+        header="#!/bin/bash\n# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n# SPDX-License-Identifier: Apache-2.0\n\n"
+      else
+        header="/*\nCopyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\nSPDX-License-Identifier: Apache-2.0\n*/\n\n"
+      fi
+      
+      # Create patch entry
+      echo "--- a/$file" >> "$patch_file"
+      echo "+++ b/$file" >> "$patch_file"
+      echo "@@ -1,1 +1,$(echo -e "$header" | wc -l) @@" >> "$patch_file"
+      echo -e "$header" | sed 's/^/+/' >> "$patch_file"
+    fi
+  done
 
-if [ -n "$files" ]; then
+if [ -s "$patch_file" ]; then
   echo "❌ Copyright header check failed."
-  echo "Files missing required \"Copyright\" and \"Amazon.com\" keywords:"
-  echo "$files" | sed 's/^/  - /'
+  echo "Files missing headers (patch preview):"
+  cat "$patch_file"
   echo
-  echo "Run 'npm run add-headers' to fix these issues."
+  echo "Run 'npm run add-headers' to apply these changes."
   exit 1
 fi