fix: git provider config flag on create (#1315)

Signed-off-by: Toma Puljak <[email protected]>
daytonaio · Nov 5, 2024 · 389fcdd · 389fcdd
1 parent 05aa014
commit 389fcdd
Showing 1 changed file with 17 additions and 12 deletions.
diff --git a/pkg/cmd/workspace/create.go b/pkg/cmd/workspace/create.go
@@ -433,19 +433,24 @@ func processGitURL(ctx context.Context, repoUrl string, apiClient *apiclient.API
 		return nil, err
 	}
 
-	gitProviderConfigs, res, err := apiClient.GitProviderAPI.ListGitProvidersForUrl(context.Background(), url.QueryEscape(repoUrl)).Execute()
-	if err != nil {
-		return nil, apiclient_util.HandleErrorResponse(res, err)
-	}
+	if projectConfigurationFlags.GitProviderConfig == nil || *projectConfigurationFlags.GitProviderConfig == "" {
+		gitProviderConfigs, res, err := apiClient.GitProviderAPI.ListGitProvidersForUrl(context.Background(), url.QueryEscape(repoUrl)).Execute()
+		if err != nil {
+			return nil, apiclient_util.HandleErrorResponse(res, err)
+		}
 
-	if len(gitProviderConfigs) == 1 {
-		projectConfigurationFlags.GitProviderConfig = &gitProviderConfigs[0].Id
-	} else if len(gitProviderConfigs) > 1 {
-		gp := selection.GetGitProviderConfigFromPrompt(selection.GetGitProviderConfigParams{
-			GitProviderConfigs: gitProviderConfigs,
-			ActionVerb:         "Use",
-		})
-		projectConfigurationFlags.GitProviderConfig = &gp.Id
+		if len(gitProviderConfigs) == 1 {
+			projectConfigurationFlags.GitProviderConfig = &gitProviderConfigs[0].Id
+		} else if len(gitProviderConfigs) > 1 {
+			gp := selection.GetGitProviderConfigFromPrompt(selection.GetGitProviderConfigParams{
+				GitProviderConfigs: gitProviderConfigs,
+				ActionVerb:         "Use",
+			})
+			if gp == nil {
+				return nil, common.ErrCtrlCAbort
+			}
+			projectConfigurationFlags.GitProviderConfig = &gp.Id
+		}
 	}
 
 	project, err := workspace_util.GetCreateProjectDtoFromFlags(projectConfigurationFlags)