@scaleway/sdk 2.0.0-alpha.12 → 2.0.0-alpha.14

package/dist/api/container/v1beta1/marshalling.gen.js

@@ -19,10 +19,10 @@ const unmarshalContainer = data => {
   }
   return {
     cpuLimit: data.cpu_limit,
-    description: data.description ? data.description : undefined,
+    description: data.description,
     domainName: data.domain_name,
     environmentVariables: data.environment_variables,
-    errorMessage: data.error_message ? data.error_message : undefined,
+    errorMessage: data.error_message,
     httpOption: data.http_option,
     id: data.id,
     maxConcurrency: data.max_concurrency,
@@ -38,7 +38,7 @@ const unmarshalContainer = data => {
     registryImage: data.registry_image,
     secretEnvironmentVariables: unmarshalArrayOfObject(data.secret_environment_variables, unmarshalSecretHashedValue),
     status: data.status,
-    timeout: data.timeout ? data.timeout : undefined
+    timeout: data.timeout
   };
 };
 const unmarshalCron = data => {
@@ -46,7 +46,7 @@ const unmarshalCron = data => {
     throw new TypeError(`Unmarshalling the type 'Cron' failed as data isn't a dictionary.`);
   }
   return {
-    args: data.args ? data.args : undefined,
+    args: data.args,
     containerId: data.container_id,
     id: data.id,
     name: data.name,
@@ -60,7 +60,7 @@ const unmarshalDomain = data => {
   }
   return {
     containerId: data.container_id,
-    errorMessage: data.error_message ? data.error_message : undefined,
+    errorMessage: data.error_message,
     hostname: data.hostname,
     id: data.id,
     status: data.status,
@@ -72,9 +72,9 @@ const unmarshalNamespace = data => {
     throw new TypeError(`Unmarshalling the type 'Namespace' failed as data isn't a dictionary.`);
   }
   return {
-    description: data.description ? data.description : undefined,
+    description: data.description,
     environmentVariables: data.environment_variables,
-    errorMessage: data.error_message ? data.error_message : undefined,
+    errorMessage: data.error_message,
     id: data.id,
     name: data.name,
     organizationId: data.organization_id,
@@ -91,12 +91,12 @@ const unmarshalToken = data => {
     throw new TypeError(`Unmarshalling the type 'Token' failed as data isn't a dictionary.`);
   }
   return {
-    containerId: data.container_id ? data.container_id : undefined,
-    description: data.description ? data.description : undefined,
+    containerId: data.container_id,
+    description: data.description,
     expiresAt: unmarshalDate(data.expires_at),
     id: data.id,
-    namespaceId: data.namespace_id ? data.namespace_id : undefined,
-    publicKey: data.public_key ? data.public_key : undefined,
+    namespaceId: data.namespace_id,
+    publicKey: data.public_key,
     status: data.status,
     token: data.token
   };
@@ -106,36 +106,37 @@ const unmarshalTriggerMnqNatsClientConfig = data => {
     throw new TypeError(`Unmarshalling the type 'TriggerMnqNatsClientConfig' failed as data isn't a dictionary.`);
   }
   return {
-    mnqCredentialId: data.mnq_credential_id ? data.mnq_credential_id : undefined,
+    mnqCredentialId: data.mnq_credential_id,
     mnqNamespaceId: data.mnq_namespace_id,
+    mnqNatsAccountId: data.mnq_nats_account_id,
     mnqProjectId: data.mnq_project_id,
     mnqRegion: data.mnq_region,
     subject: data.subject
   };
 };
-const unmarshalTriggerSqsClientConfig = data => {
-  if (!isJSONObject(data)) {
-    throw new TypeError(`Unmarshalling the type 'TriggerSqsClientConfig' failed as data isn't a dictionary.`);
-  }
-  return {
-    accessKey: data.access_key,
-    endpoint: data.endpoint,
-    queueUrl: data.queue_url,
-    secretKey: data.secret_key
-  };
-};
 const unmarshalTriggerMnqSqsClientConfig = data => {
   if (!isJSONObject(data)) {
     throw new TypeError(`Unmarshalling the type 'TriggerMnqSqsClientConfig' failed as data isn't a dictionary.`);
   }
   return {
-    mnqCredentialId: data.mnq_credential_id ? data.mnq_credential_id : undefined,
+    mnqCredentialId: data.mnq_credential_id,
     mnqNamespaceId: data.mnq_namespace_id,
     mnqProjectId: data.mnq_project_id,
     mnqRegion: data.mnq_region,
     queue: data.queue
   };
 };
+const unmarshalTriggerSqsClientConfig = data => {
+  if (!isJSONObject(data)) {
+    throw new TypeError(`Unmarshalling the type 'TriggerSqsClientConfig' failed as data isn't a dictionary.`);
+  }
+  return {
+    accessKey: data.access_key,
+    endpoint: data.endpoint,
+    queueUrl: data.queue_url,
+    secretKey: data.secret_key
+  };
+};
 const unmarshalTrigger = data => {
   if (!isJSONObject(data)) {
     throw new TypeError(`Unmarshalling the type 'Trigger' failed as data isn't a dictionary.`);
@@ -143,7 +144,7 @@ const unmarshalTrigger = data => {
   return {
     containerId: data.container_id,
     description: data.description,
-    errorMessage: data.error_message ? data.error_message : undefined,
+    errorMessage: data.error_message,
     id: data.id,
     inputType: data.input_type,
     name: data.name,
@@ -229,6 +230,10 @@ const unmarshalListTriggersResponse = data => {
     triggers: unmarshalArrayOfObject(data.triggers, unmarshalTrigger)
   };
 };
+const marshalSecret = (request, defaults) => ({
+  key: request.key,
+  value: request.value
+});
 const marshalCreateContainerRequest = (request, defaults) => ({
   cpu_limit: request.cpuLimit,
   description: request.description,
@@ -244,7 +249,7 @@ const marshalCreateContainerRequest = (request, defaults) => ({
   privacy: request.privacy,
   protocol: request.protocol,
   registry_image: request.registryImage,
-  secret_environment_variables: request.secretEnvironmentVariables,
+  secret_environment_variables: request.secretEnvironmentVariables !== undefined ? request.secretEnvironmentVariables.map(elt => marshalSecret(elt)) : undefined,
   timeout: request.timeout
 });
 const marshalCreateCronRequest = (request, defaults) => ({
@@ -262,7 +267,7 @@ const marshalCreateNamespaceRequest = (request, defaults) => ({
   environment_variables: request.environmentVariables,
   name: request.name || randomName('cns'),
   project_id: request.projectId ?? defaults.defaultProjectId,
-  secret_environment_variables: request.secretEnvironmentVariables
+  secret_environment_variables: request.secretEnvironmentVariables !== undefined ? request.secretEnvironmentVariables.map(elt => marshalSecret(elt)) : undefined
 });
 const marshalCreateTokenRequest = (request, defaults) => ({
   description: request.description,
@@ -275,19 +280,38 @@ const marshalCreateTokenRequest = (request, defaults) => ({
     value: request.namespaceId
   }])
 });
+const marshalCreateTriggerRequestMnqNatsClientConfig = (request, defaults) => ({
+  mnq_namespace_id: request.mnqNamespaceId,
+  mnq_nats_account_id: request.mnqNatsAccountId,
+  mnq_project_id: request.mnqProjectId,
+  mnq_region: request.mnqRegion,
+  subject: request.subject
+});
+const marshalCreateTriggerRequestMnqSqsClientConfig = (request, defaults) => ({
+  mnq_namespace_id: request.mnqNamespaceId,
+  mnq_project_id: request.mnqProjectId,
+  mnq_region: request.mnqRegion,
+  queue: request.queue
+});
+const marshalCreateTriggerRequestSqsClientConfig = (request, defaults) => ({
+  access_key: request.accessKey,
+  endpoint: request.endpoint,
+  queue_url: request.queueUrl,
+  secret_key: request.secretKey
+});
 const marshalCreateTriggerRequest = (request, defaults) => ({
   container_id: request.containerId,
   description: request.description,
   name: request.name,
   ...resolveOneOf([{
-    param: 'scw_nats_config',
-    value: request.scwNatsConfig
-  }, {
     param: 'scw_sqs_config',
-    value: request.scwSqsConfig
+    value: request.scwSqsConfig !== undefined ? marshalCreateTriggerRequestMnqSqsClientConfig(request.scwSqsConfig) : undefined
   }, {
     param: 'sqs_config',
-    value: request.sqsConfig
+    value: request.sqsConfig !== undefined ? marshalCreateTriggerRequestSqsClientConfig(request.sqsConfig) : undefined
+  }, {
+    param: 'scw_nats_config',
+    value: request.scwNatsConfig !== undefined ? marshalCreateTriggerRequestMnqNatsClientConfig(request.scwNatsConfig) : undefined
   }])
 });
 const marshalUpdateContainerRequest = (request, defaults) => ({
@@ -304,7 +328,7 @@ const marshalUpdateContainerRequest = (request, defaults) => ({
   protocol: request.protocol,
   redeploy: request.redeploy,
   registry_image: request.registryImage,
-  secret_environment_variables: request.secretEnvironmentVariables,
+  secret_environment_variables: request.secretEnvironmentVariables !== undefined ? request.secretEnvironmentVariables.map(elt => marshalSecret(elt)) : undefined,
   timeout: request.timeout
 });
 const marshalUpdateCronRequest = (request, defaults) => ({
@@ -316,14 +340,18 @@ const marshalUpdateCronRequest = (request, defaults) => ({
 const marshalUpdateNamespaceRequest = (request, defaults) => ({
   description: request.description,
   environment_variables: request.environmentVariables,
-  secret_environment_variables: request.secretEnvironmentVariables
+  secret_environment_variables: request.secretEnvironmentVariables !== undefined ? request.secretEnvironmentVariables.map(elt => marshalSecret(elt)) : undefined
+});
+const marshalUpdateTriggerRequestSqsClientConfig = (request, defaults) => ({
+  access_key: request.accessKey,
+  secret_key: request.secretKey
 });
 const marshalUpdateTriggerRequest = (request, defaults) => ({
   description: request.description,
   name: request.name,
   ...resolveOneOf([{
     param: 'sqs_config',
-    value: request.sqsConfig
+    value: request.sqsConfig !== undefined ? marshalUpdateTriggerRequestSqsClientConfig(request.sqsConfig) : undefined
   }])
 });
 

package/dist/api/container/v1beta1/validation-rules.gen.js

@@ -0,0 +1,44 @@
+// This file was automatically generated. DO NOT EDIT.
+// If you have any remark or suggestion do not hesitate to open an issue.
+
+const CreateTriggerRequest = {
+  description: {
+    maxLength: 255
+  },
+  name: {
+    maxLength: 50,
+    minLength: 1
+  }
+};
+const CreateTriggerRequestMnqNatsClientConfig = {
+  mnqRegion: {
+    maxLength: 20,
+    minLength: 1
+  },
+  subject: {
+    maxLength: 100,
+    minLength: 1,
+    pattern: /^[^\s]+$/
+  }
+};
+const CreateTriggerRequestMnqSqsClientConfig = {
+  mnqRegion: {
+    maxLength: 20,
+    minLength: 1
+  },
+  queue: {
+    maxLength: 100,
+    minLength: 1
+  }
+};
+const UpdateTriggerRequest = {
+  description: {
+    maxLength: 255
+  },
+  name: {
+    maxLength: 50,
+    minLength: 1
+  }
+};
+
+export { CreateTriggerRequest, CreateTriggerRequestMnqNatsClientConfig, CreateTriggerRequestMnqSqsClientConfig, UpdateTriggerRequest };

package/dist/api/document_db/v1beta1/marshalling.gen.js

@@ -33,11 +33,11 @@ const unmarshalEndpoint = data => {
   }
   return {
     directAccess: data.direct_access ? unmarshalEndpointDirectAccessDetails(data.direct_access) : undefined,
-    hostname: data.hostname ? data.hostname : undefined,
+    hostname: data.hostname,
     id: data.id,
-    ip: data.ip ? data.ip : undefined,
+    ip: data.ip,
     loadBalancer: data.load_balancer ? unmarshalEndpointLoadBalancerDetails(data.load_balancer) : undefined,
-    name: data.name ? data.name : undefined,
+    name: data.name,
     port: data.port,
     privateNetwork: data.private_network ? unmarshalEndpointPrivateNetworkDetails(data.private_network) : undefined
   };
@@ -71,7 +71,7 @@ const unmarshalInstanceLog = data => {
   }
   return {
     createdAt: unmarshalDate(data.created_at),
-    downloadUrl: data.download_url ? data.download_url : undefined,
+    downloadUrl: data.download_url,
     expiresAt: unmarshalDate(data.expires_at),
     id: data.id,
     nodeName: data.node_name,
@@ -79,27 +79,6 @@ const unmarshalInstanceLog = data => {
     status: data.status
   };
 };
-const unmarshalMaintenance = data => {
-  if (!isJSONObject(data)) {
-    throw new TypeError(`Unmarshalling the type 'Maintenance' failed as data isn't a dictionary.`);
-  }
-  return {
-    closedAt: unmarshalDate(data.closed_at),
-    reason: data.reason,
-    startsAt: unmarshalDate(data.starts_at),
-    status: data.status,
-    stopsAt: unmarshalDate(data.stops_at)
-  };
-};
-const unmarshalLogsPolicy = data => {
-  if (!isJSONObject(data)) {
-    throw new TypeError(`Unmarshalling the type 'LogsPolicy' failed as data isn't a dictionary.`);
-  }
-  return {
-    maxAgeRetention: data.max_age_retention ? data.max_age_retention : undefined,
-    totalDiskRetention: data.total_disk_retention ? data.total_disk_retention : undefined
-  };
-};
 const unmarshalBackupSchedule = data => {
   if (!isJSONObject(data)) {
     throw new TypeError(`Unmarshalling the type 'BackupSchedule' failed as data isn't a dictionary.`);
@@ -120,6 +99,27 @@ const unmarshalInstanceSetting = data => {
     value: data.value
   };
 };
+const unmarshalLogsPolicy = data => {
+  if (!isJSONObject(data)) {
+    throw new TypeError(`Unmarshalling the type 'LogsPolicy' failed as data isn't a dictionary.`);
+  }
+  return {
+    maxAgeRetention: data.max_age_retention,
+    totalDiskRetention: data.total_disk_retention
+  };
+};
+const unmarshalMaintenance = data => {
+  if (!isJSONObject(data)) {
+    throw new TypeError(`Unmarshalling the type 'Maintenance' failed as data isn't a dictionary.`);
+  }
+  return {
+    closedAt: unmarshalDate(data.closed_at),
+    reason: data.reason,
+    startsAt: unmarshalDate(data.starts_at),
+    status: data.status,
+    stopsAt: unmarshalDate(data.stops_at)
+  };
+};
 const unmarshalUpgradableVersion = data => {
   if (!isJSONObject(data)) {
     throw new TypeError(`Unmarshalling the type 'UpgradableVersion' failed as data isn't a dictionary.`);
@@ -146,7 +146,7 @@ const unmarshalInstance = data => {
   }
   return {
     backupSameRegion: data.backup_same_region,
-    backupSchedule: unmarshalBackupSchedule(data.backup_schedule),
+    backupSchedule: data.backup_schedule ? unmarshalBackupSchedule(data.backup_schedule) : undefined,
     createdAt: unmarshalDate(data.created_at),
     endpoint: data.endpoint ? unmarshalEndpoint(data.endpoint) : undefined,
     endpoints: unmarshalArrayOfObject(data.endpoints, unmarshalEndpoint),
@@ -154,7 +154,7 @@ const unmarshalInstance = data => {
     id: data.id,
     initSettings: unmarshalArrayOfObject(data.init_settings, unmarshalInstanceSetting),
     isHaCluster: data.is_ha_cluster,
-    logsPolicy: unmarshalLogsPolicy(data.logs_policy),
+    logsPolicy: data.logs_policy ? unmarshalLogsPolicy(data.logs_policy) : undefined,
     maintenances: unmarshalArrayOfObject(data.maintenances, unmarshalMaintenance),
     name: data.name,
     nodeType: data.node_type,
@@ -166,7 +166,7 @@ const unmarshalInstance = data => {
     status: data.status,
     tags: data.tags,
     upgradableVersion: unmarshalArrayOfObject(data.upgradable_version, unmarshalUpgradableVersion),
-    volume: unmarshalVolume(data.volume)
+    volume: data.volume ? unmarshalVolume(data.volume) : undefined
   };
 };
 const unmarshalPrivilege = data => {
@@ -192,7 +192,7 @@ const unmarshalSnapshot = data => {
     name: data.name,
     nodeType: data.node_type,
     region: data.region,
-    size: data.size ? data.size : undefined,
+    size: data.size,
     status: data.status,
     updatedAt: unmarshalDate(data.updated_at)
   };
@@ -215,7 +215,7 @@ const unmarshalACLRule = data => {
     description: data.description,
     direction: data.direction,
     ip: data.ip,
-    port: data.port ? data.port : undefined,
+    port: data.port,
     protocol: data.protocol
   };
 };
@@ -266,15 +266,15 @@ const unmarshalEngineSetting = data => {
   return {
     defaultValue: data.default_value,
     description: data.description,
-    floatMax: data.float_max ? data.float_max : undefined,
-    floatMin: data.float_min ? data.float_min : undefined,
+    floatMax: data.float_max,
+    floatMin: data.float_min,
     hotConfigurable: data.hot_configurable,
-    intMax: data.int_max ? data.int_max : undefined,
-    intMin: data.int_min ? data.int_min : undefined,
+    intMax: data.int_max,
+    intMin: data.int_min,
     name: data.name,
     propertyType: data.property_type,
-    stringConstraint: data.string_constraint ? data.string_constraint : undefined,
-    unit: data.unit ? data.unit : undefined
+    stringConstraint: data.string_constraint,
+    unit: data.unit
   };
 };
 const unmarshalEngineVersion = data => {
@@ -363,25 +363,25 @@ const unmarshalListInstancesResponse = data => {
     totalCount: data.total_count
   };
 };
-const unmarshalNodeTypeVolumeType = data => {
+const unmarshalNodeTypeVolumeConstraintSizes = data => {
   if (!isJSONObject(data)) {
-    throw new TypeError(`Unmarshalling the type 'NodeTypeVolumeType' failed as data isn't a dictionary.`);
+    throw new TypeError(`Unmarshalling the type 'NodeTypeVolumeConstraintSizes' failed as data isn't a dictionary.`);
   }
   return {
-    chunkSize: data.chunk_size,
-    description: data.description,
     maxSize: data.max_size,
-    minSize: data.min_size,
-    type: data.type
+    minSize: data.min_size
   };
 };
-const unmarshalNodeTypeVolumeConstraintSizes = data => {
+const unmarshalNodeTypeVolumeType = data => {
   if (!isJSONObject(data)) {
-    throw new TypeError(`Unmarshalling the type 'NodeTypeVolumeConstraintSizes' failed as data isn't a dictionary.`);
+    throw new TypeError(`Unmarshalling the type 'NodeTypeVolumeType' failed as data isn't a dictionary.`);
   }
   return {
+    chunkSize: data.chunk_size,
+    description: data.description,
     maxSize: data.max_size,
-    minSize: data.min_size
+    minSize: data.min_size,
+    type: data.type
   };
 };
 const unmarshalNodeType = data => {
@@ -395,7 +395,7 @@ const unmarshalNodeType = data => {
     disabled: data.disabled,
     generation: data.generation,
     instanceRange: data.instance_range,
-    isBssdCompatible: data.is_bssd_compatible ? data.is_bssd_compatible : undefined,
+    isBssdCompatible: data.is_bssd_compatible,
     isHaRequired: data.is_ha_required,
     memory: data.memory,
     name: data.name,
@@ -457,11 +457,19 @@ const unmarshalSetInstanceSettingsResponse = data => {
     settings: unmarshalArrayOfObject(data.settings, unmarshalInstanceSetting)
   };
 };
+const marshalACLRuleRequest = (request, defaults) => ({
+  description: request.description,
+  ip: request.ip
+});
 const marshalAddInstanceACLRulesRequest = (request, defaults) => ({
-  rules: request.rules
+  rules: request.rules.map(elt => marshalACLRuleRequest(elt))
+});
+const marshalInstanceSetting = (request, defaults) => ({
+  name: request.name,
+  value: request.value
 });
 const marshalAddInstanceSettingsRequest = (request, defaults) => ({
-  settings: request.settings
+  settings: request.settings.map(elt => marshalInstanceSetting(elt))
 });
 const marshalCloneInstanceRequest = (request, defaults) => ({
   name: request.name,
@@ -470,8 +478,29 @@ const marshalCloneInstanceRequest = (request, defaults) => ({
 const marshalCreateDatabaseRequest = (request, defaults) => ({
   name: request.name
 });
+const marshalEndpointSpecPrivateNetworkIpamConfig = (request, defaults) => ({});
+const marshalEndpointSpecLoadBalancer = (request, defaults) => ({});
+const marshalEndpointSpecPrivateNetwork = (request, defaults) => ({
+  private_network_id: request.privateNetworkId,
+  ...resolveOneOf([{
+    param: 'service_ip',
+    value: request.serviceIp
+  }, {
+    param: 'ipam_config',
+    value: request.ipamConfig !== undefined ? marshalEndpointSpecPrivateNetworkIpamConfig(request.ipamConfig) : undefined
+  }])
+});
+const marshalEndpointSpec = (request, defaults) => ({
+  ...resolveOneOf([{
+    param: 'load_balancer',
+    value: request.loadBalancer !== undefined ? marshalEndpointSpecLoadBalancer(request.loadBalancer) : undefined
+  }, {
+    param: 'private_network',
+    value: request.privateNetwork !== undefined ? marshalEndpointSpecPrivateNetwork(request.privateNetwork) : undefined
+  }])
+});
 const marshalCreateEndpointRequest = (request, defaults) => ({
-  endpoint_spec: request.endpointSpec
+  endpoint_spec: request.endpointSpec !== undefined ? marshalEndpointSpec(request.endpointSpec) : undefined
 });
 const marshalCreateInstanceFromSnapshotRequest = (request, defaults) => ({
   instance_name: request.instanceName,
@@ -482,8 +511,8 @@ const marshalCreateInstanceRequest = (request, defaults) => ({
   backup_same_region: request.backupSameRegion,
   disable_backup: request.disableBackup,
   engine: request.engine,
-  init_endpoints: request.initEndpoints,
-  init_settings: request.initSettings,
+  init_endpoints: request.initEndpoints !== undefined ? request.initEndpoints.map(elt => marshalEndpointSpec(elt)) : undefined,
+  init_settings: request.initSettings !== undefined ? request.initSettings.map(elt => marshalInstanceSetting(elt)) : undefined,
   is_ha_cluster: request.isHaCluster,
   name: request.name || randomName('ins'),
   node_type: request.nodeType,
@@ -493,18 +522,41 @@ const marshalCreateInstanceRequest = (request, defaults) => ({
   volume_size: request.volumeSize,
   volume_type: request.volumeType,
   ...resolveOneOf([{
+    default: defaults.defaultOrganizationId,
     param: 'organization_id',
     value: request.organizationId
   }, {
+    default: defaults.defaultProjectId,
     param: 'project_id',
     value: request.projectId
   }])
 });
+const marshalReadReplicaEndpointSpecPrivateNetworkIpamConfig = (request, defaults) => ({});
+const marshalReadReplicaEndpointSpecDirectAccess = (request, defaults) => ({});
+const marshalReadReplicaEndpointSpecPrivateNetwork = (request, defaults) => ({
+  private_network_id: request.privateNetworkId,
+  ...resolveOneOf([{
+    param: 'service_ip',
+    value: request.serviceIp
+  }, {
+    param: 'ipam_config',
+    value: request.ipamConfig !== undefined ? marshalReadReplicaEndpointSpecPrivateNetworkIpamConfig(request.ipamConfig) : undefined
+  }])
+});
+const marshalReadReplicaEndpointSpec = (request, defaults) => ({
+  ...resolveOneOf([{
+    param: 'direct_access',
+    value: request.directAccess !== undefined ? marshalReadReplicaEndpointSpecDirectAccess(request.directAccess) : undefined
+  }, {
+    param: 'private_network',
+    value: request.privateNetwork !== undefined ? marshalReadReplicaEndpointSpecPrivateNetwork(request.privateNetwork) : undefined
+  }])
+});
 const marshalCreateReadReplicaEndpointRequest = (request, defaults) => ({
-  endpoint_spec: request.endpointSpec
+  endpoint_spec: request.endpointSpec.map(elt => marshalReadReplicaEndpointSpec(elt))
 });
 const marshalCreateReadReplicaRequest = (request, defaults) => ({
-  endpoint_spec: request.endpointSpec,
+  endpoint_spec: request.endpointSpec !== undefined ? request.endpointSpec.map(elt => marshalReadReplicaEndpointSpec(elt)) : undefined,
   instance_id: request.instanceId,
   same_zone: request.sameZone
 });
@@ -530,23 +582,27 @@ const marshalPurgeInstanceLogsRequest = (request, defaults) => ({
   log_name: request.logName
 });
 const marshalSetInstanceACLRulesRequest = (request, defaults) => ({
-  rules: request.rules
+  rules: request.rules.map(elt => marshalACLRuleRequest(elt))
 });
 const marshalSetInstanceSettingsRequest = (request, defaults) => ({
-  settings: request.settings
+  settings: request.settings.map(elt => marshalInstanceSetting(elt))
 });
 const marshalSetPrivilegeRequest = (request, defaults) => ({
   database_name: request.databaseName,
   permission: request.permission,
   user_name: request.userName
 });
+const marshalLogsPolicy = (request, defaults) => ({
+  max_age_retention: request.maxAgeRetention,
+  total_disk_retention: request.totalDiskRetention
+});
 const marshalUpdateInstanceRequest = (request, defaults) => ({
   backup_same_region: request.backupSameRegion,
   backup_schedule_frequency: request.backupScheduleFrequency,
   backup_schedule_retention: request.backupScheduleRetention,
   backup_schedule_start_hour: request.backupScheduleStartHour,
   is_backup_schedule_disabled: request.isBackupScheduleDisabled,
-  logs_policy: request.logsPolicy,
+  logs_policy: request.logsPolicy !== undefined ? marshalLogsPolicy(request.logsPolicy) : undefined,
   name: request.name,
   tags: request.tags
 });
@@ -560,20 +616,20 @@ const marshalUpdateUserRequest = (request, defaults) => ({
 });
 const marshalUpgradeInstanceRequest = (request, defaults) => ({
   ...resolveOneOf([{
-    param: 'enable_ha',
-    value: request.enableHa
-  }, {
     param: 'node_type',
     value: request.nodeType
   }, {
-    param: 'upgradable_version_id',
-    value: request.upgradableVersionId
+    param: 'enable_ha',
+    value: request.enableHa
   }, {
     param: 'volume_size',
     value: request.volumeSize
   }, {
     param: 'volume_type',
     value: request.volumeType
+  }, {
+    param: 'upgradable_version_id',
+    value: request.upgradableVersionId
   }])
 });