Remove autorest dependency; wrapper structs/functions have been moved to a new module

auth/auth.go

@@ -8,7 +8,6 @@ import (
 	"io/ioutil"
 	"strings"
 
-	"github.com/Azure/go-autorest/autorest"
 	"golang.org/x/crypto/pkcs12"
 	"golang.org/x/oauth2"
 
@@ -95,11 +94,6 @@ func (c *Config) NewAuthorizer(ctx context.Context, api environments.Api) (Autho
 	return nil, fmt.Errorf("no Authorizer could be configured, please check your configuration")
 }
 
-// NewAutorestAuthorizerWrapper returns an Authorizer that sources tokens from a supplied autorest.BearerAuthorizer
-func NewAutorestAuthorizerWrapper(autorestAuthorizer autorest.Authorizer) (Authorizer, error) {
-	return &AutorestAuthorizerWrapper{authorizer: autorestAuthorizer}, nil
-}
-
 // NewAzureCliAuthorizer returns an Authorizer which authenticates using the Azure CLI.
 func NewAzureCliAuthorizer(ctx context.Context, api environments.Api, tenantId string) (Authorizer, error) {
 	conf, err := NewAzureCliConfig(api, tenantId)

auth/auth_test.go

@@ -5,8 +5,6 @@ import (
 	"os"
 	"testing"
 
-	"github.com/Azure/go-autorest/autorest"
-	"github.com/Azure/go-autorest/autorest/adal"
 	"golang.org/x/oauth2"
 
 	"github.com/manicminer/hamilton/auth"
@@ -176,43 +174,6 @@ func TestMsiAuthorizer(t *testing.T) {
 	}
 }
 
-func TestAutorestAuthorizerWrapper(t *testing.T) {
-	env, err := environments.EnvironmentFromString(environment)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// adal.ServicePrincipalToken.refreshInternal() doesn't support v2 tokens
-	oauthConfig, err := adal.NewOAuthConfigWithAPIVersion(string(env.AzureADEndpoint), tenantId, utils.StringPtr("1.0"))
-	if err != nil {
-		t.Fatalf("adal.NewOAuthConfig(): %v", err)
-	}
-
-	spt, err := adal.NewServicePrincipalToken(*oauthConfig, clientId, clientSecret, string(env.MsGraph.Endpoint))
-	if err != nil {
-		t.Fatalf("adal.NewServicePrincipalToken(): %v", err)
-	}
-
-	auth, err := auth.NewAutorestAuthorizerWrapper(autorest.NewBearerAuthorizer(spt))
-	if err != nil {
-		t.Fatalf("NewAutorestAuthorizerWrapper(): %v", err)
-	}
-	if auth == nil {
-		t.Fatal("auth is nil, expected Authorizer")
-	}
-
-	token, err := auth.Token()
-	if err != nil {
-		t.Fatalf("auth.Token(): %v", err)
-	}
-	if token == nil {
-		t.Fatal("token was nil")
-	}
-	if token.AccessToken == "" {
-		t.Fatal("token.AccessToken was empty")
-	}
-}
-
 func TestGitHubOIDCAuthorizer(t *testing.T) {
 	if gitHubTokenURL == "" {
 		t.Skip("gitHubTokenURL was empty")

auth/cache.go

@@ -1,12 +1,8 @@
 package auth
 
 import (
-	"fmt"
-	"net/http"
-	"strings"
 	"sync"
 
-	"github.com/Azure/go-autorest/autorest"
 	"golang.org/x/oauth2"
 )
 
@@ -64,58 +60,6 @@ func (c *CachedAuthorizer) AuxiliaryTokens() ([]*oauth2.Token, error) {
 	return c.auxTokens, nil
 }
 
-// WithAuthorization implements the autorest.Authorizer interface
-func (c *CachedAuthorizer) WithAuthorization() autorest.PrepareDecorator {
-	return func(p autorest.Preparer) autorest.Preparer {
-		return autorest.PreparerFunc(func(req *http.Request) (*http.Request, error) {
-			var err error
-			req, err = p.Prepare(req)
-			if err == nil {
-				token, err := c.Token()
-				if err != nil {
-					return nil, err
-				}
-
-				req, err = autorest.Prepare(req, autorest.WithHeader("Authorization", fmt.Sprintf("Bearer %s", token.AccessToken)))
-				if err != nil {
-					return req, err
-				}
-
-				auxTokens, err := c.AuxiliaryTokens()
-				if err != nil {
-					return req, err
-				}
-
-				auxTokenList := make([]string, 0)
-				for _, a := range auxTokens {
-					if a != nil && a.AccessToken != "" {
-						auxTokenList = append(auxTokenList, fmt.Sprintf("%s %s", a.TokenType, a.AccessToken))
-					}
-				}
-
-				return autorest.Prepare(req, autorest.WithHeader("x-ms-authorization-auxiliary", strings.Join(auxTokenList, ", ")))
-			}
-
-			return req, err
-		})
-	}
-}
-
-// BearerAuthorizerCallback is a helper that returns an *autorest.BearerAuthorizerCallback for use in data plane API clients in the Azure SDK
-func (c *CachedAuthorizer) BearerAuthorizerCallback() *autorest.BearerAuthorizerCallback {
-	return autorest.NewBearerAuthorizerCallback(nil, func(_, resource string) (*autorest.BearerAuthorizer, error) {
-		token, err := c.Token()
-		if err != nil {
-			return nil, fmt.Errorf("obtaining token: %v", err)
-		}
-
-		return autorest.NewBearerAuthorizer(&servicePrincipalTokenWrapper{
-			tokenType:  "Bearer",
-			tokenValue: token.AccessToken,
-		}), nil
-	})
-}
-
 // NewCachedAuthorizer returns an Authorizer that caches an access token for the duration of its validity.
 // If the cached token expires, a new one is acquired and cached.
 func NewCachedAuthorizer(src Authorizer) Authorizer {