Skip to content

Commit e84d21d

Browse files
FuristoFuristo
committed
Use checkout location during content init
1 parent cbc136e commit e84d21d

File tree

5 files changed

+42
-60
lines changed

5 files changed

+42
-60
lines changed

‎components/content-service/pkg/initializer/initializer.go

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -516,3 +516,22 @@ func PlaceWorkspaceReadyFile(ctx context.Context, wspath string, initsrc csapi.W
516516

517517
return nil
518518
}
519+
520+
func GetCheckoutLocationFromInitializer(init *csapi.WorkspaceInitializer) string {
521+
switch {
522+
case init.GetGit() != nil:
523+
return init.GetGit().CheckoutLocation
524+
case init.GetPrebuild() != nil && len(init.GetPrebuild().Git) > 0:
525+
return init.GetPrebuild().Git[0].CheckoutLocation
526+
case init.GetBackup() != nil:
527+
return init.GetBackup().CheckoutLocation
528+
case init.GetComposite() != nil:
529+
for _, c := range init.GetComposite().Initializer {
530+
loc := GetCheckoutLocationFromInitializer(c)
531+
if loc != "" {
532+
return loc
533+
}
534+
}
535+
}
536+
return ""
537+
}

‎components/ws-daemon/pkg/content/service.go

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ func (s *WorkspaceService) creator(req *api.InitWorkspaceRequest) session.Worksp
253253
return func(ctx context.Context, location string) (res *session.Workspace, err error) {
254254
return &session.Workspace{
255255
Location: location,
256-
CheckoutLocation: getCheckoutLocation(req),
256+
CheckoutLocation: wsinit.GetCheckoutLocationFromInitializer(req.Initializer),
257257
CreatedAt: time.Now(),
258258
Owner: req.Metadata.Owner,
259259
WorkspaceID: req.Metadata.MetaId,
@@ -273,24 +273,6 @@ func ServiceDirName(instanceID string) string {
273273
return instanceID + "-daemon"
274274
}
275275

276-
// getCheckoutLocation returns the first checkout location found of any Git initializer configured by this request
277-
func getCheckoutLocation(req *api.InitWorkspaceRequest) string {
278-
spec := req.Initializer.Spec
279-
if ir, ok := spec.(*csapi.WorkspaceInitializer_Git); ok {
280-
if ir.Git != nil {
281-
return ir.Git.CheckoutLocation
282-
}
283-
}
284-
if ir, ok := spec.(*csapi.WorkspaceInitializer_Prebuild); ok {
285-
if ir.Prebuild != nil {
286-
if len(ir.Prebuild.Git) > 0 {
287-
return ir.Prebuild.Git[0].CheckoutLocation
288-
}
289-
}
290-
}
291-
return ""
292-
}
293-
294276
// DisposeWorkspace cleans up a workspace, possibly after taking a final backup
295277
func (s *WorkspaceService) DisposeWorkspace(ctx context.Context, req *api.DisposeWorkspaceRequest) (resp *api.DisposeWorkspaceResponse, err error) {
296278
//nolint:ineffassign

‎components/ws-daemon/pkg/internal/session/workspace.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ func (s *Workspace) UpdateGitStatus(ctx context.Context) (res *csapi.GitStatus,
268268

269269
loc = filepath.Join(loc, s.CheckoutLocation)
270270
if !git.IsWorkingCopy(loc) {
271-
log.WithField("loc", loc).WithFields(s.OWI()).Debug("did not find a Git working copy - not updating Git status")
271+
log.WithField("loc", loc).WithField("checkout location", s.CheckoutLocation).WithFields(s.OWI()).Debug("did not find a Git working copy - not updating Git status")
272272
return nil, nil
273273
}
274274

‎components/ws-manager/pkg/manager/create.go

Lines changed: 12 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"github.com/gitpod-io/gitpod/common-go/kubernetes"
2828
wsk8s "github.com/gitpod-io/gitpod/common-go/kubernetes"
2929
"github.com/gitpod-io/gitpod/common-go/tracing"
30-
csapi "github.com/gitpod-io/gitpod/content-service/api"
30+
content "github.com/gitpod-io/gitpod/content-service/pkg/initializer"
3131
regapi "github.com/gitpod-io/gitpod/registry-facade/api"
3232
"github.com/gitpod-io/gitpod/ws-manager/api"
3333
config "github.com/gitpod-io/gitpod/ws-manager/api/config"
@@ -575,9 +575,11 @@ func (m *Manager) createWorkspaceEnvironment(startContext *startWorkspaceContext
575575
return filepath.Join("/workspace", strings.TrimPrefix(segment, "/workspace"))
576576
}
577577

578+
repoRoot := content.GetCheckoutLocationFromInitializer(spec.Initializer)
579+
578580
// Envs that start with GITPOD_ are appended to the Terminal environments
579581
result := []corev1.EnvVar{}
580-
result = append(result, corev1.EnvVar{Name: "GITPOD_REPO_ROOT", Value: getWorkspaceRelativePath(startContext.CheckoutLocation)})
582+
result = append(result, corev1.EnvVar{Name: "GITPOD_REPO_ROOT", Value: getWorkspaceRelativePath(repoRoot)})
581583
result = append(result, corev1.EnvVar{Name: "GITPOD_CLI_APITOKEN", Value: startContext.CLIAPIKey})
582584
result = append(result, corev1.EnvVar{Name: "GITPOD_WORKSPACE_ID", Value: startContext.Request.Metadata.MetaId})
583585
result = append(result, corev1.EnvVar{Name: "GITPOD_INSTANCE_ID", Value: startContext.Request.Id})
@@ -710,25 +712,6 @@ func (m *Manager) createDefaultSecurityContext() (*corev1.SecurityContext, error
710712
return res, nil
711713
}
712714

713-
func getCheckoutLocationFromInitializer(init *csapi.WorkspaceInitializer) string {
714-
switch {
715-
case init.GetGit() != nil:
716-
return init.GetGit().CheckoutLocation
717-
case init.GetPrebuild() != nil && len(init.GetPrebuild().Git) > 0:
718-
return init.GetPrebuild().Git[0].CheckoutLocation
719-
case init.GetBackup() != nil:
720-
return init.GetBackup().CheckoutLocation
721-
case init.GetComposite() != nil:
722-
for _, c := range init.GetComposite().Initializer {
723-
loc := getCheckoutLocationFromInitializer(c)
724-
if loc != "" {
725-
return loc
726-
}
727-
}
728-
}
729-
return ""
730-
}
731-
732715
func (m *Manager) newStartWorkspaceContext(ctx context.Context, req *api.StartWorkspaceRequest) (res *startWorkspaceContext, err error) {
733716
// we deliberately do not shadow ctx here as we need the original context later to extract the TraceID
734717
span, ctx := tracing.FromContext(ctx, "newStartWorkspaceContext")
@@ -769,15 +752,14 @@ func (m *Manager) newStartWorkspaceContext(ctx context.Context, req *api.StartWo
769752
headlessLabel: fmt.Sprintf("%v", headless),
770753
markerLabel: "true",
771754
},
772-
CLIAPIKey: cliAPIKey,
773-
OwnerToken: ownerToken,
774-
Request: req,
775-
IDEPort: 23000,
776-
SupervisorPort: 22999,
777-
WorkspaceURL: workspaceURL,
778-
TraceID: traceID,
779-
Headless: headless,
780-
CheckoutLocation: getCheckoutLocationFromInitializer(req.Spec.Initializer),
755+
CLIAPIKey: cliAPIKey,
756+
OwnerToken: ownerToken,
757+
Request: req,
758+
IDEPort: 23000,
759+
SupervisorPort: 22999,
760+
WorkspaceURL: workspaceURL,
761+
TraceID: traceID,
762+
Headless: headless,
781763
}, nil
782764
}
783765

‎components/ws-manager/pkg/manager/manager.go

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,16 +68,15 @@ type Manager struct {
6868
}
6969

7070
type startWorkspaceContext struct {
71-
Request *api.StartWorkspaceRequest `json:"request"`
72-
Labels map[string]string `json:"labels"`
73-
CLIAPIKey string `json:"cliApiKey"`
74-
OwnerToken string `json:"ownerToken"`
75-
IDEPort int32 `json:"idePort"`
76-
SupervisorPort int32 `json:"supervisorPort"`
77-
WorkspaceURL string `json:"workspaceURL"`
78-
TraceID string `json:"traceID"`
79-
Headless bool `json:"headless"`
80-
CheckoutLocation string `json:"checkoutLocation"`
71+
Request *api.StartWorkspaceRequest `json:"request"`
72+
Labels map[string]string `json:"labels"`
73+
CLIAPIKey string `json:"cliApiKey"`
74+
OwnerToken string `json:"ownerToken"`
75+
IDEPort int32 `json:"idePort"`
76+
SupervisorPort int32 `json:"supervisorPort"`
77+
WorkspaceURL string `json:"workspaceURL"`
78+
TraceID string `json:"traceID"`
79+
Headless bool `json:"headless"`
8180
}
8281

8382
const (

0 commit comments

Comments
 (0)