Merge branch 'main' into v1.6170.0

Author: remyleone

packages/clients/src/api/mongodb/v1alpha1/api.gen.ts

@@ -18,6 +18,7 @@ import {
   marshalCreateSnapshotRequest,
   marshalCreateUserRequest,
   marshalRestoreSnapshotRequest,
+  marshalSetUserRoleRequest,
   marshalUpdateInstanceRequest,
   marshalUpdateSnapshotRequest,
   marshalUpdateUserRequest,
@@ -57,6 +58,7 @@ import type {
   ListVersionsRequest,
   ListVersionsResponse,
   RestoreSnapshotRequest,
+  SetUserRoleRequest,
   Snapshot,
   UpdateInstanceRequest,
   UpdateSnapshotRequest,
@@ -542,6 +544,19 @@ export class API extends ParentAPI {
       path: `/mongodb/v1alpha1/regions/${validatePathParam('region', request.region ?? this.client.settings.defaultRegion)}/instances/${validatePathParam('instanceId', request.instanceId)}/users/${validatePathParam('name', request.name)}`,
     })
 
+  setUserRole = (request: Readonly<SetUserRoleRequest>) =>
+    this.client.fetch<User>(
+      {
+        body: JSON.stringify(
+          marshalSetUserRoleRequest(request, this.client.settings),
+        ),
+        headers: jsonContentHeaders,
+        method: 'PUT',
+        path: `/mongodb/v1alpha1/regions/${validatePathParam('region', request.region ?? this.client.settings.defaultRegion)}/instances/${validatePathParam('instanceId', request.instanceId)}/roles`,
+      },
+      unmarshalUser,
+    )
+
   /**
    * Delete a Database Instance endpoint. Delete the endpoint of a Database
    * Instance. You must specify the `endpoint_id` parameter of the endpoint you

packages/clients/src/api/mongodb/v1alpha1/marshalling.gen.ts

@@ -31,6 +31,7 @@ import type {
   NodeTypeVolumeType,
   RestoreSnapshotRequest,
   RestoreSnapshotRequestVolumeDetails,
+  SetUserRoleRequest,
   Setting,
   Snapshot,
   SnapshotVolumeType,
@@ -39,6 +40,7 @@ import type {
   UpdateUserRequest,
   UpgradeInstanceRequest,
   User,
+  UserRole,
   Version,
   Volume,
 } from './types.gen'
@@ -177,6 +179,20 @@ export const unmarshalSnapshot = (data: unknown): Snapshot => {
   } as Snapshot
 }
 
+const unmarshalUserRole = (data: unknown): UserRole => {
+  if (!isJSONObject(data)) {
+    throw new TypeError(
+      `Unmarshalling the type 'UserRole' failed as data isn't a dictionary.`,
+    )
+  }
+
+  return {
+    anyDatabase: data.any_database,
+    database: data.database,
+    role: data.role,
+  } as UserRole
+}
+
 export const unmarshalUser = (data: unknown): User => {
   if (!isJSONObject(data)) {
     throw new TypeError(
@@ -186,6 +202,7 @@ export const unmarshalUser = (data: unknown): User => {
 
   return {
     name: data.name,
+    roles: unmarshalArrayOfObject(data.roles, unmarshalUserRole),
   } as User
 }
 
@@ -450,6 +467,28 @@ export const marshalRestoreSnapshotRequest = (
   volume: marshalRestoreSnapshotRequestVolumeDetails(request.volume, defaults),
 })
 
+const marshalUserRole = (
+  request: UserRole,
+  defaults: DefaultValues,
+): Record<string, unknown> => ({
+  role: request.role,
+  ...resolveOneOf<string | boolean>([
+    { param: 'database', value: request.database },
+    { param: 'any_database', value: request.anyDatabase },
+  ]),
+})
+
+export const marshalSetUserRoleRequest = (
+  request: SetUserRoleRequest,
+  defaults: DefaultValues,
+): Record<string, unknown> => ({
+  roles:
+    request.roles !== undefined
+      ? request.roles.map(elt => marshalUserRole(elt, defaults))
+      : undefined,
+  user_name: request.userName,
+})
+
 export const marshalUpdateInstanceRequest = (
   request: UpdateInstanceRequest,
   defaults: DefaultValues,

packages/clients/src/api/mongodb/v1alpha1/types.gen.ts

@@ -48,6 +48,8 @@ export type SnapshotStatus =
   | 'error'
   | 'locked'
 
+export type UserRoleRole = 'unknown_role' | 'read' | 'read_write' | 'db_admin'
+
 export type VolumeType = 'unknown_type' | 'sbs_5k' | 'sbs_15k'
 
 /** Private Network details. */
@@ -119,6 +121,14 @@ export interface SnapshotVolumeType {
   type: VolumeType
 }
 
+export interface UserRole {
+  role: UserRoleRole
+  /** One-of ('scope'): at most one of 'database', 'anyDatabase' could be set. */
+  database?: string
+  /** One-of ('scope'): at most one of 'database', 'anyDatabase' could be set. */
+  anyDatabase?: boolean
+}
+
 export interface Setting {
   /** Setting name from the database engine. */
   name: string
@@ -242,6 +252,11 @@ export interface User {
    * characters are accepted).
    */
   name: string
+  /**
+   * List of roles assigned to the user, along with the corresponding database
+   * where each role is granted.
+   */
+  roles: UserRole[]
 }
 
 export interface Version {
@@ -530,6 +545,23 @@ export type RestoreSnapshotRequest = {
   volume: RestoreSnapshotRequestVolumeDetails
 }
 
+export type SetUserRoleRequest = {
+  /**
+   * Region to target. If none is passed will use default region from the
+   * config.
+   */
+  region?: ScwRegion
+  /** UUID of the Database Instance the user belongs to. */
+  instanceId: string
+  /** Name of the database user. */
+  userName: string
+  /**
+   * List of roles assigned to the user, along with the corresponding database
+   * where each role is granted.
+   */
+  roles?: UserRole[]
+}
+
 export type UpdateInstanceRequest = {
   /**
    * Region to target. If none is passed will use default region from the

packages/clients/src/api/mongodb/v1alpha1/validation-rules.gen.ts

@@ -138,6 +138,14 @@ export const RestoreSnapshotRequest = {
   },
 }
 
+export const SetUserRoleRequest = {
+  userName: {
+    maxLength: 63,
+    minLength: 1,
+    pattern: /^[a-zA-Z0-9_\-]*$/,
+  },
+}
+
 export const UpdateInstanceRequest = {
   name: {
     maxLength: 255,

packages/clients/src/api/webhosting/v1/content.gen.ts

@@ -4,7 +4,6 @@ import type {
   DomainAvailabilityStatus,
   DomainStatus,
   HostingStatus,
-  HostingSummaryStatus,
 } from './types.gen'
 
 /** Lists transient statutes of the enum {@link DomainAvailabilityStatus}. */
@@ -20,10 +19,3 @@ export const HOSTING_TRANSIENT_STATUSES: HostingStatus[] = [
   'deleting',
   'migrating',
 ]
-
-/** Lists transient statutes of the enum {@link HostingSummaryStatus}. */
-export const HOSTING_SUMMARY_TRANSIENT_STATUSES: HostingSummaryStatus[] = [
-  'delivering',
-  'deleting',
-  'migrating',
-]

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

@@ -406,13 +406,12 @@ const unmarshalHostingSummary = (data: unknown): HostingSummary => {
     dnsStatus: data.dns_status ? data.dns_status : undefined,
     domain: data.domain,
     domainStatus: data.domain_status,
-    hostingStatus: data.hosting_status,
     id: data.id,
     offerName: data.offer_name,
     projectId: data.project_id,
     protected: data.protected,
     region: data.region,
-    status: data.status ? data.status : undefined,
+    status: data.status,
     updatedAt: unmarshalDate(data.updated_at),
   } as HostingSummary
 }

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

@@ -42,6 +42,7 @@ export type DomainDnsAction =
   | 'auto_config_web_records'
   | 'auto_config_mail_records'
   | 'auto_config_nameservers'
+  | 'auto_config_none'
 
 export type DomainStatus =
   | 'unknown_status'
@@ -66,15 +67,6 @@ export type HostingStatus =
   | 'locked'
   | 'migrating'
 
-export type HostingSummaryStatus =
-  | 'unknown_status'
-  | 'delivering'
-  | 'ready'
-  | 'deleting'
-  | 'error'
-  | 'locked'
-  | 'migrating'
-
 export type ListDatabaseUsersRequestOrderBy = 'username_asc' | 'username_desc'
 
 export type ListDatabasesRequestOrderBy =
@@ -301,8 +293,8 @@ export interface HostingSummary {
   createdAt?: Date
   /** Date on which the Web Hosting plan was last updated. */
   updatedAt?: Date
-  /** @deprecated Status of the Web Hosting plan. */
-  status?: HostingSummaryStatus
+  /** Status of the Web Hosting plan. */
+  status: HostingStatus
   /** Main domain associated with the Web Hosting plan. */
   domain: string
   /** Whether the hosting is protected or not. */
@@ -311,8 +303,6 @@ export interface HostingSummary {
   dnsStatus?: DnsRecordsStatus
   /** Name of the active offer for the Web Hosting plan. */
   offerName: string
-  /** Status of the Web Hosting plan. */
-  hostingStatus: HostingStatus
   /** Main domain status of the Web Hosting plan. */
   domainStatus: DomainStatus
   /** Region where the Web Hosting plan is hosted. */