Merge pull request #567 from 23andMe/SEC-1819-rebase-upstream

SEC-1819 Fixing git tree.

.github/workflows/deploy-ttam.yml

@@ -55,24 +55,17 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      ###################################################################
-      # Checkout the code base (required for docker path context below) #
-      ###################################################################
-      - name: Checkout Code
-        uses: actions/checkout@v2
-
       ###########################################
       # Build and Push containers to registries #
       ###########################################
       - name: Build and push
         uses: docker/build-push-action@v2
         with:
-          context: .
-          file: ./Dockerfile-slim
           build-args: |
             BUILD_DATE=${{ env.BUILD_DATE }}
             BUILD_REVISION=${{ github.sha }}
             BUILD_VERSION=${{ github.sha }}
+          target: final_slim
           push: true
           tags: |
             ghcr.io/23andme/super-linter:latest

Dockerfile

@@ -253,8 +253,8 @@ RUN apk add --no-cache rakudo zef \
     ##############################
     # Install google-java-format #
     ##############################
-    && GOOGLE_JAVA_FORMAT_VERSION=$(curl -s https://github.com/google/google-java-format/releases/latest \
-    | cut -d '"' -f 2 | cut -d '/' -f 8 | sed -e 's/v//g') \
+    && GOOGLE_JAVA_FORMAT_VERSION=$(basename $(curl -s -w %{redirect_url} https://github.com/google/google-java-format/releases/latest) \
+    | sed -e 's/v//g') \
     && curl --retry 5 --retry-delay 5 -sSL \
     "https://github.com/google/google-java-format/releases/download/v$GOOGLE_JAVA_FORMAT_VERSION/google-java-format-$GOOGLE_JAVA_FORMAT_VERSION-all-deps.jar" \
     --output /usr/bin/google-java-format \
@@ -407,6 +407,10 @@ ENV PATH="${PATH}:/venvs/snakemake/bin"
 ENV PATH="${PATH}:/venvs/sqlfluff/bin"
 ENV PATH="${PATH}:/venvs/yamllint/bin"
 ENV PATH="${PATH}:/venvs/yq/bin"
+# 23andMe packages
+ENV PATH="${PATH}:/venvs/bandit/bin"
+ENV PATH="${PATH}:/venvs/lintly23/bin"
+ENV PATH="${PATH}:/venvs/semgrep/bin"
 
 #############################
 # Copy scripts to container #

TEMPLATES/.bandit.yml

@@ -86,6 +86,8 @@ tests:
 
 # (optional) list skipped test IDs here, eg '[B101, B406]':
 skips:
+  - B101
+  - B301
   - B311
 ### (optional) plugin settings - some test plugins require configuration data
 ### that may be given here, per-plugin. All bandit test plugins have a built in

dependencies/python/bandit.txt

@@ -0,0 +1,7 @@
+bandit==1.7.4
+gitdb==4.0.9
+gitpython==3.1.27
+pbr==5.9.0
+pyyaml==6.0
+smmap==5.0.0
+stevedore==3.5.0

dependencies/python/lintly23.txt

@@ -0,0 +1,23 @@
+autologging==1.3.2
+cached-property==1.5.2
+certifi==2021.10.8
+cffi==1.15.0
+charset-normalizer==2.0.12
+ci-py==1.0.0
+click==8.1.3
+deprecated==1.2.13
+idna==3.3
+jinja2==3.1.2
+lintly23==0.7.14
+markupsafe==2.1.1
+pycparser==2.21
+pygithub==1.55
+pyjwt==2.3.0
+pynacl==1.5.0
+python-gitlab==2.10.1
+requests-toolbelt==0.9.1
+requests==2.27.1
+six==1.16.0
+unidiff==0.6.0
+urllib3==1.26.9
+wrapt==1.14.1

dependencies/python/semgrep.txt

@@ -0,0 +1,26 @@
+attrs==21.4.0
+boltons==21.0.0
+bracex==2.2.1
+certifi==2021.10.8
+charset-normalizer==2.0.12
+click-option-group==0.5.3
+click==8.1.3
+colorama==0.4.4
+defusedxml==0.7.1
+face==20.1.1
+glom==22.1.0
+idna==3.3
+jsonschema==3.2.0
+packaging==21.3
+peewee==3.14.10
+pyparsing==3.0.8
+pyrsistent==0.18.1
+requests==2.27.1
+ruamel.yaml.clib==0.2.6
+ruamel.yaml==0.17.21
+semgrep==0.91.0
+setuptools==62.1.0
+six==1.16.0
+tqdm==4.64.0
+urllib3==1.26.9
+wcmatch==8.3

lib/linter.sh

@@ -277,7 +277,7 @@ LANGUAGE_ARRAY=('ANSIBLE' 'ARM' 'BASH' 'BASH_EXEC' 'CLANG_FORMAT'
   'PHP_PSALM' 'POWERSHELL' 'PROTOBUF' 'PYTHON_BANDIT' 'PYTHON_BLACK' 'PYTHON_PYLINT'
   'PYTHON_FLAKE8' 'PYTHON_ISORT' 'PYTHON_MYPY' 'R' 'RAKU' 'RUBY' 'RUST_2015'
   'RUST_2018' 'RUST_2021' 'RUST_CLIPPY' 'SCALAFMT' 'SEMGREP' 'SHELL_SHFMT'
-  'SNAKEMAKE_LINT' 'SNAKEMAKE_SNAKEFMT' 'STATES' 'SQL' 'SQLFLUFF' 'TEKTON'
+  'SNAKEMAKE_LINT' 'STATES' 'SQL' 'SQLFLUFF' 'TEKTON'
   'TERRAFORM_TFLINT' 'TERRAFORM_TERRASCAN' 'TERRAGRUNT' 'TSX' 'TYPESCRIPT_ES'
   "${TYPESCRIPT_STYLE_NAME}" 'XML' 'YAML')