Remove extra default update (#3)

* Remove extra default update * Fix role name
huntresslabs · Jun 12, 2024 · d7b3965 · d7b3965
1 parent 1aac2d7
commit d7b3965
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/.github/workflows/build_elastic_common_schema_toolchain.yml b/.github/workflows/build_elastic_common_schema_toolchain.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v4
         with:
-          role-to-assume: arn:aws:iam::068738303278:role/PushPullECSToolchainImage
+          role-to-assume: arn:aws:iam::068738303278:role/GithubECSRepoPolicy
           aws-region: us-east-1
 
       - name: Login to Amazon ECR

diff --git a/scripts/schema/loader.py b/scripts/schema/loader.py
@@ -307,7 +307,6 @@ def merge_fields(
                 asd["reusable"].setdefault("expected", [])
                 asd["reusable"]["expected"].extend(bsd["reusable"]["expected"])
                 bsd.pop("reusable")
-                asd.setdefault("settings", {})
             if "settings" in bsd:
                 asd.setdefault("settings", {})
                 asd["settings"] = merge_fields(asd["settings"], bsd["settings"])

diff --git a/scripts/tests/unit/test_schema_loader.py b/scripts/tests/unit/test_schema_loader.py
@@ -578,7 +578,6 @@ def test_merge_array_attributes(self):
                         "top_level": True,
                         "expected": ["normal.location", "a_new.location"],
                     },
-                    "settings": {},
                 },
                 "field_details": {"name": "foo", "type": "group"},
                 "fields": {