diff --git a/api-specs/Konnect/control-planes-config/control-planes-config.yaml b/api-specs/Konnect/control-planes-config/control-planes-config.yaml index e6515c298c7..8f7b7373882 100644 --- a/api-specs/Konnect/control-planes-config/control-planes-config.yaml +++ b/api-specs/Konnect/control-planes-config/control-planes-config.yaml @@ -169,13 +169,13 @@ paths: '201': $ref: '#/components/responses/plugin-schemas' '400': - $ref: '#/components/responses/BadRequest' + $ref: '#/components/responses/KonnectCPLegacyBadRequest' '401': - $ref: '#/components/responses/Unauthorized' + $ref: '#/components/responses/KonnectCPLegacyUnauthorized' '403': - $ref: '#/components/responses/Forbidden' + $ref: '#/components/responses/KonnectCPLegacyForbidden' '409': - $ref: '#/components/responses/Conflict' + $ref: '#/components/responses/KonnectCPLegacyConflict' tags: - Custom Plugin Schemas '/control-planes/{controlPlaneId}/core-entities/plugin-schemas/{name}': @@ -196,11 +196,11 @@ paths: '200': $ref: '#/components/responses/plugin-schemas' '401': - $ref: '#/components/responses/Unauthorized' + $ref: '#/components/responses/KonnectCPLegacyUnauthorized' '403': - $ref: '#/components/responses/Forbidden' + $ref: '#/components/responses/KonnectCPLegacyForbidden' '404': - $ref: '#/components/responses/NotFound' + $ref: '#/components/responses/KonnectCPLegacyNotFound' tags: - Custom Plugin Schemas delete: @@ -211,11 +211,11 @@ paths: '204': description: No Content '401': - $ref: '#/components/responses/Unauthorized' + $ref: '#/components/responses/KonnectCPLegacyUnauthorized' '403': - $ref: '#/components/responses/Forbidden' + $ref: '#/components/responses/KonnectCPLegacyForbidden' '404': - $ref: '#/components/responses/NotFound' + $ref: '#/components/responses/KonnectCPLegacyNotFound' tags: - Custom Plugin Schemas put: @@ -228,11 +228,11 @@ paths: '200': $ref: '#/components/responses/plugin-schemas' '401': - $ref: '#/components/responses/Unauthorized' + $ref: '#/components/responses/KonnectCPLegacyUnauthorized' '403': - $ref: '#/components/responses/Forbidden' + $ref: '#/components/responses/KonnectCPLegacyForbidden' '404': - $ref: '#/components/responses/NotFound' + $ref: '#/components/responses/KonnectCPLegacyNotFound' tags: - Custom Plugin Schemas '/control-planes/{controlPlaneId}/config-stores': @@ -6742,6 +6742,7 @@ components: description: The configuration properties for the Vault which can be found on the vaults' documentation page. type: object additionalProperties: true + nullable: true created_at: description: Unix epoch when the resource was created. type: integer @@ -6782,7 +6783,6 @@ components: required: - name - prefix - - config BaseError: description: standard error type: object @@ -7074,21 +7074,51 @@ components: example: 'kong:trace:1234567890' detail: example: Not found - ConflictError: + KonnectCPLegacyBaseError: + description: standard error + type: object + properties: + message: + description: | + A short summary of the problem. + type: string + readOnly: true + title: Error + KonnectCPLegacyBadRequestError: allOf: - - $ref: '#/components/schemas/BaseError' + - $ref: '#/components/schemas/KonnectCPLegacyBaseError' - type: object properties: - status: - example: 409 - title: - example: Conflict - type: - example: 'https://httpstatuses.com/409' - instance: - example: 'kong:trace:1234567890' - detail: + message: + example: Bad Request + KonnectCPLegacyUnauthorizedError: + allOf: + - $ref: '#/components/schemas/KonnectCPLegacyBaseError' + - type: object + properties: + message: + example: Unauthorized + KonnectCPLegacyForbiddenError: + allOf: + - $ref: '#/components/schemas/KonnectCPLegacyBaseError' + - type: object + properties: + message: + example: Forbidden + KonnectCPLegacyConflictError: + allOf: + - $ref: '#/components/schemas/KonnectCPLegacyBaseError' + - type: object + properties: + message: example: Conflict + KonnectCPLegacyNotFoundError: + allOf: + - $ref: '#/components/schemas/KonnectCPLegacyBaseError' + - type: object + properties: + message: + example: Not Found CursorMetaPage: type: object properties: @@ -7234,6 +7264,21 @@ components: title: Not Found instance: 'kong:trace:6816496025408232265' detail: Not Found + KonnectCPLegacyBadRequestExample: + value: + message: Bad Request + KonnectCPLegacyUnauthorizedExample: + value: + message: Unauthorized + KonnectCPLegacyForbiddenExample: + value: + message: Forbidden + KonnectCPLegacyConflictExample: + value: + message: Conflict + KonnectCPLegacyNotFoundExample: + value: + message: Not Found UnsupportedMediaTypeExample: value: status: 415 @@ -7267,7 +7312,7 @@ components: description: | The custom plugin schema; `jq -Rs '.' schema.lua`. type: string - example: 'return { name = \"myplugin\", fields = { { config = { type = \"record\", fields = { } } } } }' + example: 'return { name = "myplugin", fields = { { config = { type = "record", fields = { } } } } }' required: - lua_schema x-examples: @@ -7668,21 +7713,51 @@ components: examples: UnauthorizedExample: $ref: '#/components/examples/ForbiddenExample' - NotFound: - description: Not Found + KonnectCPLegacyBadRequest: + description: Forbidden content: - application/problem+json: + application/json: schema: - $ref: '#/components/schemas/NotFoundError' + $ref: '#/components/schemas/KonnectCPLegacyBadRequestError' examples: - NotFoundExample: - $ref: '#/components/examples/NotFoundExample' - Conflict: - description: Conflict + UnauthorizedExample: + $ref: '#/components/examples/KonnectCPLegacyBadRequestExample' + KonnectCPLegacyUnauthorized: + description: Unauthorized content: - application/problem+json: + application/json: schema: - $ref: '#/components/schemas/ConflictError' + $ref: '#/components/schemas/KonnectCPLegacyUnauthorizedError' + examples: + UnauthorizedExample: + $ref: '#/components/examples/KonnectCPLegacyUnauthorizedExample' + KonnectCPLegacyForbidden: + description: Forbidden + content: + application/json: + schema: + $ref: '#/components/schemas/KonnectCPLegacyForbiddenError' + examples: + UnauthorizedExample: + $ref: '#/components/examples/KonnectCPLegacyForbiddenExample' + KonnectCPLegacyConflict: + description: Forbidden + content: + application/json: + schema: + $ref: '#/components/schemas/KonnectCPLegacyConflictError' + examples: + UnauthorizedExample: + $ref: '#/components/examples/KonnectCPLegacyConflictExample' + KonnectCPLegacyNotFound: + description: Forbidden + content: + application/json: + schema: + $ref: '#/components/schemas/KonnectCPLegacyNotFoundError' + examples: + UnauthorizedExample: + $ref: '#/components/examples/KonnectCPLegacyNotFoundExample' UnsupportedMediaType: description: Unsupported Media Type content: diff --git a/api-specs/Konnect/v2/yaml/application-auth-strategies.yaml b/api-specs/Konnect/v2/yaml/application-auth-strategies.yaml index 9775c0291be..e6ed9137624 100644 --- a/api-specs/Konnect/v2/yaml/application-auth-strategies.yaml +++ b/api-specs/Konnect/v2/yaml/application-auth-strategies.yaml @@ -1114,8 +1114,6 @@ components: type: string maxLength: 64 maxItems: 10 - labels: - $ref: '#/components/schemas/Labels' additionalProperties: true required: - issuer diff --git a/api-specs/Konnect/v2/yaml/audit-logs.yaml b/api-specs/Konnect/v2/yaml/audit-logs.yaml index 1c14f6381b0..f553c37017c 100644 --- a/api-specs/Konnect/v2/yaml/audit-logs.yaml +++ b/api-specs/Konnect/v2/yaml/audit-logs.yaml @@ -250,6 +250,7 @@ components: enum: - cef - json + - cps ListAuditLogDestinations: type: object properties: diff --git a/api-specs/Konnect/v2/yaml/portal-management.yaml b/api-specs/Konnect/v2/yaml/portal-management.yaml index 45344d59608..96edaf585f1 100644 --- a/api-specs/Konnect/v2/yaml/portal-management.yaml +++ b/api-specs/Konnect/v2/yaml/portal-management.yaml @@ -5250,6 +5250,8 @@ components: description: The identity provider that contains configuration data for creating an authentication integration. type: object properties: + enabled: + $ref: '#/components/schemas/IdentityProviderEnabled' type: $ref: '#/components/schemas/IdentityProviderType' config: diff --git a/api-specs/Konnect/v3/yaml/identity.yaml b/api-specs/Konnect/v3/yaml/identity.yaml index c03b9f13194..4708a9ea655 100644 --- a/api-specs/Konnect/v3/yaml/identity.yaml +++ b/api-specs/Konnect/v3/yaml/identity.yaml @@ -134,6 +134,8 @@ paths: $ref: '#/components/responses/IdentityUnauthenticated' '403': $ref: '#/components/responses/CreateIdentityProviderPermissionDenied' + '409': + $ref: '#/components/responses/Conflict' tags: - Auth Settings '/identity-providers/{id}': @@ -184,6 +186,8 @@ paths: $ref: '#/components/responses/IdentityPermissionDenied' '404': $ref: '#/components/responses/IdentityNotFound' + '409': + $ref: '#/components/responses/Conflict' tags: - Auth Settings delete: @@ -1337,7 +1341,7 @@ components: schemas: IdentityProviderEnabled: description: | - Indicates whether the identity provider is enabled. + Indicates whether the identity provider is enabled. Only one identity provider can be active at a time, such as SAML or OIDC. type: boolean example: true @@ -1383,7 +1387,7 @@ components: title: OIDC Identity Provider Scopes Property OIDCIdentityProviderClaimMappings: description: | - Defines the mappings between OpenID Connect (OIDC) claims and local claims used by your application for + Defines the mappings between OpenID Connect (OIDC) claims and local claims used by your application for authentication. type: object properties: @@ -1427,6 +1431,8 @@ components: $ref: '#/components/schemas/IdentityProviderType' login_path: $ref: '#/components/schemas/IdentityProviderLoginPath' + enabled: + $ref: '#/components/schemas/schemas-IdentityProviderEnabled' config: type: object oneOf: @@ -1438,7 +1444,7 @@ components: type: object properties: enabled: - $ref: '#/components/schemas/IdentityProviderEnabled' + $ref: '#/components/schemas/schemas-IdentityProviderEnabled' login_path: $ref: '#/components/schemas/IdentityProviderLoginPath' config: @@ -2205,6 +2211,14 @@ components: example: 'kong:trace:1234567890' detail: example: Forbidden + schemas-IdentityProviderEnabled: + description: | + Indicates whether the identity provider is enabled. + Only one identity provider can be active at a time, such as SAML or OIDC. + type: boolean + example: true + default: false + title: Identity Provider Enabled Property StringFieldContainsFilter: description: Filter a string value field by partial contains. type: object @@ -2654,6 +2668,7 @@ components: value: type: oidc login_path: the-oidc-konnect-org + enabled: true config: issuer_url: 'https://konghq.okta.com/oauth2/default' client_id: 0oaqhb43ckTZ02j1F357 @@ -4366,6 +4381,12 @@ components: application/json: schema: $ref: '#/components/schemas/IdP' + Conflict: + description: Conflict + content: + application/problem+json: + schema: + $ref: '#/components/schemas/ConflictError' securitySchemes: systemAccountAccessToken: type: http