[supervisor] fix panic with runGP option (#18777)

* [supervisor] fix panic with runGP option

* Check if `s` is nil to avoid adding guards outside

Author: mustard-mh

components/supervisor/pkg/serverapi/publicapi.go

@@ -198,14 +198,14 @@ func (s *Service) usePublicAPI(ctx context.Context) bool {
 }
 
 func (s *Service) GetToken(ctx context.Context, query *gitpod.GetTokenSearchOptions) (res *gitpod.Token, err error) {
+	if s == nil {
+		return nil, errNotConnected
+	}
 	startTime := time.Now()
 	usePublicApi := s.usePublicAPI(ctx)
 	defer func() {
 		s.apiMetrics.ProcessMetrics(usePublicApi, "GetToken", err, startTime)
 	}()
-	if s == nil {
-		return nil, errNotConnected
-	}
 	if !usePublicApi {
 		return s.gitpodService.GetToken(ctx, query)
 	}
@@ -230,14 +230,14 @@ func (s *Service) GetToken(ctx context.Context, query *gitpod.GetTokenSearchOpti
 }
 
 func (s *Service) UpdateGitStatus(ctx context.Context, status *gitpod.WorkspaceInstanceRepoStatus) (err error) {
+	if s == nil {
+		return errNotConnected
+	}
 	startTime := time.Now()
 	usePublicApi := s.usePublicAPI(ctx)
 	defer func() {
 		s.apiMetrics.ProcessMetrics(usePublicApi, "UpdateGitStatus", err, startTime)
 	}()
-	if s == nil {
-		return errNotConnected
-	}
 	workspaceID := s.cfg.WorkspaceID
 	if !usePublicApi {
 		return s.gitpodService.UpdateGitStatus(ctx, workspaceID, status)
@@ -263,14 +263,14 @@ func (s *Service) UpdateGitStatus(ctx context.Context, status *gitpod.WorkspaceI
 }
 
 func (s *Service) OpenPort(ctx context.Context, port *gitpod.WorkspaceInstancePort) (res *gitpod.WorkspaceInstancePort, err error) {
+	if s == nil {
+		return nil, errNotConnected
+	}
 	startTime := time.Now()
 	usePublicApi := s.usePublicAPI(ctx)
 	defer func() {
 		s.apiMetrics.ProcessMetrics(usePublicApi, "OpenPort", err, startTime)
 	}()
-	if s == nil {
-		return nil, errNotConnected
-	}
 	workspaceID := s.cfg.WorkspaceID
 	if !usePublicApi {
 		return s.gitpodService.OpenPort(ctx, workspaceID, port)
@@ -304,14 +304,14 @@ func (s *Service) OpenPort(ctx context.Context, port *gitpod.WorkspaceInstancePo
 }
 
 func (s *Service) GetDefaultWorkspaceImage(ctx context.Context) (image string, err error) {
+	if s == nil {
+		return "", errNotConnected
+	}
 	startTime := time.Now()
 	usePublicApi := s.usePublicAPI(ctx)
 	defer func() {
 		s.apiMetrics.ProcessMetrics(usePublicApi, "GetDefaultWorkspaceImage", nil, startTime)
 	}()
-	if s == nil {
-		return "", errNotConnected
-	}
 	workspaceID := s.cfg.WorkspaceID
 	if !usePublicApi {
 		resp, err := s.gitpodService.GetDefaultWorkspaceImage(ctx, &gitpod.GetDefaultWorkspaceImageParams{

components/supervisor/pkg/supervisor/services.go

@@ -659,16 +659,25 @@ func (is *InfoService) RegisterREST(mux *runtime.ServeMux, grpcEndpoint string)
 	return api.RegisterInfoServiceHandlerFromEndpoint(context.Background(), mux, grpcEndpoint, []grpc.DialOption{grpc.WithTransportCredentials(insecure.NewCredentials())})
 }
 
-// WorkspaceInfo provides information about the workspace.
-func (is *InfoService) WorkspaceInfo(ctx context.Context, req *api.WorkspaceInfoRequest) (*api.WorkspaceInfoResponse, error) {
-	defaultWorkspaceImage, err := is.GitpodService.GetDefaultWorkspaceImage(ctx)
-	if err != nil {
+func (is *InfoService) getDefaultWorkspaceImage(ctx context.Context) (defaultWorkspaceImage string) {
+	defaultWorkspaceImage = is.cfg.DefaultWorkspaceImage
+	if defaultWorkspaceImage == "" {
 		// TODO: delete-me, added for compatibility before server is deployed / rollback
-		defaultWorkspaceImage = is.cfg.DefaultWorkspaceImage
-		if defaultWorkspaceImage == "" {
-			defaultWorkspaceImage = "gitpod/workspace-full:latest"
-		}
+		defaultWorkspaceImage = "gitpod/workspace-full:latest"
+	}
+	if is.GitpodService == nil {
+		return
 	}
+	wsImage, err := is.GitpodService.GetDefaultWorkspaceImage(ctx)
+	if err == nil {
+		defaultWorkspaceImage = wsImage
+	}
+	return
+}
+
+// WorkspaceInfo provides information about the workspace.
+func (is *InfoService) WorkspaceInfo(ctx context.Context, req *api.WorkspaceInfoRequest) (*api.WorkspaceInfoResponse, error) {
+	defaultWorkspaceImage := is.getDefaultWorkspaceImage(ctx)
 	resp := &api.WorkspaceInfoResponse{
 		CheckoutLocation:      is.cfg.RepoRoot,
 		InstanceId:            is.cfg.WorkspaceInstanceID,