Merge remote-tracking branch 'origin/main' into rlim/ephemeral-volume…

…-support
chanzuckerberg · Apr 19, 2024 · f5eb698 · f5eb698
2 parents 5c7d3c6 + e524193
commit f5eb698
Show file tree

Hide file tree

Showing 117 changed files with 4,825 additions and 2,342 deletions.
diff --git a/.github/workflows/api-ci.yml b/.github/workflows/api-ci.yml
@@ -63,7 +63,7 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.52.2
+          version: v1.56.2
           github-token: ${{ secrets.GITHUB_TOKEN }}
           args: --timeout 10m0s --out-format=tab
           skip-pkg-cache: true

diff --git a/.github/workflows/cleanup-playground.yml b/.github/workflows/cleanup-playground.yml
@@ -52,7 +52,7 @@ jobs:
           role-duration-seconds: 1800
           role-session-name: HappyCleanupPlaygroundStacks
       - name: Clean up stale happy stacks
-        uses: chanzuckerberg/github-actions/.github/actions/happy-cleanup@happy-cleanup-v1.4.0
+        uses: chanzuckerberg/github-actions/.github/actions/happy-cleanup@happy-cleanup-v1.6.1
         with:
           tfe_token: ${{secrets.TFE_TOKEN_PLAYGROUND}}
           time: 1 minutes
@@ -83,7 +83,7 @@ jobs:
           role-duration-seconds: 1800
           role-session-name: HappyCleanupPlaygroundStacks
       - name: Clean up stale happy stacks
-        uses: chanzuckerberg/github-actions/.github/actions/happy-cleanup@happy-cleanup-v1.4.0
+        uses: chanzuckerberg/github-actions/.github/actions/happy-cleanup@happy-cleanup-v1.6.1
         with:
           tfe_token: ${{secrets.TFE_TOKEN_PLAYGROUND}}
           time: 1 minutes
@@ -114,7 +114,7 @@ jobs:
           role-duration-seconds: 1800
           role-session-name: HappyCleanupPlaygroundStacks
       - name: Clean up stale happy stacks
-        uses: chanzuckerberg/github-actions/.github/actions/happy-cleanup@happy-cleanup-v1.4.0
+        uses: chanzuckerberg/github-actions/.github/actions/happy-cleanup@happy-cleanup-v1.6.1
         with:
           tfe_token: ${{secrets.TFE_TOKEN_PLAYGROUND}}
           time: 1 minutes
diff --git a/.github/workflows/cli-ci.yml b/.github/workflows/cli-ci.yml
@@ -38,7 +38,7 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.52.2
+          version: v1.56.2
           github-token: ${{ secrets.GITHUB_TOKEN }}
           args: --timeout 10m0s --out-format=tab
           working-directory: cli

diff --git a/.github/workflows/hvm-ci.yml b/.github/workflows/hvm-ci.yml
@@ -38,7 +38,7 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.52.2
+          version: v1.56.2
           github-token: ${{ secrets.GITHUB_TOKEN }}
           args: --timeout 10m0s
           working-directory: hvm

diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
@@ -2,22 +2,29 @@ on:
   push:
     branches:
       - main
-  pull_request: {}
+  pull_request:
+    types: [opened, reopened, labeled, unlabeled, synchronize]
+    branches:
+      - main
+  label: {}
+
   schedule:
     - cron: '0 11 * * *'
   workflow_dispatch:
 
 name: integration-test
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: false
 jobs:
   filter:
     runs-on: [ARM64, self-hosted, Linux]
     outputs:
       should_run_integration_tests: ${{ steps.check_branch.outputs.result }}
     steps:
+    - name: Print GitHub Context
+      env:
+        GITHUB_CONTEXT: ${{ toJson(github.event.pull_request) }}
+      run: |
+        echo "$GITHUB_CONTEXT"
     - name: Check if integration-test file changed
       # the output of this step is only used if the run was triggered by a pull_request
       if: ${{ github.event_name == 'pull_request' }}
@@ -27,13 +34,14 @@ jobs:
         filters: |
           dependencies:
             - '.github/workflows/integration-test.yml'
-    - name: Check for if the head branch is the release-please branch
+    - name: Check for if the head branch is the release-please branch, or if the PR has the happy:integration-test label
       id: check_branch
       uses: actions/github-script@v6
       with:
         script: |
           if ('${{ github.event_name }}' === 'pull_request') {
-            return ${{ steps.integration_test_changes.outputs.dependencies == 'true' }} || '${{ github.head_ref }}' === 'release-please--branches--main'
+            return ${{ steps.integration_test_changes.outputs.dependencies == 'true' }} || ${{ github.head_ref == 'release-please--branches--main' }} ||
+              ${{ contains(github.event.pull_request.labels.*.name, 'happy:integration-test') }} ; 
           }
           // run for all non-pull_request triggers (ie, pushes to main, workflow_dispatch)
           return true

diff --git a/.github/workflows/provider-ci.yml b/.github/workflows/provider-ci.yml
@@ -36,7 +36,7 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.52.2
+          version: v1.56.2
           github-token: ${{ secrets.GITHUB_TOKEN }}
           args: --timeout 10m0s
           working-directory: terraform/provider

