Keep workspace domain as default even when readin ID from env

Author: ryanslade

xata/utils.go

@@ -209,15 +209,14 @@ func loadDatabaseConfig() (databaseConfig, error) {
 	}
 
 	// Setup with env var
-	// XATA_WORKSPACE_ID to set the workspace Id
+	// XATA_WORKSPACE_ID to set the workspace ID
 	wsID := getEnvVar(EnvXataWorkspaceID, "")
 	if wsID != "" {
-		region := getRegion()
-		branch := getBranchName()
 		db := databaseConfig{
-			workspaceID: wsID,
-			region:      region,
-			branchName:  branch,
+			workspaceID:     wsID,
+			region:          getRegion(),
+			branchName:      getBranchName(),
+			domainWorkspace: defaultDataPlaneDomain,
 		}
 		return db, nil
 	}

xata/utils_test.go

@@ -184,19 +184,11 @@ func Test_loadDatabaseConfig_with_envvars(t *testing.T) {
 	// test workspace id from env var
 	t.Run("load config from WORKSPACE_ID env var", func(t *testing.T) {
 		dbCfg, err := loadDatabaseConfig()
-		if err != nil {
-			t.Fatalf("Error loading config: %v", err)
-		}
-
-		if dbCfg.workspaceID != setWsId {
-			t.Fatalf("Expected Workspace ID: %s, got: %s", setWsId, dbCfg.workspaceID)
-		}
-		if dbCfg.branchName != defaultBranchName {
-			t.Fatalf("Expected branch name: %s, got: %s", defaultBranchName, dbCfg.branchName)
-		}
-		if dbCfg.region != defaultRegion {
-			t.Fatalf("Expected region: %s, got: %s", defaultRegion, dbCfg.region)
-		}
+		assert.NoError(t, err)
+		assert.Equal(t, setWsId, dbCfg.workspaceID)
+		assert.Equal(t, defaultBranchName, dbCfg.branchName)
+		assert.Equal(t, defaultRegion, dbCfg.region)
+		assert.Equal(t, defaultDataPlaneDomain, dbCfg.domainWorkspace)
 	})
 
 	setBranch := "branch123"