Merge pull request #35360 from dims/fix-command-line-issues-in-audit-log-parsing

fix command line issues in audit log parsing

Author: k8s-ci-robot

config/jobs/kubernetes/sig-arch/conformance-audit.yaml

@@ -32,9 +32,10 @@ presubmits:
                   curl -sSL https://kind.sigs.k8s.io/dl/latest/linux-amd64.tgz | tar xvfz - -C "${PATH%%:*}/"
                   && curl -sO https://raw.githubusercontent.com/ii/kind/ci-audit-logging/hack/ci/e2e-k8s.sh
                   && bash e2e-k8s.sh
-                  && python3 ./../test-infra/experiment/audit/audit_log_parser.py ${ARTIFACTS}/audit/audit*.log \
+                  && python3 ./../test-infra/experiment/audit/audit_log_parser.py \
                       --output "${ARTIFACTS}/audit/audit-endpoints.txt" \
-                      --swagger-url "file://$PWD/api/openapi-spec/swagger.json"
+                      --swagger-url "file://$PWD/api/openapi-spec/swagger.json" \
+                      --audit-logs ${ARTIFACTS}/audit/audit*.log
             env:
               - name: BUILD_TYPE
                 value: docker

experiment/audit/audit_log_parser.py

@@ -23,7 +23,7 @@
 Kubernetes API endpoints using the official Swagger/OpenAPI specification
 for accurate endpoint naming.
 
-Usage: python3 audit_log_parser.py <audit_log_file> [--output <output_file>] [--swagger-url <url>]
+Usage: python3 audit_log_parser.py --audit-logs <audit_log_file>... [--output <output_file>] [--swagger-url <url>]
 """
 
 import json
@@ -602,15 +602,15 @@ def main():
         formatter_class=argparse.RawDescriptionHelpFormatter,
         epilog="""
 Examples:
-  python3 audit_log_parser_swagger.py audit.log
-  python3 audit_log_parser_swagger.py audit1.log audit2.log
-  python3 audit_log_parser_swagger.py audit.log --output results.txt
-  python3 audit_log_parser_swagger.py audit*.log --sort count --output results.txt
-  python3 audit_log_parser_swagger.py audit.log --swagger-url https://custom-swagger.json
+  python3 audit_log_parser_swagger.py --audit-logs audit.log
+  python3 audit_log_parser_swagger.py --audit-logs audit1.log audit2.log
+  python3 audit_log_parser_swagger.py --audit-logs audit.log --output results.txt
+  python3 audit_log_parser_swagger.py --audit-logs audit*.log --sort count --output results.txt
+  python3 audit_log_parser_swagger.py --audit-logs audit.log --swagger-url https://custom-swagger.json
         """
     )
 
-    parser.add_argument('audit_logs', nargs='+', help='Path(s) to Kubernetes audit log file(s)')
+    parser.add_argument('--audit-logs', nargs='+', required=True, help='Path(s) to Kubernetes audit log file(s)')
     parser.add_argument('-o', '--output', help='Output file (default: print to stdout)')
     parser.add_argument('--swagger-url', help='Custom Swagger/OpenAPI specification URL')
     parser.add_argument('--sort', choices=['count', 'name'], default='name',