adding missing fields to CreateAndStartWorkspace (#18874)

* adding some missing fields to CreateAndStartWorkspace

* updated mocks

Author: selfcontained

components/gitpod-protocol/go/gitpod-service.go

@@ -2016,8 +2016,10 @@ type CreateWorkspaceOptions struct {
 	StartWorkspaceOptions
 	ContextURL                         string `json:"contextUrl,omitempty"`
 	OrganizationId                     string `json:"organizationId,omitempty"`
-	IgnoreRunningWorkspaceOnSameCommit bool   `json:"ignoreRunningWorkspaceOnSameCommit,omitemopty"`
-	ForceDefaultConfig                 bool   `json:"forceDefaultConfig,omitemopty"`
+	IgnoreRunningWorkspaceOnSameCommit bool   `json:"ignoreRunningWorkspaceOnSameCommit,omitempty"`
+	ForceDefaultConfig                 bool   `json:"forceDefaultConfig,omitempty"`
+	IgnoreRunningPrebuild              bool   `json:"ignoreRunningPrebuild,omitempty"`
+	AllowUsingPreviousPrebuilds        bool   `json:"allowUsingPreviousPrebuilds,omitempty"`
 }
 
 // DeleteOwnAuthProviderParams is the DeleteOwnAuthProviderParams message type

components/public-api-server/pkg/apiv1/workspace.go

@@ -42,8 +42,12 @@ func (s *WorkspaceService) CreateAndStartWorkspace(ctx context.Context, req *con
 	}
 
 	ws, err := conn.CreateWorkspace(ctx, &protocol.CreateWorkspaceOptions{
-		ContextURL:     req.Msg.GetContextUrl(),
-		OrganizationId: req.Msg.GetOrganizationId(),
+		ContextURL:                         req.Msg.GetContextUrl(),
+		OrganizationId:                     req.Msg.GetOrganizationId(),
+		IgnoreRunningWorkspaceOnSameCommit: req.Msg.GetIgnoreRunningWorkspaceOnSameCommit(),
+		IgnoreRunningPrebuild:              req.Msg.GetIgnoreRunningPrebuild(),
+		AllowUsingPreviousPrebuilds:        req.Msg.GetAllowUsingPreviousPrebuilds(),
+		ForceDefaultConfig:                 req.Msg.GetForceDefaultConfig(),
 		StartWorkspaceOptions: protocol.StartWorkspaceOptions{
 			WorkspaceClass: req.Msg.GetStartSpec().GetWorkspaceClass(),
 			Region:         req.Msg.GetStartSpec().GetRegion(),

components/public-api/gitpod/experimental/v1/workspaces.proto

@@ -92,6 +92,11 @@ message CreateAndStartWorkspaceRequest {
     StartWorkspaceSpec start_spec = 5;
 
     string organization_id = 6;
+
+    bool ignore_running_workspace_on_same_commit = 7;
+    bool ignore_running_prebuild = 8;
+    bool allow_using_previous_prebuilds = 9;
+    bool force_default_config = 10;
 }
 message CreateAndStartWorkspaceResponse {
     string workspace_id = 1;