Skip to content

fix: avoid fallback on default projectId and organizationId for optional fields #478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 27, 2023
Merged

fix: avoid fallback on default projectId and organizationId for optional fields #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58478a0
feat: update generated APIs
scaleway-bot Feb 27, 2023
9dfcf8b
fix: solve per_page issue
Vinzius Feb 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions packages/clients/src/api/applesilicon/v1alpha1/api.gen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,20 +136,13 @@ export class API extends ParentAPI {
)}/servers`,
urlParams: urlParams(
['order_by', request.orderBy ?? 'created_at_asc'],
[
'organization_id',
request.organizationId ??
this.client.settings.defaultOrganizationId,
],
['organization_id', request.organizationId],
['page', request.page],
[
'page_size',
request.pageSize ?? this.client.settings.defaultPageSize,
],
[
'project_id',
request.projectId ?? this.client.settings.defaultProjectId,
],
['project_id', request.projectId],
),
},
unmarshalListServersResponse,
Expand Down
22 changes: 4 additions & 18 deletions packages/clients/src/api/baremetal/v1/api.gen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,20 +117,13 @@ export class API extends ParentAPI {
['name', request.name],
['option_id', request.optionId],
['order_by', request.orderBy ?? 'created_at_asc'],
[
'organization_id',
request.organizationId ??
this.client.settings.defaultOrganizationId,
],
['organization_id', request.organizationId],
['page', request.page],
[
'page_size',
request.pageSize ?? this.client.settings.defaultPageSize,
],
[
'project_id',
request.projectId ?? this.client.settings.defaultProjectId,
],
['project_id', request.projectId],
['status', request.status],
['tags', request.tags],
),
Expand Down Expand Up @@ -810,21 +803,14 @@ export class PrivateNetworkAPI extends ParentAPI {
)}/server-private-networks`,
urlParams: urlParams(
['order_by', request.orderBy ?? 'created_at_asc'],
[
'organization_id',
request.organizationId ??
this.client.settings.defaultOrganizationId,
],
['organization_id', request.organizationId],
['page', request.page],
[
'page_size',
request.pageSize ?? this.client.settings.defaultPageSize,
],
['private_network_id', request.privateNetworkId],
[
'project_id',
request.projectId ?? this.client.settings.defaultProjectId,
],
['project_id', request.projectId],
['server_id', request.serverId],
),
},
Expand Down
22 changes: 4 additions & 18 deletions packages/clients/src/api/container/v1beta1/api.gen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,20 +103,13 @@ export class API extends ParentAPI {
urlParams: urlParams(
['name', request.name],
['order_by', request.orderBy ?? 'created_at_asc'],
[
'organization_id',
request.organizationId ??
this.client.settings.defaultOrganizationId,
],
['organization_id', request.organizationId],
['page', request.page],
[
'page_size',
request.pageSize ?? this.client.settings.defaultPageSize,
],
[
'project_id',
request.projectId ?? this.client.settings.defaultProjectId,
],
['project_id', request.projectId],
),
},
unmarshalListNamespacesResponse,
Expand Down Expand Up @@ -243,20 +236,13 @@ export class API extends ParentAPI {
['name', request.name],
['namespace_id', request.namespaceId],
['order_by', request.orderBy ?? 'created_at_asc'],
[
'organization_id',
request.organizationId ??
this.client.settings.defaultOrganizationId,
],
['organization_id', request.organizationId],
['page', request.page],
[
'page_size',
request.pageSize ?? this.client.settings.defaultPageSize,
],
[
'project_id',
request.projectId ?? this.client.settings.defaultProjectId,
],
['project_id', request.projectId],
),
},
unmarshalListContainersResponse,
Expand Down
70 changes: 13 additions & 57 deletions packages/clients/src/api/domain/v2beta1/api.gen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,20 +173,13 @@ export class API extends ParentAPI {
['dns_zone', request.dnsZone],
['domain', request.domain],
['order_by', request.orderBy ?? 'domain_asc'],
[
'organization_id',
request.organizationId ??
this.client.settings.defaultOrganizationId,
],
['organization_id', request.organizationId],
['page', request.page],
[
'page_size',
request.pageSize ?? this.client.settings.defaultPageSize,
],
[
'project_id',
request.projectId ?? this.client.settings.defaultProjectId,
],
['project_id', request.projectId],
),
},
unmarshalListDNSZonesResponse,
Expand Down Expand Up @@ -306,10 +299,7 @@ export class API extends ParentAPI {
'page_size',
request.pageSize ?? this.client.settings.defaultPageSize,
],
[
'project_id',
request.projectId ?? this.client.settings.defaultProjectId,
],
['project_id', request.projectId],
['type', request.type ?? 'unknown'],
),
},
Expand Down Expand Up @@ -379,10 +369,7 @@ export class API extends ParentAPI {
'dnsZone',
request.dnsZone,
)}/nameservers`,
urlParams: urlParams([
'project_id',
request.projectId ?? this.client.settings.defaultProjectId,
]),
urlParams: urlParams(['project_id', request.projectId]),
},
unmarshalListDNSZoneNameserversResponse,
)
Expand Down Expand Up @@ -696,10 +683,7 @@ export class API extends ParentAPI {
'page_size',
request.pageSize ?? this.client.settings.defaultPageSize,
],
[
'project_id',
request.projectId ?? this.client.settings.defaultProjectId,
],
['project_id', request.projectId],
),
},
unmarshalListSSLCertificatesResponse,
Expand Down Expand Up @@ -781,20 +765,13 @@ export class RegistrarAPI extends ParentAPI {
urlParams: urlParams(
['domain', request.domain],
['order_by', request.orderBy ?? 'domain_desc'],
[
'organization_id',
request.organizationId ??
this.client.settings.defaultOrganizationId,
],
['organization_id', request.organizationId],
['page', request.page],
[
'page_size',
request.pageSize ?? this.client.settings.defaultPageSize,
],
[
'project_id',
request.projectId ?? this.client.settings.defaultProjectId,
],
['project_id', request.projectId],
['statuses', request.statuses],
['types', request.types],
),
Expand Down Expand Up @@ -978,20 +955,13 @@ export class RegistrarAPI extends ParentAPI {
path: `/domain/v2beta1/contacts`,
urlParams: urlParams(
['domain', request.domain],
[
'organization_id',
request.organizationId ??
this.client.settings.defaultOrganizationId,
],
['organization_id', request.organizationId],
['page', request.page],
[
'page_size',
request.pageSize ?? this.client.settings.defaultPageSize,
],
[
'project_id',
request.projectId ?? this.client.settings.defaultProjectId,
],
['project_id', request.projectId],
),
},
unmarshalListContactsResponse,
Expand Down Expand Up @@ -1062,20 +1032,13 @@ export class RegistrarAPI extends ParentAPI {
['domain', request.domain],
['is_external', request.isExternal],
['order_by', request.orderBy ?? 'domain_asc'],
[
'organization_id',
request.organizationId ??
this.client.settings.defaultOrganizationId,
],
['organization_id', request.organizationId],
['page', request.page],
[
'page_size',
request.pageSize ?? this.client.settings.defaultPageSize,
],
[
'project_id',
request.projectId ?? this.client.settings.defaultProjectId,
],
['project_id', request.projectId],
['registrar', request.registrar],
['status', request.status ?? 'status_unknown'],
),
Expand All @@ -1101,20 +1064,13 @@ export class RegistrarAPI extends ParentAPI {
path: `/domain/v2beta1/renewable-domains`,
urlParams: urlParams(
['order_by', request.orderBy ?? 'domain_asc'],
[
'organization_id',
request.organizationId ??
this.client.settings.defaultOrganizationId,
],
['organization_id', request.organizationId],
['page', request.page],
[
'page_size',
request.pageSize ?? this.client.settings.defaultPageSize,
],
[
'project_id',
request.projectId ?? this.client.settings.defaultProjectId,
],
['project_id', request.projectId],
),
},
unmarshalListRenewableDomainsResponse,
Expand Down
4 changes: 2 additions & 2 deletions packages/clients/src/api/domain/v2beta1/marshalling.gen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1667,7 +1667,7 @@ export const marshalCloneDNSZoneRequest = (
): Record<string, unknown> => ({
dest_dns_zone: request.destDnsZone,
overwrite: request.overwrite,
project_id: request.projectId ?? defaults.defaultProjectId,
project_id: request.projectId,
})

export const marshalCreateDNSZoneRequest = (
Expand Down Expand Up @@ -1862,7 +1862,7 @@ export const marshalRegistrarApiTradeDomainRequest = (
request: RegistrarApiTradeDomainRequest,
defaults: DefaultValues,
): Record<string, unknown> => ({
project_id: request.projectId ?? defaults.defaultProjectId,
project_id: request.projectId,
...resolveOneOf<unknown>([
{
param: 'new_owner_contact_id',
Expand Down
11 changes: 2 additions & 9 deletions packages/clients/src/api/flexibleip/v1alpha1/api.gen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,20 +127,13 @@ export class API extends ParentAPI {
)}/fips`,
urlParams: urlParams(
['order_by', request.orderBy ?? 'created_at_asc'],
[
'organization_id',
request.organizationId ??
this.client.settings.defaultOrganizationId,
],
['organization_id', request.organizationId],
['page', request.page],
[
'page_size',
request.pageSize ?? this.client.settings.defaultPageSize,
],
[
'project_id',
request.projectId ?? this.client.settings.defaultProjectId,
],
['project_id', request.projectId],
['server_ids', request.serverIds],
['status', request.status],
['tags', request.tags],
Expand Down
22 changes: 4 additions & 18 deletions packages/clients/src/api/function/v1beta1/api.gen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,20 +124,13 @@ export class API extends ParentAPI {
urlParams: urlParams(
['name', request.name],
['order_by', request.orderBy ?? 'created_at_asc'],
[
'organization_id',
request.organizationId ??
this.client.settings.defaultOrganizationId,
],
['organization_id', request.organizationId],
['page', request.page],
[
'page_size',
request.pageSize ?? this.client.settings.defaultPageSize,
],
[
'project_id',
request.projectId ?? this.client.settings.defaultProjectId,
],
['project_id', request.projectId],
),
},
unmarshalListNamespacesResponse,
Expand Down Expand Up @@ -264,20 +257,13 @@ export class API extends ParentAPI {
['name', request.name],
['namespace_id', request.namespaceId],
['order_by', request.orderBy ?? 'created_at_asc'],
[
'organization_id',
request.organizationId ??
this.client.settings.defaultOrganizationId,
],
['organization_id', request.organizationId],
['page', request.page],
[
'page_size',
request.pageSize ?? this.client.settings.defaultPageSize,
],
[
'project_id',
request.projectId ?? this.client.settings.defaultProjectId,
],
['project_id', request.projectId],
),
},
unmarshalListFunctionsResponse,
Expand Down
17 changes: 3 additions & 14 deletions packages/clients/src/api/iam/v1alpha1/api.gen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,20 +106,13 @@ export class API extends ParentAPI {
['disabled', request.disabled],
['name', request.name],
['order_by', request.orderBy ?? 'created_at_asc'],
[
'organization_id',
request.organizationId ??
this.client.settings.defaultOrganizationId,
],
['organization_id', request.organizationId],
['page', request.page],
[
'page_size',
request.pageSize ?? this.client.settings.defaultPageSize,
],
[
'project_id',
request.projectId ?? this.client.settings.defaultProjectId,
],
['project_id', request.projectId],
),
},
unmarshalListSSHKeysResponse,
Expand Down Expand Up @@ -390,11 +383,7 @@ export class API extends ParentAPI {
['group_ids', request.groupIds],
['name', request.name],
['order_by', request.orderBy ?? 'created_at_asc'],
[
'organization_id',
request.organizationId ??
this.client.settings.defaultOrganizationId,
],
['organization_id', request.organizationId],
['page', request.page],
[
'page_size',
Expand Down
Loading