Skip to content

Commit a8b5879

Browse files
authored
Merge branch 'main' into v1.6713.0
2 parents b4c8283 + ecb4983 commit a8b5879

File tree

2 files changed

+38
-12
lines changed

2 files changed

+38
-12
lines changed

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import type {
1010
AccountUserInfo,
1111
Event,
1212
EventPrincipal,
13+
InstanceServerInfo,
1314
KeyManagerKeyInfo,
1415
KubernetesACLInfo,
1516
KubernetesClusterInfo,
@@ -49,6 +50,18 @@ const unmarshalAccountUserInfo = (data: unknown): AccountUserInfo => {
4950
} as AccountUserInfo
5051
}
5152

53+
const unmarshalInstanceServerInfo = (data: unknown): InstanceServerInfo => {
54+
if (!isJSONObject(data)) {
55+
throw new TypeError(
56+
`Unmarshalling the type 'InstanceServerInfo' failed as data isn't a dictionary.`,
57+
)
58+
}
59+
60+
return {
61+
name: data.name,
62+
} as InstanceServerInfo
63+
}
64+
5265
const unmarshalKeyManagerKeyInfo = (data: unknown): KeyManagerKeyInfo => {
5366
if (!isJSONObject(data)) {
5467
throw new TypeError(
@@ -165,6 +178,9 @@ export const unmarshalResource = (data: unknown): Resource => {
165178
createdAt: unmarshalDate(data.created_at),
166179
deletedAt: unmarshalDate(data.deleted_at),
167180
id: data.id,
181+
instanceServerInfo: data.instance_server_info
182+
? unmarshalInstanceServerInfo(data.instance_server_info)
183+
: undefined,
168184
keyManagerKeyInfo: data.key_manager_key_info
169185
? unmarshalKeyManagerKeyInfo(data.key_manager_key_info)
170186
: undefined,

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

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ export type ResourceType =
2525
| 'key_manager_key'
2626
| 'account_user'
2727
| 'account_organization'
28+
| 'instance_server'
2829

2930
export interface AccountOrganizationInfo {}
3031

@@ -33,6 +34,10 @@ export interface AccountUserInfo {
3334
phoneNumber?: string
3435
}
3536

37+
export interface InstanceServerInfo {
38+
name: string
39+
}
40+
3641
export interface KeyManagerKeyInfo {}
3742

3843
export interface KubernetesACLInfo {}
@@ -72,66 +77,71 @@ export interface Resource {
7277
/**
7378
* @deprecated
7479
*
75-
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo' could be set.
80+
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo', 'instanceServerInfo' could be set.
7681
*/
7782
secmSecretInfo?: SecretManagerSecretInfo
7883
/**
7984
* @deprecated
8085
*
81-
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo' could be set.
86+
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo', 'instanceServerInfo' could be set.
8287
*/
8388
secmSecretVersionInfo?: SecretManagerSecretVersionInfo
8489
/**
8590
*
86-
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo' could be set.
91+
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo', 'instanceServerInfo' could be set.
8792
*/
8893
kubeClusterInfo?: KubernetesClusterInfo
8994
/**
9095
*
91-
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo' could be set.
96+
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo', 'instanceServerInfo' could be set.
9297
*/
9398
kubePoolInfo?: KubernetesPoolInfo
9499
/**
95100
*
96-
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo' could be set.
101+
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo', 'instanceServerInfo' could be set.
97102
*/
98103
kubeNodeInfo?: KubernetesNodeInfo
99104
/**
100105
*
101-
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo' could be set.
106+
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo', 'instanceServerInfo' could be set.
102107
*/
103108
kubeAclInfo?: KubernetesACLInfo
104109
/**
105110
* @deprecated
106111
*
107-
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo' could be set.
112+
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo', 'instanceServerInfo' could be set.
108113
*/
109114
keymKeyInfo?: KeyManagerKeyInfo
110115
/**
111116
*
112-
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo' could be set.
117+
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo', 'instanceServerInfo' could be set.
113118
*/
114119
secretManagerSecretInfo?: SecretManagerSecretInfo
115120
/**
116121
*
117-
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo' could be set.
122+
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo', 'instanceServerInfo' could be set.
118123
*/
119124
secretManagerVersionInfo?: SecretManagerSecretVersionInfo
120125
/**
121126
*
122-
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo' could be set.
127+
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo', 'instanceServerInfo' could be set.
123128
*/
124129
keyManagerKeyInfo?: KeyManagerKeyInfo
125130
/**
126131
*
127-
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo' could be set.
132+
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo', 'instanceServerInfo' could be set.
128133
*/
129134
accountUserInfo?: AccountUserInfo
130135
/**
131136
*
132-
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo' could be set.
137+
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo', 'instanceServerInfo' could be set.
133138
*/
134139
accountOrganizationInfo?: AccountOrganizationInfo
140+
/**
141+
*
142+
* One-of ('info'): at most one of 'secmSecretInfo', 'secmSecretVersionInfo', 'kubeClusterInfo', 'kubePoolInfo', 'kubeNodeInfo', 'kubeAclInfo', 'keymKeyInfo', 'secretManagerSecretInfo', 'secretManagerVersionInfo', 'keyManagerKeyInfo', 'accountUserInfo', 'accountOrganizationInfo', 'instanceServerInfo' could be set.
143+
*/
144+
instanceServerInfo?: InstanceServerInfo
135145
}
136146

137147
export interface ProductService {

0 commit comments

Comments
 (0)