Merge branch 'main' into dbaas-kafka-create-topic-fix

.github/workflows/validate-client-generation.yml

@@ -40,7 +40,7 @@ jobs:
       - name: Install Poetry
         uses: snok/install-poetry@v1.3.1
         with:
-          version: 1.1.13
+          version: 1.6.1
           virtualenvs-path: .venv
           virtualenvs-create: true
           virtualenvs-in-project: true

package.json

@@ -6,7 +6,7 @@
     "@redocly/cli": "^1.0.0-beta.104",
     "@stoplight/spectral-cli": "6.4.1",
     "autorest": "^3.6.1",
-    "newman": "^5.3.2",
+    "newman": "^6.0.0",
     "openapi-to-postmanv2": "^4.0.0"
   },
   "scripts": {

specification/DigitalOcean-public.v2.yaml

@@ -1271,6 +1271,18 @@ paths:
     get:
       $ref: 'resources/monitoring/monitoring_get_dropletMemoryAvailableMetrics.yml'
 
+  /v2/monitoring/metrics/apps/memory_percentage:
+    get:
+      $ref: 'resources/monitoring/monitoring_get_appMemoryPercentageMetrics.yml'
+
+  /v2/monitoring/metrics/apps/cpu_percentage:
+    get:
+      $ref: 'resources/monitoring/monitoring_get_appCPUPercentageMetrics.yml'
+
+  /v2/monitoring/metrics/apps/restart_count:
+    get:
+      $ref: 'resources/monitoring/monitoring_get_appRestartCountMetrics.yml'
+
   /v2/projects:
     get:
       $ref: 'resources/projects/projects_list.yml'

specification/resources/apps/models/app_functions_spec.yml

@@ -2,12 +2,17 @@
 
 type: object
 properties:
+
   cors:
-    $ref: apps_cors_policy.yml
+    allOf:
+      - $ref: apps_cors_policy.yml
+      - description: (Deprecated - Use Ingress Rules instead).
+      - deprecated: true
 
   routes:
     type: array
-    description: A list of HTTP routes that should be routed to this component.
+    description: (Deprecated - Use Ingress Rules instead). A list of HTTP routes that should be routed to this component.
+    deprecated: true
     items:
       $ref: app_route_spec.yml
 

specification/resources/apps/models/app_route_spec.yml

@@ -2,7 +2,7 @@ title: A criterion for routing HTTP traffic to a component.
 type: object
 properties:
   path:
-    description: An HTTP path prefix. Paths must start with / and must be unique across
+    description: (Deprecated - Use Ingress Rules instead). An HTTP path prefix. Paths must start with / and must be unique across
       all components within an app.
     type: string
     example: /api

specification/resources/apps/models/app_service_spec.yml

@@ -5,7 +5,10 @@ allOf:
 - type: object
   properties:
     cors:
-      $ref: apps_cors_policy.yml
+      allOf:
+        - $ref: apps_cors_policy.yml
+        - description: (Deprecated - Use Ingress Rules instead).
+        - deprecated: true
 
     health_check:
       $ref: app_service_spec_health_check.yml
@@ -32,7 +35,8 @@ allOf:
 
     routes:
       type: array
-      description: A list of HTTP routes that should be routed to this component.
+      description: (Deprecated - Use Ingress Rules instead). A list of HTTP routes that should be routed to this component.
+      deprecated: true
       items:
         $ref: app_route_spec.yml
 

specification/resources/apps/models/app_static_site_spec.yml

@@ -33,13 +33,17 @@ allOf:
       example: dist/
 
     cors:
-      $ref: apps_cors_policy.yml
+      allOf:
+        - $ref: apps_cors_policy.yml
+        - description: (Deprecated - Use Ingress Rules instead).
+        - deprecated: true
 
     routes:
       type: array
       items:
         $ref: app_route_spec.yml
-      description: A list of HTTP routes that should be routed to this component.
+      description: (Deprecated - Use Ingress Rules instead). A list of HTTP routes that should be routed to this component.
+      deprecated: true
 
 required:
 - name

specification/resources/databases/databases_create_cluster.yml

@@ -45,6 +45,7 @@ requestBody:
             version: "14"
             region: nyc3
             size: db-s-2vcpu-4gb
+            storage_size_mib: 61440
             num_nodes: 2
             tags:
               - production
@@ -57,6 +58,7 @@ requestBody:
             region: nyc3
             size: db-s-2vcpu-4gb
             num_nodes: 2
+            storage_size_mib: 61440
             tags:
               - production
             rules:

specification/resources/databases/databases_create_kafka_topic.yml

@@ -51,6 +51,7 @@ responses:
 
 x-codeSamples:
   - $ref: 'examples/curl/databases_create_topic.yml'
+  - $ref: 'examples/go/databases_create_topic.yml'
 
 security:
   - bearer_auth:

specification/resources/databases/databases_delete_kafka_topic.yml

@@ -37,6 +37,7 @@ responses:
 
 x-codeSamples:
   - $ref: 'examples/curl/databases_delete_topic.yml'
+  - $ref: 'examples/go/databases_delete_topic.yml'
 
 security:
   - bearer_auth:

specification/resources/databases/databases_get_kafka_topic.yml

@@ -36,6 +36,7 @@ responses:
 
 x-codeSamples:
   - $ref: 'examples/curl/databases_get_topic.yml'
+  - $ref: 'examples/go/databases_get_topic.yml'
 
 security:
   - bearer_auth:

specification/resources/databases/databases_list_kafka_topics.yml

@@ -35,6 +35,7 @@ responses:
 
 x-codeSamples:
   - $ref: 'examples/curl/databases_list_topics.yml'
+  - $ref: 'examples/go/databases_list_topics.yml'
 
 security:
   - bearer_auth:

specification/resources/databases/databases_update_clusterSize.yml

@@ -29,6 +29,7 @@ requestBody:
       example:
         size: db-s-4vcpu-8gb
         num_nodes: 3
+        storage_size_mib: 163840
 
 responses:
   '202':

specification/resources/databases/databases_update_kafka_topic.yml

@@ -21,16 +21,12 @@ requestBody:
       schema:
         allOf:
           - $ref: 'models/kafka_topic_update.yml'
-        required:
-          - topic
       example:
-        topic:
-          name: customer-events
-          partitions: 3
-          replication: 2
-          config:
-            retention_bytes: -1
-            retention_ms: 100000
+        partitions: 3
+        replication: 2
+        config:
+          retention_bytes: -1
+          retention_ms: 100000
 
 responses:
   '200':
@@ -53,6 +49,7 @@ responses:
 
 x-codeSamples:
   - $ref: 'examples/curl/databases_update_topic.yml'
+  - $ref: 'examples/go/databases_update_topic.yml'
 
 security:
   - bearer_auth:

specification/resources/databases/examples/curl/databases_create_cluster.yml

@@ -3,5 +3,5 @@ source: |-
   curl -X POST \
     -H "Content-Type: application/json" \
     -H "Authorization: Bearer $DIGITALOCEAN_TOKEN" \
-    -d '{"name": "backend", "engine": "pg", "version": "14", "region": "nyc3", "size": "db-s-2vcpu-4gb", "num_nodes": 2, "tags": ["production"]}' \
+    -d '{"name": "backend", "engine": "pg", "version": "14", "region": "nyc3", "size": "db-s-2vcpu-4gb", "num_nodes": 2, "storage_size_mib": 61440, "tags": ["production"]}' \
     "https://api.digitalocean.com/v2/databases"

specification/resources/databases/examples/curl/databases_update_clusterSize.yml

@@ -3,5 +3,5 @@ source: |-
   curl -X PUT \
   -H "Content-Type: application/json" \
   -H "Authorization: Bearer $DIGITALOCEAN_TOKEN" \
-  -d '{"size":"db-s-4vcpu-8gb", "num_nodes":3}' \
+  -d '{"size":"db-s-4vcpu-8gb", "num_nodes":3, "storage_size_mib":163840}' \
   "https://api.digitalocean.com/v2/databases/9cc10173-e9ea-4176-9dbc-a4cee4c4ff30/resize" 

specification/resources/databases/examples/curl/databases_update_topic.yml

@@ -3,5 +3,5 @@ source: |-
   curl -X PUT \
     -H "Content-Type: application/json" \
     -H "Authorization: Bearer $DIGITALOCEAN_TOKEN" \
-    -d '{"topic":{"name":"customer-events", "partition_count":3, "replication_factor": 3, "config": {"retentionMS": 1000000}}}' \
+    -d '{"partition_count":3, "replication_factor": 3, "config": {"retentionMS": 1000000}}' \
     "https://api.digitalocean.com/v2/databases/9cc10173-e9ea-4176-9dbc-a4cee4c4ff30/topics/customer-events"

specification/resources/databases/examples/go/databases_create_cluster.yml

@@ -20,6 +20,7 @@ source: |-
           Region:     "nyc3",
           SizeSlug:   "db-s-2vcpu-4gb",
           NumNodes:   2,
+          StorageSizeMiB : 61440,
       }
 
       cluster, _, err := client.Databases.Create(ctx, createRequest)

