Merge pull request #38 from planetscale/fix-ci

run expensive tests on merge queue
planetscale · Oct 12, 2023 · e5f62fc · e5f62fc
2 parents 3a8dfb8 + 8d3138d
commit e5f62fc
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/.github/workflows/test-expensive.yml → .github/workflows/test-extensive.yml b/.github/workflows/test-expensive.yml → .github/workflows/test-extensive.yml
@@ -1,7 +1,19 @@
-name: extensive
+name: extensive tests
 
 on:
+  push:
+    branches:
+      - main
   merge_group:
+    type:
+      - checks_requested
+
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - labeled
 
 permissions:
   contents: read
@@ -39,6 +51,7 @@ jobs:
           - '1.3.*'
           - '1.4.*'
           - '1.5.*'
+          - '1.6.*'
     steps:
       - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
       - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,4 +1,4 @@
-name: basic
+name: basic tests
 
 on:
   pull_request:
@@ -7,8 +7,6 @@ on:
   push:
     paths-ignore:
       - 'README.md'
-  merge_group:
-    types: [checks_requested]
 
 permissions:
   contents: read
@@ -42,7 +40,7 @@ jobs:
           cache: true
       - uses: hashicorp/setup-terraform@633666f66e0061ca3b725c73b2ec20cd13a8fdd1 # v2.0.3
         with:
-          terraform_version: 1.5.3
+          terraform_version: 1.6.1
           terraform_wrapper: false
       - run: go generate -x ./...
       - name: git diff
@@ -65,6 +63,7 @@ jobs:
           - '1.3.*'
           - '1.4.*'
           - '1.5.*'
+          - '1.6.*'
     steps:
       - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
       - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1

diff --git a/internal/provider/provider.go b/internal/provider/provider.go
@@ -36,7 +36,7 @@ type PlanetScaleProviderModel struct {
 	AccessToken types.String `tfsdk:"access_token"`
 
 	ServiceTokenName  types.String `tfsdk:"service_token_name"`
-	ServiceTokenValue types.String `tfsdk:"service_token_value"`
+	ServiceTokenValue types.String `tfsdk:"service_token"`
 }
 
 func (p *PlanetScaleProvider) Metadata(ctx context.Context, req provider.MetadataRequest, resp *provider.MetadataResponse) {