s1-shift-left-cli 0.4.1__tar.gz → 0.4.3__tar.gz

{s1_shift_left_cli-0.4.1 → s1_shift_left_cli-0.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: s1_shift_left_cli
-Version: 0.4.1
+Version: 0.4.3
 Summary: SentinelOne CNS CLI is an extension of our vision to shift-left security with SentinelOne CNS.
 License: Proprietary
 Author: pingsafe-dev
@@ -20,7 +20,7 @@ Requires-Dist: Markdown (==3.4.3)
 Requires-Dist: MarkupSafe (==2.1.2)
 Requires-Dist: PyYAML (==6.0.1)
 Requires-Dist: aiodns (==3.0.0)
-Requires-Dist: aiohttp (==3.9.1)
+Requires-Dist: aiohttp (==3.9.4)
 Requires-Dist: aiomultiprocess (==0.9.0)
 Requires-Dist: aiosignal (==1.3.1)
 Requires-Dist: alive-progress (>=3.1.4,<4.0.0)
@@ -100,7 +100,7 @@ Requires-Dist: update-checker (==0.18.0)
 Requires-Dist: urllib3 (==1.26.15)
 Requires-Dist: wcwidth (==0.2.6)
 Requires-Dist: websocket-client (==1.5.1)
-Requires-Dist: werkzeug (==2.2.3)
+Requires-Dist: werkzeug (==3.0.3)
 Requires-Dist: yarl (==1.17.0)
 Requires-Dist: zipp (==3.15.0)
 Description-Content-Type: text/markdown

{s1_shift_left_cli-0.4.1 → s1_shift_left_cli-0.4.3}/pyproject.toml

@@ -8,7 +8,7 @@ name = "s1_shift_left_cli"
 packages = [
     { include = "s1_cns_cli", from = "src" }
 ]
-version = "0.4.1" # update version in src/s1_cns_cli/version.py as well
+version = "0.4.3" # update version in src/s1_cns_cli/version.py as well
 authors = ["pingsafe-dev <dev@pingsafe.com>"]
 description = "SentinelOne CNS CLI is an extension of our vision to shift-left security with SentinelOne CNS."
 readme = "PYPI_README.md"
@@ -17,7 +17,7 @@ license = "Proprietary"
 [tool.poetry.dependencies]
 python = "^3.9"
 aiodns = "3.0.0"
-aiohttp = "3.9.1"
+aiohttp = "3.9.4"
 aiomultiprocess = "0.9.0"
 aiosignal = "1.3.1"
 argcomplete = "3.0.8"
@@ -102,7 +102,7 @@ blinker = "1.6.2"
 flask_cors = "3.0.10"
 itsdangerous = "2.1.2"
 flask = "2.2.5"
-werkzeug = "2.2.3"
+werkzeug = "3.0.3"
 importlib_metadata = "6.6.0"
 sentry-sdk = "^1.24.0"
 alive-progress = "^3.1.4"

{s1_shift_left_cli-0.4.1 → s1_shift_left_cli-0.4.3}/src/s1_cns_cli/cli/command_line_arguments.py

@@ -63,13 +63,13 @@ def add_global_flags(parser):
         dest="global_output_file",
         metavar="",
         default="",
-        help="output file path",
+        help="specify the path of output file",
     )
     parser.add_argument(
         "--output-format",
         dest="global_output_format",
         metavar="",
-        help="output format",
+        help="specify the format for the output",
         choices=[OUTPUT_FORMAT.JSON, OUTPUT_FORMAT.CSV, OUTPUT_FORMAT.SARIF],
     )
     parser.add_argument(
@@ -112,7 +112,7 @@ def add_iac_flags(iac_parser):
         dest="debug",
         action="store_true",
         default=False,
-        help="switch to debug mode",
+        help="enable debug mode for detailed logging",
     )
     iac_parser.add_argument(
         "-d",
@@ -120,7 +120,7 @@ def add_iac_flags(iac_parser):
         dest="directory",
         default="",
         metavar="",
-        help="directory to scan",
+        help="specify directory to scan",
     )
     iac_parser.add_argument(
         "--download-external-modules",
@@ -168,16 +168,16 @@ def add_iac_flags(iac_parser):
     )
     iac_parser.add_argument(
         "--output-file",
-        dest="local_output_file",
+        dest="output_file",
         metavar="",
         default="",
-        help="output file path",
+        help="specify the path of output file",
     )
     iac_parser.add_argument(
         "--output-format",
-        dest="local_output_format",
+        dest="output_format",
         metavar="",
-        help="output format",
+        help="specify the format for the output",
         choices=[OUTPUT_FORMAT.JSON, OUTPUT_FORMAT.CSV, OUTPUT_FORMAT.SARIF],
     )
     iac_parser.add_argument(
@@ -187,6 +187,14 @@ def add_iac_flags(iac_parser):
         default=False,
         help="scan pre-commit changes",
     )
