From e81d50a39132c0cde5036e73108c6a85c473c1e5 Mon Sep 17 00:00:00 2001 From: William Will <10997562+willwill96@users.noreply.github.com> Date: Wed, 16 Apr 2025 05:03:02 +0000 Subject: [PATCH] fix lint issue --- pkg/sessions/redis/aws-iam/auth.go | 8 ++++---- pkg/sessions/redis/redis_store.go | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/sessions/redis/aws-iam/auth.go b/pkg/sessions/redis/aws-iam/auth.go index 39a75db6..0019f7c4 100644 --- a/pkg/sessions/redis/aws-iam/auth.go +++ b/pkg/sessions/redis/aws-iam/auth.go @@ -27,7 +27,7 @@ const ( hexEncodedSHA256EmptyString = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" ) -type AuthTokenGenerator struct { +type IAMTokenGenerator struct { serviceName string region string req *http.Request @@ -36,7 +36,7 @@ type AuthTokenGenerator struct { signer *v4.Signer } -func New(serviceName, clusterName, userName string) (*AuthTokenGenerator, error) { +func New(serviceName, clusterName, userName string) (*IAMTokenGenerator, error) { ctx := context.Background() cfg, err := config.LoadDefaultConfig(ctx) @@ -63,7 +63,7 @@ func New(serviceName, clusterName, userName string) (*AuthTokenGenerator, error) return nil, err } - return &AuthTokenGenerator{ + return &IAMTokenGenerator{ serviceName: serviceName, region: cfg.Region, req: req, @@ -72,7 +72,7 @@ func New(serviceName, clusterName, userName string) (*AuthTokenGenerator, error) }, nil } -func (atg AuthTokenGenerator) Generate() (string, error) { +func (atg IAMTokenGenerator) Generate() (string, error) { ctx := context.Background() credentials, err := atg.credentialsProvider.Retrieve(ctx) if err != nil { diff --git a/pkg/sessions/redis/redis_store.go b/pkg/sessions/redis/redis_store.go index 72b67e64..6d1a5f85 100644 --- a/pkg/sessions/redis/redis_store.go +++ b/pkg/sessions/redis/redis_store.go @@ -12,7 +12,7 @@ import ( "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/sessions" "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger" "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/sessions/persistence" - awsAuth "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/sessions/redis/aws-iam" + auth "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/sessions/redis/aws-iam" "github.com/redis/go-redis/v9" ) @@ -188,7 +188,7 @@ func setupAWSIAMAuth(opts options.RedisStoreOptions, opt *redis.Options) error { if opts.AWSServiceName != "elasticache" && opts.AWSServiceName != "memorydb" { return fmt.Errorf("AWS IAM auth is only supported for elasticache and memorydb") } - generator, err := awsAuth.New(opts.AWSServiceName, opts.AWSClusterName, opts.AWSUsername) + generator, err := auth.New(opts.AWSServiceName, opts.AWSClusterName, opts.AWSUsername) if err != nil { return fmt.Errorf("error creating AWS IAM auth token generator: %v", err) }