Merge branch 'nutanix-cloud-native:main' into KRBN-8015

nutanix-cloud-native · Mar 21, 2024 · ec87ae3 · ec87ae3
2 parents 7688d3e + 89f8887
commit ec87ae3
Show file tree

Hide file tree

Showing 9 changed files with 174 additions and 240 deletions.
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -219,3 +219,18 @@ jobs:
         run: |
           devbox run -- \
             kind delete cluster --name chart-testing || true
+
+  govulncheck:
+    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        module: [api, common, .]
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+
+      - id: govulncheck
+        uses: golang/govulncheck-action@v1
+        with:
+          work-dir: ${{ matrix.module }}
+          go-version-file: go.mod
diff --git a/.github/workflows/dependabot-automation.yml b/.github/workflows/dependabot-automation.yml
@@ -17,26 +17,6 @@ defaults:
     shell: bash
 
 jobs:
-  auto-approve:
-    if: ${{ github.event.pull_request.user.login == 'dependabot[bot]' }}
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Dependabot metadata
-        id: dependabot-metadata
-        uses: dependabot/fetch-metadata@v1
-      - uses: actions/checkout@v4
-      - name: Approve a PR if not already approved
-        run: |
-          gh pr checkout "$PR_URL" # sets the upstream metadata for `gh pr status`
-          if [ "$(gh pr status --json reviewDecision -q .currentBranch.reviewDecision)" != "APPROVED" ]; then
-            gh pr review --approve "$PR_URL"
-          else
-            echo "PR already approved, skipping additional approvals to minimize emails/notification noise."
-          fi
-        env:
-          PR_URL: ${{github.event.pull_request.html_url}}
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
-
   enable-automerge:
     if: ${{ github.event.pull_request.user.login == 'dependabot[bot]'}}
     runs-on: ubuntu-22.04

diff --git a/.github/workflows/devbox-update.yml b/.github/workflows/devbox-update.yml
@@ -73,7 +73,6 @@ jobs:
 
       - name: Create PR using app token
         if: steps.devbox-versions-changed.outputs.number_changed > 0
-        id: create-pr
         env:
           GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
         run: |
@@ -82,15 +81,3 @@ jobs:
             --body "This PR was automatically created by the scheduled devbox update workflow." \
             --label ignore-for-release)"
           gh pr merge --auto --squash "${pr_url}"
-          echo "pr_url=${pr_url}" >>"${GITHUB_OUTPUT}"
-
-      - name: Approve PR using workflow token
-        if: steps.devbox-versions-changed.outputs.number_changed > 0
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          if [ "$(gh pr status --json reviewDecision -q .currentBranch.reviewDecision)" != "APPROVED" ]; then
-            gh pr review --approve "${{ steps.create-pr.outputs.pr_url }}"
-          else
-            echo "PR already approved, skipping additional approvals to minimize emails/notification noise."
-          fi
diff --git a/devbox.json b/devbox.json
@@ -4,7 +4,6 @@
     "chart-testing@latest",
     "clusterctl@latest",
     "coreutils@latest",
-    "crane@latest",
     "envsubst@latest",
     "findutils@latest",
     "gh@latest",
@@ -17,6 +16,7 @@
     "golines@latest",
     "goreleaser@latest",
     "gotestsum@latest",
+    "govulncheck@latest",
     "helm-docs@latest",
     "hugo@latest",
     "kind@latest",
@@ -32,9 +32,9 @@
     "yamale@latest",
     "yamllint@latest",
     "path:./hack/flakes#clusterawsadm",
-    "path:./hack/flakes#goprintconst",
     "path:./hack/flakes#go-mod-upgrade",
     "path:./hack/flakes#golangci-lint",
+    "path:./hack/flakes#goprintconst",
     "path:./hack/flakes#setup-envtest"
   ],
   "shell": {