test: remove git initializer TargetMode and CloneTaget

Signed-off-by: JenTing Hsiao <[email protected]>

Author: jenting

test/tests/components/ws-manager/content_test.go

@@ -57,14 +57,14 @@ func TestBackup(t *testing.T) {
 						api.Done(t)
 					})
 
+					// TODO: change to use server API to launch the workspace, so we could run the integration test as the user code flow
+					//       which is client -> server -> ws-manager rather than client -> ws-manager directly
 					ws1, stopWs1, err := integration.LaunchWorkspaceDirectly(t, ctx, api, integration.WithRequestModifier(func(w *wsmanapi.StartWorkspaceRequest) error {
 						w.Spec.FeatureFlags = test.FF
 						w.Spec.Initializer = &csapi.WorkspaceInitializer{
 							Spec: &csapi.WorkspaceInitializer_Git{
 								Git: &csapi.GitInitializer{
 									RemoteUri:        test.ContextURL,
-									TargetMode:       csapi.CloneTargetMode_REMOTE_BRANCH,
-									CloneTaget:       "main",
 									CheckoutLocation: test.CheckoutLocation,
 									Config:           &csapi.GitConfig{},
 								},
@@ -209,13 +209,13 @@ func TestExistingWorkspaceEnablePVC(t *testing.T) {
 				})
 
 				// Create a new workspace without the PVC feature flag
+				// TODO: change to use server API to launch the workspace, so we could run the integration test as the user code flow
+				//       which is client -> server -> ws-manager rather than client -> ws-manager directly
 				ws1, stopWs1, err := integration.LaunchWorkspaceDirectly(t, ctx, api, integration.WithRequestModifier(func(w *wsmanapi.StartWorkspaceRequest) error {
 					w.Spec.Initializer = &csapi.WorkspaceInitializer{
 						Spec: &csapi.WorkspaceInitializer_Git{
 							Git: &csapi.GitInitializer{
 								RemoteUri:        test.ContextURL,
-								TargetMode:       csapi.CloneTargetMode_REMOTE_BRANCH,
-								CloneTaget:       "main",
 								CheckoutLocation: test.CheckoutLocation,
 								Config:           &csapi.GitConfig{},
 							},

test/tests/components/ws-manager/prebuild_test.go

@@ -66,6 +66,8 @@ func TestPrebuildWorkspaceTaskSuccess(t *testing.T) {
 						api.Done(t)
 					})
 
+					// TODO: change to use server API to launch the workspace, so we could run the integration test as the user code flow
+					//       which is client -> server -> ws-manager rather than client -> ws-manager directly
 					_, stopWs, err := integration.LaunchWorkspaceDirectly(t, ctx, api, integration.WithRequestModifier(func(req *wsmanapi.StartWorkspaceRequest) error {
 						req.Type = wsmanapi.WorkspaceType_PREBUILD
 
@@ -83,8 +85,6 @@ func TestPrebuildWorkspaceTaskSuccess(t *testing.T) {
 							Spec: &csapi.WorkspaceInitializer_Git{
 								Git: &csapi.GitInitializer{
 									RemoteUri:        test.ContextURL,
-									TargetMode:       csapi.CloneTargetMode_REMOTE_BRANCH,
-									CloneTaget:       "main",
 									CheckoutLocation: test.CheckoutLocation,
 									Config:           &csapi.GitConfig{},
 								},
@@ -233,6 +233,8 @@ func TestOpenWorkspaceFromPrebuild(t *testing.T) {
 					})
 
 					// create a prebuild and stop workspace
+					// TODO: change to use server API to launch the workspace, so we could run the integration test as the user code flow
+					//       which is client -> server -> ws-manager rather than client -> ws-manager directly
 					_, prebuildStopWs, err := integration.LaunchWorkspaceDirectly(t, ctx, api, integration.WithRequestModifier(func(req *wsmanapi.StartWorkspaceRequest) error {
 						req.Type = wsmanapi.WorkspaceType_PREBUILD
 						req.Spec.Envvars = append(req.Spec.Envvars, &wsmanapi.EnvironmentVariable{
@@ -244,8 +246,6 @@ func TestOpenWorkspaceFromPrebuild(t *testing.T) {
 							Spec: &csapi.WorkspaceInitializer_Git{
 								Git: &csapi.GitInitializer{
 									RemoteUri:        test.ContextURL,
-									TargetMode:       csapi.CloneTargetMode_REMOTE_BRANCH,
-									CloneTaget:       "main",
 									CheckoutLocation: test.CheckoutLocation,
 									Config:           &csapi.GitConfig{},
 								},
@@ -265,6 +265,8 @@ func TestOpenWorkspaceFromPrebuild(t *testing.T) {
 					t.Logf("prebuild snapshot: %s, vsName: %s, vsHandle: %s", prebuildSnapshot, vsInfo.VolumeSnapshotName, vsInfo.VolumeSnapshotHandle)
 
 					// launch the workspace from prebuild
+					// TODO: change to use server API to launch the workspace, so we could run the integration test as the user code flow
+					//       which is client -> server -> ws-manager rather than client -> ws-manager directly
 					ws, stopWs, err := integration.LaunchWorkspaceDirectly(t, ctx, api, integration.WithRequestModifier(func(req *wsmanapi.StartWorkspaceRequest) error {
 						req.Spec.FeatureFlags = test.FF
 						req.Spec.Initializer = &csapi.WorkspaceInitializer{
@@ -277,8 +279,6 @@ func TestOpenWorkspaceFromPrebuild(t *testing.T) {
 									Git: []*csapi.GitInitializer{
 										{
 											RemoteUri:        test.ContextURL,
-											TargetMode:       csapi.CloneTargetMode_REMOTE_BRANCH,
-											CloneTaget:       "main",
 											CheckoutLocation: test.CheckoutLocation,
 											Config:           &csapi.GitConfig{},
 										},

test/tests/components/ws-manager/tasks_test.go

@@ -80,8 +80,6 @@ func TestRegularWorkspaceTasks(t *testing.T) {
 							Spec: &csapi.WorkspaceInitializer_Git{
 								Git: &csapi.GitInitializer{
 									RemoteUri:        testRepo,
-									TargetMode:       csapi.CloneTargetMode_REMOTE_BRANCH,
-									CloneTaget:       "main",
 									CheckoutLocation: testRepoName,
 									Config:           &csapi.GitConfig{},
 								},
@@ -91,6 +89,8 @@ func TestRegularWorkspaceTasks(t *testing.T) {
 						return nil
 					}
 
+					// TODO: change to use server API to launch the workspace, so we could run the integration test as the user code flow
+					//       which is client -> server -> ws-manager rather than client -> ws-manager directly
 					nfo, stopWs, err := integration.LaunchWorkspaceDirectly(t, ctx, api, integration.WithRequestModifier(addInitTask))
 					if err != nil {
 						t.Fatal(err)