Remove api/client folder from codeQL scanning, fix explicit returns mixed with implicit, mismatch between signature and use of an overridden method, and confusing octal (#5703)

Author: hgreebe

.github/workflows/codeql-analysis.yml

@@ -2,7 +2,11 @@ name: "CodeQL"
 
 on:
   push:
+    paths-ignore:
+      - api/client
   pull_request:
+    paths-ignore:
+      - api/client
   schedule:
     - cron: '0 10 * * 2'
 
@@ -27,4 +31,4 @@ jobs:
         languages: ${{ matrix.language }}
         queries: +security-and-quality
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v2

awsbatch-cli/src/awsbatch/awsbhosts.py

@@ -185,6 +185,7 @@ def __create_host_item(container_instance, ec2_instance):
             )
         except KeyError as e:
             fail("Error building Host item. Key (%s) not found." % e)
+            return None
 
     @staticmethod
     def __get_instance_attribute(attributes, attribute_name):

awsbatch-cli/src/awsbatch/awsbqueues.py

@@ -127,6 +127,7 @@ def __new_queue(queue):
             )
         except KeyError as e:
             fail("Error building Queue item. Key (%s) not found." % e)
+            return None
 
 
 def main():

cli/src/pcluster/cli/commands/configure/utils.py

@@ -33,6 +33,7 @@ def wrapper(*args, **kwargs):  # pylint: disable=inconsistent-return-statements
             print(f"Failed with error: {e}")
             if isinstance(e, ClientError) and "credentials" in str(e):
                 print("To set the credentials, run 'aws configure' or set them as environment variables")
+                return None
 
     return wrapper
 

cli/src/pcluster/cli/commands/ssh.py

@@ -21,8 +21,7 @@
 from functools import partial
 from typing import List
 
-import argparse
-from argparse import ArgumentParser, Namespace
+from argparse import ArgumentParser, Namespace, RawDescriptionHelpFormatter
 
 from pcluster import utils
 from pcluster.cli.commands.common import CliCommand, to_bool
@@ -96,7 +95,7 @@ def __init__(self, subparsers):
             help=self.help,
             description=self.description,
             epilog=self.epilog,
-            formatter_class=argparse.RawDescriptionHelpFormatter,
+            formatter_class=RawDescriptionHelpFormatter,
             expects_extra_args=True,
         )
 

cli/src/pcluster3_config_converter/pcluster3_config_converter.py

@@ -717,6 +717,7 @@ def convert_slurm_queues(self, scheduling, param):
             queue = self.convert_single_slurm_queue(queue_label)
             _append_if(slurm_queues, queue)
         _add_if(scheduling, param, slurm_queues)
+        return None
 
     def convert_single_slurm_queue(self, queue_label):
         """Convert single SlurmQueue."""

cli/tests/pcluster/models/test_cluster.py

@@ -436,7 +436,7 @@ def test_get_stack_events(self, cluster, mocker, set_env, stack_exists, expected
                     "ResourceType": "AWS::CloudFormation::Stack",
                     "StackId": "arn:aws:cloudformation:us-east-1:000000000000:stack/pc",
                     "StackName": "pc",
-                    "Timestamp": datetime.datetime(2021, 7, 13, 2, 20, 20, 000000, tzinfo=tz.tzutc()),
+                    "Timestamp": datetime.datetime(2021, 7, 13, 2, 20, 20, 0o00000, tzinfo=tz.tzutc()),
                 }
             ],
         }

tests/integration-tests/clusters_factory.py

@@ -40,6 +40,7 @@ def wrapper(*args, **kwargs):
             return func(*args, **kwargs)
         except Exception as e:
             logging.error("Failed when running function %s. Ignoring exception. Error: %s", func.__name__, e)
+            return None
 
     return wrapper
 

tests/integration-tests/conftest_resource_bucket.py

@@ -105,7 +105,7 @@ def get_resource_map():
 def resource_bucket_shared(request, s3_bucket_factory_shared, lambda_layer_source):
     root = Path(pkg_resources.resource_filename(__name__, "/../.."))
     if request.config.getoption("resource_bucket"):
-        return  # short-circuit this fixture if a resource-bucket is provided
+        return None  # short-circuit this fixture if a resource-bucket is provided
 
     for region, s3_bucket in s3_bucket_factory_shared.items():
         logger.info(f"Uploading artifacts to: {s3_bucket}[{region}]")

tests/integration-tests/s3_common_utils.py

@@ -54,3 +54,4 @@ def get_policy_resources(config, enable_write_access):
             else:
                 return [f"{bucket_name}", f"{bucket_name}/*"]
     logging.error("Bucket name couldn't be found in the configuration file.")
+    return None