Rename MissingAllScopes to HasAnyScope and invert the logic.

Co-authored-by: Simon Engledew <[email protected]>

Author: chrisgavin

internal/githubapiutil/githubapiutil.go

@@ -8,7 +8,7 @@ import (
 
 const xOAuthScopesHeader = "X-OAuth-Scopes"
 
-func MissingAllScopes(response *github.Response, requiredAnyScopes ...string) bool {
+func HasAnyScope(response *github.Response, scopes ...string) bool {
 	if response == nil {
 		return false
 	}
@@ -18,11 +18,11 @@ func MissingAllScopes(response *github.Response, requiredAnyScopes ...string) bo
 	actualScopes := strings.Split(response.Header.Get(xOAuthScopesHeader), ",")
 	for _, actualScope := range actualScopes {
 		actualScope = strings.Trim(actualScope, " ")
-		for _, requiredAnyScope := range requiredAnyScopes {
-			if actualScope == requiredAnyScope {
-				return false
+		for _, requiredScope := range scopes {
+			if actualScope == requiredScope {
+				return true
 			}
 		}
 	}
-	return true
+	return false
 }

internal/githubapiutil/githubapiutil_test.go

@@ -9,17 +9,17 @@ import (
 	"github.com/google/go-github/v32/github"
 )
 
-func TestHasAnyScopes(t *testing.T) {
+func TestHasAnyScope(t *testing.T) {
 	response := github.Response{
 		Response: &http.Response{Header: http.Header{}},
 	}
 
 	response.Header.Set(xOAuthScopesHeader, "gist, notifications, admin:org, repo")
-	require.False(t, MissingAllScopes(&response, "public_repo", "repo"))
+	require.True(t, HasAnyScope(&response, "public_repo", "repo"))
 
 	response.Header.Set(xOAuthScopesHeader, "gist, notifications, public_repo, admin:org")
-	require.False(t, MissingAllScopes(&response, "public_repo", "repo"))
+	require.True(t, HasAnyScope(&response, "public_repo", "repo"))
 
 	response.Header.Set(xOAuthScopesHeader, "gist, notifications, admin:org")
-	require.True(t, MissingAllScopes(&response, "public_repo", "repo"))
+	require.False(t, HasAnyScope(&response, "public_repo", "repo"))
 }

internal/push/push.go

@@ -76,7 +76,7 @@ func (pushService *pushService) createRepository() (*github.Repository, error) {
 				Name:  github.String(pushService.destinationRepositoryOwner),
 			}, user.GetLogin())
 			if err != nil {
-				if response != nil && response.StatusCode == http.StatusNotFound && githubapiutil.MissingAllScopes(response, "site_admin") {
+				if response != nil && response.StatusCode == http.StatusNotFound && !githubapiutil.HasAnyScope(response, "site_admin") {
 					return nil, usererrors.New("The destination token you have provided does not have the `site_admin` scope, so the destination organization cannot be created.")
 				}
 				return nil, errors.Wrap(err, "Error creating organization.")
@@ -105,15 +105,15 @@ func (pushService *pushService) createRepository() (*github.Repository, error) {
 	if response.StatusCode == http.StatusNotFound {
 		repository, response, err = pushService.githubEnterpriseClient.Repositories.Create(pushService.ctx, destinationOrganization, &desiredRepositoryProperties)
 		if err != nil {
-			if response.StatusCode == http.StatusNotFound && githubapiutil.MissingAllScopes(response, "public_repo", "repo") {
+			if response.StatusCode == http.StatusNotFound && !githubapiutil.HasAnyScope(response, "public_repo", "repo") {
 				return nil, usererrors.New("The destination token you have provided does not have the `public_repo` scope.")
 			}
 			return nil, errors.Wrap(err, "Error creating destination repository.")
 		}
 	} else {
 		repository, response, err = pushService.githubEnterpriseClient.Repositories.Edit(pushService.ctx, pushService.destinationRepositoryOwner, pushService.destinationRepositoryName, &desiredRepositoryProperties)
 		if err != nil {
-			if response.StatusCode == http.StatusNotFound && githubapiutil.MissingAllScopes(response, "public_repo", "repo") {
+			if response.StatusCode == http.StatusNotFound && !githubapiutil.HasAnyScope(response, "public_repo", "repo") {
 				return nil, usererrors.New("The destination token you have provided does not have the `public_repo` scope.")
 			}
 			return nil, errors.Wrap(err, "Error updating destination repository.")