From 3f412cdf5d792b192af64187b9ece1433d55b007 Mon Sep 17 00:00:00 2001 From: Prateek Gogia Date: Thu, 14 Jul 2022 19:13:22 -0500 Subject: [PATCH] Update naming for a const --- .../aws/aws_assumerole_provider.go | 12 ++--- .../aws/aws_assumerole_provider_test.go | 48 +++++++++---------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/staging/src/k8s.io/legacy-cloud-providers/aws/aws_assumerole_provider.go b/staging/src/k8s.io/legacy-cloud-providers/aws/aws_assumerole_provider.go index ad5a63b4c7f..1f96538eadf 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/aws/aws_assumerole_provider.go +++ b/staging/src/k8s.io/legacy-cloud-providers/aws/aws_assumerole_provider.go @@ -24,14 +24,14 @@ import ( ) const ( - invalidateCredsAfter = 1 * time.Second + invalidateCredsCacheAfter = 1 * time.Second ) // assumeRoleProviderWithRateLimiting makes sure we call the underlying provider only -// once after `invalidateCredsAfter` period +// once after `invalidateCredsCacheAfter` period type assumeRoleProviderWithRateLimiting struct { - provider credentials.Provider - invalidateCredsAfter time.Duration + provider credentials.Provider + invalidateCredsCacheAfter time.Duration sync.RWMutex lastError error lastValue credentials.Value @@ -40,13 +40,13 @@ type assumeRoleProviderWithRateLimiting struct { func assumeRoleProvider(provider credentials.Provider) credentials.Provider { return &assumeRoleProviderWithRateLimiting{provider: provider, - invalidateCredsAfter: invalidateCredsAfter} + invalidateCredsCacheAfter: invalidateCredsCacheAfter} } func (l *assumeRoleProviderWithRateLimiting) Retrieve() (credentials.Value, error) { l.Lock() defer l.Unlock() - if time.Since(l.lastRetrieveTime) < l.invalidateCredsAfter { + if time.Since(l.lastRetrieveTime) < l.invalidateCredsCacheAfter { if l.lastError != nil { return credentials.Value{}, l.lastError } diff --git a/staging/src/k8s.io/legacy-cloud-providers/aws/aws_assumerole_provider_test.go b/staging/src/k8s.io/legacy-cloud-providers/aws/aws_assumerole_provider_test.go index 09e947a4a11..b4ecc171c30 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/aws/aws_assumerole_provider_test.go +++ b/staging/src/k8s.io/legacy-cloud-providers/aws/aws_assumerole_provider_test.go @@ -28,12 +28,12 @@ import ( func Test_assumeRoleProviderWithRateLimiting_Retrieve(t *testing.T) { type fields struct { - provider credentials.Provider - invalidateCredsAfter time.Duration - RWMutex sync.RWMutex - lastError error - lastValue credentials.Value - lastRetrieveTime time.Time + provider credentials.Provider + invalidateCredsCacheAfter time.Duration + RWMutex sync.RWMutex + lastError error + lastValue credentials.Value + lastRetrieveTime time.Time } tests := []struct { name string @@ -51,10 +51,10 @@ func Test_assumeRoleProviderWithRateLimiting_Retrieve(t *testing.T) { }, { name: "Immediate call to assume role API, shouldn't call the underlying provider and return the last value", fields: fields{ - provider: &fakeAssumeRoleProvider{accesskeyID: "fakeID"}, - invalidateCredsAfter: 100 * time.Millisecond, - lastValue: credentials.Value{AccessKeyID: "fakeID1"}, - lastRetrieveTime: time.Now(), + provider: &fakeAssumeRoleProvider{accesskeyID: "fakeID"}, + invalidateCredsCacheAfter: 100 * time.Millisecond, + lastValue: credentials.Value{AccessKeyID: "fakeID1"}, + lastRetrieveTime: time.Now(), }, want: credentials.Value{AccessKeyID: "fakeID1"}, wantProviderCalled: false, @@ -62,9 +62,9 @@ func Test_assumeRoleProviderWithRateLimiting_Retrieve(t *testing.T) { }, { name: "Assume role provider returns an error when trying to assume a role", fields: fields{ - provider: &fakeAssumeRoleProvider{err: fmt.Errorf("can't assume fake role")}, - invalidateCredsAfter: 10 * time.Millisecond, - lastRetrieveTime: time.Now(), + provider: &fakeAssumeRoleProvider{err: fmt.Errorf("can't assume fake role")}, + invalidateCredsCacheAfter: 10 * time.Millisecond, + lastRetrieveTime: time.Now(), }, wantProviderCalled: true, wantErr: true, @@ -73,9 +73,9 @@ func Test_assumeRoleProviderWithRateLimiting_Retrieve(t *testing.T) { }, { name: "Immediate call to assume role API, shouldn't call the underlying provider and return the last error value", fields: fields{ - provider: &fakeAssumeRoleProvider{}, - invalidateCredsAfter: 100 * time.Millisecond, - lastRetrieveTime: time.Now(), + provider: &fakeAssumeRoleProvider{}, + invalidateCredsCacheAfter: 100 * time.Millisecond, + lastRetrieveTime: time.Now(), }, want: credentials.Value{}, wantProviderCalled: false, @@ -84,9 +84,9 @@ func Test_assumeRoleProviderWithRateLimiting_Retrieve(t *testing.T) { }, { name: "Delayed call to assume role API, should call the underlying provider", fields: fields{ - provider: &fakeAssumeRoleProvider{accesskeyID: "fakeID2"}, - invalidateCredsAfter: 20 * time.Millisecond, - lastRetrieveTime: time.Now(), + provider: &fakeAssumeRoleProvider{accesskeyID: "fakeID2"}, + invalidateCredsCacheAfter: 20 * time.Millisecond, + lastRetrieveTime: time.Now(), }, want: credentials.Value{AccessKeyID: "fakeID2"}, wantProviderCalled: true, @@ -95,11 +95,11 @@ func Test_assumeRoleProviderWithRateLimiting_Retrieve(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { l := &assumeRoleProviderWithRateLimiting{ - provider: tt.fields.provider, - invalidateCredsAfter: tt.fields.invalidateCredsAfter, - lastError: tt.fields.lastError, - lastValue: tt.fields.lastValue, - lastRetrieveTime: tt.fields.lastRetrieveTime, + provider: tt.fields.provider, + invalidateCredsCacheAfter: tt.fields.invalidateCredsCacheAfter, + lastError: tt.fields.lastError, + lastValue: tt.fields.lastValue, + lastRetrieveTime: tt.fields.lastRetrieveTime, } time.Sleep(tt.sleepBeforeCallingProvider) got, err := l.Retrieve()