Merge branch 'main' into makefile-local-context-check

Author: ktdreyer

.mergify.yml

@@ -0,0 +1,17 @@
+queue_rules:
+  - name: default
+    merge_method: squash
+    queue_conditions:
+      - check-success=End-to-End Tests
+      - check-success=amber-review
+      - check-success=validate-manifests
+      - check-success=test-local-dev-simulation
+
+pull_request_rules:
+  - name: enqueue on approval
+    conditions:
+      - "#approved-reviews-by>=1"
+      - "#changes-requested-reviews-by=0"
+    actions:
+      queue:
+        name: default

components/ambient-api-server/cmd/ambient-api-server/environments/e_development.go

@@ -18,9 +18,10 @@ func (e *DevEnvImpl) OverrideDatabase(c *pkgenv.Database) error {
 }
 
 func (e *DevEnvImpl) OverrideConfig(c *config.ApplicationConfig) error {
-	c.Server.EnableJWT = false
-	c.Server.EnableHTTPS = false
 	c.Server.CORSAllowedHeaders = []string{"X-Ambient-Project"}
+	c.Server.JwkCertFile = "secrets/kind-jwks.json"
+	c.Server.JwkCertURL = ""
+	c.Auth.EnableJWT = false
 	return nil
 }
 
@@ -38,11 +39,10 @@ func (e *DevEnvImpl) OverrideClients(c *pkgenv.Clients) error {
 
 func (e *DevEnvImpl) Flags() map[string]string {
 	return map[string]string{
-		"v":                      "10",
+		"v":                      "8",
 		"enable-authz":           "false",
 		"debug":                  "false",
 		"enable-mock":            "true",
-		"enable-https":           "false",
 		"enable-metrics-https":   "false",
 		"api-server-hostname":    "localhost",
 		"api-server-bindaddress": "localhost:8000",

components/ambient-api-server/cmd/ambient-api-server/environments/e_production.go

@@ -19,6 +19,9 @@ func (e *ProductionEnvImpl) OverrideDatabase(c *pkgenv.Database) error {
 
 func (e *ProductionEnvImpl) OverrideConfig(c *config.ApplicationConfig) error {
 	c.Server.CORSAllowedHeaders = []string{"X-Ambient-Project"}
+	c.Server.JwkCertURL = "https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/certs"
+	c.Server.JwkCertFile = ""
+	c.Auth.JwkCertURL = "https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/certs"
 	return nil
 }
 

components/ambient-api-server/go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/gorilla/mux v1.7.3
 	github.com/onsi/gomega v1.27.1
 	github.com/openshift-online/ocm-sdk-go v0.1.334
-	github.com/openshift-online/rh-trex-ai v0.0.14
+	github.com/openshift-online/rh-trex-ai v0.0.19 // v0.0.14→v0.0.19: gRPC TLS support, JWT audience validation fix, OpenAPI generator improvements
 	github.com/spf13/pflag v1.0.6
 	google.golang.org/grpc v1.75.1
 	google.golang.org/protobuf v1.36.11

components/ambient-api-server/go.sum

@@ -468,8 +468,8 @@ github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJw
 github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M=
 github.com/openshift-online/ocm-sdk-go v0.1.334 h1:45WSkXEsmpGekMa9kO6NpEG8PW5/gfmMekr7kL+1KvQ=
 github.com/openshift-online/ocm-sdk-go v0.1.334/go.mod h1:KYOw8kAKAHyPrJcQoVR82CneQ4ofC02Na4cXXaTq4Nw=
-github.com/openshift-online/rh-trex-ai v0.0.14 h1:uwWs1adDGJw24xyOKDX3PUTV9x7KBBx52ZPlkFWfkJc=
-github.com/openshift-online/rh-trex-ai v0.0.14/go.mod h1:uAKlJizd9Lu7uLckgyxhMMAA9Zr2LuH1XjtwJLc5uKU=
+github.com/openshift-online/rh-trex-ai v0.0.19 h1:Qj40SSPXrrunplRRvcevWwNZw3ZNvOp/o6lguA+grKw=
+github.com/openshift-online/rh-trex-ai v0.0.19/go.mod h1:uAKlJizd9Lu7uLckgyxhMMAA9Zr2LuH1XjtwJLc5uKU=
 github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=

components/ambient-api-server/plugins/projectSettings/plugin.go

@@ -48,7 +48,7 @@ func init() {
 		return NewServiceLocator(env.(*environments.Env))
 	})
 
-	pkgserver.RegisterRoutes("project_settings", func(apiV1Router *mux.Router, services pkgserver.ServicesInterface, authMiddleware auth.JWTMiddleware, authzMiddleware auth.AuthorizationMiddleware) {
+	pkgserver.RegisterRoutes("project_settings", func(apiV1Router *mux.Router, services pkgserver.ServicesInterface, authMiddleware environments.JWTMiddleware, authzMiddleware auth.AuthorizationMiddleware) {
 		envServices := services.(*environments.Services)
 		handler := NewProjectSettingsHandler(Service(envServices), generic.Service(envServices))
 

components/ambient-api-server/plugins/projects/plugin.go

@@ -48,7 +48,7 @@ func init() {
 		return NewServiceLocator(env.(*environments.Env))
 	})
 
-	pkgserver.RegisterRoutes("projects", func(apiV1Router *mux.Router, services pkgserver.ServicesInterface, authMiddleware auth.JWTMiddleware, authzMiddleware auth.AuthorizationMiddleware) {
+	pkgserver.RegisterRoutes("projects", func(apiV1Router *mux.Router, services pkgserver.ServicesInterface, authMiddleware environments.JWTMiddleware, authzMiddleware auth.AuthorizationMiddleware) {
 		envServices := services.(*environments.Services)
 		projectHandler := NewProjectHandler(Service(envServices), generic.Service(envServices))
 

components/ambient-api-server/plugins/sessions/plugin.go

@@ -48,7 +48,7 @@ func init() {
 		return NewServiceLocator(env.(*environments.Env))
 	})
 
-	pkgserver.RegisterRoutes("sessions", func(apiV1Router *mux.Router, services pkgserver.ServicesInterface, authMiddleware auth.JWTMiddleware, authzMiddleware auth.AuthorizationMiddleware) {
+	pkgserver.RegisterRoutes("sessions", func(apiV1Router *mux.Router, services pkgserver.ServicesInterface, authMiddleware environments.JWTMiddleware, authzMiddleware auth.AuthorizationMiddleware) {
 		envServices := services.(*environments.Services)
 		sessionHandler := NewSessionHandler(Service(envServices), generic.Service(envServices))
 

components/ambient-api-server/plugins/users/plugin.go

@@ -48,7 +48,7 @@ func init() {
 		return NewServiceLocator(env.(*environments.Env))
 	})
 
-	pkgserver.RegisterRoutes("users", func(apiV1Router *mux.Router, services pkgserver.ServicesInterface, authMiddleware auth.JWTMiddleware, authzMiddleware auth.AuthorizationMiddleware) {
+	pkgserver.RegisterRoutes("users", func(apiV1Router *mux.Router, services pkgserver.ServicesInterface, authMiddleware environments.JWTMiddleware, authzMiddleware auth.AuthorizationMiddleware) {
 		envServices := services.(*environments.Services)
 		userHandler := NewUserHandler(Service(envServices), generic.Service(envServices))
 

components/ambient-api-server/secrets/db.port

@@ -1 +1 @@
-5432
+5432