From b6f0dc3ba712246182048ab5b68c73ba467aed10 Mon Sep 17 00:00:00 2001 From: Ryan Richard Date: Thu, 7 Sep 2023 09:52:56 -0700 Subject: [PATCH] Fix conflicts caused from rebasing main into multiple IDPs branch --- .../active_directory_upstream_watcher_test.go | 2 +- internal/upstreamldap/upstreamldap_test.go | 4 ++-- test/integration/e2e_test.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/controller/supervisorconfig/activedirectoryupstreamwatcher/active_directory_upstream_watcher_test.go b/internal/controller/supervisorconfig/activedirectoryupstreamwatcher/active_directory_upstream_watcher_test.go index f88287a0..92500d6e 100644 --- a/internal/controller/supervisorconfig/activedirectoryupstreamwatcher/active_directory_upstream_watcher_test.go +++ b/internal/controller/supervisorconfig/activedirectoryupstreamwatcher/active_directory_upstream_watcher_test.go @@ -2491,7 +2491,7 @@ func TestAttributeUnchangedSinceLogin(t *testing.T) { tt := test t.Run(tt.name, func(t *testing.T) { initialValRawEncoded := base64.RawURLEncoding.EncodeToString([]byte(initialVal)) - err := attributeUnchangedSinceLogin(attributeName)(tt.entry, provider.RefreshAttributes{AdditionalAttributes: map[string]string{attributeName: initialValRawEncoded}}) + err := attributeUnchangedSinceLogin(attributeName)(tt.entry, upstreamprovider.RefreshAttributes{AdditionalAttributes: map[string]string{attributeName: initialValRawEncoded}}) if tt.wantErr != "" { require.Error(t, err) require.Equal(t, tt.wantErr, err.Error()) diff --git a/internal/upstreamldap/upstreamldap_test.go b/internal/upstreamldap/upstreamldap_test.go index e511d66e..574b478d 100644 --- a/internal/upstreamldap/upstreamldap_test.go +++ b/internal/upstreamldap/upstreamldap_test.go @@ -2203,8 +2203,8 @@ func TestUpstreamRefresh(t *testing.T) { { name: "search result has a changed pwdLastSet value", providerConfig: providerConfig(func(p *ProviderConfig) { - p.RefreshAttributeChecks = map[string]func(*ldap.Entry, provider.RefreshAttributes) error{ - pwdLastSetAttribute: func(*ldap.Entry, provider.RefreshAttributes) error { + p.RefreshAttributeChecks = map[string]func(*ldap.Entry, upstreamprovider.RefreshAttributes) error{ + pwdLastSetAttribute: func(*ldap.Entry, upstreamprovider.RefreshAttributes) error { return errors.New(`value for attribute "pwdLastSet" has changed since initial value at login`) }, } diff --git a/test/integration/e2e_test.go b/test/integration/e2e_test.go index 48074af3..f684b512 100644 --- a/test/integration/e2e_test.go +++ b/test/integration/e2e_test.go @@ -1210,7 +1210,7 @@ func TestE2EFullIntegration_Browser(t *testing.T) { testCtx, cancel := context.WithTimeout(context.Background(), 5*time.Minute) t.Cleanup(cancel) - tempDir := testutil.TempDir(t) // per-test tmp dir to avoid sharing files between tests + tempDir := t.TempDir() // per-test tmp dir to avoid sharing files between tests // Start a fresh browser driver because we don't want to share cookies between the various tests in this file. browser := browsertest.OpenBrowser(t)