Merge pull request #236 from Ner0theHer0/improve-oauth-error-handling

Improve oauth error handling

Author: DrFaust92

bitbucket/error.go

@@ -6,23 +6,31 @@ import (
 	"net/http"
 
 	"github.com/DrFaust92/bitbucket-go-client"
+	"golang.org/x/oauth2"
 )
 
+type ClientScopeError struct {
+	Error struct {
+		Message string `json:"message"`
+		Detail  struct {
+			Required []string `json:"required"`
+			Granted  []string `json:"granted"`
+		} `json:"detail"`
+	} `json:"error"`
+}
+
 func handleClientError(httpResponse *http.Response, err error) error {
+	if oauthError, ok := err.(*oauth2.RetrieveError); ok {
+		return fmt.Errorf("%s: %s", oauthError.Response.Status, oauthError.ErrorDescription)
+	}
+
 	if httpResponse == nil || httpResponse.StatusCode < 400 {
 		return nil
 	}
 
 	clientHttpError, ok := err.(bitbucket.GenericSwaggerError)
 	if ok {
-		var errorBody string
-		var bitbucketHttpError bitbucket.ModelError
-		if err := json.Unmarshal(clientHttpError.Body(), &bitbucketHttpError); err != nil {
-			errorBody = string(clientHttpError.Body()[:])
-		} else {
-			errorBody = bitbucketHttpError.Error_.Message
-		}
-
+		errorBody := extractErrorMessage(clientHttpError.Body())
 		return fmt.Errorf("%s: %s", httpResponse.Status, errorBody)
 	}
 
@@ -32,3 +40,20 @@ func handleClientError(httpResponse *http.Response, err error) error {
 
 	return nil
 }
+
+func extractErrorMessage(body []byte) string {
+	var bitbucketHttpError bitbucket.ModelError
+	if err := json.Unmarshal(body, &bitbucketHttpError); err == nil {
+		return bitbucketHttpError.Error_.Message
+	}
+
+	var clientScopeErr ClientScopeError
+	if err := json.Unmarshal(body, &clientScopeErr); err == nil {
+		message := clientScopeErr.Error.Message
+		required := clientScopeErr.Error.Detail.Required
+		granted := clientScopeErr.Error.Detail.Granted
+		return fmt.Sprintf("%s Required: %v Granted: %v", message, required, granted)
+	}
+
+	return string(body[:])
+}

bitbucket/resource_deploy_key.go

@@ -107,7 +107,7 @@ func resourceDeployKeysRead(ctx context.Context, d *schema.ResourceData, m inter
 
 	deployKey, res, err := deployApi.RepositoriesWorkspaceRepoSlugDeployKeysKeyIdGet(c.AuthContext, keyId, repo, workspace)
 
-	if res.StatusCode == http.StatusNotFound {
+	if res != nil && res.StatusCode == http.StatusNotFound {
 		log.Printf("[WARN] Deploy Key (%s) not found, removing from state", d.Id())
 		d.SetId("")
 		return nil

bitbucket/resource_deployment_variable.go

@@ -107,7 +107,7 @@ func resourceDeploymentVariableRead(ctx context.Context, d *schema.ResourceData,
 
 	rvRes, res, err := pipeApi.GetDeploymentVariables(c.AuthContext, workspace, repoSlug, deployment, nil)
 
-	if res.StatusCode == http.StatusNotFound {
+	if res != nil && res.StatusCode == http.StatusNotFound {
 		log.Printf("[WARN] Deployment Variable (%s) not found, removing from state", d.Id())
 		d.SetId("")
 		return nil

bitbucket/resource_forked_repository.go

@@ -267,7 +267,7 @@ func resourceForkedRepositoryRead(ctx context.Context, d *schema.ResourceData, m
 
 	repoRes, res, err := repoApi.RepositoriesWorkspaceRepoSlugGet(c.AuthContext, repoSlug, workspace)
 
-	if res.StatusCode == http.StatusNotFound {
+	if res != nil && res.StatusCode == http.StatusNotFound {
 		log.Printf("[WARN] Repository (%s) not found, removing from state", d.Id())
 		d.SetId("")
 		return nil

bitbucket/resource_pipeline_schedule.go

@@ -150,7 +150,7 @@ func resourcePipelineScheduleRead(ctx context.Context, d *schema.ResourceData, m
 
 	schedule, res, err := pipeApi.GetRepositoryPipelineSchedule(c.AuthContext, workspace, repo, uuid)
 
-	if res.StatusCode == http.StatusNotFound {
+	if res != nil && res.StatusCode == http.StatusNotFound {
 		log.Printf("[WARN] Pipeline Schedule (%s) not found, removing from state", d.Id())
 		d.SetId("")
 		return nil

bitbucket/resource_pipeline_ssh_key.go

@@ -75,7 +75,7 @@ func resourcePipelineSshKeysRead(ctx context.Context, d *schema.ResourceData, m
 
 	key, res, err := pipeApi.GetRepositoryPipelineSshKeyPair(c.AuthContext, workspace, repo)
 
-	if res.StatusCode == http.StatusNotFound {
+	if res != nil && res.StatusCode == http.StatusNotFound {
 		log.Printf("[WARN] Pipeline Ssh Key (%s) not found, removing from state", d.Id())
 		d.SetId("")
 		return nil

bitbucket/resource_pipeline_ssh_known_host.go

@@ -121,7 +121,7 @@ func resourcePipelineSshKnownHostsRead(ctx context.Context, d *schema.ResourceDa
 
 	host, res, err := pipeApi.GetRepositoryPipelineKnownHost(c.AuthContext, workspace, repo, uuid)
 
-	if res.StatusCode == http.StatusNotFound {
+	if res != nil && res.StatusCode == http.StatusNotFound {
 		log.Printf("[WARN] Pipeline Ssh known host (%s) not found, removing from state", d.Id())
 		d.SetId("")
 		return nil

bitbucket/resource_project.go

@@ -198,7 +198,7 @@ func resourceProjectRead(ctx context.Context, d *schema.ResourceData, m interfac
 
 	projRes, res, err := projectApi.WorkspacesWorkspaceProjectsProjectKeyGet(c.AuthContext, projectKey, d.Get("owner").(string))
 
-	if res.StatusCode == http.StatusNotFound {
+	if res != nil && res.StatusCode == http.StatusNotFound {
 		log.Printf("[WARN] Project (%s) not found, removing from state", d.Id())
 		d.SetId("")
 		return nil

bitbucket/resource_repository.go

@@ -345,7 +345,7 @@ func resourceRepositoryRead(ctx context.Context, d *schema.ResourceData, m inter
 
 	repoRes, res, err := repoApi.RepositoriesWorkspaceRepoSlugGet(c.AuthContext, repoSlug, workspace)
 
-	if res.StatusCode == http.StatusNotFound {
+	if res != nil && res.StatusCode == http.StatusNotFound {
 		log.Printf("[WARN] Repository (%s) not found, removing from state", d.Id())
 		d.SetId("")
 		return nil

bitbucket/resource_repository_variable.go

@@ -105,7 +105,7 @@ func resourceRepositoryVariableRead(ctx context.Context, d *schema.ResourceData,
 
 	rvRes, res, err := pipeApi.GetRepositoryPipelineVariable(c.AuthContext, workspace, repoSlug, d.Get("uuid").(string))
 
-	if res.StatusCode == http.StatusNotFound {
+	if res != nil && res.StatusCode == http.StatusNotFound {
 		log.Printf("[WARN] Repository Variable (%s) not found, removing from state", d.Id())
 		d.SetId("")
 		return nil