add: table tests for s3 config variations

Author: iwilltry42

pkg/client/client_test.go

@@ -15,6 +15,7 @@ import (
 var c, _ = New(context.Background(), Options{
 	S3BucketName:   os.Getenv("WORKSPACE_PROVIDER_S3_BUCKET"),
 	S3BaseEndpoint: os.Getenv("WORKSPACE_PROVIDER_S3_BASE_ENDPOINT"),
+	S3UsePathStyle: os.Getenv("WORKSPACE_PROVIDER_S3_USE_PATH_STYLE") == "true",
 })
 
 func TestProviders(t *testing.T) {
@@ -73,7 +74,7 @@ func TestCreateAndRmS3Provider(t *testing.T) {
 	bucket, dir, _ := strings.Cut(strings.TrimPrefix(id, S3Provider+"://"), "/")
 	testS3Provider := &s3Provider{
 		bucket: bucket,
-		client: s3Prv.client,
+		client: s3TestSetups[0].provider.client,
 	}
 
 	// Nothing should be created
@@ -308,6 +309,10 @@ func TestCreateAndRmS3ProviderFromDirectoryProvider(t *testing.T) {
 		t.Errorf("unexpected error when listing workspaceContent: %v", err)
 	}
 
+	if len(workspaceContent) == 0 {
+		t.Fatalf("workspaceContent is empty")
+	}
+
 	if len(workspaceContent) != 1 {
 		t.Errorf("unexpected number of workspaceContent: %d", len(workspaceContent))
 	}

pkg/client/directory_test.go

@@ -13,13 +13,18 @@ import (
 	"testing"
 )
 
+type s3TestSetup struct {
+	name      string
+	factory   workspaceFactory
+	testingID string
+	provider  *s3Provider
+}
+
 var (
 	directoryFactory   workspaceFactory
-	s3Factory          workspaceFactory
 	directoryTestingID string
-	s3TestingID        string
 	dirPrv             workspaceClient
-	s3Prv              *s3Provider
+	s3TestSetups       []s3TestSetup
 	skipS3Tests        = os.Getenv("WORKSPACE_PROVIDER_S3_BUCKET") == ""
 )
 
@@ -29,12 +34,31 @@ func TestMain(m *testing.M) {
 	dirPrv, _ = directoryFactory.New(directoryTestingID)
 
 	if !skipS3Tests {
-		s3Factory, _ = newS3(context.Background(), os.Getenv("WORKSPACE_PROVIDER_S3_BUCKET"), os.Getenv("WORKSPACE_PROVIDER_S3_BASE_ENDPOINT"), os.Getenv("WORKSPACE_PROVIDER_S3_USE_PATH_STYLE") == "true")
-		// This won't ever error because it doesn't create anything.
-		s3TestingID = s3Factory.Create()
+		if os.Getenv("WORKSPACE_PROVIDER_S3_USE_PATH_STYLE") != "true" {
+			s3Factory, _ := newS3(context.Background(), os.Getenv("WORKSPACE_PROVIDER_S3_BUCKET"), os.Getenv("WORKSPACE_PROVIDER_S3_BASE_ENDPOINT"), false)
+			// This won't ever error because it doesn't create anything.
+			s3TestingID := s3Factory.Create()
+
+			s3Client, _ := s3Factory.New(s3TestingID)
+			s3Prv := s3Client.(*s3Provider)
+			s3TestSetups = append(s3TestSetups, s3TestSetup{
+				name:      "default",
+				factory:   s3Factory,
+				testingID: s3TestingID,
+				provider:  s3Prv,
+			})
+		}
+
+		s3PathStyleFactory, _ := newS3(context.Background(), os.Getenv("WORKSPACE_PROVIDER_S3_BUCKET"), os.Getenv("WORKSPACE_PROVIDER_S3_BASE_ENDPOINT"), true)
+		s3PathStyleTestingID := s3PathStyleFactory.Create()
+		s3PathStyleClient, _ := s3PathStyleFactory.New(s3PathStyleTestingID)
+		s3TestSetups = append(s3TestSetups, s3TestSetup{
+			name:      "use-path-style",
+			factory:   s3PathStyleFactory,
+			testingID: s3PathStyleTestingID,
+			provider:  s3PathStyleClient.(*s3Provider),
+		})
 
-		s3Client, _ := s3Factory.New(s3TestingID)
-		s3Prv = s3Client.(*s3Provider)
 	}
 
 	exitCode := m.Run()
@@ -45,8 +69,10 @@ func TestMain(m *testing.M) {
 	}
 
 	if !skipS3Tests {
-		if err := s3Factory.Rm(context.Background(), s3TestingID); err != nil {
-			errs = append(errs, fmt.Errorf("error removing s3 workspace: %v", err))
+		for _, s3TS := range s3TestSetups {
+			if err := s3TS.factory.Rm(context.Background(), s3TS.testingID); err != nil {
+				errs = append(errs, fmt.Errorf("error removing s3 workspace: %v", err))
+			}
 		}
 	}