Skip to content

[content-service] Add snapshot initializer to walkInitializer #13179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 19 additions & 17 deletions components/content-service-api/go/initializer.go
Original file line number Diff line number Diff line change
Expand Up @@ -105,27 +105,12 @@ func WalkInitializer(path []string, init *WorkspaceInitializer, visitor func(pat
}

switch spec := init.Spec.(type) {
case *WorkspaceInitializer_Backup:
return visitor(append(path, "backup"), init)
case *WorkspaceInitializer_Composite:
path = append(path, "composite")
err := visitor(path, init)
if err != nil {
return err
}
for i, p := range spec.Composite.Initializer {
err := WalkInitializer(append(path, strconv.Itoa(i)), p, visitor)
if err != nil {
return err
}
}
return nil
case *WorkspaceInitializer_Download:
return visitor(append(path, "download"), init)
case *WorkspaceInitializer_Empty:
return visitor(append(path, "empty"), init)
case *WorkspaceInitializer_Git:
return visitor(append(path, "git"), init)
case *WorkspaceInitializer_Snapshot:
return visitor(append(path, "snapshot"), init)
case *WorkspaceInitializer_Prebuild:
child := append(path, "prebuild")
err := visitor(child, init)
Expand All @@ -139,6 +124,23 @@ func WalkInitializer(path []string, init *WorkspaceInitializer, visitor func(pat
}
}
return nil
case *WorkspaceInitializer_Composite:
path = append(path, "composite")
err := visitor(path, init)
if err != nil {
return err
}
for i, p := range spec.Composite.Initializer {
err := WalkInitializer(append(path, strconv.Itoa(i)), p, visitor)
if err != nil {
return err
}
}
return nil
case *WorkspaceInitializer_Download:
return visitor(append(path, "download"), init)
case *WorkspaceInitializer_Backup:
return visitor(append(path, "backup"), init)

default:
return fmt.Errorf("unsupported workspace initializer in walkInitializer - this is a bug in Gitpod")
Expand Down
11 changes: 11 additions & 0 deletions components/content-service-api/go/initializer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,17 @@ func TestGetCheckoutLocationsFromInitializer(t *testing.T) {
{
Name: "nil initializer",
},
{
Name: "snapshot initializer",
Initializer: &api.WorkspaceInitializer{
Spec: &api.WorkspaceInitializer_Snapshot{
Snapshot: &api.SnapshotInitializer{
Snapshot: "foo",
FromVolumeSnapshot: true,
},
},
},
},
}

for _, test := range tests {
Expand Down