+    iac_parser.add_argument(
+        "--provider",
+        dest="provider",
+        help="specify git provider (GITHUB/GITLAB/BITBUCKET/AZURE)",
+        metavar="",
+        default="",
+        required=False,
+    )
     iac_parser.add_argument(
         "--publish-result",
         dest="publish_result",
@@ -226,7 +234,7 @@ def add_iac_flags(iac_parser):
         help="paths to be ignored during scan using a glob expression",
     )
     iac_parser.add_argument(
-        "--tag", dest="tag", default="", metavar="", help="tag"
+        "--tag", dest="tag", default="", metavar="", help="tag associated with scanner policy for scanning"
     )
     iac_parser.add_argument(
         "--var-file",
@@ -251,13 +259,13 @@ def add_secret_flags(secret_parser):
         dest="debug",
         action="store_true",
         default=False,
-        help="switch to debug mode",
+        help="enable debug mode for detailed logging",
     )
     secret_parser.add_argument(
         "-d",
         "--directory",
         dest="directory",
-        help="directory to scan",
+        help="specify directory to scan",
         metavar="",
         default="",
         required=False,
@@ -311,20 +319,20 @@ def add_secret_flags(secret_parser):
         dest="mask_secret",
         action="store_true",
         default=False,
-        help="mask secret in output",
+        help="mask secret in the output",
     )
     secret_parser.add_argument(
         "--output-file",
-        dest="local_output_file",
+        dest="output_file",
         metavar="",
         default="",
-        help="output file path",
+        help="specify the path of output file",
     )
     secret_parser.add_argument(
         "--output-format",
-        dest="local_output_format",
+        dest="output_format",
         metavar="",
-        help="output format",
+        help="specify the format for the output",
         choices=[OUTPUT_FORMAT.JSON, OUTPUT_FORMAT.CSV, OUTPUT_FORMAT.SARIF],
     )
     secret_parser.add_argument(
@@ -334,6 +342,14 @@ def add_secret_flags(secret_parser):
         default=False,
         help="scan pre-commit changes",
     )
+    secret_parser.add_argument(
+        "--provider",
+        dest="provider",
+        help="specify git provider (GITHUB/GITLAB/BITBUCKET/AZURE)",
+        metavar="",
+        default="",
+        required=False,
+    )
     secret_parser.add_argument(
         "--publish-result",
         dest="publish_result",
@@ -400,14 +416,14 @@ def add_secret_flags(secret_parser):
         help="show all findings irrespective of severity",
     )
     secret_parser.add_argument(
-        "--tag", dest="tag", default="", metavar="", help="tag"
+        "--tag", dest="tag", default="", metavar="", help="tag associated with scanner policy for scanning"
     )
     secret_parser.add_argument(
         "--verified-only",
         dest="verified_only",
         action="store_true",
         default=False,
-        help="give results for verified secrets only",
+        help="show results for verified secrets only",
     )
 
 
@@ -424,7 +440,7 @@ def add_vulnerability_flags(vulnerability_parser):
         dest="debug",
         action="store_true",
         default=False,
