Move deployedProjectID before github access check

rilldata · Jun 27, 2024 · 09f0e31 · 09f0e31
1 parent 93f85c5
commit 09f0e31
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/cli/pkg/local/server.go b/cli/pkg/local/server.go
@@ -138,6 +138,15 @@ func (s *Server) DeployValidation(ctx context.Context, r *connect.Request[localv
 		return nil, err
 	}
 
+	rc, err := dotrillcloud.GetAll(s.app.ProjectPath, s.app.adminURL)
+	if err != nil {
+		return nil, err
+	}
+	var deployedProjectID string
+	if rc != nil {
+		deployedProjectID = rc.ProjectID
+	}
+
 	userStatus, err := c.GetGithubUserStatus(ctx, &adminv1.GetGithubUserStatusRequest{})
 	if err != nil {
 		return nil, err
@@ -161,18 +170,10 @@ func (s *Server) DeployValidation(ctx context.Context, r *connect.Request[localv
 			RillOrgExistsAsGithubUserName: false,
 			RillUserOrgs:                  nil,
 			LocalProjectName:              localProjectName,
+			DeployedProjectId:             deployedProjectID,
 		}), nil
 	}
 
-	rc, err := dotrillcloud.GetAll(s.app.ProjectPath, s.app.adminURL)
-	if err != nil {
-		return nil, err
-	}
-	var deployedProjectID string
-	if rc != nil {
-		deployedProjectID = rc.ProjectID
-	}
-
 	isGithubRepo := true
 	githubRemoteFound := true
 	repoAccess := false