From 419f15a4f331b315c7f4652a84422a8fda964a95 Mon Sep 17 00:00:00 2001 From: Francis Charette Migneault Date: Thu, 20 Feb 2020 11:43:26 -0500 Subject: [PATCH 1/3] update adapter to twitcher 0.5.3 --- Dockerfile.adapter | 2 +- HISTORY.rst | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile.adapter b/Dockerfile.adapter index 31922b910..6dcc29bbc 100644 --- a/Dockerfile.adapter +++ b/Dockerfile.adapter @@ -3,7 +3,7 @@ # docker run will need to override ini file with mounted volume # using config 'twitcher.adapter = magpie.adapter.MagpieAdapter' # -FROM birdhouse/twitcher:v0.5.2 +FROM birdhouse/twitcher:v0.5.3 LABEL Description="Configures MagpieAdapter on top of Twitcher application." LABEL Maintainer="Francis Charette-Migneault " LABEL Vendor="CRIM" diff --git a/HISTORY.rst b/HISTORY.rst index 12912106d..d2c44cea1 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -6,6 +6,10 @@ History Unreleased --------------------- +Features / Changes +~~~~~~~~~~~~~~~~~~~~~ +* Update adapter docker image reference to ``birdhouse/twitcher:v0.5.3``. + 1.9.0 (2020-01-29) --------------------- From e4bce316a97253b1dcb715629b7bee321b4352be Mon Sep 17 00:00:00 2001 From: Francis Charette Migneault Date: Thu, 20 Feb 2020 11:46:36 -0500 Subject: [PATCH 2/3] patch gitleaks action ref --- .github/workflows/secret-scan.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/secret-scan.yml b/.github/workflows/secret-scan.yml index af624614d..4a168e4df 100644 --- a/.github/workflows/secret-scan.yml +++ b/.github/workflows/secret-scan.yml @@ -42,7 +42,11 @@ jobs: # @todo command is failing #- run: gitleaks -v --exclude-forks --redact --threads=1 --branch=$GITHUB_REF --repo-path=$GITHUB_WORKSPACE - - uses: eshork/gitleaks-action@v1.0.0 + # FIXME: revert to original repo when (if) they ever consider the fix + # https://github.com/eshork/gitleaks-action/pull/4 + # https://github.com/eshork/gitleaks-action/issues/3 + - uses: fmigneault/gitleaks-action@master + #- uses: eshork/gitleaks-action@v1.0.0 - uses: CySeq/gitcret@v2 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 0eec26682f19862705fd26119a0a293e35a1993d Mon Sep 17 00:00:00 2001 From: Francis Charette Migneault Date: Thu, 20 Feb 2020 13:56:54 -0500 Subject: [PATCH 3/3] disable gitcret action duplicating gitleaks --- .github/workflows/secret-scan.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/secret-scan.yml b/.github/workflows/secret-scan.yml index 4a168e4df..c20578a92 100644 --- a/.github/workflows/secret-scan.yml +++ b/.github/workflows/secret-scan.yml @@ -47,6 +47,10 @@ jobs: # https://github.com/eshork/gitleaks-action/issues/3 - uses: fmigneault/gitleaks-action@master #- uses: eshork/gitleaks-action@v1.0.0 - - uses: CySeq/gitcret@v2 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + # NOTE: + # does the same as gitleaks-action, but over the whole git history + posts found problem on issue/PR comments + # disable as it causes old (fixed) problems to be detected + #- uses: CySeq/gitcret@v2 + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}