Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'workhorse/internal/upload/destination/objectstore/s3_session_test.go')
-rw-r--r--workhorse/internal/upload/destination/objectstore/s3_session_test.go11
1 files changed, 9 insertions, 2 deletions
diff --git a/workhorse/internal/upload/destination/objectstore/s3_session_test.go b/workhorse/internal/upload/destination/objectstore/s3_session_test.go
index 2329569b774..35959fff906 100644
--- a/workhorse/internal/upload/destination/objectstore/s3_session_test.go
+++ b/workhorse/internal/upload/destination/objectstore/s3_session_test.go
@@ -65,7 +65,7 @@ func TestS3SessionExpiry(t *testing.T) {
require.Equal(t, aws.StringValue(sess.Config.Region), "us-west-1")
require.True(t, aws.BoolValue(sess.Config.S3ForcePathStyle))
- firstSession, ok := sessionCache.sessions[cfg]
+ firstSession, ok := getS3Session(cfg)
require.True(t, ok)
require.False(t, firstSession.isExpired())
@@ -75,7 +75,7 @@ func TestS3SessionExpiry(t *testing.T) {
_, err = setupS3Session(credentials, cfg)
require.NoError(t, err)
- nextSession, ok := sessionCache.sessions[cfg]
+ nextSession, ok := getS3Session(cfg)
require.True(t, ok)
require.False(t, nextSession.isExpired())
}
@@ -85,3 +85,10 @@ func resetS3Sessions() {
defer sessionCache.Unlock()
sessionCache.sessions = make(map[config.S3Config]*s3Session)
}
+
+func getS3Session(cfg config.S3Config) (*s3Session, bool) {
+ sessionCache.Lock()
+ defer sessionCache.Unlock()
+ session, ok := sessionCache.sessions[cfg]
+ return session, ok
+}