chore(deps): reduce aws dependencies

Author: 404tk

go.mod

@@ -5,15 +5,13 @@ go 1.24
 require (
 	github.com/404tk/go-prompt v0.0.1
 	github.com/404tk/table v0.0.4
-	github.com/aws/aws-sdk-go-v2 v1.41.6
 	golang.org/x/oauth2 v0.12.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
 	cloud.google.com/go/compute v1.20.1 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
-	github.com/aws/smithy-go v1.25.0 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/kr/pretty v0.2.0 // indirect
 	github.com/mattn/go-colorable v0.1.12 // indirect

go.sum

@@ -6,10 +6,6 @@ github.com/404tk/go-prompt v0.0.1 h1:PUa2qXxzidYrn0sZITvMTCQ6wKqpODB06ohcjPs60RU
 github.com/404tk/go-prompt v0.0.1/go.mod h1:BU3cEVX1xhNDco8T27cBQ8lzkY8P+xUCLotUpjTJR7o=
 github.com/404tk/table v0.0.4 h1:WlhqtfsX8zEHMwBJRknq2D5J2ew9EvMHw4ahD8EBSq0=
 github.com/404tk/table v0.0.4/go.mod h1:bMAHHOKSl6wXuSY6TX6t/f3/XfCNsbjmzZKb6S9PjsQ=
-github.com/aws/aws-sdk-go-v2 v1.41.6 h1:1AX0AthnBQzMx1vbmir3Y4WsnJgiydmnJjiLu+LvXOg=
-github.com/aws/aws-sdk-go-v2 v1.41.6/go.mod h1:dy0UzBIfwSeot4grGvY1AqFWN5zgziMmWGzysDnHFcQ=
-github.com/aws/smithy-go v1.25.0 h1:Sz/XJ64rwuiKtB6j98nDIPyYrV1nVNJ4YU74gttcl5U=
-github.com/aws/smithy-go v1.25.0/go.mod h1:YE2RhdIuDbA5E5bTdciG9KrW3+TiEONeUWCqxX9i1Fc=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=

pkg/providers/aws/auth/credential.go

@@ -1,17 +1,15 @@
 package auth
 
 import (
-	"context"
 	"errors"
 	"strings"
 
 	"github.com/404tk/cloudtoolkit/pkg/schema"
 	"github.com/404tk/cloudtoolkit/utils"
-	awsv2 "github.com/aws/aws-sdk-go-v2/aws"
 )
 
-// Credential is the provider-local AWS credential shape used by the
-// lightweight STS client and direct sdk.Config construction.
+// Credential is the provider-local AWS credential shape consumed by the
+// lightweight STS / EC2 / IAM / S3 API clients under pkg/providers/aws/api.
 type Credential struct {
 	AccessKeyID     string
 	SecretAccessKey string
@@ -49,15 +47,3 @@ func (c Credential) Validate() error {
 		return nil
 	}
 }
-
-func (c Credential) Retrieve(context.Context) (awsv2.Credentials, error) {
-	if err := c.Validate(); err != nil {
-		return awsv2.Credentials{}, err
-	}
-	return awsv2.Credentials{
-		AccessKeyID:     c.AccessKeyID,
-		SecretAccessKey: c.SecretAccessKey,
-		SessionToken:    c.SessionToken,
-		Source:          "ctk-static",
-	}, nil
-}

pkg/providers/aws/auth/credential_test.go

@@ -1,14 +1,13 @@
 package auth
 
 import (
-	"context"
 	"testing"
 
 	"github.com/404tk/cloudtoolkit/pkg/schema"
 	"github.com/404tk/cloudtoolkit/utils"
 )
 
-func TestFromOptionsAndRetrieve(t *testing.T) {
+func TestFromOptionsParsesCredential(t *testing.T) {
 	options := schema.Options{
 		utils.AccessKey:     "ak",
 		utils.SecretKey:     "sk",
@@ -19,12 +18,8 @@ func TestFromOptionsAndRetrieve(t *testing.T) {
 	if err != nil {
 		t.Fatalf("FromOptions() error = %v", err)
 	}
-	creds, err := credential.Retrieve(context.Background())
-	if err != nil {
-		t.Fatalf("Retrieve() error = %v", err)
-	}
-	if creds.AccessKeyID != "ak" || creds.SecretAccessKey != "sk" || creds.SessionToken != "token" {
-		t.Fatalf("unexpected credentials: %+v", creds)
+	if credential.AccessKeyID != "ak" || credential.SecretAccessKey != "sk" || credential.SessionToken != "token" {
+		t.Fatalf("unexpected credential: %+v", credential)
 	}
 }
 

pkg/providers/aws/aws.go

@@ -13,14 +13,13 @@ import (
 	"github.com/404tk/cloudtoolkit/utils"
 	"github.com/404tk/cloudtoolkit/utils/cache"
 	"github.com/404tk/cloudtoolkit/utils/logger"
-	awsv2 "github.com/aws/aws-sdk-go-v2/aws"
 )
 
 // Provider is a data provider for aws API
 type Provider struct {
-	region    string
-	cfg       awsv2.Config
-	apiClient *_api.Client
+	region        string
+	defaultRegion string
+	apiClient     *_api.Client
 }
 
 // New creates a new provider client for aws API
@@ -29,25 +28,19 @@ func New(options schema.Options) (*Provider, error) {
 	if err != nil {
 		return nil, err
 	}
-	region, _ := options.GetMetadata(utils.Region)
-	version, _ := options.GetMetadata(utils.Version)
-	cfg, err := newConfig(
-		credential.AccessKeyID,
-		credential.SecretAccessKey,
-		credential.SessionToken,
-		region,
-		version,
-	)
-	if err != nil {
+	if err := credential.Validate(); err != nil {
 		return nil, err
 	}
+	region, _ := options.GetMetadata(utils.Region)
+	version, _ := options.GetMetadata(utils.Version)
+	defaultRegion := resolveBootstrapRegion(region, version)
 	apiClient := _api.NewClient(credential)
 
 	payload, _ := options.GetMetadata(utils.Payload)
 	if payload == "cloudlist" {
 		resp, err := apiClient.GetCallerIdentity(
 			context.Background(),
-			resolveBootstrapRegion(region, version),
+			defaultRegion,
 		)
 		if err != nil {
 			return nil, err
@@ -59,9 +52,9 @@ func New(options schema.Options) (*Provider, error) {
 	}
 
 	return &Provider{
-		region:    region,
-		cfg:       cfg,
-		apiClient: apiClient,
+		region:        region,
+		defaultRegion: defaultRegion,
+		apiClient:     apiClient,
 	}, nil
 }
 
@@ -80,7 +73,7 @@ func (p *Provider) Resources(ctx context.Context) (schema.Resources, error) {
 			ec2provider := &_ec2.Driver{
 				Client:        p.apiClient,
 				Region:        p.region,
-				DefaultRegion: p.cfg.Region,
+				DefaultRegion: p.defaultRegion,
 			}
 			hosts, err := ec2provider.GetResource(ctx)
 			schema.AppendAssets(&list, hosts)
@@ -90,13 +83,13 @@ func (p *Provider) Resources(ctx context.Context) (schema.Resources, error) {
 			iamprovider := &_iam.Driver{
 				Client:        p.apiClient,
 				Region:        p.region,
-				DefaultRegion: p.cfg.Region,
+				DefaultRegion: p.defaultRegion,
 			}
 			users, err := iamprovider.ListUsers(ctx)
 			schema.AppendAssets(&list, users)
 			list.AddError("account", err)
 		case "bucket":
-			s3provider := &_s3.Driver{Client: p.apiClient, DefaultRegion: p.cfg.Region}
+			s3provider := &_s3.Driver{Client: p.apiClient, DefaultRegion: p.defaultRegion}
 			storages, err := s3provider.GetBuckets(ctx)
 			schema.AppendAssets(&list, storages)
 			list.AddError("bucket", err)
@@ -111,7 +104,7 @@ func (p *Provider) UserManagement(action, username, password string) {
 	ramprovider := &_iam.Driver{
 		Client:        p.apiClient,
 		Region:        p.region,
-		DefaultRegion: p.cfg.Region,
+		DefaultRegion: p.defaultRegion,
 		Username:      username,
 		Password:      password,
 	}
@@ -126,7 +119,7 @@ func (p *Provider) UserManagement(action, username, password string) {
 }
 
 func (p *Provider) BucketDump(ctx context.Context, action, bucketName string) {
-	s3provider := &_s3.Driver{Client: p.apiClient, DefaultRegion: p.cfg.Region}
+	s3provider := &_s3.Driver{Client: p.apiClient, DefaultRegion: p.defaultRegion}
 	switch action {
 	case "list":
 		var infos = make(map[string]string)
@@ -140,7 +133,7 @@ func (p *Provider) BucketDump(ctx context.Context, action, bucketName string) {
 				infos[b.BucketName] = b.Region
 			}
 		} else {
-			infos[bucketName] = p.cfg.Region
+			infos[bucketName] = p.defaultRegion
 		}
 		s3provider.ListObjects(ctx, infos)
 	case "total":
@@ -155,7 +148,7 @@ func (p *Provider) BucketDump(ctx context.Context, action, bucketName string) {
 				infos[b.BucketName] = b.Region
 			}
 		} else {
-			infos[bucketName] = p.cfg.Region
+			infos[bucketName] = p.defaultRegion
 		}
 		s3provider.TotalObjects(ctx, infos)
 	default:

pkg/providers/aws/config.go

@@ -3,28 +3,9 @@ package aws
 import (
 	"strings"
 
-	"github.com/404tk/cloudtoolkit/pkg/providers/aws/auth"
 	"github.com/404tk/cloudtoolkit/pkg/providers/aws/internal/arnutil"
-	awsv2 "github.com/aws/aws-sdk-go-v2/aws"
 )
 
-func newConfig(
-	accessKey string,
-	secretKey string,
-	token string,
-	region string,
-	version string,
-) (awsv2.Config, error) {
-	credential := auth.New(accessKey, secretKey, token)
-	if err := credential.Validate(); err != nil {
-		return awsv2.Config{}, err
-	}
-	return awsv2.Config{
-		Region:      resolveBootstrapRegion(region, version),
-		Credentials: awsv2.NewCredentialsCache(credential),
-	}, nil
-}
-
 func resolveBootstrapRegion(region string, version string) string {
 	if region != "" && region != "all" {
 		return region

pkg/providers/aws/config_test.go

@@ -1,9 +1,6 @@
 package aws
 
-import (
-	"context"
-	"testing"
-)
+import "testing"
 
 func TestResolveBootstrapRegion(t *testing.T) {
 	tests := []struct {
@@ -57,23 +54,3 @@ func TestConsoleURLForARN(t *testing.T) {
 		}
 	}
 }
-
-func TestNewConfigUsesStaticCredentials(t *testing.T) {
-	cfg, err := newConfig("ak", "sk", "token", "all", "China")
-	if err != nil {
-		t.Fatalf("newConfig() error = %v", err)
-	}
-	if cfg.Region != "cn-northwest-1" {
-		t.Fatalf("unexpected region: %s", cfg.Region)
-	}
-	if cfg.Credentials == nil {
-		t.Fatal("expected credentials provider")
-	}
-	creds, err := cfg.Credentials.Retrieve(context.Background())
-	if err != nil {
-		t.Fatalf("Retrieve() error = %v", err)
-	}
-	if creds.AccessKeyID != "ak" || creds.SecretAccessKey != "sk" || creds.SessionToken != "token" {
-		t.Fatalf("unexpected credentials: %+v", creds)
-	}
-}