From 94b7bc46fe6601c27a292942ea2b76a8c027acda Mon Sep 17 00:00:00 2001 From: Henning Fleischhauer <18215579+CaptainStandby@users.noreply.github.com> Date: Mon, 6 Mar 2023 16:44:52 +0100 Subject: [PATCH] fix: use type alias instead of type definition --- internal/client-go/model_identity_schema_container.go | 2 +- internal/httpclient/model_identity_schema_container.go | 2 +- schema/handler.go | 2 +- spec/api.json | 3 ++- spec/swagger.json | 3 ++- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/internal/client-go/model_identity_schema_container.go b/internal/client-go/model_identity_schema_container.go index e6325c056db0..d25bd30ab716 100644 --- a/internal/client-go/model_identity_schema_container.go +++ b/internal/client-go/model_identity_schema_container.go @@ -19,7 +19,7 @@ import ( type IdentitySchemaContainer struct { // The ID of the Identity JSON Schema Id *string `json:"id,omitempty"` - // Raw JSON Schema + // The actual Identity JSON Schema Schema map[string]interface{} `json:"schema,omitempty"` } diff --git a/internal/httpclient/model_identity_schema_container.go b/internal/httpclient/model_identity_schema_container.go index e6325c056db0..d25bd30ab716 100644 --- a/internal/httpclient/model_identity_schema_container.go +++ b/internal/httpclient/model_identity_schema_container.go @@ -19,7 +19,7 @@ import ( type IdentitySchemaContainer struct { // The ID of the Identity JSON Schema Id *string `json:"id,omitempty"` - // Raw JSON Schema + // The actual Identity JSON Schema Schema map[string]interface{} `json:"schema,omitempty"` } diff --git a/schema/handler.go b/schema/handler.go index d628f3e181e7..3d81f34da602 100644 --- a/schema/handler.go +++ b/schema/handler.go @@ -70,7 +70,7 @@ func (h *Handler) RegisterAdminRoutes(admin *x.RouterAdmin) { // //nolint:deadcode,unused //lint:ignore U1000 Used to generate Swagger and OpenAPI definitions -type identitySchema json.RawMessage +type identitySchema = json.RawMessage // Get Identity JSON Schema Response // diff --git a/spec/api.json b/spec/api.json index 24a7ed80f033..603f7e6707f0 100755 --- a/spec/api.json +++ b/spec/api.json @@ -971,7 +971,8 @@ "type": "string" }, "schema": { - "$ref": "#/components/schemas/identitySchema" + "description": "The actual Identity JSON Schema", + "type": "object" } }, "type": "object" diff --git a/spec/swagger.json b/spec/swagger.json index ba7757488e67..83c0ef6451f2 100755 --- a/spec/swagger.json +++ b/spec/swagger.json @@ -3769,7 +3769,8 @@ "type": "string" }, "schema": { - "$ref": "#/definitions/identitySchema" + "description": "The actual Identity JSON Schema", + "type": "object" } } },