removed acquire package; moved aquire to chrysom; added back in auth to basicclientconfig

Author: maurafortino

acquire/acquire.go chrysom/acquire.go

@@ -1,16 +1,13 @@
 // SPDX-FileCopyrightText: 2024 Comcast Cable Communications Management, LLC
 // SPDX-License-Identifier: Apache-2.0
 
-package acquire
+package chrysom
 
 import (
 	"net/http"
-	"time"
 )
 
+// Acquirer adds an authorization header and value to a given http request.
 type Acquirer interface {
 	AddAuth(*http.Request) error
-	Acquire() (string, error)
-	ParseToken([]byte) (string, error)
-	ParseExpiration([]byte) (time.Time, error)
 }

chrysom/basicClient.go

@@ -12,7 +12,6 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/xmidt-org/ancla/acquire"
 	"github.com/xmidt-org/ancla/model"
 	"github.com/xmidt-org/sallust"
 	"go.uber.org/zap"
@@ -55,12 +54,16 @@ type BasicClientConfig struct {
 	// HTTPClient refers to the client that will be used to send requests.
 	// (Optional) Defaults to http.DefaultClient.
 	HTTPClient *http.Client
+
+	// Auth provides the mechanism to add auth headers to outgoing requests.
+	// (Optional) If not provided, no auth headers are added.
+	Auth Acquirer
 }
 
 // BasicClient is the client used to make requests to Argus.
 type BasicClient struct {
 	client       *http.Client
-	auth         acquire.Acquirer
+	auth         Acquirer
 	storeBaseURL string
 	bucket       string
 }
@@ -83,7 +86,7 @@ type Items []model.Item
 
 // NewBasicClient creates a new BasicClient that can be used to
 // make requests to Argus.
-func NewBasicClient(config BasicClientConfig, auth acquire.Acquirer) (*BasicClient, error) {
+func NewBasicClient(config BasicClientConfig) (*BasicClient, error) {
 	err := validateBasicConfig(&config)
 	if err != nil {
 		return nil, err
@@ -94,7 +97,7 @@ func NewBasicClient(config BasicClientConfig, auth acquire.Acquirer) (*BasicClie
 	}
 	clientStore := &BasicClient{
 		client:       config.HTTPClient,
-		auth:         auth,
+		auth:         config.Auth,
 		bucket:       config.Bucket,
 		storeBaseURL: config.Address + storeAPIPath,
 	}

service.go

@@ -10,7 +10,6 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/xmidt-org/ancla/acquire"
 	"github.com/xmidt-org/ancla/chrysom"
 	"github.com/xmidt-org/sallust"
 	"go.uber.org/fx"
@@ -43,13 +42,6 @@ type Service interface {
 type Config struct {
 	BasicClientConfig chrysom.BasicClientConfig
 
-	// JWTParserType establishes which parser type will be used by the JWT token
-	// acquirer used by Argus. Options include 'simple' and 'raw'.
-	// Simple: parser assumes token payloads have the following structure: https://github.com/xmidt-org/bascule/blob/c011b128d6b95fa8358228535c63d1945347adaa/acquire/bearer.go#L77
-	// Raw: parser assumes all of the token payload == JWT token
-	// (Optional). Defaults to 'simple'
-	JWTParserType string
-
 	// DisablePartnerIDs, if true, will allow webhooks to register without
 	// checking the validity of the partnerIDs in the request
 	DisablePartnerIDs bool
@@ -69,8 +61,8 @@ type ClientService struct {
 }
 
 // NewService builds the Argus client service from the given configuration.
-func NewService(cfg Config, auth acquire.Acquirer) (*ClientService, error) {
-	basic, err := chrysom.NewBasicClient(cfg.BasicClientConfig, auth)
+func NewService(cfg Config) (*ClientService, error) {
+	basic, err := chrysom.NewBasicClient(cfg.BasicClientConfig)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create chrysom basic client: %v", err)
 	}
@@ -153,13 +145,13 @@ type ServiceIn struct {
 
 	Config Config
 	Client *http.Client
-	Auth   acquire.Acquirer
+	Auth   chrysom.Acquirer
 }
 
 func ProvideService() fx.Option {
 	return fx.Provide(
 		func(in ServiceIn) (*ClientService, error) {
-			svc, err := NewService(in.Config, in.Auth)
+			svc, err := NewService(in.Config)
 			if err != nil {
 				return nil, errors.Join(errFailedConfig, err)
 			}