diff --git a/.github/workflows/katalon-evidence-example.yml b/.github/workflows/katalon-evidence-example.yml index 6ec725d..14612bc 100644 --- a/.github/workflows/katalon-evidence-example.yml +++ b/.github/workflows/katalon-evidence-example.yml @@ -146,6 +146,7 @@ jobs: $packageVersion = "${{ env.TAG_NAME }}" $packageRepoName = "${{ env.REPO_NAME }}" $predicatePath = "reports\katalon-results.json" + $providerId = "katalon" $predicateType = "http://katalon.com/test-results/v1" $privateKey = "${{ secrets.PRIVATE_KEY }}" $privateKeyAlias = "${{ secrets.PRIVATE_KEY_ALIAS }}" @@ -156,6 +157,7 @@ jobs: "--package-repo-name", $packageRepoName, "--key", $privateKey, "--key-alias", $privateKeyAlias, + "--provider-id", $providerId, "--predicate", $predicatePath, "--predicate-type", $predicateType ) diff --git a/examples/gitlab-provenance/.gitlab-ci.yml b/examples/gitlab/provenance/.gitlab-ci.yml similarity index 98% rename from examples/gitlab-provenance/.gitlab-ci.yml rename to examples/gitlab/provenance/.gitlab-ci.yml index 16ec62d..0518657 100644 --- a/examples/gitlab-provenance/.gitlab-ci.yml +++ b/examples/gitlab/provenance/.gitlab-ci.yml @@ -62,7 +62,7 @@ create_md_file_and_attach_evidence: echo "No artifacts metadata file found: ${PREDICATE_FILE}" fi - python3 json-to-md.py - - jf evd create --package-name="${PACKAGE_NAME}" --package-version="${PACKAGE_VERSION}" --package-repo-name="${REPO_NAME}" --key="${PRIVATE_KEY}" --key-alias="${PRIVATE_KEY_ALIAS}" --predicate="${PREDICATE_FILE}" --predicate-type="${PREDICATE_TYPE}" --markdown="${MARKDOWN_FILE}" + - jf evd create --package-name="${PACKAGE_NAME}" --package-version="${PACKAGE_VERSION}" --package-repo-name="${REPO_NAME}" --key="${PRIVATE_KEY}" --key-alias="${PRIVATE_KEY_ALIAS}" --predicate="${PREDICATE_FILE}" --predicate-type="${PREDICATE_TYPE}" --provider-id="gitlab" --markdown="${MARKDOWN_FILE}" dependencies: - build_and_publish needs: diff --git a/examples/gitlab-provenance/README.md b/examples/gitlab/provenance/README.md similarity index 99% rename from examples/gitlab-provenance/README.md rename to examples/gitlab/provenance/README.md index 674cdc4..8a1e88c 100644 --- a/examples/gitlab-provenance/README.md +++ b/examples/gitlab/provenance/README.md @@ -149,6 +149,7 @@ jf evd create \ --key-alias "${PRIVATE_KEY_ALIAS}" \ --predicate "${PREDICATE_FILE}" \ --predicate-type "${PREDICATE_TYPE}" \ + --provider-id="gitlab" \ --markdown "${MARKDOWN_FILE}" ``` diff --git a/examples/gitlab-provenance/index.js b/examples/gitlab/provenance/index.js similarity index 100% rename from examples/gitlab-provenance/index.js rename to examples/gitlab/provenance/index.js diff --git a/examples/gitlab-provenance/json-to-md.py b/examples/gitlab/provenance/json-to-md.py similarity index 100% rename from examples/gitlab-provenance/json-to-md.py rename to examples/gitlab/provenance/json-to-md.py diff --git a/examples/gitlab-provenance/package.json b/examples/gitlab/provenance/package.json similarity index 100% rename from examples/gitlab-provenance/package.json rename to examples/gitlab/provenance/package.json diff --git a/examples/gitlab-sbom/.gitlab-ci.yml b/examples/gitlab/sbom/.gitlab-ci.yml similarity index 97% rename from examples/gitlab-sbom/.gitlab-ci.yml rename to examples/gitlab/sbom/.gitlab-ci.yml index 72d0fed..4e7fce4 100644 --- a/examples/gitlab-sbom/.gitlab-ci.yml +++ b/examples/gitlab/sbom/.gitlab-ci.yml @@ -50,4 +50,4 @@ create_md_file_and_attach_evidence: - jf config add --url ${ARTIFACTORY_URL} --access-token ${ARTIFACTORY_ACCESS_TOKEN} --interactive=false script: - python3 json-to-md.py - - jf evd create --package-name="${PACKAGE_NAME}" --package-version="${PACKAGE_VERSION}" --package-repo-name="${REPO_NAME}" --key="${PRIVATE_KEY}" --key-alias="${PRIVATE_KEY_ALIAS}" --predicate="${PREDICATE_FILE}" --predicate-type="${PREDICATE_TYPE}" --markdown="${MARKDOWN_FILE}" \ No newline at end of file + - jf evd create --package-name="${PACKAGE_NAME}" --package-version="${PACKAGE_VERSION}" --package-repo-name="${REPO_NAME}" --key="${PRIVATE_KEY}" --key-alias="${PRIVATE_KEY_ALIAS}" --predicate="${PREDICATE_FILE}" --predicate-type="${PREDICATE_TYPE}" --provider-id="gitlab" --markdown="${MARKDOWN_FILE}" \ No newline at end of file diff --git a/examples/gitlab-sbom/Dockerfile b/examples/gitlab/sbom/Dockerfile similarity index 100% rename from examples/gitlab-sbom/Dockerfile rename to examples/gitlab/sbom/Dockerfile diff --git a/examples/gitlab-sbom/README.md b/examples/gitlab/sbom/README.md similarity index 95% rename from examples/gitlab-sbom/README.md rename to examples/gitlab/sbom/README.md index c7ac8d8..c271968 100644 --- a/examples/gitlab-sbom/README.md +++ b/examples/gitlab/sbom/README.md @@ -64,7 +64,7 @@ Trigger the pipeline in GitLab CI/CD. The pipeline will: - **Build Docker Image:** The pipeline first builds a Docker image from the specified Dockerfile and then pushes it to your Artifactory instance using the JFrog CLI. ```bash - docker build -f ./examples/gitlab-sbom/Dockerfile -t $DOCKER_IMAGE_NAME_WITH_TAG ./examples/gitlab-sbom + docker build -f ./examples/gitlab/sbom/Dockerfile -t $DOCKER_IMAGE_NAME_WITH_TAG ./examples/gitlab/sbom ``` - **Push Docker Image:** ```bash @@ -78,7 +78,7 @@ Trigger the pipeline in GitLab CI/CD. The pipeline will: - **Attach Evidence:** The jf evd create command attaches the original SBOM report to the Docker image package in Artifactory. This creates a permanent, tamper-proof link between your image and its complete list of software components. ```bash - jf evd create --package-name="${PACKAGE_NAME}" --package-version="${PACKAGE_VERSION}" --package-repo-name="${REPO_NAME}" --key="${PRIVATE_KEY}" --key-alias="${PRIVATE_KEY_ALIAS}" --predicate="${PREDICATE_FILE}" --predicate-type="${PREDICATE_TYPE}" --markdown="${MARKDOWN_FILE}" + jf evd create --package-name="${PACKAGE_NAME}" --package-version="${PACKAGE_VERSION}" --package-repo-name="${REPO_NAME}" --key="${PRIVATE_KEY}" --key-alias="${PRIVATE_KEY_ALIAS}" --predicate="${PREDICATE_FILE}" --predicate-type="${PREDICATE_TYPE}" --provider-id="gitlab" --markdown="${MARKDOWN_FILE}" ``` ## References diff --git a/examples/gitlab-sbom/json-to-md.py b/examples/gitlab/sbom/json-to-md.py similarity index 100% rename from examples/gitlab-sbom/json-to-md.py rename to examples/gitlab/sbom/json-to-md.py diff --git a/examples/gitlab-sbom/requirements.txt b/examples/gitlab/sbom/requirements.txt similarity index 100% rename from examples/gitlab-sbom/requirements.txt rename to examples/gitlab/sbom/requirements.txt diff --git a/examples/katalon/README.md b/examples/katalon/README.md index cffb652..7c0f921 100644 --- a/examples/katalon/README.md +++ b/examples/katalon/README.md @@ -154,6 +154,7 @@ Once the workflow completes successfully, you can navigate to your repository in "--package-repo-name", $packageRepoName, "--key", $privateKey, "--key-alias", $privateKeyAlias, + "--provider-id", "katalon", "--predicate", $predicatePath, "--predicate-type", $predicateType )