fix checks

Author: jkoronaAtCisco

cmd/schemagen/internal/config.go

@@ -103,7 +103,7 @@ func ReadConfig() (*Config, error) {
 			switch class {
 			case "receiver", "processor", "exporter", "connector", "extension":
 				mode = Component
-			case "pkg":
+			case "", "pkg":
 				mode = Package
 			default:
 				return nil, fmt.Errorf("schema generation for class '%s' is not supported", md.Status.Class)

cmd/schemagen/internal/parser.go

@@ -433,5 +433,7 @@ func (p *Parser) parseOptional(indexExpr *ast.IndexExpr) (SchemaElement, error)
 		return element, err
 	}
 
-	return nil, fmt.Errorf("unrecognized generic type: %s", wrapperTypeName)
+	fmt.Printf("Warning: unrecognized generic type: %s\n", wrapperTypeName)
+
+	return nil, nil
 }

cmd/schemagen/run_schemagen_dir.sh

@@ -5,21 +5,26 @@
 
 # 1. Parse CLI arguments
 usage() {
-    echo "Usage: $0 [-v] [-i dir1,dir2,...] <target_directory>"
+    echo "Usage: $0 [-v] [-m] [-i dir1,dir2,...] <target_directory>"
     echo "  -i  Comma-separated directory basenames to ignore (recursion prunes them)"
-    echo "  -v  Recursively process directories containing *.schema.yaml files"
+    echo "  -m  After successful run also run schemagen in internal/metadata"
+    echo "  -v  Validation mode - process only directories containing *.schema.yaml files"
 }
 
 IGNORED_DIRS=()
 RECURSIVE_MODE=false
-while getopts ":i:hv" opt; do
+METADATA_MODE=false
+while getopts ":i:hmv" opt; do
     case $opt in
         i)
             if [ -n "$OPTARG" ]; then
                 IFS=',' read -r -a tmp <<< "$OPTARG"
                 IGNORED_DIRS+=("${tmp[@]}")
             fi
             ;;
+        m)
+            METADATA_MODE=true
+            ;;
         h)
             usage
             exit 0
@@ -47,6 +52,11 @@ FAILED_DIRS=() # Array to keep track of failures
 EXEC_DIR=$(pwd)
 dirs_to_process=()
 
+run_schemagen_for_dir() {
+    local dir_path=$1
+    (cd "$EXEC_DIR" && make schemagen SRC="$dir_path")
+}
+
 dir_already_scheduled() {
     local candidate=$1
     for existing_dir in "${dirs_to_process[@]}"; do
@@ -132,35 +142,35 @@ for dir in "${dirs_to_process[@]}"; do
 
     echo "Run on: $dir_display"
 
-    if ! (cd "$dir" && "$EXEC_DIR/.tools/schemagen"); then
+    if ! run_schemagen_for_dir "$dir"; then
         FAILED_DIRS+=("$dir_display")
         echo "Done with $dir_display"
         echo "------------------------------------------"
         continue
     fi
 
     echo "Done with $dir_display"
-
-
-    metadata_dir="$dir/internal/metadata"
-    if [ -f "$metadata_dir/generated_config.go" ]; then
-        metadata_basename=$(basename "$metadata_dir")
-        skip_metadata=false
-        for ignored in "${IGNORED_DIRS[@]}"; do
-            if [[ "$metadata_basename" == "$ignored" ]]; then
-                skip_metadata=true
-                break
-            fi
-        done
-        metadata_display="$dir_display/internal/metadata"
-        if [ "$skip_metadata" = true ]; then
-            echo "Skipping $metadata_display (in ignore list)"
-        else
-            echo "Run on: $metadata_display"
-            if ! (cd "$metadata_dir" && "$EXEC_DIR/.tools/schemagen"); then
-                FAILED_DIRS+=("$metadata_display")
+    if [ "$METADATA_MODE" = true ]; then
+        metadata_dir="$dir/internal/metadata"
+        if [ -f "$metadata_dir/generated_config.go" ]; then
+            metadata_basename=$(basename "$metadata_dir")
+            skip_metadata=false
+            for ignored in "${IGNORED_DIRS[@]}"; do
+                if [[ "$metadata_basename" == "$ignored" ]]; then
+                    skip_metadata=true
+                    break
+                fi
+            done
+            metadata_display="$dir_display/internal/metadata"
+            if [ "$skip_metadata" = true ]; then
+                echo "Skipping $metadata_display (in ignore list)"
+            else
+                echo "Run on: $metadata_display"
+                if ! run_schemagen_for_dir "$metadata_dir"; then
+                    FAILED_DIRS+=("$metadata_display")
+                fi
+                echo "Done with $metadata_display"
             fi
-            echo "Done with $metadata_display"
         fi
     fi