Merge pull request #35 from BrownUniversity/34-update-for-fall-2024

chore: update for Fall 2024

.github/workflows/pr-labeler.yml

@@ -7,7 +7,7 @@ jobs:
   pr-labeler:
     runs-on: ubuntu-latest
     steps:
-      - uses: TimonVS/pr-labeler-action@v3
+      - uses: TimonVS/pr-labeler-action@v5
         with:
           configuration-path: .github/pr-labeler.yml # optional, .github/pr-labeler.yml is the default value
         env:

.github/workflows/release-drafter.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       # Drafts your next Release notes as Pull Requests are merged into "main"
-      - uses: release-drafter/release-drafter@v5
+      - uses: release-drafter/release-drafter@v6
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

.github/workflows/kitchen-tests.yml → .github/workflows/terraform-tests.yml

@@ -1,4 +1,4 @@
-name: kitchen-tests
+name: terraform-tests
 
 on:
   push:
@@ -26,9 +26,9 @@ jobs:
       full_image_id: ${{ steps.save_full_image_id.outputs.full_image_id }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - uses: dorny/paths-filter@v2.2.0
+      - uses: dorny/paths-filter@v3
         id: filter
         with:
           base: ${{ github.ref }}
@@ -39,21 +39,21 @@ jobs:
               - 'Gemfile*'
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Log into the container registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
@@ -85,8 +85,7 @@ jobs:
     container:
       image: "${{ needs.docker.outputs.full_image_id }}"
     steps:
-      - uses: actions/checkout@v3
-
+      - uses: actions/checkout@v4
       - name: Create Credential File
         run: |
           echo "$GCP_CREDENTIAL_JSON" | base64 -d > /tmp/credentials.json
@@ -104,8 +103,10 @@ jobs:
           gcloud auth activate-service-account ${{ secrets.GCP_PF_SA }} --key-file=/tmp/credentials.json
           kubectl config view
           ls -la /tmp
-      - name: Run Kitchen
-        run: kitchen test sample-jhub
+      - name: Run Terraform Test
+        run: |
+          terraform init
+          terraform test -filter=tests/test-sample-jhub.tftest.hcl -verbose
         env:
           TF_VAR_billing_account: ${{ secrets.GCP_BILLING_ACCOUNT }}
           TF_VAR_org_id: ${{ secrets.GCP_ORG_ID }}
@@ -124,7 +125,7 @@ jobs:
     container:
       image: "${{ needs.docker.outputs.full_image_id }}"
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Create Credential File
         run: |
@@ -143,8 +144,10 @@ jobs:
           gcloud auth activate-service-account ${{ secrets.GCP_PF_SA }} --key-file=/tmp/credentials.json
           kubectl config view
           ls -la /tmp
-      - name: Run Kitchen
-        run: kitchen test nfs
+      - name: Run Terraform Test
+        run: |
+          terraform init
+          terraform test -filter=tests/test-sample-jhub-nfs.tftest.hcl -verbose
         env:
           TF_VAR_billing_account: ${{ secrets.GCP_BILLING_ACCOUNT }}
           TF_VAR_org_id: ${{ secrets.GCP_ORG_ID }}

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/antonbabenko/pre-commit-terraform
-  rev: v1.81.0 # Get the latest from: https://github.com/antonbabenko/pre-commit-terraform/releases
+  rev: v1.92.0 # Get the latest from: https://github.com/antonbabenko/pre-commit-terraform/releases
   hooks:
     - id: terraform_fmt
     - id: terraform_docs

.tool-versions

@@ -1,2 +1 @@
-terraform 1.5.0
-ruby 3.2.2-r0
+terraform 1.9.2

Brewfile

@@ -2,7 +2,7 @@ brew "pre-commit"
 brew "terraform-docs"
 brew "tflint"
 brew "tfsec"
-brew "lastpass-cli"
+brew "1password-cli"
 brew "helm"
 
 cask "google-cloud-sdk"

Dockerfile

@@ -1,4 +1,4 @@
-FROM gcr.io/google.com/cloudsdktool/cloud-sdk:439.0.0-alpine
+FROM gcr.io/google.com/cloudsdktool/cloud-sdk:488.0.0-alpine
 
 # Putting the version of alpine here.
 # Ruby version available to apk can be found here
@@ -18,37 +18,13 @@ RUN gcloud components install gke-gcloud-auth-plugin
 RUN gcloud components install kubectl
 
 #terraform
-ENV TERRAFORM_VERSION=1.5.0
+ENV TERRAFORM_VERSION=1.9.2
 ENV TERRAFORM_URL="https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip"
 RUN curl -L ${TERRAFORM_URL} -o terraform_${TERRAFORM_VERSION}_linux_amd64.zip \
     && unzip terraform_${TERRAFORM_VERSION}_linux_amd64.zip \
     && mv terraform /usr/bin/terraform\
     && chmod +x /usr/bin/terraform \
     && rm -rf terraform*
 
-
-COPY .ruby-version .ruby-version
-
-# Update and install all of the required packages.
-# At the end, remove the apk cache
-RUN apk upgrade && \
-    apk add --update \
-    openssh ca-certificates bash jq \
-    curl-dev \
-    "ruby-dev=$(cat .ruby-version)" \
-    "ruby-full=$(cat .ruby-version)" \
-    build-base \
-    python3 && \
-    rm -rf /var/cache/apk/*
-
-
-RUN mkdir /usr/app
-WORKDIR /usr/app
-
-COPY Gemfile ./
-RUN gem install bundler && \
-    bundle config set system 'true' && \
-    bundle install
-
 ENTRYPOINT ["/bin/bash"]