Skip to content

Commit

Permalink
Fix policy addition in cases where a policy already exists.
Browse files Browse the repository at this point in the history
Signed-by: Eddy Mwiti <[email protected]>
  • Loading branch information
EddyMM committed Sep 11, 2023
1 parent adea554 commit eb34946
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions tests/integration-tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -627,7 +627,7 @@ def _inject_additional_iam_policies(node_config, additional_iam_policies):
if dict_has_nested_key(node_config, ("Iam", "AdditionalIamPolicies")):
for policy in additional_iam_policies:
if policy not in node_config["Iam"]["AdditionalIamPolicies"]:
node_config["Iam"]["AdditionalIamPolicies"] += copy.deepcopy(policy)
node_config["Iam"]["AdditionalIamPolicies"] += [copy.deepcopy(policy)]
else:
dict_add_nested_key(node_config, additional_iam_policies, ("Iam", "AdditionalIamPolicies"))

Expand All @@ -636,21 +636,21 @@ def _inject_additional_iam_policies_for_nodes(
config_content, scheduler: str, node_types: List[NodeType], policies: List[Dict]
):
if NodeType.HEAD_NODE in node_types:
_inject_additional_iam_policies(config_content["HeadNode"], copy.deepcopy(policies))
_inject_additional_iam_policies(config_content["HeadNode"], policies)
if (
scheduler == "slurm"
and dict_has_nested_key(config_content, ("Scheduling", "SlurmQueues"))
and NodeType.COMPUTE_NODES in node_types
):
for queue in config_content["Scheduling"]["SlurmQueues"]:
_inject_additional_iam_policies(queue, copy.deepcopy(policies))
_inject_additional_iam_policies(queue, policies)
if (
scheduler == "slurm"
and dict_has_nested_key(config_content, ("LoginNodes", "Pools"))
and NodeType.LOGIN_NODES in node_types
):
for pool in config_content["LoginNodes"]["Pools"]:
_inject_additional_iam_policies(pool, copy.deepcopy(policies))
_inject_additional_iam_policies(pool, policies)


def inject_additional_config_settings(cluster_config, request, region, benchmarks=None): # noqa C901
Expand Down

0 comments on commit eb34946

Please sign in to comment.