From c47aed0db57ec676d95bf23b7a693cdd4592d3c7 Mon Sep 17 00:00:00 2001 From: linoman <2051016+linoman@users.noreply.github.com> Date: Thu, 12 Dec 2024 12:42:09 +0100 Subject: [PATCH] SCIM: Clean removes old swagger documentation (#97786) * remove open swagger references --- .../receiver/v0alpha1/receiver_schema_gen.go | 2 +- .../v0alpha1/templategroup_schema_gen.go | 2 +- .../v0alpha1/timeinterval_schema_gen.go | 2 +- public/api-enterprise-spec.json | 237 ----------------- public/api-merged.json | 237 ----------------- .../datasource/cloudwatch/dataquery.cue | 2 +- public/openapi3.json | 241 ------------------ 7 files changed, 4 insertions(+), 719 deletions(-) diff --git a/apps/alerting/notifications/pkg/apis/resource/receiver/v0alpha1/receiver_schema_gen.go b/apps/alerting/notifications/pkg/apis/resource/receiver/v0alpha1/receiver_schema_gen.go index 48b5d72fbd9..d159d0d9cb9 100644 --- a/apps/alerting/notifications/pkg/apis/resource/receiver/v0alpha1/receiver_schema_gen.go +++ b/apps/alerting/notifications/pkg/apis/resource/receiver/v0alpha1/receiver_schema_gen.go @@ -13,7 +13,7 @@ import ( // schema is unexported to prevent accidental overwrites var ( schemaReceiver = resource.NewSimpleSchema("notifications.alerting.grafana.app", "v0alpha1", &Receiver{}, &ReceiverList{}, resource.WithKind("Receiver"), - resource.WithPlural("receivers"), resource.WithScope(resource.NamespacedScope), resource.WithSelectableFields([]resource.SelectableField{resource.SelectableField{ + resource.WithPlural("receivers"), resource.WithScope(resource.NamespacedScope), resource.WithSelectableFields([]resource.SelectableField{{ FieldSelector: "spec.title", FieldValueFunc: func(o resource.Object) (string, error) { cast, ok := o.(*Receiver) diff --git a/apps/alerting/notifications/pkg/apis/resource/templategroup/v0alpha1/templategroup_schema_gen.go b/apps/alerting/notifications/pkg/apis/resource/templategroup/v0alpha1/templategroup_schema_gen.go index 256fbab3116..073e8eb9058 100644 --- a/apps/alerting/notifications/pkg/apis/resource/templategroup/v0alpha1/templategroup_schema_gen.go +++ b/apps/alerting/notifications/pkg/apis/resource/templategroup/v0alpha1/templategroup_schema_gen.go @@ -13,7 +13,7 @@ import ( // schema is unexported to prevent accidental overwrites var ( schemaTemplateGroup = resource.NewSimpleSchema("notifications.alerting.grafana.app", "v0alpha1", &TemplateGroup{}, &TemplateGroupList{}, resource.WithKind("TemplateGroup"), - resource.WithPlural("templategroups"), resource.WithScope(resource.NamespacedScope), resource.WithSelectableFields([]resource.SelectableField{resource.SelectableField{ + resource.WithPlural("templategroups"), resource.WithScope(resource.NamespacedScope), resource.WithSelectableFields([]resource.SelectableField{{ FieldSelector: "spec.title", FieldValueFunc: func(o resource.Object) (string, error) { cast, ok := o.(*TemplateGroup) diff --git a/apps/alerting/notifications/pkg/apis/resource/timeinterval/v0alpha1/timeinterval_schema_gen.go b/apps/alerting/notifications/pkg/apis/resource/timeinterval/v0alpha1/timeinterval_schema_gen.go index 627e02a9572..af8ff6454a5 100644 --- a/apps/alerting/notifications/pkg/apis/resource/timeinterval/v0alpha1/timeinterval_schema_gen.go +++ b/apps/alerting/notifications/pkg/apis/resource/timeinterval/v0alpha1/timeinterval_schema_gen.go @@ -13,7 +13,7 @@ import ( // schema is unexported to prevent accidental overwrites var ( schemaTimeInterval = resource.NewSimpleSchema("notifications.alerting.grafana.app", "v0alpha1", &TimeInterval{}, &TimeIntervalList{}, resource.WithKind("TimeInterval"), - resource.WithPlural("timeintervals"), resource.WithScope(resource.NamespacedScope), resource.WithSelectableFields([]resource.SelectableField{resource.SelectableField{ + resource.WithPlural("timeintervals"), resource.WithScope(resource.NamespacedScope), resource.WithSelectableFields([]resource.SelectableField{{ FieldSelector: "spec.name", FieldValueFunc: func(o resource.Object) (string, error) { cast, ok := o.(*TimeInterval) diff --git a/public/api-enterprise-spec.json b/public/api-enterprise-spec.json index cdd858d9dcc..1d86bd94020 100644 --- a/public/api-enterprise-spec.json +++ b/public/api-enterprise-spec.json @@ -2211,113 +2211,6 @@ } } }, - "/scim/users/": { - "get": { - "tags": [ - "users", - "enterprise" - ], - "summary": "Fetches all users in UserSchema format.", - "operationId": "getUsers", - "responses": { - "200": { - "$ref": "#/responses/getUsers" - }, - "400": { - "$ref": "#/responses/badRequestError" - }, - "401": { - "$ref": "#/responses/unauthorisedError" - }, - "404": { - "$ref": "#/responses/notFoundError" - }, - "500": { - "$ref": "#/responses/internalServerError" - } - } - }, - "post": { - "tags": [ - "users", - "enterprise" - ], - "summary": "Creates user.", - "operationId": "createUser", - "responses": { - "200": { - "$ref": "#/responses/okResponse" - }, - "400": { - "$ref": "#/responses/badRequestError" - }, - "401": { - "$ref": "#/responses/unauthorisedError" - }, - "403": { - "$ref": "#/responses/forbiddenError" - }, - "409": { - "$ref": "#/responses/conflictError" - }, - "500": { - "$ref": "#/responses/internalServerError" - } - } - }, - "delete": { - "tags": [ - "user", - "enterprise" - ], - "summary": "Deletes user.", - "operationId": "deleteUser", - "responses": { - "200": { - "$ref": "#/responses/okResponse" - }, - "400": { - "$ref": "#/responses/badRequestError" - }, - "401": { - "$ref": "#/responses/unauthorisedError" - }, - "404": { - "$ref": "#/responses/notFoundError" - }, - "500": { - "$ref": "#/responses/internalServerError" - } - } - } - }, - "/scim/users/:id": { - "get": { - "tags": [ - "user", - "enterprise" - ], - "summary": "Gets user by id.", - "operationId": "getUser", - "responses": { - "200": { - "$ref": "#/responses/okResponse" - }, - "400": { - "$ref": "#/responses/badRequestError" - }, - "401": { - "$ref": "#/responses/unauthorisedError" - }, - "403": { - "$ref": "#/responses/forbiddenError" - }, - "500": { - "$ref": "#/responses/internalServerError" - } - } - } - }, "/teams/{teamId}/groups": { "get": { "tags": [ @@ -4608,21 +4501,6 @@ } } }, - "EmailSchema": { - "description": "Implementation of SCIM specification email schema\nhttps://datatracker.ietf.org/doc/html/rfc7643#section-4.1.2", - "type": "object", - "properties": { - "primary": { - "type": "boolean" - }, - "type": { - "type": "string" - }, - "value": { - "type": "string" - } - } - }, "EnumFieldConfig": { "description": "Enum field config\nVector values are used as lookup keys into the enum fields", "type": "object", @@ -5138,35 +5016,6 @@ } } }, - "GetUsersBody": { - "type": "object", - "properties": { - "Resources": { - "type": "array", - "items": { - "$ref": "#/definitions/UserSchema" - } - }, - "itemsPerPage": { - "type": "integer", - "format": "int64" - }, - "schemas": { - "type": "array", - "items": { - "type": "string" - } - }, - "startIndex": { - "type": "integer", - "format": "int64" - }, - "totalResults": { - "type": "integer", - "format": "int64" - } - } - }, "Group": { "type": "object", "properties": { @@ -5704,29 +5553,6 @@ } } }, - "MetaSchema": { - "description": "Implementation of SCIM specification meta schema\nhttps://datatracker.ietf.org/doc/html/rfc7643#section-3.1", - "type": "object", - "properties": { - "created": { - "type": "string", - "format": "date-time" - }, - "lastModified": { - "type": "string", - "format": "date-time" - }, - "location": { - "type": "string" - }, - "resourceType": { - "type": "string" - }, - "version": { - "type": "string" - } - } - }, "Metadata": { "description": "Metadata contains user accesses for a given resource\nEx: map[string]bool{\"create\":true, \"delete\": true}", "type": "object", @@ -5911,24 +5737,6 @@ } } }, - "NameSchema": { - "description": "Implementation of SCIM specification name schema\nhttps://datatracker.ietf.org/doc/html/rfc7643#section-4.1.1", - "type": "object", - "properties": { - "familyName": { - "type": "string" - }, - "formatted": { - "type": "string" - }, - "givenName": { - "type": "string" - }, - "middleName": { - "type": "string" - } - } - }, "NavbarPreference": { "type": "object", "title": "NavbarPreference defines model for NavbarPreference.", @@ -8758,45 +8566,6 @@ } } }, - "UserSchema": { - "description": "Implementation of SCIM specification user schema\nhttps://datatracker.ietf.org/doc/html/rfc7643#section-4.1.1", - "type": "object", - "properties": { - "active": { - "type": "boolean" - }, - "displayName": { - "type": "string" - }, - "emails": { - "type": "array", - "items": { - "$ref": "#/definitions/EmailSchema" - } - }, - "externalId": { - "type": "string" - }, - "id": { - "type": "string" - }, - "meta": { - "$ref": "#/definitions/MetaSchema" - }, - "name": { - "$ref": "#/definitions/NameSchema" - }, - "schemas": { - "type": "array", - "items": { - "type": "string" - } - }, - "userName": { - "type": "string" - } - } - }, "UserSearchHitDTO": { "type": "object", "properties": { @@ -10000,12 +9769,6 @@ } } }, - "getUsers": { - "description": "", - "schema": { - "$ref": "#/definitions/GetUsersBody" - } - }, "goneError": { "description": "GoneError is returned when the requested endpoint was removed.", "schema": { diff --git a/public/api-merged.json b/public/api-merged.json index e9b63723b69..5f2e962b409 100644 --- a/public/api-merged.json +++ b/public/api-merged.json @@ -8606,113 +8606,6 @@ } } }, - "/scim/users/": { - "get": { - "tags": [ - "users", - "enterprise" - ], - "summary": "Fetches all users in UserSchema format.", - "operationId": "getUsers", - "responses": { - "200": { - "$ref": "#/responses/getUsers" - }, - "400": { - "$ref": "#/responses/badRequestError" - }, - "401": { - "$ref": "#/responses/unauthorisedError" - }, - "404": { - "$ref": "#/responses/notFoundError" - }, - "500": { - "$ref": "#/responses/internalServerError" - } - } - }, - "post": { - "tags": [ - "users", - "enterprise" - ], - "summary": "Creates user.", - "operationId": "createUser", - "responses": { - "200": { - "$ref": "#/responses/okResponse" - }, - "400": { - "$ref": "#/responses/badRequestError" - }, - "401": { - "$ref": "#/responses/unauthorisedError" - }, - "403": { - "$ref": "#/responses/forbiddenError" - }, - "409": { - "$ref": "#/responses/conflictError" - }, - "500": { - "$ref": "#/responses/internalServerError" - } - } - }, - "delete": { - "tags": [ - "user", - "enterprise" - ], - "summary": "Deletes user.", - "operationId": "deleteUser", - "responses": { - "200": { - "$ref": "#/responses/okResponse" - }, - "400": { - "$ref": "#/responses/badRequestError" - }, - "401": { - "$ref": "#/responses/unauthorisedError" - }, - "404": { - "$ref": "#/responses/notFoundError" - }, - "500": { - "$ref": "#/responses/internalServerError" - } - } - } - }, - "/scim/users/:id": { - "get": { - "tags": [ - "user", - "enterprise" - ], - "summary": "Gets user by id.", - "operationId": "getUser", - "responses": { - "200": { - "$ref": "#/responses/okResponse" - }, - "400": { - "$ref": "#/responses/badRequestError" - }, - "401": { - "$ref": "#/responses/unauthorisedError" - }, - "403": { - "$ref": "#/responses/forbiddenError" - }, - "500": { - "$ref": "#/responses/internalServerError" - } - } - } - }, "/search": { "get": { "tags": [ @@ -15146,21 +15039,6 @@ } } }, - "EmailSchema": { - "description": "Implementation of SCIM specification email schema\nhttps://datatracker.ietf.org/doc/html/rfc7643#section-4.1.2", - "type": "object", - "properties": { - "primary": { - "type": "boolean" - }, - "type": { - "type": "string" - }, - "value": { - "type": "string" - } - } - }, "EmbeddedContactPoint": { "description": "EmbeddedContactPoint is the contact point type that is used\nby grafanas embedded alertmanager implementation.", "type": "object", @@ -15875,35 +15753,6 @@ } } }, - "GetUsersBody": { - "type": "object", - "properties": { - "Resources": { - "type": "array", - "items": { - "$ref": "#/definitions/UserSchema" - } - }, - "itemsPerPage": { - "type": "integer", - "format": "int64" - }, - "schemas": { - "type": "array", - "items": { - "type": "string" - } - }, - "startIndex": { - "type": "integer", - "format": "int64" - }, - "totalResults": { - "type": "integer", - "format": "int64" - } - } - }, "GettableAlertmanagers": { "type": "object", "properties": { @@ -17200,29 +17049,6 @@ "$ref": "#/definitions/Matcher" } }, - "MetaSchema": { - "description": "Implementation of SCIM specification meta schema\nhttps://datatracker.ietf.org/doc/html/rfc7643#section-3.1", - "type": "object", - "properties": { - "created": { - "type": "string", - "format": "date-time" - }, - "lastModified": { - "type": "string", - "format": "date-time" - }, - "location": { - "type": "string" - }, - "resourceType": { - "type": "string" - }, - "version": { - "type": "string" - } - } - }, "Metadata": { "description": "Metadata contains user accesses for a given resource\nEx: map[string]bool{\"create\":true, \"delete\": true}", "type": "object", @@ -17449,24 +17275,6 @@ } } }, - "NameSchema": { - "description": "Implementation of SCIM specification name schema\nhttps://datatracker.ietf.org/doc/html/rfc7643#section-4.1.1", - "type": "object", - "properties": { - "familyName": { - "type": "string" - }, - "formatted": { - "type": "string" - }, - "givenName": { - "type": "string" - }, - "middleName": { - "type": "string" - } - } - }, "NamespaceConfigResponse": { "type": "object", "additionalProperties": { @@ -22329,45 +22137,6 @@ } } }, - "UserSchema": { - "description": "Implementation of SCIM specification user schema\nhttps://datatracker.ietf.org/doc/html/rfc7643#section-4.1.1", - "type": "object", - "properties": { - "active": { - "type": "boolean" - }, - "displayName": { - "type": "string" - }, - "emails": { - "type": "array", - "items": { - "$ref": "#/definitions/EmailSchema" - } - }, - "externalId": { - "type": "string" - }, - "id": { - "type": "string" - }, - "meta": { - "$ref": "#/definitions/MetaSchema" - }, - "name": { - "$ref": "#/definitions/NameSchema" - }, - "schemas": { - "type": "array", - "items": { - "type": "string" - } - }, - "userName": { - "type": "string" - } - } - }, "UserSearchHitDTO": { "type": "object", "properties": { @@ -24343,12 +24112,6 @@ } } }, - "getUsers": { - "description": "(empty)", - "schema": { - "$ref": "#/definitions/GetUsersBody" - } - }, "goneError": { "description": "GoneError is returned when the requested endpoint was removed.", "schema": { diff --git a/public/app/plugins/datasource/cloudwatch/dataquery.cue b/public/app/plugins/datasource/cloudwatch/dataquery.cue index a7eb8261407..a0afcfb729f 100644 --- a/public/app/plugins/datasource/cloudwatch/dataquery.cue +++ b/public/app/plugins/datasource/cloudwatch/dataquery.cue @@ -167,7 +167,7 @@ composableKinds: DataQuery: { // @deprecated use logGroups logGroupNames?: [...string] // Language used for querying logs, can be CWLI, SQL, or PPL. If empty, the default language is CWLI. - queryLanguage?: #LogsQueryLanguage + queryLanguage?: #LogsQueryLanguage } @cuetsy(kind="interface") #LogGroup: { // ARN of the log group diff --git a/public/openapi3.json b/public/openapi3.json index 117b43ca050..5bba4ec6ad8 100644 --- a/public/openapi3.json +++ b/public/openapi3.json @@ -1405,16 +1405,6 @@ }, "description": "(empty)" }, - "getUsers": { - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/GetUsersBody" - } - } - }, - "description": "(empty)" - }, "goneError": { "content": { "application/json": { @@ -5124,21 +5114,6 @@ }, "type": "object" }, - "EmailSchema": { - "description": "Implementation of SCIM specification email schema\nhttps://datatracker.ietf.org/doc/html/rfc7643#section-4.1.2", - "properties": { - "primary": { - "type": "boolean" - }, - "type": { - "type": "string" - }, - "value": { - "type": "string" - } - }, - "type": "object" - }, "EmbeddedContactPoint": { "description": "EmbeddedContactPoint is the contact point type that is used\nby grafanas embedded alertmanager implementation.", "properties": { @@ -5853,35 +5828,6 @@ }, "type": "object" }, - "GetUsersBody": { - "properties": { - "Resources": { - "items": { - "$ref": "#/components/schemas/UserSchema" - }, - "type": "array" - }, - "itemsPerPage": { - "format": "int64", - "type": "integer" - }, - "schemas": { - "items": { - "type": "string" - }, - "type": "array" - }, - "startIndex": { - "format": "int64", - "type": "integer" - }, - "totalResults": { - "format": "int64", - "type": "integer" - } - }, - "type": "object" - }, "GettableAlertmanagers": { "properties": { "data": { @@ -7178,29 +7124,6 @@ }, "type": "array" }, - "MetaSchema": { - "description": "Implementation of SCIM specification meta schema\nhttps://datatracker.ietf.org/doc/html/rfc7643#section-3.1", - "properties": { - "created": { - "format": "date-time", - "type": "string" - }, - "lastModified": { - "format": "date-time", - "type": "string" - }, - "location": { - "type": "string" - }, - "resourceType": { - "type": "string" - }, - "version": { - "type": "string" - } - }, - "type": "object" - }, "Metadata": { "additionalProperties": { "type": "boolean" @@ -7427,24 +7350,6 @@ }, "type": "object" }, - "NameSchema": { - "description": "Implementation of SCIM specification name schema\nhttps://datatracker.ietf.org/doc/html/rfc7643#section-4.1.1", - "properties": { - "familyName": { - "type": "string" - }, - "formatted": { - "type": "string" - }, - "givenName": { - "type": "string" - }, - "middleName": { - "type": "string" - } - }, - "type": "object" - }, "NamespaceConfigResponse": { "additionalProperties": { "items": { @@ -12306,45 +12211,6 @@ }, "type": "object" }, - "UserSchema": { - "description": "Implementation of SCIM specification user schema\nhttps://datatracker.ietf.org/doc/html/rfc7643#section-4.1.1", - "properties": { - "active": { - "type": "boolean" - }, - "displayName": { - "type": "string" - }, - "emails": { - "items": { - "$ref": "#/components/schemas/EmailSchema" - }, - "type": "array" - }, - "externalId": { - "type": "string" - }, - "id": { - "type": "string" - }, - "meta": { - "$ref": "#/components/schemas/MetaSchema" - }, - "name": { - "$ref": "#/components/schemas/NameSchema" - }, - "schemas": { - "items": { - "type": "string" - }, - "type": "array" - }, - "userName": { - "type": "string" - } - }, - "type": "object" - }, "UserSearchHitDTO": { "properties": { "authLabels": { @@ -22617,113 +22483,6 @@ ] } }, - "/scim/users/": { - "delete": { - "operationId": "deleteUser", - "responses": { - "200": { - "$ref": "#/components/responses/okResponse" - }, - "400": { - "$ref": "#/components/responses/badRequestError" - }, - "401": { - "$ref": "#/components/responses/unauthorisedError" - }, - "404": { - "$ref": "#/components/responses/notFoundError" - }, - "500": { - "$ref": "#/components/responses/internalServerError" - } - }, - "summary": "Deletes user.", - "tags": [ - "user", - "enterprise" - ] - }, - "get": { - "operationId": "getUsers", - "responses": { - "200": { - "$ref": "#/components/responses/getUsers" - }, - "400": { - "$ref": "#/components/responses/badRequestError" - }, - "401": { - "$ref": "#/components/responses/unauthorisedError" - }, - "404": { - "$ref": "#/components/responses/notFoundError" - }, - "500": { - "$ref": "#/components/responses/internalServerError" - } - }, - "summary": "Fetches all users in UserSchema format.", - "tags": [ - "users", - "enterprise" - ] - }, - "post": { - "operationId": "createUser", - "responses": { - "200": { - "$ref": "#/components/responses/okResponse" - }, - "400": { - "$ref": "#/components/responses/badRequestError" - }, - "401": { - "$ref": "#/components/responses/unauthorisedError" - }, - "403": { - "$ref": "#/components/responses/forbiddenError" - }, - "409": { - "$ref": "#/components/responses/conflictError" - }, - "500": { - "$ref": "#/components/responses/internalServerError" - } - }, - "summary": "Creates user.", - "tags": [ - "users", - "enterprise" - ] - } - }, - "/scim/users/:id": { - "get": { - "operationId": "getUser", - "responses": { - "200": { - "$ref": "#/components/responses/okResponse" - }, - "400": { - "$ref": "#/components/responses/badRequestError" - }, - "401": { - "$ref": "#/components/responses/unauthorisedError" - }, - "403": { - "$ref": "#/components/responses/forbiddenError" - }, - "500": { - "$ref": "#/components/responses/internalServerError" - } - }, - "summary": "Gets user by id.", - "tags": [ - "user", - "enterprise" - ] - } - }, "/search": { "get": { "operationId": "search",