Skip to content

Commit 9503d97

Browse files
authored
Merge branch 'main' into v1.6087.0
2 parents 4aac518 + b985b98 commit 9503d97

File tree

3 files changed

+40
-17
lines changed

3 files changed

+40
-17
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// This file was automatically generated. DO NOT EDIT.
22
// If you have any remark or suggestion do not hesitate to open an issue.
33
import { API as ParentAPI, urlParams, validatePathParam } from '../../../bridge'
4-
import type { Region } from '../../../bridge'
4+
import type { Region as ScwRegion } from '../../../bridge'
55
import {
66
unmarshalListEventsResponse,
77
unmarshalListProductsResponse,
@@ -21,7 +21,7 @@ import type {
2121
*/
2222
export class API extends ParentAPI {
2323
/** Lists the available regions of the API. */
24-
public static readonly LOCALITIES: Region[] = ['fr-par', 'nl-ams']
24+
public static readonly LOCALITIES: ScwRegion[] = ['fr-par', 'nl-ams']
2525

2626
/**
2727
* List events. Retrieve the list of Audit Trail events for a Scaleway

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88
import type {
99
Event,
1010
EventPrincipal,
11+
KeyManagerKeyInfo,
1112
KubernetesACLInfo,
1213
KubernetesClusterInfo,
1314
KubernetesNodeInfo,
@@ -21,6 +22,16 @@ import type {
2122
SecretManagerSecretVersionInfo,
2223
} from './types.gen'
2324

25+
const unmarshalKeyManagerKeyInfo = (data: unknown): KeyManagerKeyInfo => {
26+
if (!isJSONObject(data)) {
27+
throw new TypeError(
28+
`Unmarshalling the type 'KeyManagerKeyInfo' failed as data isn't a dictionary.`,
29+
)
30+
}
31+
32+
return {} as KeyManagerKeyInfo
33+
}
34+
2435
const unmarshalKubernetesACLInfo = (data: unknown): KubernetesACLInfo => {
2536
if (!isJSONObject(data)) {
2637
throw new TypeError(
@@ -120,6 +131,9 @@ export const unmarshalResource = (data: unknown): Resource => {
120131
createdAt: unmarshalDate(data.created_at),
121132
deletedAt: unmarshalDate(data.deleted_at),
122133
id: data.id,
134+
keymKeyInfo: data.keym_key_info
135+
? unmarshalKeyManagerKeyInfo(data.keym_key_info)
136+
: undefined,
123137
kubeAclInfo: data.kube_acl_info
124138
? unmarshalKubernetesACLInfo(data.kube_acl_info)
125139
: undefined,

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

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
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-
import type { Region } from '../../../bridge'
3+
import type { Region as ScwRegion } from '../../../bridge'
44

55
export type ListEventsRequestOrderBy = 'recorded_at_desc' | 'recorded_at_asc'
66

@@ -12,6 +12,9 @@ export type ResourceType =
1212
| 'kube_pool'
1313
| 'kube_node'
1414
| 'kube_acl'
15+
| 'keym_key'
16+
17+
export interface KeyManagerKeyInfo {}
1518

1619
export interface KubernetesACLInfo {}
1720

@@ -48,40 +51,46 @@ export interface Resource {
4851
name?: string
4952
/**
5053
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo',
51-
* 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo' could be
52-
* set.
54+
* 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo',
55+
* 'keymKeyInfo' could be set.
5356
*/
5457
secmSecretInfo?: SecretManagerSecretInfo
5558
/**
5659
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo',
57-
* 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo' could be
58-
* set.
60+
* 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo',
61+
* 'keymKeyInfo' could be set.
5962
*/
6063
secmSecretVersionInfo?: SecretManagerSecretVersionInfo
6164
/**
6265
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo',
63-
* 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo' could be
64-
* set.
66+
* 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo',
67+
* 'keymKeyInfo' could be set.
6568
*/
6669
kubeClusterInfo?: KubernetesClusterInfo
6770
/**
6871
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo',
69-
* 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo' could be
70-
* set.
72+
* 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo',
73+
* 'keymKeyInfo' could be set.
7174
*/
7275
kubePoolInfo?: KubernetesPoolInfo
7376
/**
7477
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo',
75-
* 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo' could be
76-
* set.
78+
* 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo',
79+
* 'keymKeyInfo' could be set.
7780
*/
7881
kubeNodeInfo?: KubernetesNodeInfo
7982
/**
8083
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo',
81-
* 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo' could be
82-
* set.
84+
* 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo',
85+
* 'keymKeyInfo' could be set.
8386
*/
8487
kubeAclInfo?: KubernetesACLInfo
88+
/**
89+
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo',
90+
* 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo',
91+
* 'keymKeyInfo' could be set.
92+
*/
93+
keymKeyInfo?: KeyManagerKeyInfo
8594
}
8695

8796
export interface ProductService {
@@ -139,7 +148,7 @@ export type ListEventsRequest = {
139148
* Region to target. If none is passed will use default region from the
140149
* config.
141150
*/
142-
region?: Region
151+
region?: ScwRegion
143152
/** (Optional) ID of the Project containing the Audit Trail events. */
144153
projectId?: string
145154
/** ID of the Organization containing the Audit Trail events. */
@@ -183,7 +192,7 @@ export type ListProductsRequest = {
183192
* Region to target. If none is passed will use default region from the
184193
* config.
185194
*/
186-
region?: Region
195+
region?: ScwRegion
187196
}
188197

189198
export interface ListProductsResponse {

0 commit comments

Comments
 (0)