ci: test with both Terraform and OpenTofu (#24)

Author: kangasta

.github/workflows/test.yml

@@ -40,8 +40,17 @@ jobs:
         with:
           version: latest
 
-  test-upcloud:
-    name: Acceptance Tests (UpCloud)
+  test:
+    name: Acceptance Tests
+    strategy:
+      matrix:
+        target:
+          - UpCloud
+          - Minio
+          - moto
+        cli:
+          - terraform
+          - tofu
     needs: build
     runs-on: ubuntu-latest
     timeout-minutes: 15
@@ -54,8 +63,18 @@ jobs:
       - uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3.1.2
         with:
           terraform_wrapper: false
+        if: matrix.cli == 'terraform'
+      - uses: opentofu/setup-opentofu@592200bd4b9bbf4772ace78f887668b1aee8f716 # v1.0.5
+        if: matrix.cli == 'tofu'
+      - name: Set TF_ACC_* environment for OpenTofu
+        run: |
+          echo "TF_ACC_TERRAFORM_PATH=$(which tofu)" >> "$GITHUB_ENV"
+          echo "TF_ACC_PROVIDER_NAMESPACE=hashicorp" >> "$GITHUB_ENV"
+          echo "TF_ACC_PROVIDER_HOST=registry.opentofu.org" >> "$GITHUB_ENV"
+        if: matrix.cli == 'tofu'
       - run: go mod download
-      - env:
+      - name: Test against UpCloud Managed Object Storage
+        env:
           TF_ACC: "1"
           TEST_TARGET: UpCloud
           OBJSTO_ACCESS_KEY: ${{ secrets.UPCLOUD_ACCESS_KEY }}
@@ -64,23 +83,9 @@ jobs:
           OBJSTO_REGION: ${{ secrets.UPCLOUD_REGION }}
         run: go test -v -cover ./internal/provider/
         timeout-minutes: 10
-
-  test-minio:
-    name: Acceptance Tests (Minio)
-    needs: build
-    runs-on: ubuntu-latest
-    timeout-minutes: 15
-    steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
-      - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
-        with:
-          go-version-file: 'go.mod'
-          cache: true
-      - uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3.1.2
-        with:
-          terraform_wrapper: false
-      - run: go mod download
-      - env:
+        if: matrix.target == 'UpCloud'
+      - name: Test against Minio
+        env:
           TF_ACC: "1"
           TEST_TARGET: Minio
           OBJSTO_ACCESS_KEY: access_key
@@ -92,23 +97,9 @@ jobs:
           
           go test -v -cover ./internal/provider/
         timeout-minutes: 10
-
-  test-moto:
-    name: Acceptance Tests (moto)
-    needs: build
-    runs-on: ubuntu-latest
-    timeout-minutes: 15
-    steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
-      - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
-        with:
-          go-version-file: 'go.mod'
-          cache: true
-      - uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3.1.2
-        with:
-          terraform_wrapper: false
-      - run: go mod download
-      - env:
+        if: matrix.target == 'Minio'
+      - name: Test against moto
+        env:
           TF_ACC: "1"
           TEST_TARGET: moto
           OBJSTO_ACCESS_KEY: access_key
@@ -120,3 +111,4 @@ jobs:
           
           go test -v -cover ./internal/provider/
         timeout-minutes: 10
+        if: matrix.target == 'moto'

internal/provider/bucket_resource_test.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"math/rand"
 	"os"
+	"path/filepath"
 	"regexp"
 	"testing"
 
@@ -14,7 +15,7 @@ import (
 // From Kubernetes random suffixes.
 const letterBytes = "bcdfghjklmnpqrstvwxz2456789"
 
-func RandomSuffix(n int) string {
+func randomSuffix(n int) string {
 	b := make([]byte, n)
 	for i := range b {
 		b[i] = letterBytes[rand.Intn(len(letterBytes))]
@@ -23,20 +24,25 @@ func RandomSuffix(n int) string {
 }
 
 func withSuffix(name string) string {
+	nameAndCli := fmt.Sprintf("%s-terraform", name)
+	if cliPath := os.Getenv("TF_ACC_TERRAFORM_PATH"); cliPath != "" {
+		nameAndCli = fmt.Sprintf("%s-%s", name, filepath.Base(cliPath))
+	}
+
 	job := os.Getenv("GITHUB_JOB")
 	runNumber := os.Getenv("GITHUB_RUN_NUMBER")
 	runAttempt := os.Getenv("GITHUB_RUN_ATTEMPT")
 	if runNumber != "" && runAttempt != "" {
-		return fmt.Sprintf("%s-github-%s-%s.%s", name, job, runNumber, runAttempt)
+		return fmt.Sprintf("%s-github-%s-%s.%s", nameAndCli, job, runNumber, runAttempt)
 	}
 
-	randStr := RandomSuffix(8)
+	randStr := randomSuffix(8)
 
 	if os.Getenv("CI") != "" {
-		return fmt.Sprintf("%s-ci-%s", name, randStr)
+		return fmt.Sprintf("%s-ci-%s", nameAndCli, randStr)
 	}
 
-	return fmt.Sprintf("%s-%s", name, randStr)
+	return fmt.Sprintf("%s-%s", nameAndCli, randStr)
 }
 
 func TestAccBucketResource_crud(t *testing.T) {