Refactor/invoker

Makefile

@@ -8,4 +8,4 @@ default: test
 
 test:
 	go fmt ./...
-	go test -v ./...
+	gotestsum --format=testname

accessors.go

@@ -0,0 +1,18 @@
+package infra_sdk
+
+import (
+	"context"
+
+	"github.com/aws/aws-sdk-go-v2/aws"
+	"golang.org/x/oauth2"
+)
+
+type AwsAccessor interface {
+	NewConfig(region string) (*aws.Config, error)
+	AwsAccountId() string
+}
+
+type GcpAccessor interface {
+	GetTokenSource(ctx context.Context) (oauth2.TokenSource, error)
+	GcpProjectId() string
+}

builtin/aws/aws-account/coster.go

@@ -7,8 +7,6 @@ import (
 	ce "github.com/aws/aws-sdk-go-v2/service/costexplorer"
 	cetypes "github.com/aws/aws-sdk-go-v2/service/costexplorer/types"
 	infra_sdk "github.com/nullstone-io/infra-sdk"
-	"github.com/nullstone-io/infra-sdk/access/aws"
-	"gopkg.in/nullstone-io/go-api-client.v0/types"
 )
 
 var (
@@ -20,17 +18,19 @@ var (
 )
 
 type Coster struct {
-	Assumer  aws.Assumer
-	Provider types.Provider
+	Accessor infra_sdk.AwsAccessor
 }
 
 func (c Coster) GetCosts(ctx context.Context, query infra_sdk.CostQuery) (*infra_sdk.CostResult, error) {
 	// Cost Explorer is global, use us-east-1 as the region to satisfy the aws sdk
-	awsConfig, err := aws.ResolveConfig(c.Assumer.AwsConfig(), c.Provider, &types.AwsProviderConfig{Region: "us-east-1"}, "")
+	awsConfig, err := c.Accessor.NewConfig("us-east-1")
 	if err != nil {
 		return nil, fmt.Errorf("error resolving aws config: %w", err)
 	}
-	client := ce.NewFromConfig(awsConfig)
+	if awsConfig == nil {
+		return nil, nil
+	}
+	client := ce.NewFromConfig(*awsConfig)
 
 	period := &cetypes.DateInterval{
 		Start: ptr(query.Start.Format("2006-01-02")),

builtin/aws/aws-account/scanner.go

@@ -6,8 +6,6 @@ import (
 	"fmt"
 
 	"github.com/nullstone-io/infra-sdk"
-	"github.com/nullstone-io/infra-sdk/access/aws"
-	"gopkg.in/nullstone-io/go-api-client.v0/types"
 )
 
 var (
@@ -40,20 +38,24 @@ var (
 )
 
 type Scanner struct {
-	Assumer        aws.Assumer
-	Provider       types.Provider
-	ProviderConfig *types.AwsProviderConfig
+	Accessor infra_sdk.AwsAccessor
 }
 
 func (s Scanner) Scan(ctx context.Context) ([]infra_sdk.ScanResource, error) {
-	awsConfig, err := aws.ResolveConfig(s.Assumer.AwsConfig(), s.Provider, s.ProviderConfig, "")
+	if s.Accessor == nil {
+		return nil, nil
+	}
+	awsConfig, err := s.Accessor.NewConfig("")
 	if err != nil {
 		return nil, fmt.Errorf("error resolving aws config: %w", err)
 	}
+	if awsConfig == nil {
+		return nil, nil
+	}
 
 	tracker := NewResourceScanTracker()
 	for _, scanner := range AllScanners {
-		tracker.Scan(ctx, awsConfig, scanner)
+		tracker.Scan(ctx, *awsConfig, scanner)
 	}
 	tracker.Wait()
 	if len(tracker.Errors) > 0 {

builtin/aws/secret_manager.go

@@ -10,7 +10,6 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/secretsmanager"
 	sm_types "github.com/aws/aws-sdk-go-v2/service/secretsmanager/types"
 	infra_sdk "github.com/nullstone-io/infra-sdk"
-	"github.com/nullstone-io/infra-sdk/access/aws"
 	"gopkg.in/nullstone-io/go-api-client.v0/types"
 )
 
@@ -19,19 +18,17 @@ var (
 )
 
 type SecretManager struct {
-	Assumer        aws.Assumer
-	Provider       types.Provider
-	ProviderConfig *types.AwsProviderConfig
+	Accessor infra_sdk.AwsAccessor
 }
 
 func (s SecretManager) List(ctx context.Context, location types.SecretLocation) ([]types.Secret, error) {
-	if s.ProviderConfig == nil || s.ProviderConfig.ProviderName == "" {
-		return nil, nil
-	}
 	client, err := s.smClient(location.AwsRegion)
 	if err != nil {
 		return nil, err
 	}
+	if client == nil {
+		return nil, nil
+	}
 
 	input := &secretsmanager.ListSecretsInput{}
 	out, err := client.ListSecrets(ctx, input)
@@ -54,13 +51,13 @@ func (s SecretManager) List(ctx context.Context, location types.SecretLocation)
 }
 
 func (s SecretManager) Create(ctx context.Context, identity types.SecretIdentity, value string) (*types.Secret, error) {
-	if s.ProviderConfig == nil || s.ProviderConfig.ProviderName == "" {
-		return nil, nil
-	}
 	client, err := s.smClient(identity.AwsRegion)
 	if err != nil {
 		return nil, err
 	}
+	if client == nil {
+		return nil, nil
+	}
 
 	out, err := client.CreateSecret(ctx, &secretsmanager.CreateSecretInput{
 		Name:         &identity.Name,
@@ -83,12 +80,11 @@ func (s SecretManager) Create(ctx context.Context, identity types.SecretIdentity
 }
 
 func (s SecretManager) Update(ctx context.Context, identity types.SecretIdentity, value string) (*types.Secret, error) {
-	if s.ProviderConfig == nil || s.ProviderConfig.ProviderName == "" {
-		return nil, nil
-	}
 	client, err := s.smClient(identity.AwsRegion)
 	if err != nil {
 		return nil, err
+	} else if client == nil {
+		return nil, nil
 	}
 
 	out, err := client.UpdateSecret(ctx, &secretsmanager.UpdateSecretInput{
@@ -112,20 +108,30 @@ func (s SecretManager) Update(ctx context.Context, identity types.SecretIdentity
 }
 
 func (s SecretManager) smClient(region string) (*secretsmanager.Client, error) {
-	awsConfig, err := aws.ResolveConfig(s.Assumer.AwsConfig(), s.Provider, s.ProviderConfig, region)
+	if s.Accessor == nil {
+		return nil, nil
+	}
+	awsConfig, err := s.Accessor.NewConfig(region)
 	if err != nil {
 		return nil, fmt.Errorf("error resolving aws config: %w", err)
 	}
-	return secretsmanager.NewFromConfig(awsConfig), nil
+	if awsConfig == nil {
+		return nil, nil
+	}
+	return secretsmanager.NewFromConfig(*awsConfig), nil
 }
 
 func (s SecretManager) secretIdentityFromAws(secretArn *string, name *string, primaryRegion *string) types.SecretIdentity {
+	awsAccountId := ""
+	if s.Accessor != nil {
+		awsAccountId = s.Accessor.AwsAccountId()
+	}
 	identity := types.SecretIdentity{
 		Name: unptr(name),
 		SecretLocation: types.SecretLocation{
 			Platform:     types.SecretLocationPlatformAws,
 			AwsRegion:    unptr(primaryRegion),
-			AwsAccountId: s.Provider.ProviderId,
+			AwsAccountId: awsAccountId,
 		},
 	}
 	if a, err := arn.Parse(unptr(secretArn)); err == nil {