fix tests

Signed-off-by: notfromstatefarm <86763948+notfromstatefarm@users.noreply.github.com>
argoproj · Jul 12, 2022 · c6ad8cb · c6ad8cb
1 parent acbf027
commit c6ad8cb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/util/dex/dex.go b/util/dex/dex.go
@@ -33,7 +33,7 @@ type DexTLSConfig struct {
 }
 
 func TLSConfig(tlsConfig *DexTLSConfig) *tls.Config {
-	if tlsConfig == nil {
+	if tlsConfig == nil || tlsConfig.DisableTLS {
 		return nil
 	}
 	if !tlsConfig.StrictValidation {

diff --git a/util/oidc/oidc_test.go b/util/oidc/oidc_test.go
@@ -21,6 +21,7 @@ import (
 	"github.com/argoproj/argo-cd/v2/server/settings/oidc"
 	"github.com/argoproj/argo-cd/v2/util"
 	"github.com/argoproj/argo-cd/v2/util/crypto"
+	"github.com/argoproj/argo-cd/v2/util/dex"
 	"github.com/argoproj/argo-cd/v2/util/settings"
 	"github.com/argoproj/argo-cd/v2/util/test"
 )
@@ -178,9 +179,7 @@ requestedScopes: ["oidc"]`, oidcTestServer.URL),
 			t.Fatal("did not receive expected certificate verification failure error")
 		}
 
-		cdSettings.OIDCTLSInsecureSkipVerify = true
-
-		app, err = NewClientApp(cdSettings, dexTestServer.URL, nil, "https://argocd.example.com")
+		app, err = NewClientApp(cdSettings, dexTestServer.URL, &dex.DexTLSConfig{StrictValidation: false}, "https://argocd.example.com")
 		require.NoError(t, err)
 
 		w = httptest.NewRecorder()
@@ -262,9 +261,7 @@ requestedScopes: ["oidc"]`, oidcTestServer.URL),
 			t.Fatal("did not receive expected certificate verification failure error")
 		}
 
-		cdSettings.OIDCTLSInsecureSkipVerify = true
-
-		app, err = NewClientApp(cdSettings, dexTestServer.URL, nil, "https://argocd.example.com")
+		app, err = NewClientApp(cdSettings, dexTestServer.URL, &dex.DexTLSConfig{StrictValidation: false}, "https://argocd.example.com")
 		require.NoError(t, err)
 
 		w = httptest.NewRecorder()