diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-19 06:09:23 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-19 06:09:23 +0300 |
commit | 5d3fb47a057b7a2bfc03676d3fdeaa9138424c2f (patch) | |
tree | 3cc1a4ab008ac157887f8e743d50f205df0d175b /workhorse | |
parent | af5bf83315cddeb562d2429ae88b09a95b647472 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'workhorse')
-rw-r--r-- | workhorse/internal/upload/destination/objectstore/s3_session_test.go | 11 |
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 +} |