specification/resources/databases/examples/go/databases_create_topic.yml

@@ -0,0 +1,26 @@
+lang: Go
+source: |-
+  import (
+      "context"
+      "os"
+
+      "github.com/digitalocean/godo"
+  )
+
+  func main() {
+      token := os.Getenv("DIGITALOCEAN_TOKEN")
+
+      client := godo.NewFromToken(token)
+      ctx := context.TODO()
+
+      createRequest := &DatabaseCreateTopicRequest{
+        Name:              "events",
+        PartitionCount:    3,
+        ReplicationFactor: 2,
+        Config: &TopicConfig{
+          RetentionMS: 60000,
+        }
+      },
+
+      cluster, _, err := client.Databases.CreateTopic(ctx, "9cc10173-e9ea-4176-9dbc-a4cee4c4ff30", createRequest)
+  }

specification/resources/databases/examples/go/databases_delete_topic.yml

@@ -0,0 +1,19 @@
+lang: Go
+source: |-
+  import (
+      "context"
+      "os"
+
+      "github.com/digitalocean/godo"
+  )
+
+  func main() {
+      token := os.Getenv("DIGITALOCEAN_TOKEN")
+
+      client := godo.NewFromToken(token)
+      ctx := context.TODO()
+
+      topicName := "events"
+
+      _, err := client.Databases.DeleteTopic(ctx, "9cc10173-e9ea-4176-9dbc-a4cee4c4ff30", topicName)
+  }

