From 52fb946f51dad85a217b0ba88f298cd3c64f2045 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Jul 2021 17:01:18 +0000 Subject: [PATCH 1/8] Bump python from 3.9-alpine to 3.9.6-alpine Bumps python from 3.9-alpine to 3.9.6-alpine. --- updated-dependencies: - dependency-name: python dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1c48a45..59ea4cd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ ARG VERSION=unspecified -FROM python:3.9-alpine +FROM python:3.9.6-alpine ARG VERSION From a0f24937d650459b8f70fe38f93fcb54fc6ac3d5 Mon Sep 17 00:00:00 2001 From: dav3r Date: Wed, 4 Aug 2021 09:30:18 -0400 Subject: [PATCH 2/8] Fix a typo --- setup-env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup-env b/setup-env index 5d7f673..f526cdb 100755 --- a/setup-env +++ b/setup-env @@ -6,7 +6,7 @@ set -o pipefail USAGE=$( cat << 'END_OF_LINE' -Configure a developement environment for this repository. +Configure a development environment for this repository. It does the following: - Verifies pyenv and pyenv-virtualenv are installed. From 3ebf37da6ea14dd4bbdb607271d8faa9e1484dd2 Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Thu, 5 Aug 2021 11:02:01 -0400 Subject: [PATCH 3/8] Remove support for the linux/s390x platform Issue cisagov/skeleton-docker#69 has been created to remind us to re-add it once it is again supported by the official Python Docker image. --- .github/workflows/build.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2aa6319..ade2bdc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,8 +29,11 @@ env: CURL_CACHE_DIR: ~/.cache/curl IMAGE_NAME: cisagov/example PIP_CACHE_DIR: ~/.cache/pip + # TODO: Add back in support for the linux/s390x platform once the + # official Python Docker image again supports it. See + # cisagov/skeleton-docker#69 for more details. PLATFORMS: "linux/amd64,linux/arm/v6,linux/arm/v7,\ - linux/arm64,linux/ppc64le,linux/s390x" + linux/arm64,linux/ppc64le" PRE_COMMIT_CACHE_DIR: ~/.cache/pre-commit RUN_TMATE: ${{ secrets.RUN_TMATE }} From f7140d8116532d5d680e10109912fd2741c353ac Mon Sep 17 00:00:00 2001 From: Nicholas McDonnell <50747025+mcdonnnj@users.noreply.github.com> Date: Mon, 9 Aug 2021 23:42:42 -0400 Subject: [PATCH 4/8] Use the hashicorp/setup-terraform Action Instead of manually installing a Terraform binary we can leverage the Action provided by Hashicorp to do the same thing. --- .github/workflows/build.yml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1160e61..6aa2aeb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -75,17 +75,9 @@ jobs: ${{ env.CURL_CACHE_DIR }}/"${PACKER_ZIP}" sudo mv /usr/local/bin/packer /usr/local/bin/packer-default sudo ln -s /opt/packer/packer /usr/local/bin/packer - - name: Install Terraform - run: | - TERRAFORM_ZIP="terraform_${TERRAFORM_VERSION}_linux_amd64.zip" - curl --output ${{ env.CURL_CACHE_DIR }}/"${TERRAFORM_ZIP}" \ - --time-cond ${{ env.CURL_CACHE_DIR }}/"${TERRAFORM_ZIP}" \ - --location \ - "https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/${TERRAFORM_ZIP}" - sudo unzip -d /opt/terraform \ - ${{ env.CURL_CACHE_DIR }}/"${TERRAFORM_ZIP}" - sudo mv /usr/local/bin/terraform /usr/local/bin/terraform-default - sudo ln -s /opt/terraform/terraform /usr/local/bin/terraform + - uses: hashicorp/setup-terraform@v1 + with: + terraform_version: ${{ env.TERRAFORM_VERSION }} - name: Install shfmt run: go install mvdan.cc/sh/v3/cmd/shfmt@${SHFMT_VERSION} - name: Install Terraform-docs From 7f324b9807549b6b06acd3a43b3636743322e826 Mon Sep 17 00:00:00 2001 From: Nicholas McDonnell <50747025+mcdonnnj@users.noreply.github.com> Date: Tue, 10 Aug 2021 11:36:33 -0400 Subject: [PATCH 5/8] Add a markdownlint rule for horizontal rules This sets a specific rule for MD035 (Horizontal rule style) instead of the default value of "consistent". --- .mdl_config.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.mdl_config.yaml b/.mdl_config.yaml index a2f08f3..f40ea77 100644 --- a/.mdl_config.yaml +++ b/.mdl_config.yaml @@ -38,3 +38,8 @@ MD033: allowed_elements: - h1 - img + +# MD035/hr-style - Horizontal rule style +MD035: + # Enforce dashes for horizontal rules + style: "---" From 9848ff69448b32b45e31013a4f8709963849659e Mon Sep 17 00:00:00 2001 From: Nicholas McDonnell <50747025+mcdonnnj@users.noreply.github.com> Date: Tue, 10 Aug 2021 11:38:39 -0400 Subject: [PATCH 6/8] Add a markdownlint rule for code blocks This sets a specific rule for MD046 (code block style) instead of the default value of "consistent". --- .mdl_config.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.mdl_config.yaml b/.mdl_config.yaml index f40ea77..b36f943 100644 --- a/.mdl_config.yaml +++ b/.mdl_config.yaml @@ -43,3 +43,8 @@ MD033: MD035: # Enforce dashes for horizontal rules style: "---" + +# MD046/code-block-style Code block style +MD046: + # Enforce the fenced style for code blocks + style: "fenced" From 23f9cfd015d5b0de488823130ff0eee4bef2da67 Mon Sep 17 00:00:00 2001 From: Nicholas McDonnell <50747025+mcdonnnj@users.noreply.github.com> Date: Mon, 9 Aug 2021 23:46:40 -0400 Subject: [PATCH 7/8] Update pre-commit hooks Update pre-commit hooks using `pre-commit autoupdate`. The `ansible-lint` hook is intentionally held back due to issues with switching to v5. --- .pre-commit-config.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8ed26ad..5f06453 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -31,7 +31,7 @@ repos: # Text file hooks - repo: https://github.com/igorshubovych/markdownlint-cli - rev: v0.27.1 + rev: v0.28.1 hooks: - id: markdownlint args: @@ -41,7 +41,7 @@ repos: hooks: - id: prettier - repo: https://github.com/adrienverge/yamllint - rev: v1.26.1 + rev: v1.26.2 hooks: - id: yamllint args: @@ -49,7 +49,7 @@ repos: # pre-commit hooks - repo: https://github.com/pre-commit/pre-commit - rev: v2.13.0 + rev: v2.14.0 hooks: - id: validate_manifest @@ -91,7 +91,7 @@ repos: additional_dependencies: - flake8-docstrings - repo: https://github.com/PyCQA/isort - rev: 5.9.2 + rev: 5.9.3 hooks: - id: isort - repo: https://github.com/pre-commit/mirrors-mypy @@ -99,7 +99,7 @@ repos: hooks: - id: mypy - repo: https://github.com/asottile/pyupgrade - rev: v2.21.2 + rev: v2.23.3 hooks: - id: pyupgrade From a3825d8f6295049eacf1ba7f98009e896dc9019d Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Mon, 23 Aug 2021 11:26:52 -0400 Subject: [PATCH 8/8] Revert "Remove support for the linux/s390x platform" This reverts commit 3ebf37da6ea14dd4bbdb607271d8faa9e1484dd2. There was finally a successful build of the official Python Docker image upstream, so we can add this back in. Resolves cisagov/skeleton-docker#69. --- .github/workflows/build.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ade2bdc..2aa6319 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,11 +29,8 @@ env: CURL_CACHE_DIR: ~/.cache/curl IMAGE_NAME: cisagov/example PIP_CACHE_DIR: ~/.cache/pip - # TODO: Add back in support for the linux/s390x platform once the - # official Python Docker image again supports it. See - # cisagov/skeleton-docker#69 for more details. PLATFORMS: "linux/amd64,linux/arm/v6,linux/arm/v7,\ - linux/arm64,linux/ppc64le" + linux/arm64,linux/ppc64le,linux/s390x" PRE_COMMIT_CACHE_DIR: ~/.cache/pre-commit RUN_TMATE: ${{ secrets.RUN_TMATE }}