Fix CodeQL findings (#5698)

* Fix incomplete url substring sanitization, implicit string concatenation, and wrong number of arguments in a call code scanning alerts.

* Remove unnecessary passes

Author: hgreebe

cli/src/pcluster/api/awslambda/serverless_wsgi.py

@@ -108,7 +108,7 @@ def get_script_name(headers, request_context):
         "1",
     ]
 
-    if "amazonaws.com" in headers.get("Host", "") and not strip_stage_path:
+    if headers.get("Host", "").endswith(".amazonaws.com") and not strip_stage_path:
         script_name = "/{}".format(request_context.get("stage", ""))
     else:
         script_name = ""

cli/tests/pcluster/models/test_cluster.py

@@ -224,7 +224,7 @@ def test_get_stack_template(self, cluster, mocker, template_body, error_message)
             None,
             "No UpDatES ARE TO BE PERformed",
             "some longer message also containing no updates are to be performed and more words at the end"
-            "some other error message",
+            + "some other error message",
         ],
     )
     def test_update_stack_template(self, cluster, mocker, error_message):

cli/tests/pcluster/models/test_imagebuilder.py

@@ -73,7 +73,7 @@
             [
                 "Kms Key Id key_id is specified, the encrypted state must be True.",
                 "Root volume size 25 GB is less than the minimum required size 50 GB that equals parent ami"
-                " volume size.",
+                + " volume size.",
             ],
             [FailureLevel.ERROR, FailureLevel.ERROR],
         )
@@ -120,11 +120,11 @@ def test_imagebuilder_kms_key_id_encrypted_validator_and_ami_volume_size_validat
             URLError("[Errno 2] No such file or directory: '/test/aws-parallelcluster-cookbook-3.0.tgz'"),
             [
                 "The url 'https:///test/aws-parallelcluster-cookbook-3.0.tgz' causes URLError, the error reason is "
-                "'[Errno 2] No such file or directory: '/test/aws-parallelcluster-cookbook-3.0.tgz''",
+                + "'[Errno 2] No such file or directory: '/test/aws-parallelcluster-cookbook-3.0.tgz''",
                 "Failed when accessing object 'aws-parallelcluster-node-3.0.tgz' from bucket 'test'. This can be due "
-                "to 'aws-parallelcluster-node-3.0.tgz' not found in 'test'",
+                + "to 'aws-parallelcluster-node-3.0.tgz' not found in 'test'",
                 "The value 'ftp://test/aws-parallelcluster-batch-3.0.tgz' is not a valid URL, choose URL with "
-                "'https' or 's3' prefix.",
+                + "'https' or 's3' prefix.",
             ],
             [FailureLevel.WARNING, FailureLevel.WARNING, FailureLevel.ERROR],
         ),
@@ -439,7 +439,7 @@ def test_get_stack_events(self, image_builder, mocker, stack_exists, expected_er
                     "ResourceType": "AWS::CloudFormation::Stack",
                     "StackId": "arn:aws:cloudformation:us-east-1:000000000000:stack/img",
                     "StackName": "img",
-                    "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()),
                 }
             ],
         }

cli/tests/pcluster/templates/test_imagebuilder_stack.py

@@ -1356,7 +1356,7 @@ def test_imagebuilder_instance_role(
                                                     {"Ref": "AWS::Partition"},
                                                     ":iam::",
                                                     {"Ref": "AWS::AccountId"},
-                                                    ":role/parallelcluster/" "ParallelClusterImageCleanup-",
+                                                    ":role/parallelcluster/ParallelClusterImageCleanup-",
                                                     {"Fn::Select": [2, {"Fn::Split": ["/", {"Ref": "AWS::StackId"}]}]},
                                                 ],
                                             ]
@@ -1839,7 +1839,7 @@ def test_imagebuilder_instance_role(
                                                     {"Ref": "AWS::Partition"},
                                                     ":iam::",
                                                     {"Ref": "AWS::AccountId"},
-                                                    ":role/parallelcluster/" "ParallelClusterImageCleanup-",
+                                                    ":role/parallelcluster/ParallelClusterImageCleanup-",
                                                     {"Fn::Select": [2, {"Fn::Split": ["/", {"Ref": "AWS::StackId"}]}]},
                                                 ],
                                             ]

cli/tests/pcluster/validators/test_cluster_validators.py

@@ -3202,11 +3202,11 @@ def test_root_volume_encryption_consistency_validator(
             ],
             [
                 "The queue queue_1 contains an instance type with multiple network interfaces however the "
-                "AssignPublicIp value is set to true. AWS public IPs can only be assigned to instances "
-                "launched with a single network interface.",
+                + "AssignPublicIp value is set to true. AWS public IPs can only be assigned to instances "
+                + "launched with a single network interface.",
                 "The queue queue_1 contains an instance type with multiple network interfaces however the subnets "
-                "['subnet_1'] is configured to automatically assign public IPs. AWS public IPs can only be assigned "
-                "to instances launched with a single network interface.",
+                + "['subnet_1'] is configured to automatically assign public IPs. AWS public IPs can only be assigned "
+                + "to instances launched with a single network interface.",
             ],
             id="Test with multi nic queue with assigned public ip and subnet with public ip",
         ),