Merge pull request #593 from hashicorp/brandonc/upgrade_actions

Upgrade available actions to v3
hashicorp · Nov 22, 2022 · b36fd8c · b36fd8c
2 parents c3c75e0 + 65fe9e4
commit b36fd8c
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
     timeout-minutes: 5
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up Go
         uses: actions/setup-go@v3
@@ -52,7 +52,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up Go
         uses: actions/setup-go@v3

diff --git a/.github/workflows/create-jira-issue.yml b/.github/workflows/create-jira-issue.yml
@@ -3,8 +3,6 @@ name: Create Jira Issue
 on:
   issues:
     types: [opened, closed, deleted, reopened]
-  pull_request_target:
-    types: [opened, closed, reopened]
   issue_comment:
     types: [created]
 

diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -8,13 +8,13 @@ jobs:
     name: lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set local Go version
         run: |
           VERSION=`cat .go-version| awk '{printf$1}'`
-          echo "go_version=$VERSION" >> $GITHUB_ENV      
+          echo "go_version=$VERSION" >> $GITHUB_ENV
       - name: Setup Go Environment
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
           go-version: "${{ env.go_version }}"
       - name: golangci-lint

diff --git a/.github/workflows/nightly-tfe-ci.yml b/.github/workflows/nightly-tfe-ci.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up Go
         uses: actions/setup-go@v3
@@ -34,7 +34,7 @@ jobs:
     timeout-minutes: 5
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up Go
         uses: actions/setup-go@v3
@@ -72,7 +72,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up Go
         uses: actions/setup-go@v3

diff --git a/helper_test.go b/helper_test.go
@@ -1164,7 +1164,7 @@ func createPlanExport(t *testing.T, client *Client, r *Run) (*PlanExport, func()
 		t.Fatal(err)
 	}
 
-	timeout := 3 * time.Minute
+	timeout := 10 * time.Minute
 
 	ctxPollExportReady, cancelPollExportReady := context.WithTimeout(ctx, timeout)
 	t.Cleanup(cancelPollExportReady)
@@ -1184,7 +1184,7 @@ func createPlanExport(t *testing.T, client *Client, r *Run) (*PlanExport, func()
 				t.Fatal(err)
 			}
 
-			if pe.Status == PlanExportFinished {
+			if pe.Status == PlanExportFinished || pe.Status == PlanExportQueued {
 				return pe, func() {
 					if rCleanup != nil {
 						rCleanup()
@@ -1193,7 +1193,7 @@ func createPlanExport(t *testing.T, client *Client, r *Run) (*PlanExport, func()
 			} else if pe.Status == PlanExportErrored {
 				t.Fatal("Plan export failed")
 			} else {
-				t.Logf("Waiting for plan export finished but was %s", pe.Status)
+				t.Logf("Waiting for plan export finished or queued but was %s", pe.Status)
 			}
 		}
 	}

diff --git a/variable_set_test.go b/variable_set_test.go
@@ -288,8 +288,10 @@ func TestVariableSetsApplyToAndRemoveFromWorkspaces(t *testing.T) {
 
 		// Variable set should be applied to [wTest1, wTest2]
 		assert.Equal(t, 2, len(vsAfter.Workspaces))
-		assert.Equal(t, wTest1.ID, vsAfter.Workspaces[0].ID)
-		assert.Equal(t, wTest2.ID, vsAfter.Workspaces[1].ID)
+		wsIDs := []string{vsAfter.Workspaces[0].ID, vsAfter.Workspaces[1].ID}
+
+		assert.Contains(t, wsIDs, wTest1.ID)
+		assert.Contains(t, wsIDs, wTest2.ID)
 	})
 
 	t.Run("with first workspace removed", func(t *testing.T) {