use specific error for github authorization error

Signed-off-by: James Cockbain <[email protected]>
eclipse-archived · Jun 10, 2020 · f05a0d7 · f05a0d7
1 parent 28b1b38
commit f05a0d7
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/cmd/cli/main_test.go b/cmd/cli/main_test.go
@@ -189,18 +189,19 @@ func testCreateProjectFromTemplate(t *testing.T) {
 		assert.Equal(t, "{\"status\":\"success\",\"projectPath\":\"./testDir\",\"result\":{\"language\":\"unknown\",\"projectType\":\"docker\"}}\n", string(out))
 	})
 	t.Run("fail case: create GHE project using good username but bad password"+
-		"\ncwctl project create --url <secureTemplateRepo> --path <testDir> --username <goodUsername> --password <badPassword>", func(t *testing.T) {
+		"\ncwctl --json project create --url <secureTemplateRepo> --path <testDir> --username <goodUsername> --password <badPassword>", func(t *testing.T) {
 		os.RemoveAll(testDir)
 		defer os.RemoveAll(testDir)
 
-		cmd := exec.Command(cwctl, "project", "create",
+		cmd := exec.Command(cwctl, "--json", "project", "create",
 			"--url="+test.GHERepoURL,
 			"--path="+testDir,
 			"--username="+test.GHEUsername,
 			"--password=badpassword",
 		)
 		out, err := cmd.CombinedOutput()
 		assert.NotNil(t, err)
+		assert.Contains(t, string(out), "invalid_git_credentials")
 		assert.Contains(t, string(out), "401 Unauthorized")
 	})
 }
@@ -390,7 +391,7 @@ func testSuccessfulAddAndRemoveTemplateRepos(t *testing.T) {
 	})
 	t.Run("fail case: add GHE template repo and create one of its projects using bad password, overriding good stored GHE creds"+
 		"\ncwctl templates repos add --url <GHEDevfile> --username --password"+
-		"\ncwctl project create --url <GHETemplateRepo> --username <goodUsername> --password <badPassword>"+
+		"\ncwctl --json project create --url <GHETemplateRepo> --username <goodUsername> --password <badPassword>"+
 		"\ncwctl templates repos remove --url", func(t *testing.T) {
 		if !test.UsingOwnGHECredentials {
 			t.Skip("skipping this test because you haven't set GitHub credentials needed for this test")
@@ -408,14 +409,15 @@ func testSuccessfulAddAndRemoveTemplateRepos(t *testing.T) {
 		assert.Nil(t, err)
 		assert.Contains(t, string(out), test.GHEDevfileURL)
 
-		createCmd := exec.Command(cwctl, "project", "create",
+		createCmd := exec.Command(cwctl, "--json", "project", "create",
 			"--url="+test.GHERepoURL,
 			"--path="+testDir,
 			"--username="+test.GHEUsername,
 			"--password=badpassword",
 		)
 		createOut, createErr := createCmd.CombinedOutput()
 		assert.NotNil(t, createErr)
+		assert.Contains(t, string(createOut), "invalid_git_credentials")
 		assert.Contains(t, string(createOut), "401 Unauthorized")
 
 		removeCmd := exec.Command(cwctl, "templates", "repos", "remove",
@@ -427,7 +429,7 @@ func testSuccessfulAddAndRemoveTemplateRepos(t *testing.T) {
 	})
 	t.Run("fail case: add GHE template repo and create one of its projects using bad personalAccessToken, overriding good stored GHE creds"+
 		"\ncwctl templates repos add --url <GHEDevfile> --personalAccessToken <goodToken>"+
-		"\ncwctl project create --url <GHETemplateRepo> --personalAccessToken <badToken>"+
+		"\ncwctl --json project create --url <GHETemplateRepo> --personalAccessToken <badToken>"+
 		"\ncwctl templates repos remove --url", func(t *testing.T) {
 		if !test.UsingOwnGHECredentials {
 			t.Skip("skipping this test because you haven't set GitHub credentials needed for this test")
@@ -444,13 +446,14 @@ func testSuccessfulAddAndRemoveTemplateRepos(t *testing.T) {
 		assert.Nil(t, err)
 		assert.Contains(t, string(out), test.GHEDevfileURL)
 
-		createCmd := exec.Command(cwctl, "project", "create",
+		createCmd := exec.Command(cwctl, "--json", "project", "create",
 			"--url="+test.GHERepoURL,
 			"--path="+testDir,
 			"--personalAccessToken=badtoken",
 		)
 		createOut, createErr := createCmd.CombinedOutput()
 		assert.NotNil(t, createErr)
+		assert.Contains(t, string(createOut), "invalid_git_credentials")
 		assert.Contains(t, string(createOut), "401 Unauthorized")
 
 		removeCmd := exec.Command(cwctl, "templates", "repos", "remove",

diff --git a/pkg/project/create.go b/pkg/project/create.go
@@ -72,7 +72,12 @@ func DownloadTemplate(destination, url string, gitCredentials *utils.GitCredenti
 
 	err := utils.DownloadFromURLThenExtract(url, destination, gitCredentials)
 	if err != nil {
-		return nil, &ProjectError{errOpCreateProject, err, err.Error()}
+		errOp := errOpCreateProject
+		// if 401 error, use invalid credentials error code
+		if strings.Contains(err.Error(), "401 Unauthorized") {
+			errOp = errOpInvalidCredentials
+		}
+		return nil, &ProjectError{errOp, err, err.Error()}
 	}
 
 	err = utils.ReplaceInFiles(destination, "[PROJ_NAME_PLACEHOLDER]", projectName)

diff --git a/pkg/project/project_utils.go b/pkg/project/project_utils.go
@@ -46,6 +46,7 @@ const (
 	errOpSync            = "proj_sync"
 	errOpSyncRef         = "proj_sync_ref"
 	errOpWriteCwSettings = "proj_write_cw_settings"
+	errOpInvalidCredentials = "invalid_git_credentials"
 )
 
 const (