Skip to content

Commit 8a485ea

Browse files
authored
Merge branch 'main' into v1.7157.0
2 parents e45aaac + ef40081 commit 8a485ea

File tree

7 files changed

+12
-98
lines changed

7 files changed

+12
-98
lines changed

packages_generated/cockpit/src/v1/api.gen.ts

Lines changed: 1 addition & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,8 @@ import {
2020
marshalRegionalApiDeleteContactPointRequest,
2121
marshalRegionalApiDisableAlertManagerRequest,
2222
marshalRegionalApiDisableAlertRulesRequest,
23-
marshalRegionalApiDisableManagedAlertsRequest,
2423
marshalRegionalApiEnableAlertManagerRequest,
2524
marshalRegionalApiEnableAlertRulesRequest,
26-
marshalRegionalApiEnableManagedAlertsRequest,
2725
marshalRegionalApiTriggerTestAlertRequest,
2826
marshalRegionalApiUpdateContactPointRequest,
2927
marshalRegionalApiUpdateDataSourceRequest,
@@ -86,10 +84,8 @@ import type {
8684
RegionalApiDeleteTokenRequest,
8785
RegionalApiDisableAlertManagerRequest,
8886
RegionalApiDisableAlertRulesRequest,
89-
RegionalApiDisableManagedAlertsRequest,
9087
RegionalApiEnableAlertManagerRequest,
9188
RegionalApiEnableAlertRulesRequest,
92-
RegionalApiEnableManagedAlertsRequest,
9389
RegionalApiGetAlertManagerRequest,
9490
RegionalApiGetConfigRequest,
9591
RegionalApiGetDataSourceRequest,
@@ -695,7 +691,7 @@ The output returned displays a URL to access the Alert manager, and whether the
695691
)
696692

697693
/**
698-
* Get a detailed count of enabled rules in the specified Project. Includes preconfigured and custom alerting and recording rules.. Get a detailed count of enabled rules in the specified Project. Includes preconfigured and custom alerting and recording rules.
694+
* Get the number of enabled rules Get a detailed count of enabled rules in the specified Project. Includes preconfigured and custom alerting and recording rules.. Get the number of enabled rules Get a detailed count of enabled rules in the specified Project. Includes preconfigured and custom alerting and recording rules.
699695
*
700696
* @param request - The request {@link RegionalApiGetRulesCountRequest}
701697
* @returns A Promise of GetRulesCountResponse
@@ -835,54 +831,6 @@ If you need to receive alerts for other receivers, you can create additional con
835831
unmarshalListAlertsResponse,
836832
)
837833

838-
/**
839-
* Enable managed alerts. Enable the sending of managed alerts for the specified Project. Managed alerts are predefined alerts that apply to Scaleway recources integrated with Cockpit by default.
840-
*
841-
* @param request - The request {@link RegionalApiEnableManagedAlertsRequest}
842-
* @returns A Promise of AlertManager
843-
*/
844-
enableManagedAlerts = (
845-
request: Readonly<RegionalApiEnableManagedAlertsRequest> = {},
846-
) =>
847-
this.client.fetch<AlertManager>(
848-
{
849-
body: JSON.stringify(
850-
marshalRegionalApiEnableManagedAlertsRequest(
851-
request,
852-
this.client.settings,
853-
),
854-
),
855-
headers: jsonContentHeaders,
856-
method: 'POST',
857-
path: `/cockpit/v1/regions/${validatePathParam('region', request.region ?? this.client.settings.defaultRegion)}/alert-manager/managed-alerts/enable`,
858-
},
859-
unmarshalAlertManager,
860-
)
861-
862-
/**
863-
* Disable managed alerts. Disable the sending of managed alerts for the specified Project.
864-
*
865-
* @param request - The request {@link RegionalApiDisableManagedAlertsRequest}
866-
* @returns A Promise of AlertManager
867-
*/
868-
disableManagedAlerts = (
869-
request: Readonly<RegionalApiDisableManagedAlertsRequest> = {},
870-
) =>
871-
this.client.fetch<AlertManager>(
872-
{
873-
body: JSON.stringify(
874-
marshalRegionalApiDisableManagedAlertsRequest(
875-
request,
876-
this.client.settings,
877-
),
878-
),
879-
headers: jsonContentHeaders,
880-
method: 'POST',
881-
path: `/cockpit/v1/regions/${validatePathParam('region', request.region ?? this.client.settings.defaultRegion)}/alert-manager/managed-alerts/disable`,
882-
},
883-
unmarshalAlertManager,
884-
)
885-
886834
/**
887835
* Enable preconfigured alert rules. Enable alert rules from the list of available preconfigured rules.
888836
*

packages_generated/cockpit/src/v1/marshalling.gen.ts

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,8 @@ import type {
4141
RegionalApiDeleteContactPointRequest,
4242
RegionalApiDisableAlertManagerRequest,
4343
RegionalApiDisableAlertRulesRequest,
44-
RegionalApiDisableManagedAlertsRequest,
4544
RegionalApiEnableAlertManagerRequest,
4645
RegionalApiEnableAlertRulesRequest,
47-
RegionalApiEnableManagedAlertsRequest,
4846
RegionalApiTriggerTestAlertRequest,
4947
RegionalApiUpdateContactPointRequest,
5048
RegionalApiUpdateDataSourceRequest,
@@ -613,13 +611,6 @@ export const marshalRegionalApiDisableAlertRulesRequest = (
613611
rule_ids: request.ruleIds,
614612
})
615613

616-
export const marshalRegionalApiDisableManagedAlertsRequest = (
617-
request: RegionalApiDisableManagedAlertsRequest,
618-
defaults: DefaultValues,
619-
): Record<string, unknown> => ({
620-
project_id: request.projectId ?? defaults.defaultProjectId,
621-
})
622-
623614
export const marshalRegionalApiEnableAlertManagerRequest = (
624615
request: RegionalApiEnableAlertManagerRequest,
625616
defaults: DefaultValues,
@@ -635,13 +626,6 @@ export const marshalRegionalApiEnableAlertRulesRequest = (
635626
rule_ids: request.ruleIds,
636627
})
637628

638-
export const marshalRegionalApiEnableManagedAlertsRequest = (
639-
request: RegionalApiEnableManagedAlertsRequest,
640-
defaults: DefaultValues,
641-
): Record<string, unknown> => ({
642-
project_id: request.projectId ?? defaults.defaultProjectId,
643-
})
644-
645629
export const marshalRegionalApiTriggerTestAlertRequest = (
646630
request: RegionalApiTriggerTestAlertRequest,
647631
defaults: DefaultValues,

packages_generated/cockpit/src/v1/types.gen.ts

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -895,20 +895,6 @@ export type RegionalApiDisableAlertRulesRequest = {
895895
ruleIds?: string[]
896896
}
897897

898-
/**
899-
* Disable the sending of managed alerts.
900-
*/
901-
export type RegionalApiDisableManagedAlertsRequest = {
902-
/**
903-
* Region to target. If none is passed will use default region from the config.
904-
*/
905-
region?: ScwRegion
906-
/**
907-
* ID of the Project.
908-
*/
909-
projectId?: string
910-
}
911-
912898
/**
913899
* Enable the Alert manager.
914900
*/
@@ -938,20 +924,6 @@ export type RegionalApiEnableAlertRulesRequest = {
938924
ruleIds?: string[]
939925
}
940926

941-
/**
942-
* Enable the sending of managed alerts.
943-
*/
944-
export type RegionalApiEnableManagedAlertsRequest = {
945-
/**
946-
* Region to target. If none is passed will use default region from the config.
947-
*/
948-
region?: ScwRegion
949-
/**
950-
* ID of the Project.
951-
*/
952-
projectId?: string
953-
}
954-
955927
/**
956928
* Get the Alert manager.
957929
*/

packages_generated/edge_services/src/v1beta1/marshalling.gen.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@ export const unmarshalDNSStage = (data: unknown): DNSStage => {
180180
backendStageId: data.backend_stage_id,
181181
cacheStageId: data.cache_stage_id,
182182
createdAt: unmarshalDate(data.created_at),
183+
defaultFqdn: data.default_fqdn,
183184
fqdns: data.fqdns,
184185
id: data.id,
185186
pipelineId: data.pipeline_id,

packages_generated/edge_services/src/v1beta1/types.gen.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,11 @@ export interface DNSStage {
291291
*/
292292
id: string
293293
/**
294-
* List of Fully Qualified Domain Names attached to the stage.
294+
* Default Fully Qualified Domain Name attached to the stage.
295+
*/
296+
defaultFqdn: string
297+
/**
298+
* List of additional (custom) Fully Qualified Domain Names attached to the stage.
295299
*/
296300
fqdns: string[]
297301
/**

packages_generated/secret/src/v1beta1/marshalling.gen.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ export const unmarshalSecretVersion = (data: unknown): SecretVersion => {
5858
? unmarshalEphemeralProperties(data.ephemeral_properties)
5959
: undefined,
6060
latest: data.latest,
61+
region: data.region,
6162
revision: data.revision,
6263
secretId: data.secret_id,
6364
status: data.status,

packages_generated/secret/src/v1beta1/types.gen.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,10 @@ export interface SecretVersion {
142142
* Returns the time at which deletion was requested.
143143
*/
144144
deletionRequestedAt?: Date
145+
/**
146+
* Region of the version.
147+
*/
148+
region: ScwRegion
145149
}
146150

147151
export interface Secret {

0 commit comments

Comments
 (0)