fixes #2712 edge-oidc missing from /version

controller/internal/routes/version_router.go

@@ -87,6 +87,7 @@ func (ir *VersionRouter) List(ae *env.AppEnv, rc *response.RequestContext) {
 			APIVersions: map[string]map[string]rest_model.APIVersion{
 				webapis.ClientApiBinding:     {webapis.VersionV1: mapApiVersionToRestModel(webapis.ClientRestApiBaseUrlV1)},
 				webapis.ManagementApiBinding: {webapis.VersionV1: mapApiVersionToRestModel(webapis.ManagementRestApiBaseUrlV1)},
+				webapis.OidcApiBinding:       {webapis.VersionV1: mapApiVersionToRestModel(webapis.OidcRestApiBaseUrl)},
 			},
 			Capabilities: []string{},
 		}

controller/webapis/versions.go

@@ -30,6 +30,7 @@ const (
 	ClientRestApiBaseUrlV1            = ClientRestApiBase + RestApiV1
 	ManagementRestApiBaseUrlV1        = ManagementRestApiBase + RestApiV1
 	ControllerHealthCheckApiBaseUrlV1 = ControllerHealthCheck + RestApiV1
+	OidcRestApiBaseUrl                = "/oidc"
 
 	ClientRestApiBaseUrlLatest     = ClientRestApiBaseUrlV1
 	ManagementRestApiBaseUrlLatest = ManagementRestApiBaseUrlV1

tests/endpoint_test.go

@@ -1,6 +1,8 @@
 package tests
 
 import (
+	"encoding/json"
+	"github.com/openziti/edge-api/rest_model"
 	"net/http"
 	"testing"
 )
@@ -76,4 +78,78 @@ func Test_Endpoints(t *testing.T) {
 		ctx.Req.Equal("application/pkcs7-mime", resp.Header().Get("Content-Type"))
 		ctx.Req.NotEmpty(resp.Body())
 	})
+
+	t.Run("the version endpoint", func(t *testing.T) {
+
+		t.Run("responds on root /version", func(t *testing.T) {
+			ctx.testContextChanged(t)
+
+			rootResp, err := ctx.newAnonymousClientApiRequest().Get("https://" + ctx.ApiHost + "/version")
+			ctx.Req.NoError(err)
+			ctx.Req.Equal(200, rootResp.StatusCode())
+
+			t.Run("has the proper values", func(t *testing.T) {
+				ctx.testContextChanged(t)
+
+				ctx.Req.Equal("application/json", rootResp.Header().Get("Content-Type"))
+
+				data := &rest_model.Version{}
+				envelope := &rest_model.Empty{
+					Data: data,
+				}
+
+				err = json.Unmarshal(rootResp.Body(), envelope)
+				ctx.Req.NoError(err)
+
+				ctx.Req.NotEmpty(envelope)
+				ctx.Req.NotEmpty(envelope.Data)
+				ctx.Req.NotEmpty(data)
+				ctx.Req.NotEmpty(data.Version)
+				ctx.Req.NotEmpty(data.APIVersions)
+				ctx.Req.NotEmpty(data.BuildDate)
+				ctx.Req.NotEmpty(data.Capabilities)
+				ctx.Req.NotEmpty(data.Revision)
+				ctx.Req.NotEmpty(data.RuntimeVersion)
+
+				ctx.Req.Contains(data.APIVersions, "edge")
+				ctx.Req.Contains(data.APIVersions["edge"], "v1")
+				ctx.Req.Equal(*data.APIVersions["edge"]["v1"].Path, "/edge/client/v1")
+
+				ctx.Req.Contains(data.APIVersions, "edge-client")
+				ctx.Req.Contains(data.APIVersions["edge-client"], "v1")
+				ctx.Req.Equal(*data.APIVersions["edge-client"]["v1"].Path, "/edge/client/v1")
+
+				ctx.Req.Contains(data.APIVersions, "edge-management")
+				ctx.Req.Contains(data.APIVersions["edge-management"], "v1")
+				ctx.Req.Equal(*data.APIVersions["edge-management"]["v1"].Path, "/edge/management/v1")
+
+				ctx.Req.Contains(data.APIVersions, "edge-oidc")
+				ctx.Req.Contains(data.APIVersions["edge-oidc"], "v1")
+				ctx.Req.Equal(*data.APIVersions["edge-oidc"]["v1"].Path, "/oidc")
+
+				ctx.Req.Contains(data.APIVersions, "health-checks")
+				ctx.Req.Contains(data.APIVersions["health-checks"], "v1")
+				ctx.Req.Equal(*data.APIVersions["health-checks"]["v1"].Path, "/health-checks/v1")
+			})
+
+			t.Run("responds on /edge/client/v1/version", func(t *testing.T) {
+				ctx.testContextChanged(t)
+
+				resp, err := ctx.newAnonymousClientApiRequest().Get("version")
+				ctx.Req.NoError(err)
+				ctx.Req.Equal(200, resp.StatusCode())
+				ctx.Req.Equal(rootResp.Body(), resp.Body())
+			})
+
+			t.Run("responds on /edge/management/v1/version", func(t *testing.T) {
+				ctx.testContextChanged(t)
+
+				resp, err := ctx.newAnonymousManagementApiRequest().Get("version")
+				ctx.Req.NoError(err)
+				ctx.Req.Equal(200, resp.StatusCode())
+				ctx.Req.Equal(rootResp.Body(), resp.Body())
+			})
+		})
+
+	})
 }