diff --git a/specification/DigitalOcean-public.v2.yaml b/specification/DigitalOcean-public.v2.yaml index 0fb09c4a..8fa492bd 100644 --- a/specification/DigitalOcean-public.v2.yaml +++ b/specification/DigitalOcean-public.v2.yaml @@ -570,14 +570,6 @@ paths: get: $ref: 'resources/apps/apps_get_logs_active_deployment_aggregate.yml' - /v2/apps/tiers: - get: - $ref: 'resources/apps/apps_list_tiers.yml' - - /v2/apps/tiers/{slug}: - get: - $ref: 'resources/apps/apps_get_tier.yml' - /v2/apps/tiers/instance_sizes: get: $ref: 'resources/apps/apps_list_instanceSizes.yml' diff --git a/specification/resources/apps/apps_get_tier.yml b/specification/resources/apps/apps_get_tier.yml deleted file mode 100755 index 587121cc..00000000 --- a/specification/resources/apps/apps_get_tier.yml +++ /dev/null @@ -1,44 +0,0 @@ -operationId: apps_get_tier - -deprecated: true - -summary: Retrieve an App Tier - -description: | - Retrieve information about a specific app tier. - This endpoint has been deprecated because app tiers are not tied to instance sizes anymore. - The concept of tiers will be retired in the future. - -tags: -- Apps - -parameters: - - $ref: parameters.yml#/slug_tier - -responses: - "200": - $ref: responses/get_tier.yml - - "401": - $ref: ../../shared/responses/unauthorized.yml - - '404': - $ref: '../../shared/responses/not_found.yml' - - "429": - $ref: "../../shared/responses/too_many_requests.yml" - - "500": - $ref: ../../shared/responses/server_error.yml - - default: - $ref: ../../shared/responses/unexpected_error.yml - -x-codeSamples: - - $ref: 'examples/curl/apps_get_tier.yml' - - $ref: 'examples/python/apps_get_tier.yml' - -security: - - bearer_auth: - - 'app:read' - diff --git a/specification/resources/apps/apps_list_tiers.yml b/specification/resources/apps/apps_list_tiers.yml deleted file mode 100755 index bb1a60a0..00000000 --- a/specification/resources/apps/apps_list_tiers.yml +++ /dev/null @@ -1,38 +0,0 @@ -operationId: apps_list_tiers - -deprecated: true - -summary: List App Tiers - -description: | - List all app tiers. - This endpoint has been deprecated because app tiers are not tied to instance sizes anymore. - The concept of tiers will be retired in the future. - -tags: -- Apps - -responses: - "200": - $ref: responses/all_tiers.yml - - "401": - $ref: ../../shared/responses/unauthorized.yml - - "429": - $ref: "../../shared/responses/too_many_requests.yml" - - "500": - $ref: ../../shared/responses/server_error.yml - - default: - $ref: ../../shared/responses/unexpected_error.yml - -x-codeSamples: - - $ref: 'examples/curl/apps_list_tiers.yml' - - $ref: 'examples/python/apps_list_tiers.yml' - -security: - - bearer_auth: - - 'app:read' - diff --git a/specification/resources/apps/examples/curl/apps_get_tier.yml b/specification/resources/apps/examples/curl/apps_get_tier.yml deleted file mode 100644 index 876a80fd..00000000 --- a/specification/resources/apps/examples/curl/apps_get_tier.yml +++ /dev/null @@ -1,6 +0,0 @@ -lang: cURL -source: |- - curl -X GET \ - -H "Content-Type: application/json" \ - -H "Authorization: Bearer $DIGITALOCEAN_TOKEN" \ - "https://api.digitalocean.com/v2/apps/tiers/{slug}" diff --git a/specification/resources/apps/examples/curl/apps_list_tiers.yml b/specification/resources/apps/examples/curl/apps_list_tiers.yml deleted file mode 100644 index 3fdc57d9..00000000 --- a/specification/resources/apps/examples/curl/apps_list_tiers.yml +++ /dev/null @@ -1,6 +0,0 @@ -lang: cURL -source: |- - curl -X GET \ - -H "Content-Type: application/json" \ - -H "Authorization: Bearer $DIGITALOCEAN_TOKEN" \ - "https://api.digitalocean.com/v2/apps/tiers" diff --git a/specification/resources/apps/examples/python/apps_get_tier.yml b/specification/resources/apps/examples/python/apps_get_tier.yml deleted file mode 100644 index b7e3dfde..00000000 --- a/specification/resources/apps/examples/python/apps_get_tier.yml +++ /dev/null @@ -1,8 +0,0 @@ -lang: Python -source: |- - import os - from pydo import Client - - client = Client(token=os.environ.get("DIGITALOCEAN_TOKEN")) - - create_resp = client.apps.get_tier(slug="basic") \ No newline at end of file diff --git a/specification/resources/apps/examples/python/apps_list_tiers.yml b/specification/resources/apps/examples/python/apps_list_tiers.yml deleted file mode 100644 index 997b3136..00000000 --- a/specification/resources/apps/examples/python/apps_list_tiers.yml +++ /dev/null @@ -1,8 +0,0 @@ -lang: Python -source: |- - import os - from pydo import Client - - client = Client(token=os.environ.get("DIGITALOCEAN_TOKEN")) - - get_resp = client.apps.list_tiers() diff --git a/specification/resources/apps/models/app_component_base.yml b/specification/resources/apps/models/app_component_base.yml index ef805f13..ab973c88 100644 --- a/specification/resources/apps/models/app_component_base.yml +++ b/specification/resources/apps/models/app_component_base.yml @@ -59,4 +59,7 @@ properties: example: node-js log_destinations: - $ref: app_log_destination_definition.yml + type: array + items: + $ref: app_log_destination_definition.yml + description: A list of configured log forwarding destinations. diff --git a/specification/resources/apps/models/app_functions_spec.yml b/specification/resources/apps/models/app_functions_spec.yml index 3f31a28d..fbb61695 100755 --- a/specification/resources/apps/models/app_functions_spec.yml +++ b/specification/resources/apps/models/app_functions_spec.yml @@ -50,7 +50,10 @@ properties: $ref: apps_gitlab_source_spec.yml log_destinations: - $ref: app_log_destination_definition.yml + type: array + items: + $ref: app_log_destination_definition.yml + description: A list of configured log forwarding destinations. required: - name diff --git a/specification/resources/apps/models/apps_tier.yml b/specification/resources/apps/models/apps_tier.yml deleted file mode 100755 index ff711e1e..00000000 --- a/specification/resources/apps/models/apps_tier.yml +++ /dev/null @@ -1,25 +0,0 @@ -properties: - build_seconds: - format: int64 - title: The amount of included build time in seconds - type: string - example: "233" - egress_bandwidth_bytes: - format: int64 - title: The amount of included outbound bandwidth in bytes - type: string - example: "123" - name: - title: A human-readable name of the tier - type: string - example: test - slug: - title: The slug of the tier - type: string - example: test - storage_bytes: - format: int64 - title: The allotted disk space in bytes - type: string - example: "10000000" -type: object diff --git a/specification/resources/apps/responses/all_tiers.yml b/specification/resources/apps/responses/all_tiers.yml deleted file mode 100644 index 84f3a7a8..00000000 --- a/specification/resources/apps/responses/all_tiers.yml +++ /dev/null @@ -1,18 +0,0 @@ -description: A JSON object with a `tiers` key. This will be a list - of all app tiers - -content: - application/json: - schema: - $ref: ../models/apps_list_tiers_response.yml - examples: - tiers: - $ref: examples.yml#/tiers -headers: - ratelimit-limit: - $ref: ../../../shared/headers.yml#/ratelimit-limit - ratelimit-remaining: - $ref: ../../../shared/headers.yml#/ratelimit-remaining - ratelimit-reset: - $ref: ../../../shared/headers.yml#/ratelimit-reset - diff --git a/specification/resources/apps/responses/get_tier.yml b/specification/resources/apps/responses/get_tier.yml deleted file mode 100644 index caf51bc4..00000000 --- a/specification/resources/apps/responses/get_tier.yml +++ /dev/null @@ -1,17 +0,0 @@ -description: A JSON with the key `tier` - -content: - application/json: - schema: - $ref: ../models/apps_get_tier_response.yml - examples: - tier: - $ref: examples.yml#/tier - -headers: - ratelimit-limit: - $ref: ../../../shared/headers.yml#/ratelimit-limit - ratelimit-remaining: - $ref: ../../../shared/headers.yml#/ratelimit-remaining - ratelimit-reset: - $ref: ../../../shared/headers.yml#/ratelimit-reset diff --git a/specification/resources/databases/responses/logsink.yml b/specification/resources/databases/responses/logsink.yml index c598f90e..e249bea6 100644 --- a/specification/resources/databases/responses/logsink.yml +++ b/specification/resources/databases/responses/logsink.yml @@ -11,39 +11,44 @@ headers: content: application/json: schema: - allOf: - - $ref: "../models/logsink_verbose.yml" - required: - - sink_id - - sink_name - - sink_type - - config + properties: + sink: + allOf: + - $ref: "../models/logsink_verbose.yml" + required: + - sink_id + - sink_name + - sink_type + - config examples: Create an opensearch logsink: value: - sink_id: "dfcc9f57d86bf58e321c2c6c31c7a971be244ac7" - sink_name: "logs-sink" - sink_type: "opensearch" - config: - url: https://user:passwd@192.168.0.1:25060 - index_prefix: "opensearch-logs" - index_days_max: 5 + sink: + sink_id: "dfcc9f57d86bf58e321c2c6c31c7a971be244ac7" + sink_name: "logs-sink" + sink_type: "opensearch" + config: + url: https://user:passwd@192.168.0.1:25060 + index_prefix: "opensearch-logs" + index_days_max: 5 Create an elasticsearch logsink: value: - sink_id: "dfcc9f57d86bf58e321c2c6c31c7a971be244ac7" - sink_name: "logs-sink" - sink_type: "elasticsearch" - config: - url: https://user:passwd@192.168.0.1:25060 - index_prefix: "elasticsearch-logs" - index_days_max: 5 + sink: + sink_id: "dfcc9f57d86bf58e321c2c6c31c7a971be244ac7" + sink_name: "logs-sink" + sink_type: "elasticsearch" + config: + url: https://user:passwd@192.168.0.1:25060 + index_prefix: "elasticsearch-logs" + index_days_max: 5 Create a rsyslog logsink: value: - sink_id: "dfcc9f57d86bf58e321c2c6c31c7a971be244ac7" - sink_name: logs-sink - sink_type: rsyslog - config: - server: 192.168.0.1 - port: 514 - tls: false - format: rfc5424 \ No newline at end of file + sink: + sink_id: "dfcc9f57d86bf58e321c2c6c31c7a971be244ac7" + sink_name: logs-sink + sink_type: rsyslog + config: + server: 192.168.0.1 + port: 514 + tls: false + format: rfc5424