Skip to content

Commit 275bc00

Browse files
jremy42jremy42
authored
Merge branch 'main' into v1.6824.0
2 parents 876737a + a248ca6 commit 275bc00

File tree

3 files changed

+96
-15
lines changed

3 files changed

+96
-15
lines changed

‎packages_generated/audit_trail/src/v1alpha1/api.gen.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
// This file was automatically generated. DO NOT EDIT.
22
// If you have any remark or suggestion do not hesitate to open an issue.
3+
4+
import type { ApiLocality } from '@scaleway/sdk-client'
35
import {
46
API as ParentAPI,
57
toApiLocality,
68
urlParams,
79
validatePathParam,
810
} from '@scaleway/sdk-client'
9-
import type { ApiLocality } from '@scaleway/sdk-client'
1011
import {
1112
unmarshalListEventsResponse,
1213
unmarshalListProductsResponse,

‎packages_generated/audit_trail/src/v1alpha1/marshalling.gen.ts‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,11 @@ import {
77
} from '@scaleway/sdk-client'
88
import type {
99
AccountOrganizationInfo,
10+
AccountProjectInfo,
1011
AccountUserInfo,
1112
AppleSiliconServerInfo,
13+
BaremetalServerInfo,
14+
BaremetalSettingInfo,
1215
Event,
1316
EventPrincipal,
1417
InstanceServerInfo,
@@ -38,6 +41,18 @@ const unmarshalAccountOrganizationInfo = (
3841
return {} as AccountOrganizationInfo
3942
}
4043

44+
const unmarshalAccountProjectInfo = (data: unknown): AccountProjectInfo => {
45+
if (!isJSONObject(data)) {
46+
throw new TypeError(
47+
`Unmarshalling the type 'AccountProjectInfo' failed as data isn't a dictionary.`,
48+
)
49+
}
50+
51+
return {
52+
description: data.description,
53+
} as AccountProjectInfo
54+
}
55+
4156
const unmarshalAccountUserInfo = (data: unknown): AccountUserInfo => {
4257
if (!isJSONObject(data)) {
4358
throw new TypeError(
@@ -66,6 +81,31 @@ const unmarshalAppleSiliconServerInfo = (
6681
} as AppleSiliconServerInfo
6782
}
6883

84+
const unmarshalBaremetalServerInfo = (data: unknown): BaremetalServerInfo => {
85+
if (!isJSONObject(data)) {
86+
throw new TypeError(
87+
`Unmarshalling the type 'BaremetalServerInfo' failed as data isn't a dictionary.`,
88+
)
89+
}
90+
91+
return {
92+
description: data.description,
93+
tags: data.tags,
94+
} as BaremetalServerInfo
95+
}
96+
97+
const unmarshalBaremetalSettingInfo = (data: unknown): BaremetalSettingInfo => {
98+
if (!isJSONObject(data)) {
99+
throw new TypeError(
100+
`Unmarshalling the type 'BaremetalSettingInfo' failed as data isn't a dictionary.`,
101+
)
102+
}
103+
104+
return {
105+
type: data.type,
106+
} as BaremetalSettingInfo
107+
}
108+
69109
const unmarshalInstanceServerInfo = (data: unknown): InstanceServerInfo => {
70110
if (!isJSONObject(data)) {
71111
throw new TypeError(
@@ -188,12 +228,21 @@ export const unmarshalResource = (data: unknown): Resource => {
188228
accountOrganizationInfo: data.account_organization_info
189229
? unmarshalAccountOrganizationInfo(data.account_organization_info)
190230
: undefined,
231+
accountProjectInfo: data.account_project_info
232+
? unmarshalAccountProjectInfo(data.account_project_info)
233+
: undefined,
191234
accountUserInfo: data.account_user_info
192235
? unmarshalAccountUserInfo(data.account_user_info)
193236
: undefined,
194237
appleSiliconServerInfo: data.apple_silicon_server_info
195238
? unmarshalAppleSiliconServerInfo(data.apple_silicon_server_info)
196239
: undefined,
240+
baremetalServerInfo: data.baremetal_server_info
241+
? unmarshalBaremetalServerInfo(data.baremetal_server_info)
242+
: undefined,
243+
baremetalSettingInfo: data.baremetal_setting_info
244+
? unmarshalBaremetalSettingInfo(data.baremetal_setting_info)
245+
: undefined,
197246
createdAt: unmarshalDate(data.created_at),
198247
deletedAt: unmarshalDate(data.deleted_at),
199248
id: data.id,

‎packages_generated/audit_trail/src/v1alpha1/types.gen.ts‎

Lines changed: 45 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,18 @@ export type ResourceType =
2525
| 'key_manager_key'
2626
| 'account_user'
2727
| 'account_organization'
28+
| 'account_project'
2829
| 'instance_server'
2930
| 'apple_silicon_server'
31+
| 'baremetal_server'
32+
| 'baremetal_setting'
3033

3134
export interface AccountOrganizationInfo {}
3235

36+
export interface AccountProjectInfo {
37+
description: string
38+
}
39+
3340
export interface AccountUserInfo {
3441
email: string
3542
phoneNumber?: string
@@ -40,6 +47,15 @@ export interface AppleSiliconServerInfo {
4047
name: string
4148
}
4249

50+
export interface BaremetalServerInfo {
51+
description: string
52+
tags: string[]
53+
}
54+
55+
export interface BaremetalSettingInfo {
56+
type: string
57+
}
58+
4359
export interface InstanceServerInfo {
4460
name: string
4561
}
@@ -83,76 +99,91 @@ export interface Resource {
8399
/**
84100
* @deprecated
85101
*
86-
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo', 'instanceServerInfo', 'appleSiliconServerInfo' could be set.
102+
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo', 'instanceServerInfo', 'appleSiliconServerInfo', 'accountProjectInfo', 'baremetalServerInfo', 'baremetalSettingInfo' could be set.
87103
*/
88104
secmSecretInfo?: SecretManagerSecretInfo
89105
/**
90106
* @deprecated
91107
*
92-
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo', 'instanceServerInfo', 'appleSiliconServerInfo' could be set.
108+
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo', 'instanceServerInfo', 'appleSiliconServerInfo', 'accountProjectInfo', 'baremetalServerInfo', 'baremetalSettingInfo' could be set.
93109
*/
94110
secmSecretVersionInfo?: SecretManagerSecretVersionInfo
95111
/**
96112
*
97-
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo', 'instanceServerInfo', 'appleSiliconServerInfo' could be set.
113+
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo', 'instanceServerInfo', 'appleSiliconServerInfo', 'accountProjectInfo', 'baremetalServerInfo', 'baremetalSettingInfo' could be set.
98114
*/
99115
kubeClusterInfo?: KubernetesClusterInfo
100116
/**
101117
*
102-
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo', 'instanceServerInfo', 'appleSiliconServerInfo' could be set.
118+
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo', 'instanceServerInfo', 'appleSiliconServerInfo', 'accountProjectInfo', 'baremetalServerInfo', 'baremetalSettingInfo' could be set.
103119
*/
104120
kubePoolInfo?: KubernetesPoolInfo
105121
/**
106122
*
107-
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo', 'instanceServerInfo', 'appleSiliconServerInfo' could be set.
123+
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo', 'instanceServerInfo', 'appleSiliconServerInfo', 'accountProjectInfo', 'baremetalServerInfo', 'baremetalSettingInfo' could be set.
108124
*/
109125
kubeNodeInfo?: KubernetesNodeInfo
110126
/**
111127
*
112-
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo', 'instanceServerInfo', 'appleSiliconServerInfo' could be set.
128+
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo', 'instanceServerInfo', 'appleSiliconServerInfo', 'accountProjectInfo', 'baremetalServerInfo', 'baremetalSettingInfo' could be set.
113129
*/
114130
kubeAclInfo?: KubernetesACLInfo
115131
/**
116132
* @deprecated
117133
*
118-
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo', 'instanceServerInfo', 'appleSiliconServerInfo' could be set.
134+
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo', 'instanceServerInfo', 'appleSiliconServerInfo', 'accountProjectInfo', 'baremetalServerInfo', 'baremetalSettingInfo' could be set.
119135
*/
120136
keymKeyInfo?: KeyManagerKeyInfo
121137
/**
122138
*
123-
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo', 'instanceServerInfo', 'appleSiliconServerInfo' could be set.
139+
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo', 'instanceServerInfo', 'appleSiliconServerInfo', 'accountProjectInfo', 'baremetalServerInfo', 'baremetalSettingInfo' could be set.
124140
*/
125141
secretManagerSecretInfo?: SecretManagerSecretInfo
126142
/**
127143
*
128-
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo', 'instanceServerInfo', 'appleSiliconServerInfo' could be set.
144+
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo', 'instanceServerInfo', 'appleSiliconServerInfo', 'accountProjectInfo', 'baremetalServerInfo', 'baremetalSettingInfo' could be set.
129145
*/
130146
secretManagerVersionInfo?: SecretManagerSecretVersionInfo
131147
/**
132148
*
133-
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo', 'instanceServerInfo', 'appleSiliconServerInfo' could be set.
149+
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo', 'instanceServerInfo', 'appleSiliconServerInfo', 'accountProjectInfo', 'baremetalServerInfo', 'baremetalSettingInfo' could be set.
134150
*/
135151
keyManagerKeyInfo?: KeyManagerKeyInfo
136152
/**
137153
*
138-
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo', 'instanceServerInfo', 'appleSiliconServerInfo' could be set.
154+
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo', 'instanceServerInfo', 'appleSiliconServerInfo', 'accountProjectInfo', 'baremetalServerInfo', 'baremetalSettingInfo' could be set.
139155
*/
140156
accountUserInfo?: AccountUserInfo
141157
/**
142158
*
143-
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo', 'instanceServerInfo', 'appleSiliconServerInfo' could be set.
159+
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo', 'instanceServerInfo', 'appleSiliconServerInfo', 'accountProjectInfo', 'baremetalServerInfo', 'baremetalSettingInfo' could be set.
144160
*/
145161
accountOrganizationInfo?: AccountOrganizationInfo
146162
/**
147163
*
148-
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo', 'instanceServerInfo', 'appleSiliconServerInfo' could be set.
164+
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo', 'instanceServerInfo', 'appleSiliconServerInfo', 'accountProjectInfo', 'baremetalServerInfo', 'baremetalSettingInfo' could be set.
149165
*/
150166
instanceServerInfo?: InstanceServerInfo
151167
/**
152168
*
153-
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo', 'instanceServerInfo', 'appleSiliconServerInfo' could be set.
169+
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo', 'instanceServerInfo', 'appleSiliconServerInfo', 'accountProjectInfo', 'baremetalServerInfo', 'baremetalSettingInfo' could be set.
154170
*/
155171
appleSiliconServerInfo?: AppleSiliconServerInfo
172+
/**
173+
*
174+
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo', 'instanceServerInfo', 'appleSiliconServerInfo', 'accountProjectInfo', 'baremetalServerInfo', 'baremetalSettingInfo' could be set.
175+
*/
176+
accountProjectInfo?: AccountProjectInfo
177+
/**
178+
*
179+
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo', 'instanceServerInfo', 'appleSiliconServerInfo', 'accountProjectInfo', 'baremetalServerInfo', 'baremetalSettingInfo' could be set.
180+
*/
181+
baremetalServerInfo?: BaremetalServerInfo
182+
/**
183+
*
184+
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo', 'instanceServerInfo', 'appleSiliconServerInfo', 'accountProjectInfo', 'baremetalServerInfo', 'baremetalSettingInfo' could be set.
185+
*/
186+
baremetalSettingInfo?: BaremetalSettingInfo
156187
}
157188

158189
export interface ProductService {

0 commit comments

Comments
 (0)