Commit bbc1ebd5 authored by Konstantinos Togias's avatar Konstantinos Togias
Browse files

Format executor checks and review the public executor pin fingerprint

parent 94028408

ci/consumers.py

+3 −5
Changes for ci/consumers.py: 3 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -107,8 +107,7 @@ def resolve_ref(requested, get=read): 
def executor_ref(get=read):

    tag = get("projects/377/repository/tags/" + SRM_EXECUTOR_REF)

    require(

        tag.get("commit", {}).get("id") == SRM_EXECUTOR_SHA

        and tag.get("protected") is True,

        tag.get("commit", {}).get("id") == SRM_EXECUTOR_SHA and tag.get("protected") is True,

        "Canonical consumer executor tag differs from the reviewed pin",

    )

    return {"ref": SRM_EXECUTOR_REF, "source_sha": SRM_EXECUTOR_SHA}
@@ -204,9 +203,8 @@ def prepare(environment=None, get=read, out=OUT, head=None, *, selected=False): 
            {"srm-consumer-selected": bridge(chosen, environment, image=False, mode=mode)}

            if chosen

            else {

                "srm-consumer-" + target: bridge(

                    entry, environment, image=False, mode=mode, executor=executor

                )

                "srm-consumer-"

                + target: bridge(entry, environment, image=False, mode=mode, executor=executor)

                for target, entry in canonical.items()

            }

        )

ci/secrets-reviewed.json

+6 −0
Changes for ci/secrets-reviewed.json: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -102,6 +102,12 @@ 
      "type": "Secret Keyword",

      "hashed_secret": "ecb252044b5ea0f679ee78ec1a12904739e2904d",

      "reason": "Synthetic schema-example identifier, or literal string placeholder; no authentication value."

    },

    {

      "path": "ci/consumers.py",

      "type": "Hex High Entropy String",

      "hashed_secret": "62b38ecc906505d21e726dc2e0eac06de30751c0",

      "reason": "Public immutable SRM executor commit pinned by sdk-consumer-runner-v1: https://labs.etsi.org/rep/oop/code/service-resource-manager/-/commit/8950772bc9a9da3463488ce86ccef3bf6f3d1680"

    }

  ]

}

tests/ci/test_consumer_selection.py

+2 −1
Changes for tests/ci/test_consumer_selection.py: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -39,7 +39,8 @@ def api(): 
        "projects/377/repository/branches/develop": {"commit": {"id": DEVELOP}},

        "projects/377/repository/branches/main": {"commit": {"id": MAIN}},

        "projects/377/repository/tags/sdk-consumer-runner-v1": {

            "commit": {"id": consumers.SRM_EXECUTOR_SHA}, "protected": True,

            "commit": {"id": consumers.SRM_EXECUTOR_SHA},

            "protected": True,

        },

        "projects/377/repository/branches/feature%2Fsrm": {"commit": {"id": FEATURE}},

        "projects/377/merge_requests/12": {