-        help="switch to debug mode",
+        help="enable debug mode for detailed logging",
     )
     vulnerability_parser.add_argument(
         "-d",
@@ -432,7 +448,7 @@ def add_vulnerability_flags(vulnerability_parser):
         dest="directory",
         metavar="",
         default="",
-        help="directory to scan for vulnerabilities",
+        help="specify directory to scan for vulnerabilities",
     )
     vulnerability_parser.add_argument(
         "--docker-image",
@@ -457,16 +473,16 @@ def add_vulnerability_flags(vulnerability_parser):
     )
     vulnerability_parser.add_argument(
         "--output-file",
-        dest="local_output_file",
+        dest="output_file",
         metavar="",
         default="",
-        help="output file path",
+        help="specify the path of output file",
     )
     vulnerability_parser.add_argument(
         "--output-format",
-        dest="local_output_format",
+        dest="output_format",
         metavar="",
-        help="output format",
+        help="specify the format for the output",
         choices=[OUTPUT_FORMAT.JSON, OUTPUT_FORMAT.CSV, OUTPUT_FORMAT.SARIF],
     )
     vulnerability_parser.add_argument(
@@ -488,7 +504,7 @@ def add_vulnerability_flags(vulnerability_parser):
         dest="registry",
         metavar="",
         default="index.docker.io",
-        help="specify registry for image (default: index.docker.io)",
+        help="specify registry for image to be scanned (default: index.docker.io)",
     )
     vulnerability_parser.add_argument(
         "--repo-full-name",
@@ -503,7 +519,7 @@ def add_vulnerability_flags(vulnerability_parser):
         dest="sbom_format",
         metavar="",
         choices=["s1-cns-json", "cyclonedx-json", "spdx-json"],
-        help="sbom output format, options=[s1-cns-json, cyclonedx-json, spdx-json] ("
+        help="sbom output format for sbom, options=[s1-cns-json, cyclonedx-json, spdx-json] ("
              "default=s1-cns-json)",
     )
     vulnerability_parser.add_argument(
@@ -522,7 +538,7 @@ def add_vulnerability_flags(vulnerability_parser):
         help="paths to be ignored during scan using a glob expression",
     )
     vulnerability_parser.add_argument(
-        "--tag", dest="tag", default="", metavar="", help="tag"
+        "--tag", dest="tag", default="", metavar="", help="tag associated with scanner policy for scanning"
     )
     vulnerability_parser.add_argument(
         "--username",
@@ -550,48 +566,47 @@ def add_config_global_flags(config_sub_parser):
         required=False,
         default="",
         metavar="",
-        help="service-user api-token for s1-cns-cli",
+        help="service-user-api-token for SentinelOne CNS CLI",
     )
     config_sub_parser.add_argument(
         "--cache-directory",
         dest="cache_directory",
         metavar="",
         default=get_home_path(DEFAULT_SENTINELONE_CNS_DIR),
-        help=f"s1-cns-cli cache dir (default='{get_home_path(DEFAULT_SENTINELONE_CNS_DIR)}')",
+        help=f"SentinelOne CNS CLI cache dir (default='{get_home_path(DEFAULT_SENTINELONE_CNS_DIR)}')",
     )
     config_sub_parser.add_argument(
         "--debug",
         dest="debug",
         action="store_true",
         default=False,
-        help="debug config command",
+        help="enable debug mode for detailed logging",
     )
     config_sub_parser.add_argument(
         "--output-format",
         dest="output_format",
         metavar="",
-        help="output format for results",
-        default=DEFAULT_GLOBAL_CONFIGURATIONS.OUTPUT_FORMAT.value,
-        choices=[OUTPUT_FORMAT.JSON, OUTPUT_FORMAT.CSV],
+        help=f"specify the format for the output",
+        choices=[OUTPUT_FORMAT.JSON, OUTPUT_FORMAT.CSV, OUTPUT_FORMAT.SARIF],
     )
     config_sub_parser.add_argument(
         "--output-file",
         dest="output_file",
         metavar="",
         default="",
-        help="output file location",
+        help="specify the path of output file",
     )
     config_sub_parser.add_argument(
         "--workers-count",
         dest="workers_count",
         default=DEFAULT_GLOBAL_CONFIGURATIONS.WORKERS_COUNT.value,
         metavar="",
-        help="worker count for concurrency",
+        help=f"no of workers for concurrent processing (default: {DEFAULT_GLOBAL_CONFIGURATIONS.WORKERS_COUNT.value})",
     )
     config_sub_parser.add_argument(
         "--management-console-url",
         dest="management_console_url",
-        metavar="management console url",
+        metavar="url of the management console",
         required=True,
         help="",
     )
