Merge branch 'main' into v1.5668.0

Author: Laure-di

packages/clients/src/api/rdb/v1/marshalling.gen.ts

@@ -1308,5 +1308,6 @@ export const marshalUpgradeInstanceRequest = (
             )
           : undefined,
     },
+    { param: 'enable_encryption', value: request.enableEncryption },
   ]),
 })

packages/clients/src/api/rdb/v1/types.gen.ts

@@ -1577,51 +1577,60 @@ export type UpgradeInstanceRequest = {
    * Node type of the Database Instance you want to upgrade to.
    *
    * One-of ('upgradeTarget'): at most one of 'nodeType', 'enableHa',
-   * 'volumeSize', 'volumeType', 'upgradableVersionId', 'majorUpgradeWorkflow'
-   * could be set.
+   * 'volumeSize', 'volumeType', 'upgradableVersionId', 'majorUpgradeWorkflow',
+   * 'enableEncryption' could be set.
    */
   nodeType?: string
   /**
    * Defines whether or not high availability should be enabled on the Database
    * Instance.
    *
    * One-of ('upgradeTarget'): at most one of 'nodeType', 'enableHa',
-   * 'volumeSize', 'volumeType', 'upgradableVersionId', 'majorUpgradeWorkflow'
-   * could be set.
+   * 'volumeSize', 'volumeType', 'upgradableVersionId', 'majorUpgradeWorkflow',
+   * 'enableEncryption' could be set.
    */
   enableHa?: boolean
   /**
    * Increase your block storage volume size.
    *
    * One-of ('upgradeTarget'): at most one of 'nodeType', 'enableHa',
-   * 'volumeSize', 'volumeType', 'upgradableVersionId', 'majorUpgradeWorkflow'
-   * could be set.
+   * 'volumeSize', 'volumeType', 'upgradableVersionId', 'majorUpgradeWorkflow',
+   * 'enableEncryption' could be set.
    */
   volumeSize?: number
   /**
    * Change your Database Instance storage type.
    *
    * One-of ('upgradeTarget'): at most one of 'nodeType', 'enableHa',
-   * 'volumeSize', 'volumeType', 'upgradableVersionId', 'majorUpgradeWorkflow'
-   * could be set.
+   * 'volumeSize', 'volumeType', 'upgradableVersionId', 'majorUpgradeWorkflow',
+   * 'enableEncryption' could be set.
    */
   volumeType?: VolumeType
   /**
    * This will create a new Database Instance with same specifications as the
    * current one and perform a Database Engine upgrade.
    *
    * One-of ('upgradeTarget'): at most one of 'nodeType', 'enableHa',
-   * 'volumeSize', 'volumeType', 'upgradableVersionId', 'majorUpgradeWorkflow'
-   * could be set.
+   * 'volumeSize', 'volumeType', 'upgradableVersionId', 'majorUpgradeWorkflow',
+   * 'enableEncryption' could be set.
    */
   upgradableVersionId?: string
   /**
    * Upgrade your database engine to a new major version including instance
    * endpoints.
    *
    * One-of ('upgradeTarget'): at most one of 'nodeType', 'enableHa',
-   * 'volumeSize', 'volumeType', 'upgradableVersionId', 'majorUpgradeWorkflow'
-   * could be set.
+   * 'volumeSize', 'volumeType', 'upgradableVersionId', 'majorUpgradeWorkflow',
+   * 'enableEncryption' could be set.
    */
   majorUpgradeWorkflow?: UpgradeInstanceRequestMajorUpgradeWorkflow
+  /**
+   * Defines whether or not encryption should be enabled on the Database
+   * Instance.
+   *
+   * One-of ('upgradeTarget'): at most one of 'nodeType', 'enableHa',
+   * 'volumeSize', 'volumeType', 'upgradableVersionId', 'majorUpgradeWorkflow',
+   * 'enableEncryption' could be set.
+   */
+  enableEncryption?: boolean
 }