From db9434877dc97612c942d8d1d06ea4e59bbceb02 Mon Sep 17 00:00:00 2001
From: hc-github-team-secure-vault-core
 <82990506+hc-github-team-secure-vault-core@users.noreply.github.com>
Date: Thu, 30 Mar 2023 16:20:20 -0400
Subject: [PATCH] backport of commit 525bce060dc89f5da900183effea75f353067e52
 (#19869)

Co-authored-by: Kuba Wieczorek <kuba.wieczorek@hashicorp.com>
---
 .github/workflows/ci.yml      |  3 ---
 .github/workflows/test-go.yml | 18 +++++++++---------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6ffc22715c..469d906145 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -119,7 +119,6 @@ jobs:
     if: ${{ ! (startsWith( github.ref_name, 'ui/' ) || startsWith( github.ref_name, 'docs/' ) || startsWith( github.ref_name, 'backport/docs/') ) }}
     uses: ./.github/workflows/test-go.yml
     with:
-      name: ''
       total-runners: 16
       go-arch: amd64
       go-build-tags: '${{ needs.setup.outputs.go-build-tags }},deadlock'
@@ -135,7 +134,6 @@ jobs:
     if: ${{ ! (startsWith( github.ref_name, 'ui/' ) || startsWith( github.ref_name, 'docs/' ) || startsWith( github.ref_name, 'backport/docs/') ) }}
     uses: ./.github/workflows/test-go.yml
     with:
-      name: race
       total-runners: 16
       env-vars: |
         {
@@ -158,7 +156,6 @@ jobs:
     - setup-go-cache
     uses: ./.github/workflows/test-go.yml
     with:
-      name: fips
       total-runners: 16
       env-vars: |
         {
diff --git a/.github/workflows/test-go.yml b/.github/workflows/test-go.yml
index ec12a8a2d0..c23092a1fe 100644
--- a/.github/workflows/test-go.yml
+++ b/.github/workflows/test-go.yml
@@ -1,10 +1,6 @@
 on:
   workflow_call:
     inputs:
-      name:
-        description: A suffix to be added to the matrix job names.
-        required: true
-        type: string
       go-arch:
         description: The execution architecture (arm, amd64, etc.)
         required: true
@@ -26,15 +22,19 @@ on:
         description: A space-separated list of additional build flags.
         required: false
         type: string
+      go-build-tags:
+          description: A comma-separated list of additional build tags to consider satisfied during the build.
+          required: false
+          type: string
+      matrix-job-name:
+          description: A suffix to be added to the matrix job names.
+          required: false
+          type: string
       runs-on:
         description: An expression indicating which kind of runners to use.
         required: false
         type: string
         default: ubuntu-latest
-      go-build-tags:
-        description: A comma-separated list of additional build tags to consider satisfied during the build.
-        required: false
-        type: string
 
 env: ${{ fromJSON(inputs.env-vars) }}
 
@@ -67,7 +67,7 @@ jobs:
     permissions:
       id-token: write  # Note: this permission is explicitly required for Vault auth
       contents: read
-    name: "${{ matrix.runner-index }} ${{ inputs.name }}"
+    name: "${{ matrix.runner-index }} ${{ inputs.matrix-job-name }}"
     needs:
     - runner-indexes
     runs-on: ${{ fromJSON(inputs.runs-on) }}