@@ -601,12 +616,12 @@ def add_config_global_flags(config_sub_parser):
         default=DEFAULT_GLOBAL_CONFIGURATIONS.ON_CRASH_EXIT_CODE.value,
         metavar="",
         type=int,
-        help="Exit status when something went wrong",
+        help="exit status when an error occurs",
     )
     config_sub_parser.add_argument(
         "--scope-id",
         dest="scope_id",
-        help="S1 scope id",
+        help="scope id where the service user is created",
         required=True,
     )
 
@@ -614,11 +629,11 @@ def add_config_global_flags(config_sub_parser):
         "--scope-type",
         dest="scope_type",
         required=True,
-        metavar="S1 scope",
+        metavar=f"scope type where the service user is created (default: {SCOPE_TYPE.ACCOUNT.value})",
         choices=[SCOPE_TYPE.ACCOUNT.value, SCOPE_TYPE.SITE.value],
     )
     config_sub_parser.add_argument(
-        "--tag", dest="tag", default="", metavar="", help="tag"
+        "--tag", dest="tag", default="", metavar="", help="tag associated with scanner policy for scanning"
     )
 
 
@@ -627,7 +642,7 @@ def add_global_sub_parser(parser):
     sub_parser = parser.add_subparsers(
         dest="main_sub_parser",
         title="Sub Commands",
-        description="Use following sub-commands to configure SentinelOne CNS CLI or scan your code.",
+        description="use following sub-commands to configure SentinelOne CNS CLI or scan your code.",
         help="Description",
     )
 
@@ -643,7 +658,7 @@ def add_global_sub_parser(parser):
     config_sub_parser = sub_parser.add_parser(
         "config",
         prog="Configure SentinelOne CNS CLI",
-        description="Configure your SentinelOne CNS CLI",
+        description="configure your SentinelOne CNS CLI",
         help="configure SentinelOne CNS cli",
         epilog=CONFIG_EPILOG,
         formatter_class=argparse.RawDescriptionHelpFormatter,

{s1_shift_left_cli-0.4.1 → s1_shift_left_cli-0.4.3}/src/s1_cns_cli/cli/scan/iac.py

@@ -79,7 +79,8 @@ def iac_parser(args, cache_directory):
 
         if path == "./*" or path == "./**":
             args.skip_paths[index] = path[2:]
-
+    path = os.path.abspath(args.directory)
+    LOGGER.info(f"Started iac scan for dir: {path}")
     for framework in args.frameworks:
         graph = DEFAULT_FRAMEWORK_RUNNERS[framework].generate_graph(args.directory,
                                                                     create_runner_filter(args, framework))
@@ -276,9 +277,12 @@ def iac_pre_evaluation(args, cache_directory):
 
 # validate_iac_command will verify whether all necessary flags are correctly provided or not
 def validate_iac_command(args):
-    if args.publish_result and (args.branch == "" or args.repo_url == "" or args.repo_full_name == ""):
+    if args.publish_result and (args.branch == "" or args.repo_url == "" or args.repo_full_name == "" or args.provider == ""):
         raise MissingRequiredFlags(
-            "Please provide mandatory flags (--branch, --repo-url, --repo-full-name) to publish results to SentinelOne CNS.")
+            "Please provide mandatory flags (--branch, --repo-url, --repo-full-name, --provider) to publish results to SentinelOne CNS.")
+
+    if args.provider != "" and args.provider not in SUPPORTED_GIT_PROVIDERS:
+        raise InvalidInput(f"Provider not supported. Supported providers: {', '.join(SUPPORTED_GIT_PROVIDERS)}")
 
     if args.repo_full_name != "" and "/" not in args.repo_full_name:
         raise InvalidInput("Please provide repository full name(owner/repoName)")
