diff --git a/.github/workflows/go-ci-metrics.yaml b/.github/workflows/go-ci-metrics.yaml index 51aea2c0317..89db841063b 100644 --- a/.github/workflows/go-ci-metrics.yaml +++ b/.github/workflows/go-ci-metrics.yaml @@ -13,7 +13,7 @@ jobs: steps: - name: Checkout Source uses: actions/checkout@v2.3.4 - - uses: actions/setup-python@v2.2.2 + - uses: actions/setup-python@v2.3.0 with: python-version: "3.x" - name: Run test metrics script diff --git a/.github/workflows/mkdocs.yml b/.github/workflows/mkdocs.yml index 6708019454c..f95c4f4515d 100644 --- a/.github/workflows/mkdocs.yml +++ b/.github/workflows/mkdocs.yml @@ -28,7 +28,7 @@ jobs: value: https://github.com/Checkmarx/kics/actions/runs/${{ github.run_id }}" - name: View HEAD Commit value: https://github.com/Checkmarx/kics/commit/${{ github.sha }} - - uses: actions/setup-python@v2.2.2 + - uses: actions/setup-python@v2.3.0 with: python-version: 3.x - name: Install dependencies diff --git a/.github/workflows/release-apispec.yml b/.github/workflows/release-apispec.yml index 1f1887e86c5..6a2840346fb 100644 --- a/.github/workflows/release-apispec.yml +++ b/.github/workflows/release-apispec.yml @@ -174,7 +174,7 @@ jobs: echo "scratch,${COMMIT_SHA8},${DATE},${DIGEST}" >> docs/docker/apispec.csv echo "alpine,${COMMIT_SHA8},${DATE},${ALPINE_DIGEST}" >> docs/docker/apispec.csv echo "debian,${COMMIT_SHA8},${DATE},${DEBIAN_DIGEST}" >> docs/docker/apispec.csv - - uses: actions/setup-python@v2.2.2 + - uses: actions/setup-python@v2.3.0 with: python-version: 3.x - name: Generate .md table diff --git a/.github/workflows/release-dkr-image.yml b/.github/workflows/release-dkr-image.yml index db081c2aca1..9fb8eaab11f 100644 --- a/.github/workflows/release-dkr-image.yml +++ b/.github/workflows/release-dkr-image.yml @@ -112,7 +112,7 @@ jobs: echo "${VERSION}-alpine,${ALPINE_DIGEST}" >> docs/docker/digests.csv echo "${VERSION}-debian,${DEBIAN_DIGEST}" >> docs/docker/digests.csv echo "${VERSION}-ubi7,${UBI7_DIGEST}" >> docs/docker/digests.csv - - uses: actions/setup-python@v2.2.2 + - uses: actions/setup-python@v2.3.0 with: python-version: 3.x - name: Generate .md table diff --git a/.github/workflows/release-nightly.yml b/.github/workflows/release-nightly.yml index 254a1a0874a..82231443d95 100644 --- a/.github/workflows/release-nightly.yml +++ b/.github/workflows/release-nightly.yml @@ -211,7 +211,7 @@ jobs: echo "alpine,${COMMIT_SHA8},${DATE},${ALPINE_DIGEST}" >> docs/docker/nightly.csv echo "debian,${COMMIT_SHA8},${DATE},${DEBIAN_DIGEST}" >> docs/docker/nightly.csv echo "ubi7,${COMMIT_SHA8},${DATE},${UBI7_DIGEST}" >> docs/docker/nightly.csv - - uses: actions/setup-python@v2.2.2 + - uses: actions/setup-python@v2.3.0 with: python-version: 3.x - name: Generate .md table diff --git a/.github/workflows/update-docs-queries.yaml b/.github/workflows/update-docs-queries.yaml index 4dbfbcbf4cc..54f9d5a6855 100644 --- a/.github/workflows/update-docs-queries.yaml +++ b/.github/workflows/update-docs-queries.yaml @@ -19,7 +19,7 @@ jobs: - uses: actions/checkout@v2.3.4 with: fetch-depth: 0 - - uses: actions/setup-python@v2.2.2 + - uses: actions/setup-python@v2.3.0 with: python-version: "3.x" - name: Update docs diff --git a/.github/workflows/update-docs-release.yaml b/.github/workflows/update-docs-release.yaml index ecf91a0212e..f70559381ce 100644 --- a/.github/workflows/update-docs-release.yaml +++ b/.github/workflows/update-docs-release.yaml @@ -32,7 +32,7 @@ jobs: echo "curr tag ${{ steps.version.outputs.ctag }}" echo "prev ver ${{ steps.version.outputs.pversion }}" echo "curr ver ${{ steps.version.outputs.cversion }}" - - uses: actions/setup-python@v2.2.2 + - uses: actions/setup-python@v2.3.0 with: python-version: 3.x - name: Install dependencies diff --git a/.github/workflows/update-install-script.yaml b/.github/workflows/update-install-script.yaml index e926d12adc5..569e9920b8e 100644 --- a/.github/workflows/update-install-script.yaml +++ b/.github/workflows/update-install-script.yaml @@ -30,7 +30,7 @@ jobs: && chmod +x godownloader \ && rm -vf $(basename "${FULL_URL}") \ && cd "${PROJDIR}" - - uses: actions/setup-python@v2.2.2 + - uses: actions/setup-python@v2.3.0 with: python-version: "3.x" - name: Install dependencies diff --git a/.github/workflows/validate-cfn-samples.yml b/.github/workflows/validate-cfn-samples.yml index d451e8df73c..3ac2a67d942 100644 --- a/.github/workflows/validate-cfn-samples.yml +++ b/.github/workflows/validate-cfn-samples.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v2.3.4 with: persist-credentials: false - - uses: actions/setup-python@v2.2.2 + - uses: actions/setup-python@v2.3.0 with: python-version: '3.x' - name: Get commit changed files diff --git a/Dockerfile b/Dockerfile index d26365ddf44..75f7d8a56de 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,7 +32,7 @@ USER Checkmarx HEALTHCHECK CMD wget -q --method=HEAD localhost/system-status.txt # Runtime image -FROM alpine:3.14.2 +FROM alpine:3.14.3 # Install Git RUN apk add --no-cache \ diff --git a/Dockerfile.apispec b/Dockerfile.apispec index 3dc5e56cd06..04d9f3754a2 100644 --- a/Dockerfile.apispec +++ b/Dockerfile.apispec @@ -29,7 +29,7 @@ USER Checkmarx #Healthcheck the container HEALTHCHECK CMD wget -q --method=HEAD localhost/system-status.txt #runtime image -FROM alpine:3.14.2 +FROM alpine:3.14.3 RUN addgroup -S Checkmarx && adduser -S Checkmarx -G Checkmarx diff --git a/e2e/utils/html.go b/e2e/utils/html.go index 2c310afc001..0808740d2d9 100644 --- a/e2e/utils/html.go +++ b/e2e/utils/html.go @@ -12,15 +12,15 @@ import ( "golang.org/x/net/html" ) -var availablePlatforms = map[string]string{ - "Ansible": "ansible", - "CloudFormation": "cloudFormation", - "Common": "common", - "Dockerfile": "dockerfile", - "Kubernetes": "k8s", - "OpenAPI": "openAPI", - "Terraform": "terraform", - "AzureResourceManager": "azureResourceManager", +var availablePlatforms = initPlatforms() + +func initPlatforms() map[string]string { + platforms := make(map[string]string) + for k, v := range constants.AvailablePlatforms { + platforms[k] = v + } + platforms["Common"] = "common" + return platforms } // HTMLValidation executes many asserts to validate the HTML Report diff --git a/go.mod b/go.mod index c567c462f1b..921616b1692 100644 --- a/go.mod +++ b/go.mod @@ -20,7 +20,7 @@ require ( github.com/mailru/easyjson v0.7.7 github.com/mitchellh/go-wordwrap v1.0.1 // indirect github.com/moby/buildkit v0.9.3 - github.com/open-policy-agent/opa v0.34.1 + github.com/open-policy-agent/opa v0.34.2 github.com/pkg/errors v0.9.1 github.com/rs/zerolog v1.26.0 github.com/spf13/cobra v1.2.1 diff --git a/go.sum b/go.sum index b507861cca0..a867bfa8dcd 100644 --- a/go.sum +++ b/go.sum @@ -1145,8 +1145,8 @@ github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y github.com/onsi/gomega v1.10.3 h1:gph6h/qe9GSUw1NhH1gp+qb+h8rXD8Cy60Z32Qw3ELA= github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= -github.com/open-policy-agent/opa v0.34.1 h1:u+x9Y1ynLv9w7GilJdtOrnM5PfQfOJYZg9eY1LPDAAQ= -github.com/open-policy-agent/opa v0.34.1/go.mod h1:buysXn+6zB/b+6JgLkP4WgKZ9+UgUtFAgtemYGrL9Ik= +github.com/open-policy-agent/opa v0.34.2 h1:asRmfDRUSd8gwPNRrpUsDxwOUkxLgc1x1FYkwjcnag4= +github.com/open-policy-agent/opa v0.34.2/go.mod h1:buysXn+6zB/b+6JgLkP4WgKZ9+UgUtFAgtemYGrL9Ik= github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= diff --git a/internal/constants/constants.go b/internal/constants/constants.go index 5459677c2f4..5095bf36356 100644 --- a/internal/constants/constants.go +++ b/internal/constants/constants.go @@ -41,12 +41,12 @@ var ( // AvailablePlatforms - All platforms available AvailablePlatforms = map[string]string{ "Ansible": "ansible", - "CloudFormation": "cloudformation", + "CloudFormation": "cloudFormation", "Dockerfile": "dockerfile", "Kubernetes": "k8s", + "OpenAPI": "openAPI", "Terraform": "terraform", - "OpenAPI": "openapi", - "AzureResourceManager": "azureresourcemanager", + "AzureResourceManager": "azureResourceManager", } // AvailableSeverities - All severities available diff --git a/test/queries_content_test.go b/test/queries_content_test.go index 4ab30015f22..d8fa86c06cb 100644 --- a/test/queries_content_test.go +++ b/test/queries_content_test.go @@ -52,17 +52,8 @@ var ( } // TODO uncomment this test once all metadata are fixed - availablePlatforms = map[string]string{ - "Ansible": "ansible", - "CloudFormation": "cloudFormation", - "Common": "common", - "Dockerfile": "dockerfile", - "Kubernetes": "k8s", - "OpenAPI": "openAPI", - "Terraform": "terraform", - "AzureResourceManager": "azureResourceManager", - } - platformKeys = MapToStringSlice(availablePlatforms) + availablePlatforms = initPlatforms() + platformKeys = MapToStringSlice(availablePlatforms) CategoriesKeys = MapToStringSlice(constants.AvailableCategories) @@ -120,6 +111,15 @@ var ( } ) +func initPlatforms() map[string]string { + platforms := make(map[string]string) + for k, v := range constants.AvailablePlatforms { + platforms[k] = v + } + platforms["Common"] = "common" + return platforms +} + func TestQueriesContent(t *testing.T) { log.Logger = log.Output(zerolog.ConsoleWriter{Out: io.Discard})