From a016983c1c791d356ea3024da835aea3f82aaa77 Mon Sep 17 00:00:00 2001 From: scaleway-bot Date: Fri, 13 Dec 2024 14:44:10 +0000 Subject: [PATCH 1/2] feat: update generated APIs --- .../clients/src/api/iam/v1alpha1/index.gen.ts | 1 + packages/clients/src/api/vpcgw/index.gen.ts | 1 + .../clients/src/api/vpcgw/v2/index.gen.ts | 49 +++++++++++++++++++ .../src/api/webhosting/v1/index.gen.ts | 1 + .../src/api/webhosting/v1/marshalling.gen.ts | 20 ++++++++ .../src/api/webhosting/v1/types.gen.ts | 17 +++++++ 6 files changed, 89 insertions(+) create mode 100644 packages/clients/src/api/vpcgw/v2/index.gen.ts diff --git a/packages/clients/src/api/iam/v1alpha1/index.gen.ts b/packages/clients/src/api/iam/v1alpha1/index.gen.ts index 68b33821c..d25177e5d 100644 --- a/packages/clients/src/api/iam/v1alpha1/index.gen.ts +++ b/packages/clients/src/api/iam/v1alpha1/index.gen.ts @@ -97,6 +97,7 @@ export type { UpdateSSHKeyRequest, UpdateUserPasswordRequest, UpdateUserRequest, + UpdateUserUsernameRequest, User, UserStatus, UserType, diff --git a/packages/clients/src/api/vpcgw/index.gen.ts b/packages/clients/src/api/vpcgw/index.gen.ts index a86d42c0b..bfc9cec79 100644 --- a/packages/clients/src/api/vpcgw/index.gen.ts +++ b/packages/clients/src/api/vpcgw/index.gen.ts @@ -4,3 +4,4 @@ */ export * as v1 from './v1/index.gen' +export * as v2 from './v2/index.gen' diff --git a/packages/clients/src/api/vpcgw/v2/index.gen.ts b/packages/clients/src/api/vpcgw/v2/index.gen.ts new file mode 100644 index 000000000..b0270c213 --- /dev/null +++ b/packages/clients/src/api/vpcgw/v2/index.gen.ts @@ -0,0 +1,49 @@ +// This file was automatically generated. DO NOT EDIT. +// If you have any remark or suggestion do not hesitate to open an issue. +export { API } from './api.gen' +export * from './content.gen' +export type { + CreateGatewayNetworkRequest, + CreateGatewayRequest, + CreateIPRequest, + CreatePatRuleRequest, + DeleteGatewayNetworkRequest, + DeleteGatewayRequest, + DeleteIPRequest, + DeletePatRuleRequest, + Gateway, + GatewayNetwork, + GatewayNetworkStatus, + GatewayStatus, + GatewayType, + GetGatewayNetworkRequest, + GetGatewayRequest, + GetIPRequest, + GetPatRuleRequest, + IP, + ListGatewayNetworksRequest, + ListGatewayNetworksRequestOrderBy, + ListGatewayNetworksResponse, + ListGatewayTypesRequest, + ListGatewayTypesResponse, + ListGatewaysRequest, + ListGatewaysRequestOrderBy, + ListGatewaysResponse, + ListIPsRequest, + ListIPsRequestOrderBy, + ListIPsResponse, + ListPatRulesRequest, + ListPatRulesRequestOrderBy, + ListPatRulesResponse, + PatRule, + PatRuleProtocol, + RefreshSSHKeysRequest, + SetPatRulesRequest, + SetPatRulesRequestRule, + SetPatRulesResponse, + UpdateGatewayNetworkRequest, + UpdateGatewayRequest, + UpdateIPRequest, + UpdatePatRuleRequest, + UpgradeGatewayRequest, +} from './types.gen' diff --git a/packages/clients/src/api/webhosting/v1/index.gen.ts b/packages/clients/src/api/webhosting/v1/index.gen.ts index 47a6ef8f7..9f1ef58ea 100644 --- a/packages/clients/src/api/webhosting/v1/index.gen.ts +++ b/packages/clients/src/api/webhosting/v1/index.gen.ts @@ -15,6 +15,7 @@ export type { CheckUserOwnsDomainResponse, ControlPanel, ControlPanelApiListControlPanelsRequest, + CreateDatabaseRequestUser, CreateHostingRequestDomainConfiguration, Database, DatabaseApiAssignDatabaseUserRequest, diff --git a/packages/clients/src/api/webhosting/v1/marshalling.gen.ts b/packages/clients/src/api/webhosting/v1/marshalling.gen.ts index cdc90bf25..0bf7b9690 100644 --- a/packages/clients/src/api/webhosting/v1/marshalling.gen.ts +++ b/packages/clients/src/api/webhosting/v1/marshalling.gen.ts @@ -2,6 +2,7 @@ // If you have any remark or suggestion do not hesitate to open an issue. import { isJSONObject, + resolveOneOf, unmarshalArrayOfObject, unmarshalDate, unmarshalMoney, @@ -10,6 +11,7 @@ import type { DefaultValues } from '../../../bridge' import type { CheckUserOwnsDomainResponse, ControlPanel, + CreateDatabaseRequestUser, CreateHostingRequestDomainConfiguration, Database, DatabaseApiAssignDatabaseUserRequest, @@ -517,11 +519,29 @@ export const marshalDatabaseApiChangeDatabaseUserPasswordRequest = ( password: request.password, }) +const marshalCreateDatabaseRequestUser = ( + request: CreateDatabaseRequestUser, + defaults: DefaultValues, +): Record => ({ + password: request.password, + username: request.username, +}) + export const marshalDatabaseApiCreateDatabaseRequest = ( request: DatabaseApiCreateDatabaseRequest, defaults: DefaultValues, ): Record => ({ database_name: request.databaseName, + ...resolveOneOf | string>([ + { + param: 'new_user', + value: + request.newUser !== undefined + ? marshalCreateDatabaseRequestUser(request.newUser, defaults) + : undefined, + }, + { param: 'existing_username', value: request.existingUsername }, + ]), }) export const marshalDatabaseApiCreateDatabaseUserRequest = ( diff --git a/packages/clients/src/api/webhosting/v1/types.gen.ts b/packages/clients/src/api/webhosting/v1/types.gen.ts index a1e928ee5..e4fab8a91 100644 --- a/packages/clients/src/api/webhosting/v1/types.gen.ts +++ b/packages/clients/src/api/webhosting/v1/types.gen.ts @@ -106,6 +106,11 @@ export interface PlatformControlPanel { urls?: PlatformControlPanelUrls } +export interface CreateDatabaseRequestUser { + username: string + password: string +} + export interface CreateHostingRequestDomainConfiguration { updateNameservers: boolean updateWebRecord: boolean @@ -316,6 +321,18 @@ export type DatabaseApiCreateDatabaseRequest = { hostingId: string /** Name of the database to be created. */ databaseName: string + /** + * (Optional) Username and password to create a user and link to the database. + * + * One-of ('user'): at most one of 'newUser', 'existingUsername' could be set. + */ + newUser?: CreateDatabaseRequestUser + /** + * (Optional) Username to link an existing user to the database. + * + * One-of ('user'): at most one of 'newUser', 'existingUsername' could be set. + */ + existingUsername?: string } export type DatabaseApiCreateDatabaseUserRequest = { From 0d94be81685131b5d0b1988758e230a8fd85e1f3 Mon Sep 17 00:00:00 2001 From: devtools-ci-cd Date: Mon, 16 Dec 2024 10:56:09 +0100 Subject: [PATCH 2/2] Reverted iam updateUserNameRequest --- packages/clients/src/api/iam/v1alpha1/index.gen.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/clients/src/api/iam/v1alpha1/index.gen.ts b/packages/clients/src/api/iam/v1alpha1/index.gen.ts index d25177e5d..68b33821c 100644 --- a/packages/clients/src/api/iam/v1alpha1/index.gen.ts +++ b/packages/clients/src/api/iam/v1alpha1/index.gen.ts @@ -97,7 +97,6 @@ export type { UpdateSSHKeyRequest, UpdateUserPasswordRequest, UpdateUserRequest, - UpdateUserUsernameRequest, User, UserStatus, UserType,