@@ -366,7 +370,7 @@ def download_iac_cache(iac_cache_dir_path, global_config_data):
         # creating plugin files
         for plugin_data in plugins[framework]:
             # id refers to policyCode
-            filename = plugin_data["id"].split(":")[-1] + ".json"
+            filename = f"{plugin_data['provider']}:{plugin_data['id'].split(':')[-1]}.json"
             file_path = os.path.normpath(os.path.join(framework_dir_path, filename))
 
             if not file_path.startswith(framework_dir_path):
@@ -455,7 +459,9 @@ def create_runner_filter(args, framework):
 
 
 def list_plugins(args, cache_directory):
-    global_config_data = read_json_file(get_config_path(cache_directory))
+    manager = get_config_manager()
+    global_config_data = manager.get_global()
+    output_file, output_format = get_output_file_and_format(args, global_config_data)
     iac_cache_dir = os.path.join(cache_directory, CodeTypeSubParser.IAC)
     all_plugins = []
     for _, frameworks, _ in os.walk(iac_cache_dir):
@@ -467,7 +473,7 @@ def list_plugins(args, cache_directory):
                     all_plugins.append(generate_list_plugin_dict(plugin_data))
     if len(all_plugins) > 0:
         print(tabulate(all_plugins, headers="keys", tablefmt="psql"))
-        print_output_on_file(args, all_plugins, global_config_data)
+        print_output_on_file(all_plugins, output_file, output_format)
     else:
         LOGGER.info("No plugin found.")
 
@@ -651,7 +657,6 @@ def scan_plugins(directory_to_scan,
                  include_ignored):
     results = []
     workers = int(os.environ.get("WORKERS_COUNT", 10))
-
     with ThreadPoolExecutor(max_workers=workers) as executor:
         futures = []
         for plugin in plugins:
@@ -710,7 +715,8 @@ def send_issues_to_sentinelone(args, results, global_config_data):
         "issues": results,
         "branch": args.branch,
         "repositoryFullName": args.repo_full_name,
-        "repoUrl": args.repo_url
+        "repoUrl": args.repo_url,
+        "provider": args.provider
     }
     management_console_url = global_config_data["management_console_url"]
     api_token = global_config_data["service_user_api_token"]
@@ -725,10 +731,10 @@ def send_issues_to_sentinelone(args, results, global_config_data):
 
 
 def save_issues_on_file(args, filtered_issues, global_config_data):
-    _, output_format = get_output_file_and_format(args, global_config_data)
+    output_file, output_format = get_output_file_and_format(args, global_config_data)
     if output_format == OUTPUT_FORMAT.SARIF:
         filtered_issues = convert_issues_to_sarif(filtered_issues)
-    print_output_on_file(args, filtered_issues, global_config_data)
+    print_output_on_file(filtered_issues, output_file, output_format)
 
 
 def convert_issues_to_sarif(issues):

{s1_shift_left_cli-0.4.1 → s1_shift_left_cli-0.4.3}/src/s1_cns_cli/cli/scan/secret.py

@@ -11,17 +11,18 @@ from tabulate import tabulate
 
 from s1_cns_cli.cli.config import get_config_manager
 from s1_cns_cli.cli.registry import CodeTypeSubParser, BASELINE_FILE, MissingRequiredFlags, MissingDependencies, \
-    LogColors, HttpMethod, PUBLISH_ISSUES_API, InvalidInput, SUPPORTED_GIT_PROVIDERS, OUTPUT_FORMAT, \
-    SEVERITY_MAP, ScanNotEnabledException
+    LogColors, PUBLISH_ISSUES_API, InvalidInput, SUPPORTED_GIT_PROVIDERS, OUTPUT_FORMAT, \
+    SEVERITY_MAP, ScanNotEnabledException, HttpMethod
 from s1_cns_cli.cli.utils import read_json_file, write_json_to_file, get_version, \