specification/resources/databases/examples/go/databases_get_topic.yml

@@ -0,0 +1,19 @@
+lang: Go
+source: |-
+  import (
+      "context"
+      "os"
+
+      "github.com/digitalocean/godo"
+  )
+
+  func main() {
+      token := os.Getenv("DIGITALOCEAN_TOKEN")
+
+      client := godo.NewFromToken(token)
+      ctx := context.TODO()
+    
+      topicName := "events"
+
+      user, _, err := client.Databases.GetTopic(ctx, "9cc10173-e9ea-4176-9dbc-a4cee4c4ff30", topicName)
+  }

specification/resources/databases/examples/go/databases_list_topics.yml

@@ -0,0 +1,17 @@
+lang: Go
+source: |-
+  import (
+      "context"
+      "os"
+
+      "github.com/digitalocean/godo"
+  )
+
+  func main() {
+      token := os.Getenv("DIGITALOCEAN_TOKEN")
+
+      client := godo.NewFromToken(token)
+      ctx := context.TODO()
+
+      replicas, _, err := client.Databases.ListTopics(ctx, "9cc10173-e9ea-4176-9dbc-a4cee4c4ff30", nil)
+  }

specification/resources/databases/examples/go/databases_update_clusterSize.yml

@@ -14,5 +14,6 @@ source: |-
       resizeRequest := &godo.DatabaseResizeRequest{
           SizeSlug: "db-s-4vcpu-8gb",
           NumNodes: 3,
+          StorageSizeMib: 163840,
       }
   }

specification/resources/databases/examples/go/databases_update_topic.yml

@@ -0,0 +1,26 @@
+lang: Go
+source: |-
+  import (
+      "context"
+      "os"
+
+      "github.com/digitalocean/godo"
+  )
+
+  func main() {
+      token := os.Getenv("DIGITALOCEAN_TOKEN")
+
+      client := godo.NewFromToken(token)
+      ctx := context.TODO()
+
+      topicName := "events"
+      updateRequest := &DatabaseUpdateTopicRequest{
+        PartitionCount:    3,
+        ReplicationFactor: 2,
+        Config: &TopicConfig{
+          RetentionMS: 60000,
+        },
+      }
+
+      _, err := client.Databases.UpdateTopic(ctx, "9cc10173-e9ea-4176-9dbc-a4cee4c4ff30", topicName, updateRequest)
+  }

specification/resources/databases/examples/python/databases_create_cluster.yml

@@ -12,6 +12,7 @@ source: |-
     "region": "nyc3",
     "size": "db-s-2vcpu-4gb",
     "num_nodes": 2,
+    "storage_size_mib": 61440,
     "tags": [
       "production"
     ]

specification/resources/databases/examples/python/databases_update_clusterSize.yml

@@ -7,7 +7,8 @@ source: |-
 
   req = {
     "size": "db-s-4vcpu-8gb",
-    "num_nodes": 3
+    "num_nodes": 3,
+    "storage_size_mib": 163840
   }
 
   update_resp = client.databases.update_cluster_size(database_cluster_uuid="a7a8bas", body=req)

specification/resources/databases/models/database_cluster.yml

@@ -133,6 +133,12 @@ properties:
     description: >-
       A timestamp referring to the date when the particular version will no longer be available for creating new
       clusters. If null, the version does not have an end of availability timeline.
+  storage_size_mib:
+    type: integer
+    example: 61440
+    description: >-
+      Additional storage added to the cluster, in MiB. If null, no additional storage is added to the cluster, beyond
+      what is provided as a base amount from the 'size' and any previously added additional storage.
 
 
 required:

specification/resources/databases/models/database_cluster_resize.yml

@@ -13,6 +13,13 @@ properties:
       The number of nodes in the database cluster. Valid values are are 1-3.
       In addition to the primary node, up to two standby nodes may be added for
       highly available configurations.
+  storage_size_mib:
+    type: integer
+    example: 61440
+    description: >-
+      Additional storage added to the cluster, in MiB. If null, no additional storage is added to the cluster, beyond
+      what is provided as a base amount from the 'size' and any previously added additional storage.
+
 
 required:
   - size