diff --git a/.github/workflows/shared-ci.yml b/.github/workflows/shared-ci.yml
@@ -39,7 +39,7 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.52.2
+          version: v1.56.2
           github-token: ${{ secrets.GITHUB_TOKEN }}
           args: --timeout 10m0s
           working-directory: shared

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,22 +1,22 @@
 {
-  "cli": "0.126.5",
-  "api": "0.126.5",
-  "shared": "0.126.5",
-  "terraform/provider": "0.126.5",
+  "cli": "0.127.3",
+  "api": "0.127.3",
+  "shared": "0.127.3",
+  "terraform/provider": "0.127.3",
   "terraform/modules/happy-dns-ecs": "1.5.0",
   "terraform/modules/happy-env-ecs": "3.3.0",
   "terraform/modules/happy-env-eks": "4.12.2",
   "terraform/modules/happy-github-ci-role": "1.5.0",
   "terraform/modules/happy-route53": "1.3.0",
   "terraform/modules/happy-service-ecs": "2.1.0",
-  "terraform/modules/happy-service-eks": "3.23.0",
+  "terraform/modules/happy-service-eks": "3.25.0",
   "terraform/modules/happy-stack-ecs": "2.2.0",
   "terraform/modules/happy-stack-helm-eks": "0.1.0",
-  "terraform/modules/happy-stack-eks": "4.28.0",
+  "terraform/modules/happy-stack-eks": "4.30.0",
   "terraform/modules/happy-tfe-okta-app": "3.0.0",
   "terraform/modules/happy-tfe-user": "1.3.0",
   "terraform/modules/happy-ingress-eks": "2.11.0",
-  "hvm": "0.126.5",
+  "hvm": "0.127.3",
   "terraform/modules/happy-cloudfront": "1.1.0",
   "helm-charts/charts/stack": "0.3.1"
 }
diff --git a/Dockerfile.api b/Dockerfile.api
@@ -1,4 +1,4 @@
-FROM golang:1.20-alpine AS builder
+FROM golang:1.22-alpine AS builder
 
 RUN apk update && apk add --no-cache git gcc
 RUN apk add --no-cache sqlite-libs sqlite-dev
@@ -20,7 +20,7 @@ RUN --mount=type=cache,mode=0755,target=/go/pkg/mod GO111MODULE=on CGO_ENABLED=0
 
 # --------------------------------------------------------------------------------------------------
 
-FROM golang:1.20-alpine
+FROM golang:1.22-alpine
 COPY --from=builder /code/api/dist/happy-api .
 COPY --from=builder /code/api/app-config*.yaml .
 

diff --git a/README.md b/README.md
@@ -287,6 +287,11 @@ happy update mystack
 happy delete mystack
 ```
 
+### Integration Testing
+
+All release-please pull requests automatically trigger an Integration Test workflow, which has to complete successfully for Happy
+to be released. This workflow does not run automatically on feature pull requests. If you wish to run an integration test on a pull request, add a `happy:integration-test` label to it.
+
 ### Contributing
 
 This project adheres to the Contributor Covenant code of conduct. By participating, you are expected to uphold this code. Please report unacceptable behavior to [email protected].

diff --git a/api/.golangci.yml b/api/.golangci.yml
@@ -1,7 +1,6 @@
 linters:
   enable:
     - deadcode
-    - depguard
     - errcheck
     - errorlint
     - forbidigo

diff --git a/api/CHANGELOG.md b/api/CHANGELOG.md
@@ -1,5 +1,40 @@
 # Changelog
 
+## [0.127.3](https://github.com/chanzuckerberg/happy/compare/api-v0.127.2...api-v0.127.3) (2024-03-27)
+
+
+### Miscellaneous Chores
+
+* **api:** Synchronize happy platform versions
+
+## [0.127.2](https://github.com/chanzuckerberg/happy/compare/api-v0.127.1...api-v0.127.2) (2024-03-22)
+
+
+### Bug Fixes
+
+* only print happy pod logs when feature flag is set and not prod ([#3161](https://github.com/chanzuckerberg/happy/issues/3161)) ([cee293a](https://github.com/chanzuckerberg/happy/commit/cee293a8d435278a4523828f45ffe135746f309f))
+
+## [0.127.1](https://github.com/chanzuckerberg/happy/compare/api-v0.127.0...api-v0.127.1) (2024-03-12)
+
+
+### Miscellaneous Chores
+
+* **api:** Synchronize happy platform versions
+
+## [0.127.0](https://github.com/chanzuckerberg/happy/compare/api-v0.126.6...api-v0.127.0) (2024-02-27)
+
+
+### Miscellaneous Chores
+
+* **api:** Synchronize happy platform versions
+
+## [0.126.6](https://github.com/chanzuckerberg/happy/compare/api-v0.126.5...api-v0.126.6) (2024-02-26)
+
+
+### Bug Fixes
+
+* Happy fails with "Invalid run parameters: Configuration version is still being processed." ([#3081](https://github.com/chanzuckerberg/happy/issues/3081)) ([7ea7531](https://github.com/chanzuckerberg/happy/commit/7ea7531bddf4968c9331e4fa07b51185d56c935c))
+
 ## [0.126.5](https://github.com/chanzuckerberg/happy/compare/api-v0.126.4...api-v0.126.5) (2024-02-09)