-    print_output_on_file, get_severity_color, get_wrapping_length, wrap_text, make_request, get_priority, \
-    get_output_file_and_format, get_sarif_payload, get_actionable_and_non_actionable
+    print_output_on_file, get_severity_color, get_wrapping_length, wrap_text, get_priority, \
+    get_output_file_and_format, get_sarif_payload, get_actionable_and_non_actionable, make_request
 
 LOGGER = logging.getLogger("cli")
 HASH_STRING = "pingsafe_hashing_string"
 
 
 def print_detectors(args, detectors, global_config_data):
+    output_file, output_format = get_output_file_and_format(args, global_config_data)
     required_width = get_wrapping_length(4)
     if len(detectors) > 0:
         table_data = []
@@ -33,7 +34,7 @@ def print_detectors(args, detectors, global_config_data):
                 "Can-Verify": wrap_text(str(detector["can_verify"]), required_width),
             })
         print(tabulate(table_data, headers="keys", tablefmt="psql"))
-        print_output_on_file(args, detectors, global_config_data)
+        print_output_on_file(detectors, output_file, output_format)
     else:
         LOGGER.info("No detectors found.")
     return 0
@@ -78,18 +79,19 @@ def secret_pre_evaluation(args):
         raise MissingRequiredFlags(
             "Publish result for secret scanning will only works with pre-commit or pull-request.")
 
-    if args.publish_result and (args.repo_url == "" or args.repo_full_name == ""):
+    if args.publish_result and (args.repo_url == "" or args.repo_full_name == "" or args.provider == ""):
         raise MissingRequiredFlags(
-            "Please provide mandatory flags (--repo-url, --repo-full-name) to publish results to SentinelOne CNS.")
+            "Please provide mandatory flags (--repo-url, --repo-full-name, --provider) to publish results to SentinelOne CNS.")
+
+    if args.provider != "" and args.provider not in SUPPORTED_GIT_PROVIDERS:
+        raise InvalidInput(f"Provider not supported. Supported providers: {', '.join(SUPPORTED_GIT_PROVIDERS)}")
 
     if args.repo_full_name != "" and "/" not in args.repo_full_name:
         raise InvalidInput("Please provide repository full name(owner/repoName)")
 
     if args.repo_url:
-        for provider in SUPPORTED_GIT_PROVIDERS:
-            if provider.lower() in args.repo_url.lower():
-                return
-        raise InvalidInput("Git provider not supported yet. Please contact SentinelOne CNS support.")
+        if all(provider.lower() not in args.repo_url.lower() for provider in SUPPORTED_GIT_PROVIDERS):
+            raise InvalidInput(f"provider not supported yet. Please contact SentinelOne CNS support.")
 
     if (args.all_commits or args.range or args.pull_request or
         args.scan_commit or args.pre_commit) and not is_git_installed():
@@ -350,7 +352,8 @@ def send_result_to_sentinelone(args, results, global_config_data):
         "scanType": CodeTypeSubParser.SECRET,
         "issues": results,
         "repositoryFullName": args.repo_full_name,
-        "repoUrl": args.repo_url
+        "repoUrl": args.repo_url,
+        "provider": args.provider
     }
 
     management_console_url = global_config_data["management_console_url"]
@@ -365,10 +368,10 @@ def send_result_to_sentinelone(args, results, global_config_data):
 
 
 def save_issues_on_file(args, filtered_issues, global_config_data):
-    _, output_format = get_output_file_and_format(args, global_config_data)
+    output_file, output_format = get_output_file_and_format(args, global_config_data)
     if output_format == OUTPUT_FORMAT.SARIF:
         filtered_issues = convert_issues_to_sarif(filtered_issues)
-    print_output_on_file(args, filtered_issues, global_config_data)
+    print_output_on_file(filtered_issues, output_file, output_format)
 
 
 def convert_issues_to_sarif(issues):

{s1_shift_left_cli-0.4.1 → s1_shift_left_cli-0.4.3}/src/s1_cns_cli/cli/scan/vulnerability.py

@@ -334,10 +334,10 @@ def generate_table_row(issue):
 
 
 def save_issues_on_file(args, filtered_issues, global_config_data):
