Skip to content

Commit

Permalink
Merge pull request #27 from fortify/release-please--branches--main--c…
Browse files Browse the repository at this point in the history
…omponents--github-action

chore(main): release 1.2.0
  • Loading branch information
rsenden authored Feb 5, 2024
2 parents 32bc6a9 + ea2a234 commit b59558e
Show file tree
Hide file tree
Showing 14 changed files with 44 additions and 31 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
# Changelog

## [1.2.0](https://github.com/fortify/github-action/compare/v1.1.0...v1.2.0) (2024-02-05)


### Features

* Add support for Debricked CLI on fortify/github-action/setup ([2c7c1e7](https://github.com/fortify/github-action/commit/2c7c1e703af0d7b0f56adf456bf8fa019a51f72a))
* Add support for updateable/customizable tool definitions ([2c7c1e7](https://github.com/fortify/github-action/commit/2c7c1e703af0d7b0f56adf456bf8fa019a51f72a))


### Bug Fixes

* Fix documentation on ScanCentral SAST inputs (fixes [#23](https://github.com/fortify/github-action/issues/23)) ([3a20c7c](https://github.com/fortify/github-action/commit/3a20c7c27810a16129a63b2d7b244072f673d73a))

## [1.1.0](https://github.com/fortify/github-action/compare/v1.0.4...v1.1.0) (2023-11-28)


Expand Down
4 changes: 2 additions & 2 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ inputs:
runs:
using: composite
steps:
- uses: fortify/github-action/fod-sast-scan@main
- uses: fortify/github-action/fod-sast-scan@v1.2.0
if: inputs['sast-scan']=='true' && env.FOD_URL
- uses: fortify/github-action/sc-sast-scan@main
- uses: fortify/github-action/sc-sast-scan@v1.2.0
if: inputs['sast-scan']=='true' && env.SSC_URL

branding:
Expand Down
6 changes: 3 additions & 3 deletions fod-export/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ author: 'Fortify'
runs:
using: composite
steps:
- uses: fortify/github-action/internal/set-fod-var-defaults@main
- uses: fortify/github-action/setup@main
- uses: fortify/github-action/internal/set-fod-var-defaults@v1.2.0
- uses: fortify/github-action/setup@v1.2.0
with:
export-path: false
vuln-exporter: action-default
Expand All @@ -15,7 +15,7 @@ runs:
*) echo '_RELEASE_OPT="--fod.release.id=${FOD_RELEASE}"' >> $GITHUB_ENV ;;
esac
shell: bash
- uses: fortify/github-action/internal/run@main
- uses: fortify/github-action/internal/run@v1.2.0
with:
cmd: '"${VULN_EXPORTER_CMD}" FoDToGitHub "--fod.baseUrl=${FOD_URL}" "--fod.tenant=${FOD_TENANT}" "--fod.user=${FOD_USER}" "--fod.password=${FOD_PASSWORD}" "--fod.clientID=${FOD_CLIENT_ID}" "--fod.clientSecret=${FOD_CLIENT_SECRET}" "${_RELEASE_OPT}"'
# Uploaded the generated file containing Fortify vulnerabilities to GitHub.
Expand Down
16 changes: 8 additions & 8 deletions fod-sast-scan/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,23 @@ author: 'Fortify'
runs:
using: composite
steps:
- uses: fortify/github-action/internal/set-fod-var-defaults@main
- uses: fortify/github-action/setup@main
- uses: fortify/github-action/internal/set-fod-var-defaults@v1.2.0
- uses: fortify/github-action/setup@v1.2.0
with:
export-path: false
fcli: action-default
- uses: fortify/github-action/internal/fod-login@main
- uses: fortify/github-action/package@main
- uses: fortify/github-action/internal/run@main
- uses: fortify/github-action/internal/fod-login@v1.2.0
- uses: fortify/github-action/package@v1.2.0
- uses: fortify/github-action/internal/run@v1.2.0
with:
cmd: '"${FCLI_CMD}" fod sast-scan start --rel "${FOD_RELEASE}" -f package.zip --store fod_scan ${EXTRA_FOD_SAST_SCAN_OPTS}'
- uses: fortify/github-action/internal/run@main
- uses: fortify/github-action/internal/run@v1.2.0
if: env.DO_WAIT == 'true' || env.DO_EXPORT == 'true'
with:
cmd: '"${FCLI_CMD}" fod sast-scan wait-for ::fod_scan::'
- uses: fortify/github-action/internal/fod-logout@main
- uses: fortify/github-action/internal/fod-logout@v1.2.0
- if: env.DO_EXPORT == 'true'
uses: fortify/github-action/fod-export@main
uses: fortify/github-action/fod-export@v1.2.0

branding:
icon: 'shield'
Expand Down
2 changes: 1 addition & 1 deletion internal/fod-login/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ runs:
fi
shell: bash
# Run fcli login command; note that the calling action/workflow is responsible for installing fcli
- uses: fortify/github-action/internal/run@main
- uses: fortify/github-action/internal/run@v1.2.0
with:
cmd: '"${FCLI_CMD}" fod session login ${_FOD_LOGIN_OPTS}'
# Clean up temporary environment variables
Expand Down
2 changes: 1 addition & 1 deletion internal/fod-logout/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ runs:
using: composite
steps:
# Run fcli logout command; note that the calling action/workflow is responsible for installing fcli
- uses: fortify/github-action/internal/run@main
- uses: fortify/github-action/internal/run@v1.2.0
with:
cmd: '"${FCLI_CMD}" fod session logout'
branding:
Expand Down
2 changes: 1 addition & 1 deletion internal/sc-sast-login/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ runs:
echo '_SC_SAST_LOGIN_OPTS=--ssc-url "${SSC_URL}" -t "${SSC_TOKEN}" -c "${SC_SAST_TOKEN}" ${EXTRA_SC_SAST_LOGIN_OPTS}' >> $GITHUB_ENV
shell: bash
# Run fcli login command; note that the calling action/workflow is responsible for installing fcli
- uses: fortify/github-action/internal/run@main
- uses: fortify/github-action/internal/run@v1.2.0
with:
cmd: '"${FCLI_CMD}" sc-sast session login ${_SC_SAST_LOGIN_OPTS}'
# Clean up temporary environment variables
Expand Down
2 changes: 1 addition & 1 deletion internal/sc-sast-logout/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ runs:
using: composite
steps:
# Run fcli logout command; note that the calling action/workflow is responsible for installing fcli
- uses: fortify/github-action/internal/run@main
- uses: fortify/github-action/internal/run@v1.2.0
with:
# TODO If we add functionality for generating a CIToken in the sc-sast-login
# action, we should clean it up here.
Expand Down
2 changes: 1 addition & 1 deletion internal/ssc-login/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ runs:
fi
shell: bash
# Run fcli login command; note that the calling action/workflow is responsible for installing fcli
- uses: fortify/github-action/internal/run@main
- uses: fortify/github-action/internal/run@v1.2.0
with:
cmd: '"${FCLI_CMD}" ssc session login ${_SSC_LOGIN_OPTS}'
# Clean up temporary environment variables
Expand Down
2 changes: 1 addition & 1 deletion internal/ssc-logout/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ runs:
fi
shell: bash
# Run fcli login command; note that the calling action/workflow is responsible for installing fcli
- uses: fortify/github-action/internal/run@main
- uses: fortify/github-action/internal/run@v1.2.0
with:
cmd: '"${FCLI_CMD}" ssc session logout ${_SSC_LOGOUT_OPTS}'
# Clean up temporary environment variables
Expand Down
4 changes: 2 additions & 2 deletions package/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ author: 'Fortify'
runs:
using: composite
steps:
- uses: fortify/github-action/setup@main
- uses: fortify/github-action/setup@v1.2.0
with:
export-path: false
sc-client: action-default
- uses: fortify/github-action/internal/run@main
- uses: fortify/github-action/internal/run@v1.2.0
with:
cmd: '"${SC_CLIENT_CMD}" package ${EXTRA_PACKAGE_OPTS} -o package.zip'
branding:
Expand Down
14 changes: 7 additions & 7 deletions sc-sast-scan/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@ author: 'Fortify'
runs:
using: composite
steps:
- uses: fortify/github-action/setup@main
- uses: fortify/github-action/setup@v1.2.0
with:
export-path: false
fcli: action-default
- uses: fortify/github-action/internal/sc-sast-login@main
- uses: fortify/github-action/package@main
- uses: fortify/github-action/internal/run@main
- uses: fortify/github-action/internal/sc-sast-login@v1.2.0
- uses: fortify/github-action/package@v1.2.0
- uses: fortify/github-action/internal/run@v1.2.0
with:
cmd: '"${FCLI_CMD}" sc-sast scan start --publish-to "${SSC_APPVERSION}" -p package.zip -v "${SC_SAST_SENSOR_VERSION}" --store sc_sast_scan ${EXTRA_SC_SAST_SCAN_OPTS}'
- uses: fortify/github-action/internal/run@main
- uses: fortify/github-action/internal/run@v1.2.0
if: env.DO_WAIT == 'true' || env.DO_EXPORT == 'true'
with:
cmd: '"${FCLI_CMD}" sc-sast scan wait-for ::sc_sast_scan::'
- uses: fortify/github-action/internal/sc-sast-logout@main
- uses: fortify/github-action/internal/sc-sast-logout@v1.2.0
- if: env.DO_EXPORT == 'true'
uses: fortify/github-action/ssc-export@main
uses: fortify/github-action/ssc-export@v1.2.0

branding:
icon: 'shield'
Expand Down
4 changes: 2 additions & 2 deletions ssc-export/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ author: 'Fortify'
runs:
using: composite
steps:
- uses: fortify/github-action/setup@main
- uses: fortify/github-action/setup@v1.2.0
with:
export-path: false
vuln-exporter: action-default
Expand All @@ -14,7 +14,7 @@ runs:
*) echo '_APPVERSION_OPT="--ssc.version.id=${SSC_APPVERSION}"' >> $GITHUB_ENV ;;
esac
shell: bash
- uses: fortify/github-action/internal/run@main
- uses: fortify/github-action/internal/run@v1.2.0
with:
cmd: '"${VULN_EXPORTER_CMD}" SSCToGitHub "--ssc.baseUrl=${SSC_URL}" "--ssc.user=${SSC_USER}" "--ssc.password=${SSC_PASSWORD}" "--ssc.authToken=${SSC_TOKEN}" "${_APPVERSION_OPT}"'
- run: |
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.1.0
1.2.0

0 comments on commit b59558e

Please sign in to comment.