move DefaultWorkspaceFolder to options package

Signed-off-by: Cian Johnston <[email protected]>

Author: johnstcn

envbuilder.go

@@ -32,7 +32,6 @@ import (
 	"github.com/GoogleContainerTools/kaniko/pkg/creds"
 	"github.com/GoogleContainerTools/kaniko/pkg/executor"
 	"github.com/GoogleContainerTools/kaniko/pkg/util"
-	giturls "github.com/chainguard-dev/git-urls"
 	"github.com/coder/envbuilder/devcontainer"
 	"github.com/coder/envbuilder/internal/ebutil"
 	"github.com/coder/envbuilder/internal/log"
@@ -95,11 +94,7 @@ func Run(ctx context.Context, opts options.Options) error {
 		opts.Filesystem = &osfsWithChmod{osfs.New("/")}
 	}
 	if opts.WorkspaceFolder == "" {
-		f, err := DefaultWorkspaceFolder(opts.GitURL)
-		if err != nil {
-			return err
-		}
-		opts.WorkspaceFolder = f
+		opts.WorkspaceFolder = options.DefaultWorkspaceFolder(opts.GitURL)
 	}
 
 	stageNumber := 0
@@ -930,25 +925,6 @@ ENTRYPOINT [%q]`, exePath, exePath, exePath)
 	return nil
 }
 
-// DefaultWorkspaceFolder returns the default workspace folder
-// for a given repository URL.
-func DefaultWorkspaceFolder(repoURL string) (string, error) {
-	if repoURL == "" {
-		return constants.EmptyWorkspaceDir, nil
-	}
-	parsed, err := giturls.Parse(repoURL)
-	if err != nil {
-		return "", err
-	}
-	name := strings.Split(parsed.Path, "/")
-	hasOwnerAndRepo := len(name) >= 2
-	if !hasOwnerAndRepo {
-		return constants.EmptyWorkspaceDir, nil
-	}
-	repo := strings.TrimSuffix(name[len(name)-1], ".git")
-	return fmt.Sprintf("/workspaces/%s", repo), nil
-}
-
 type userInfo struct {
 	uid  int
 	gid  int

envbuilder_test.go

@@ -1,74 +1 @@
 package envbuilder_test
-
-import (
-	"testing"
-
-	"github.com/coder/envbuilder"
-	"github.com/coder/envbuilder/constants"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestDefaultWorkspaceFolder(t *testing.T) {
-	t.Parallel()
-
-	successTests := []struct {
-		name     string
-		gitURL   string
-		expected string
-	}{
-		{
-			name:     "HTTP",
-			gitURL:   "https://github.com/coder/envbuilder.git",
-			expected: "/workspaces/envbuilder",
-		},
-		{
-			name:     "SSH",
-			gitURL:   "[email protected]:coder/envbuilder.git",
-			expected: "/workspaces/envbuilder",
-		},
-		{
-			name:     "username and password",
-			gitURL:   "https://username:[email protected]/coder/envbuilder.git",
-			expected: "/workspaces/envbuilder",
-		},
-		{
-			name:     "fragment",
-			gitURL:   "https://github.com/coder/envbuilder.git#feature-branch",
-			expected: "/workspaces/envbuilder",
-		},
-		{
-			name:     "empty",
-			gitURL:   "",
-			expected: constants.EmptyWorkspaceDir,
-		},
-	}
-	for _, tt := range successTests {
-		t.Run(tt.name, func(t *testing.T) {
-			dir, err := envbuilder.DefaultWorkspaceFolder(tt.gitURL)
-			require.NoError(t, err)
-			require.Equal(t, tt.expected, dir)
-		})
-	}
-
-	invalidTests := []struct {
-		name       string
-		invalidURL string
-	}{
-		{
-			name:       "simple text",
-			invalidURL: "not a valid URL",
-		},
-		{
-			name:       "website URL",
-			invalidURL: "www.google.com",
-		},
-	}
-	for _, tt := range invalidTests {
-		t.Run(tt.name, func(t *testing.T) {
-			dir, err := envbuilder.DefaultWorkspaceFolder(tt.invalidURL)
-			require.NoError(t, err)
-			require.Equal(t, constants.EmptyWorkspaceDir, dir)
-		})
-	}
-}