-    _, output_format = get_output_file_and_format(args, global_config_data)
+    output_file, output_format = get_output_file_and_format(args, global_config_data)
     if output_format == OUTPUT_FORMAT.SARIF:
         filtered_issues = convert_issues_to_sarif(filtered_issues)
-    print_output_on_file(args, filtered_issues, global_config_data)
+    print_output_on_file(filtered_issues, output_file, output_format)
 
 
 def convert_issues_to_sarif(issues):

{s1_shift_left_cli-0.4.1 → s1_shift_left_cli-0.4.3}/src/s1_cns_cli/cli/utils.py

@@ -424,9 +424,7 @@ def send_exception_to_sentry(e, cache_directory):
         LOGGER.debug(e)
 
 
-def print_output_on_file(args, results, global_config_data):
-    output_file, output_format = get_output_file_and_format(args, global_config_data)
-
+def print_output_on_file(results, output_file, output_format):
     if output_file != "":
         if output_format == OUTPUT_FORMAT.JSON or output_format == OUTPUT_FORMAT.SARIF:
             write_json_to_file(output_file, results)
@@ -440,21 +438,25 @@ def print_output_on_file(args, results, global_config_data):
 
 def get_output_file_and_format(args, global_config_data):
     output_file = global_config_data["output_file"]
-    if args.global_output_file:
+    output_format = global_config_data["output_format"]
+
+    if len(args.global_output_file) > 0:
         output_file = args.global_output_file
-    if args.local_output_file:
-        output_file = args.local_output_file
+    if len(args.output_file) > 0:
+        output_file = args.output_file
 
-    output_format = global_config_data["output_format"]
-    if args.global_output_format or args.local_output_format:
-        # checking if output format is passed in command but output file is neither passed in command nor present in global config
-        if output_file == "":
-            LOGGER.warning(
-                "Output format given without output file. Please provide --output-file flag to get result on desired file.")
+    if args.global_output_format is not None:
         output_format = args.global_output_format
+    if args.output_format is not None:
+        output_format = args.output_format
+
+    # checking if output format is passed in command but output file is not passed
+    if output_format is not None and len(output_format) > 0 and len(output_file) == 0:
+        LOGGER.warning("Output format given without output file. Please provide"
+                       " --output-file flag to get result on desired file.")
 
     # setting default behaviour for output format as JSON when output file path is given but output format is skipped
-    if output_file != "" and output_format == "":
+    if len(output_file) > 0 and (output_format is None or len(output_format) == 0):
         output_format = OUTPUT_FORMAT.JSON
 
     return output_file, output_format

{s1_shift_left_cli-0.4.1 → s1_shift_left_cli-0.4.3}/src/s1_cns_cli/s1graph/common/graph/graph_builder/graph_resources_encription_manager.py

@@ -1,5 +1,6 @@
 from dataclasses import dataclass
 from typing import Any, Dict, Optional
+
 from s1_cns_cli.s1graph.common.graph.graph_builder.graph_components.attribute_names import EncryptionValues
 from s1_cns_cli.s1graph.common.graph.graph_builder.graph_components.blocks import Block
 
@@ -20,6 +21,8 @@ class GraphResourcesEncryptionManager():
     def get_encryption_result(self, vertex: Block) -> Optional[EncryptionResult]:
         resource_type = vertex.id.split(".")[0]
         encryption_conf = self._encription_by_resource_type.get(resource_type)
+        if resource_type == "aws_s3_bucket" or resource_type == "AWS::S3::Bucket":
+            return None
         if not encryption_conf:
             return None
         attributes = vertex.get_attribute_dict()

s1_shift_left_cli-0.4.3/src/s1_cns_cli/version.py

@@ -0,0 +1,2 @@
+version = "0.4.3" # update version in pyproject.toml + server/templates/cli/latestVersion.json at trustic as well
+build_type = "pypi" # "pypi"/"testpypi"/"local"

s1_shift_left_cli-0.4.1/src/s1_cns_cli/version.py

@@ -1,2 +0,0 @@
-version = "0.4.1" # update version in pyproject.toml as well
-build_type = "pypi" # "pypi"/"testpypi"/"local"