From 961f9269406eece7e0f26eecaeae32537ab7a87a Mon Sep 17 00:00:00 2001 From: Abdul Azeez Date: Tue, 21 Nov 2023 16:27:47 +0530 Subject: [PATCH] dex pkg upgrade (#8291) * dex pkg upgrade Signed-off-by: Abdul-Az * added empty comment Signed-off-by: Abdul-Az * added blank commits to build Signed-off-by: Abdul-Az --------- Signed-off-by: Abdul-Az --- components/automate-backend-deployment/habitat/plan.sh | 1 + components/automate-cluster-ctl/habitat/plan.sh | 1 + components/local-user-service/users/dex/dex_test.go | 1 + components/session-service/server/server_functional_test.go | 2 ++ go.mod | 2 +- 5 files changed, 6 insertions(+), 1 deletion(-) diff --git a/components/automate-backend-deployment/habitat/plan.sh b/components/automate-backend-deployment/habitat/plan.sh index 3925bb2322a..287903d77c6 100644 --- a/components/automate-backend-deployment/habitat/plan.sh +++ b/components/automate-backend-deployment/habitat/plan.sh @@ -1,5 +1,6 @@ #stable channel + pkg_name=automate-ha-deployment pkg_description="A wrapper package for setting up a deployment workstation for the A2 HA Backend." pkg_origin=chef diff --git a/components/automate-cluster-ctl/habitat/plan.sh b/components/automate-cluster-ctl/habitat/plan.sh index 98deada1469..91c5028653a 100644 --- a/components/automate-cluster-ctl/habitat/plan.sh +++ b/components/automate-cluster-ctl/habitat/plan.sh @@ -1,5 +1,6 @@ #stable channel + pkg_name=automate-ha-cluster-ctl pkg_description="A package for automate-cluster-ctl for the A2 HA Backend." pkg_origin=chef diff --git a/components/local-user-service/users/dex/dex_test.go b/components/local-user-service/users/dex/dex_test.go index ba977e79c00..93f295de44c 100644 --- a/components/local-user-service/users/dex/dex_test.go +++ b/components/local-user-service/users/dex/dex_test.go @@ -26,6 +26,7 @@ func TestDexUsersAdapter(t *testing.T) { // We need to load the dex certs for the dex server because // local user service checks the name the server gives back // matches automate-dex, which is in the automate-dex cert. + dexCerts := helpers.LoadDevCerts(t, "automate-dex") dexConnFactory := secureconn.NewFactory(*dexCerts) diff --git a/components/session-service/server/server_functional_test.go b/components/session-service/server/server_functional_test.go index 14e299f798c..267ad861984 100644 --- a/components/session-service/server/server_functional_test.go +++ b/components/session-service/server/server_functional_test.go @@ -2,6 +2,7 @@ // session-service, and use a standard http.Client to interacting with them. // These interactions do properly handle redirects and cookies, so they closely // approximate what happens in a real-world setting. + package server_test import ( @@ -59,6 +60,7 @@ func TestMain(t *testing.T) { s := httptest.NewUnstartedServer(mux) dexCerts := devDexCerts(t) s.TLS = &tls.Config{ + // We have to use the dex certs here because session-service is going // to check that the thing its talking to is automate-dex Certificates: []tls.Certificate{*dexCerts.ServiceKeyPair}, diff --git a/go.mod b/go.mod index ff4a526e819..6d210d226c4 100644 --- a/go.mod +++ b/go.mod @@ -26,7 +26,7 @@ require ( github.com/ckaznocha/protoc-gen-lint v0.2.1 github.com/coreos/go-oidc v2.0.0+incompatible github.com/dave/jennifer v0.17.0 - github.com/dexidp/dex v2.19.0+incompatible + github.com/dexidp/dex v2.35.0+incompatible github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/envoyproxy/protoc-gen-validate v0.4.0 github.com/fatih/color v1.9.0