Merge pull request #9 from cisagov/lineage/skeleton

Lineage pull request for: skeleton
cisagov · Aug 26, 2021 · 25057b6 · 25057b6
2 parents c781cab + adbb607
commit 25057b6
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 19 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -79,17 +79,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
@@ -118,7 +110,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version:
+          - 3.6
+          - 3.7
+          - 3.8
+          - 3.9
     steps:
       - uses: actions/checkout@v2
       - id: setup-python
@@ -201,7 +197,11 @@ jobs:
     needs: [lint, test]
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version:
+          - 3.6
+          - 3.7
+          - 3.8
+          - 3.9
     steps:
       - uses: actions/checkout@v2
       - id: setup-python

diff --git a/.mdl_config.yaml b/.mdl_config.yaml
@@ -38,3 +38,13 @@ MD033:
   allowed_elements:
     - h1
     - img
+
+# MD035/hr-style - Horizontal rule style
+MD035:
+  # Enforce dashes for horizontal rules
+  style: "---"
+
+# MD046/code-block-style Code block style
+MD046:
+  # Enforce the fenced style for code blocks
+  style: "fenced"
diff --git 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,15 +41,15 @@ repos:
     hooks:
       - id: prettier
   - repo: https://github.com/adrienverge/yamllint
-    rev: v1.26.1
+    rev: v1.26.2
     hooks:
       - id: yamllint
         args:
           - --strict
 
   # pre-commit hooks
   - repo: https://github.com/pre-commit/pre-commit
-    rev: v2.13.0
+    rev: v2.14.0
     hooks:
       - id: validate_manifest
 
@@ -101,7 +101,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
@@ -111,7 +111,7 @@ repos:
         additional_dependencies:
           - types-requests
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.21.2
+    rev: v2.23.3
     hooks:
       - id: pyupgrade
 

diff --git 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.