remove vestigial return from HasMinimumScopes

vilmibm · vilmibm · commit 6c64cb8d2349 · 2020-08-11T16:33:13.000-05:00
diff --git a/api/client.go b/api/client.go
@@ -200,18 +200,18 @@ type MissingScopesError struct {
 	error
 }
 
-func (c Client) HasMinimumScopes(hostname string) (bool, error) {
+func (c Client) HasMinimumScopes(hostname string) error {
 	apiEndpoint := ghinstance.RESTPrefix(hostname)
 
 	req, err := http.NewRequest("GET", apiEndpoint, nil)
 	if err != nil {
-		return false, err
+		return err
 	}
 
 	req.Header.Set("Content-Type", "application/json; charset=utf-8")
 	res, err := c.http.Do(req)
 	if err != nil {
-		return false, err
+		return err
 	}
 
 	defer func() {
@@ -222,7 +222,7 @@ func (c Client) HasMinimumScopes(hostname string) (bool, error) {
 	}()
 
 	if res.StatusCode != 200 {
-		return false, handleHTTPError(res)
+		return handleHTTPError(res)
 	}
 
 	hasScopes := strings.Split(res.Header.Get("X-Oauth-Scopes"), ",")
@@ -247,10 +247,10 @@ func (c Client) HasMinimumScopes(hostname string) (bool, error) {
 	}
 
 	if len(errorMsgs) > 0 {
-		return false, &MissingScopesError{error: errors.New(strings.Join(errorMsgs, ";"))}
+		return &MissingScopesError{error: errors.New(strings.Join(errorMsgs, ";"))}
 	}
 
-	return true, nil
+	return nil
 }
 
 // GraphQL performs a GraphQL request and parses the response
diff --git a/pkg/cmd/auth/client/client.go b/pkg/cmd/auth/client/client.go
@@ -14,7 +14,7 @@ func ValidateHostCfg(hostname string, cfg config.Config) error {
 		return err
 	}
 
-	_, err = apiClient.HasMinimumScopes(hostname)
+	err = apiClient.HasMinimumScopes(hostname)
 	if err != nil {
 		return fmt.Errorf("could not validate token: %w", err)
 	}
diff --git a/pkg/cmd/auth/status/status.go b/pkg/cmd/auth/status/status.go
@@ -84,7 +84,7 @@ func statusRun(opts *StatusOptions) error {
 			return err
 		}
 
-		_, err = apiClient.HasMinimumScopes(hostname)
+		err = apiClient.HasMinimumScopes(hostname)
 		if err != nil {
 			var missingScopes *api.MissingScopesError
 			if errors.As(err, &missingScopes) {
@@ -145,7 +145,7 @@ func statusRun(opts *StatusOptions) error {
 			statusInfo[hostname] = append(statusInfo[hostname], fmt.Sprintf(x, ys...))
 		}
 
-		_, err = apiClient.HasMinimumScopes(hostname)
+		err = apiClient.HasMinimumScopes(hostname)
 		if err != nil {
 			var missingScopes *api.MissingScopesError
 			if errors.As(err, &missingScopes) {

Original file line number	Diff line number	Diff line change
`@@ -200,18 +200,18 @@ type MissingScopesError struct {`
`200`	`200`	`error`
`201`	`201`	`}`
`202`	`202`
`203`		`-func (c Client) HasMinimumScopes(hostname string) (bool, error) {`
	`203`	`+func (c Client) HasMinimumScopes(hostname string) error {`
`204`	`204`	`apiEndpoint := ghinstance.RESTPrefix(hostname)`
`205`	`205`
`206`	`206`	`req, err := http.NewRequest("GET", apiEndpoint, nil)`
`207`	`207`	`if err != nil {`
`208`		`- return false, err`
	`208`	`+ return err`
`209`	`209`	`}`
`210`	`210`
`211`	`211`	`req.Header.Set("Content-Type", "application/json; charset=utf-8")`
`212`	`212`	`res, err := c.http.Do(req)`
`213`	`213`	`if err != nil {`
`214`		`- return false, err`
	`214`	`+ return err`
`215`	`215`	`}`
`216`	`216`
`217`	`217`	`defer func() {`
`@@ -222,7 +222,7 @@ func (c Client) HasMinimumScopes(hostname string) (bool, error) {`
`222`	`222`	`}()`
`223`	`223`
`224`	`224`	`if res.StatusCode != 200 {`
`225`		`- return false, handleHTTPError(res)`
	`225`	`+ return handleHTTPError(res)`
`226`	`226`	`}`
`227`	`227`
`228`	`228`	`hasScopes := strings.Split(res.Header.Get("X-Oauth-Scopes"), ",")`
`@@ -247,10 +247,10 @@ func (c Client) HasMinimumScopes(hostname string) (bool, error) {`
`247`	`247`	`}`
`248`	`248`
`249`	`249`	`if len(errorMsgs) > 0 {`
`250`		`- return false, &MissingScopesError{error: errors.New(strings.Join(errorMsgs, ";"))}`
	`250`	`+ return &MissingScopesError{error: errors.New(strings.Join(errorMsgs, ";"))}`
`251`	`251`	`}`
`252`	`252`
`253`		`- return true, nil`
	`253`	`+ return nil`
`254`	`254`	`}`
`255`	`255`
`256`	`256`	`// GraphQL performs a GraphQL request and parses the response`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ func ValidateHostCfg(hostname string, cfg config.Config) error {`
`14`	`14`	`return err`
`15`	`15`	`}`
`16`	`16`
`17`		`- _, err = apiClient.HasMinimumScopes(hostname)`
	`17`	`+ err = apiClient.HasMinimumScopes(hostname)`
`18`	`18`	`if err != nil {`
`19`	`19`	`return fmt.Errorf("could not validate token: %w", err)`
`20`	`20`	`}`