Skip to content

Commit 72a733d

Browse files
authored
Revert "feat(secret): retrieve secrets by name (#447)" (#473)
1 parent 1fb324a commit 72a733d

File tree

2 files changed

+8
-77
lines changed

2 files changed

+8
-77
lines changed

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

Lines changed: 3 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import {
44
API as ParentAPI,
55
enrichForPagination,
6-
resolveOneOf,
76
urlParams,
87
validatePathParam,
98
} from '../../../bridge'
@@ -81,24 +80,14 @@ export class API extends ParentAPI {
8180
* @param request - The request {@link GetSecretRequest}
8281
* @returns A Promise of Secret
8382
*/
84-
getSecret = (request: Readonly<GetSecretRequest> = {}) =>
83+
getSecret = (request: Readonly<GetSecretRequest>) =>
8584
this.client.fetch<Secret>(
8685
{
8786
method: 'GET',
8887
path: `/secret-manager/v1alpha1/regions/${validatePathParam(
8988
'region',
9089
request.region ?? this.client.settings.defaultRegion,
9190
)}/secrets/${validatePathParam('secretId', request.secretId)}`,
92-
urlParams: urlParams(
93-
...Object.entries(
94-
resolveOneOf([
95-
{
96-
param: 'secret_name',
97-
value: request.secretName,
98-
},
99-
]),
100-
),
101-
),
10291
},
10392
unmarshalSecret,
10493
)
@@ -134,7 +123,6 @@ export class API extends ParentAPI {
134123
request.region ?? this.client.settings.defaultRegion,
135124
)}/secrets`,
136125
urlParams: urlParams(
137-
['name', request.name],
138126
['order_by', request.orderBy ?? 'name_asc'],
139127
[
140128
'organization_id',
@@ -218,16 +206,6 @@ export class API extends ParentAPI {
218206
'secretId',
219207
request.secretId,
220208
)}/versions/${validatePathParam('revision', request.revision)}`,
221-
urlParams: urlParams(
222-
...Object.entries(
223-
resolveOneOf([
224-
{
225-
param: 'secret_name',
226-
value: request.secretName,
227-
},
228-
]),
229-
),
230-
),
231209
},
232210
unmarshalSecretVersion,
233211
)
@@ -258,7 +236,7 @@ export class API extends ParentAPI {
258236
)
259237

260238
protected pageOfListSecretVersions = (
261-
request: Readonly<ListSecretVersionsRequest> = {},
239+
request: Readonly<ListSecretVersionsRequest>,
262240
) =>
263241
this.client.fetch<ListSecretVersionsResponse>(
264242
{
@@ -274,14 +252,6 @@ export class API extends ParentAPI {
274252
request.pageSize ?? this.client.settings.defaultPageSize,
275253
],
276254
['status', request.status],
277-
...Object.entries(
278-
resolveOneOf([
279-
{
280-
param: 'secret_name',
281-
value: request.secretName,
282-
},
283-
]),
284-
),
285255
),
286256
},
287257
unmarshalListSecretVersionsResponse,
@@ -293,7 +263,7 @@ export class API extends ParentAPI {
293263
* @param request - The request {@link ListSecretVersionsRequest}
294264
* @returns A Promise of ListSecretVersionsResponse
295265
*/
296-
listSecretVersions = (request: Readonly<ListSecretVersionsRequest> = {}) =>
266+
listSecretVersions = (request: Readonly<ListSecretVersionsRequest>) =>
297267
enrichForPagination('versions', this.pageOfListSecretVersions, request)
298268

299269
/**
@@ -382,16 +352,6 @@ export class API extends ParentAPI {
382352
'secretId',
383353
request.secretId,
384354
)}/versions/${validatePathParam('revision', request.revision)}/access`,
385-
urlParams: urlParams(
386-
...Object.entries(
387-
resolveOneOf([
388-
{
389-
param: 'secret_name',
390-
value: request.secretName,
391-
},
392-
]),
393-
),
394-
),
395355
},
396356
unmarshalAccessSecretVersionResponse,
397357
)

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

Lines changed: 5 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -106,13 +106,7 @@ export type GetSecretRequest = {
106106
/** Region to target. If none is passed will use default region from the config */
107107
region?: Region
108108
/** ID of the Secret */
109-
secretId?: string
110-
/**
111-
* Name of the Secret (alternative to secret_id).
112-
*
113-
* One-of ('secretRef'): at most one of 'secretName' could be set.
114-
*/
115-
secretName?: string
109+
secretId: string
116110
}
117111

118112
export type UpdateSecretRequest = {
@@ -137,8 +131,6 @@ export type ListSecretsRequest = {
137131
projectId?: string
138132
/** List of tags to filter on (optional) */
139133
tags?: string[]
140-
/** Name of the secrets (optional) */
141-
name?: string
142134
orderBy?: ListSecretsRequestOrderBy
143135
page?: number
144136
pageSize?: number
@@ -166,15 +158,9 @@ export type GetSecretVersionRequest = {
166158
/** Region to target. If none is passed will use default region from the config */
167159
region?: Region
168160
/** ID of the Secret */
169-
secretId?: string
161+
secretId: string
170162
/** Revision of the SecretVersion (may be a number or "latest") */
171163
revision: string
172-
/**
173-
* Name of the Secret (alternative to secret_id).
174-
*
175-
* One-of ('secretRef'): at most one of 'secretName' could be set.
176-
*/
177-
secretName?: string
178164
}
179165

180166
export type UpdateSecretVersionRequest = {
@@ -192,13 +178,7 @@ export type ListSecretVersionsRequest = {
192178
/** Region to target. If none is passed will use default region from the config */
193179
region?: Region
194180
/** ID of the Secret */
195-
secretId?: string
196-
/**
197-
* Name of the Secret (alternative to secret_id).
198-
*
199-
* One-of ('secretRef'): at most one of 'secretName' could be set.
200-
*/
201-
secretName?: string
181+
secretId: string
202182
page?: number
203183
pageSize?: number
204184
/** Filter results by status */
@@ -236,16 +216,7 @@ export type AccessSecretVersionRequest = {
236216
/** Region to target. If none is passed will use default region from the config */
237217
region?: Region
238218
/** ID of the Secret */
239-
secretId?: string
240-
/**
241-
* Revision of the SecretVersion (may be a number, "latest" or
242-
* "latest_enabled")
243-
*/
219+
secretId: string
220+
/** Revision of the SecretVersion (may be a number or "latest") */
244221
revision: string
245-
/**
246-
* Name of the Secret (alternative to secret_id).
247-
*
248-
* One-of ('secretRef'): at most one of 'secretName' could be set.
249-
*/
250-
secretName?: string
251222
}

0 commit comments

Comments
 (0)