From 53f0c40dc2fd585e236937cd7b5d894b35a37c48 Mon Sep 17 00:00:00 2001 From: GitHub Action Bot Date: Wed, 6 Dec 2023 21:36:29 +0000 Subject: [PATCH] Automated commit 'Merge pull request #1509 from sailpoint/fix/SpConfigResponses Fix the response schema for sp config endpoints' by github action: 7120554106 --- idn/beta/paths/sp-config-export-status.yaml | 6 +++--- idn/beta/paths/sp-config-export.yaml | 2 +- idn/beta/paths/sp-config-import-status.yaml | 6 +++--- idn/beta/schemas/SpConfigExportJob.yaml | 10 ++++++++++ idn/beta/schemas/SpConfigExportJobStatus.yaml | 11 +++++++++++ idn/beta/schemas/SpConfigImportJobStatus.yaml | 16 ++++++++++++++++ idn/beta/schemas/SpConfigJob.yaml | 16 ---------------- 7 files changed, 44 insertions(+), 23 deletions(-) create mode 100644 idn/beta/schemas/SpConfigExportJob.yaml create mode 100644 idn/beta/schemas/SpConfigExportJobStatus.yaml create mode 100644 idn/beta/schemas/SpConfigImportJobStatus.yaml diff --git a/idn/beta/paths/sp-config-export-status.yaml b/idn/beta/paths/sp-config-export-status.yaml index fd3a9e06..b1640bec 100644 --- a/idn/beta/paths/sp-config-export-status.yaml +++ b/idn/beta/paths/sp-config-export-status.yaml @@ -1,7 +1,7 @@ get: operationId: getSpConfigExportStatus - # security: - # - oauth2: [sp:config:export] + security: + - UserContextAuth: [ sp:config:read, sp:config:manage] tags: - SP-Config summary: Get export job status @@ -27,7 +27,7 @@ get: content: application/json: schema: - $ref: '../../beta/schemas/SpConfigJob.yaml' + $ref: '../../beta/schemas/SpConfigExportJobStatus.yaml' example: { "jobId": "1e824aa0-4c6e-4f14-95e9-e7dc5234aa51", diff --git a/idn/beta/paths/sp-config-export.yaml b/idn/beta/paths/sp-config-export.yaml index 997a20be..cca8c4cb 100644 --- a/idn/beta/paths/sp-config-export.yaml +++ b/idn/beta/paths/sp-config-export.yaml @@ -108,7 +108,7 @@ post: content: application/json: schema: - $ref: "../schemas/SpConfigJob.yaml" + $ref: "../schemas/SpConfigExportJob.yaml" "400": description: | Client Error - Returned if the request body is invalid. diff --git a/idn/beta/paths/sp-config-import-status.yaml b/idn/beta/paths/sp-config-import-status.yaml index 7ed97e03..3b48d234 100644 --- a/idn/beta/paths/sp-config-import-status.yaml +++ b/idn/beta/paths/sp-config-import-status.yaml @@ -1,7 +1,7 @@ get: operationId: getSpConfigImportStatus - # security: - # - oauth2: [sp:config:import] + security: + - UserContextAuth: [ sp:config:manage ] tags: - SP-Config summary: Get import job status @@ -28,7 +28,7 @@ get: content: application/json: schema: - $ref: '../../beta/schemas/SpConfigJob.yaml' + $ref: '../../beta/schemas/SpConfigImportJobStatus.yaml' example: { "jobId": "4fb10503-1c49-4603-8f8d-886e1f6aa47b", diff --git a/idn/beta/schemas/SpConfigExportJob.yaml b/idn/beta/schemas/SpConfigExportJob.yaml new file mode 100644 index 00000000..35b69fb7 --- /dev/null +++ b/idn/beta/schemas/SpConfigExportJob.yaml @@ -0,0 +1,10 @@ +allOf: + - $ref: "./SpConfigJob.yaml" + - type: object + required: + - description + properties: + description: + type: string + description: Optional user defined description/name for export job. + example: "ETS configuration objects from Acme-Solar sandbox" \ No newline at end of file diff --git a/idn/beta/schemas/SpConfigExportJobStatus.yaml b/idn/beta/schemas/SpConfigExportJobStatus.yaml new file mode 100644 index 00000000..da907900 --- /dev/null +++ b/idn/beta/schemas/SpConfigExportJobStatus.yaml @@ -0,0 +1,11 @@ +allOf: + - $ref: "./SpConfigExportJob.yaml" + - type: object + required: + - completed + properties: + completed: + type: string + format: 'date-time' + description: The time the job was completed. + example: "2021-05-11T22:23:16Z" \ No newline at end of file diff --git a/idn/beta/schemas/SpConfigImportJobStatus.yaml b/idn/beta/schemas/SpConfigImportJobStatus.yaml new file mode 100644 index 00000000..b35b1deb --- /dev/null +++ b/idn/beta/schemas/SpConfigImportJobStatus.yaml @@ -0,0 +1,16 @@ +allOf: + - $ref: "./SpConfigJob.yaml" + - type: object + required: + - completed + - message + properties: + message: + type: string + description: This message contains additional information about the overall status of the job. + example: "Download import results for details." + completed: + type: string + format: 'date-time' + description: The time the job was completed. + example: "2021-05-11T22:23:16Z" \ No newline at end of file diff --git a/idn/beta/schemas/SpConfigJob.yaml b/idn/beta/schemas/SpConfigJob.yaml index a6d1df82..0948fc21 100644 --- a/idn/beta/schemas/SpConfigJob.yaml +++ b/idn/beta/schemas/SpConfigJob.yaml @@ -21,14 +21,6 @@ properties: - EXPORT - IMPORT example: "IMPORT" - message: - type: string - description: This message contains additional information about the overall status of the job. - example: "Download import results for details." - description: - type: string - description: Optional user defined description/name for export job. - example: "ETS configuration objects from Acme-Solar sandbox" expiration: type: string format: 'date-time' @@ -44,18 +36,10 @@ properties: format: 'date-time' description: The time of the last update to the job. example: "2021-05-11T22:23:16Z" - completed: - type: string - format: 'date-time' - description: The time the job was completed. - example: "2021-05-11T22:23:16Z" required: - jobId - status - type - - message - - description - expiration - created - modified - - completed