Skip to content

[AAWF-460] Remove intermediate operation object #2322

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
skarimo merged 1 commit into from
Jun 3, 2025
Merged

[AAWF-460] Remove intermediate operation object #2322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 6 additions & 11 deletions packages/datadog-api-client/src/configuration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ export class Configuration {
readonly backoffMultiplier: number | undefined;
unstableOperations: { [name: string]: boolean };
servers: BaseServerConfiguration[];
operationServers: { [endpoint: string]: BaseServerConfiguration[] };

public constructor(
baseServer: BaseServerConfiguration | undefined,
Expand Down Expand Up @@ -67,13 +66,15 @@ export class Configuration {
for (const server of servers) {
this.servers.push(server.clone());
}
this.operationServers = {};
if (backoffBase && backoffBase < 2) {
throw new Error("Backoff base must be at least 2");
}
}

getServerAndOverrides(key: string): {
getServerAndOverrides(
key: string,
operationServers?: { [key: string]: BaseServerConfiguration[] },
): {
server: BaseServerConfiguration;
overrides?: { [key: string]: string };
} {
Expand All @@ -83,9 +84,9 @@ export class Configuration {

let server: BaseServerConfiguration;
let overrides: { [key: string]: string } | undefined;
if (key in this.operationServers) {
if (operationServers && key in operationServers) {
const index = this.operationServerIndices[key] || 0;
server = this.operationServers[key][index];
server = operationServers[key][index];
overrides = this.operationServerVariables[key];
} else {
const index = this.serverIndex;
Expand All @@ -95,12 +96,6 @@ export class Configuration {

return { server, overrides };
}

addOperationServers(operationServers: {
[key: string]: BaseServerConfiguration[];
}): void {
this.operationServers = { ...operationServers, ...this.operationServers };
}
}

/**
Expand Down
11 changes: 4 additions & 7 deletions services/action_connection/src/v2/ActionConnectionApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ export class ActionConnectionApiRequestFactory extends BaseAPIRequestFactory {
// Make Request Context
const { server, overrides } = _config.getServerAndOverrides(
"ActionConnectionApi.v2.createActionConnection",
ActionConnectionApi.operationServers,
);
const requestContext = server.makeRequestContext(
localVarPath,
Expand Down Expand Up @@ -108,6 +109,7 @@ export class ActionConnectionApiRequestFactory extends BaseAPIRequestFactory {
// Make Request Context
const { server, overrides } = _config.getServerAndOverrides(
"ActionConnectionApi.v2.deleteActionConnection",
ActionConnectionApi.operationServers,
);
const requestContext = server.makeRequestContext(
localVarPath,
Expand Down Expand Up @@ -151,6 +153,7 @@ export class ActionConnectionApiRequestFactory extends BaseAPIRequestFactory {
// Make Request Context
const { server, overrides } = _config.getServerAndOverrides(
"ActionConnectionApi.v2.getActionConnection",
ActionConnectionApi.operationServers,
);
const requestContext = server.makeRequestContext(
localVarPath,
Expand Down Expand Up @@ -200,6 +203,7 @@ export class ActionConnectionApiRequestFactory extends BaseAPIRequestFactory {
// Make Request Context
const { server, overrides } = _config.getServerAndOverrides(
"ActionConnectionApi.v2.updateActionConnection",
ActionConnectionApi.operationServers,
);
const requestContext = server.makeRequestContext(
localVarPath,
Expand Down Expand Up @@ -532,13 +536,6 @@ export class ActionConnectionApi {
new ActionConnectionApiRequestFactory(this.configuration);
this.responseProcessor =
responseProcessor || new ActionConnectionApiResponseProcessor();

// Add operation servers to the configuration
if (Object.keys(ActionConnectionApi.operationServers).length > 0) {
this.configuration.addOperationServers(
ActionConnectionApi.operationServers,
);
}
}

/**
Expand Down
14 changes: 7 additions & 7 deletions services/agentless_scanning/src/v2/AgentlessScanningApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ export class AgentlessScanningApiRequestFactory extends BaseAPIRequestFactory {
// Make Request Context
const { server, overrides } = _config.getServerAndOverrides(
"AgentlessScanningApi.v2.createAwsOnDemandTask",
AgentlessScanningApi.operationServers,
);
const requestContext = server.makeRequestContext(
localVarPath,
Expand Down Expand Up @@ -107,6 +108,7 @@ export class AgentlessScanningApiRequestFactory extends BaseAPIRequestFactory {
// Make Request Context
const { server, overrides } = _config.getServerAndOverrides(
"AgentlessScanningApi.v2.createAwsScanOptions",
AgentlessScanningApi.operationServers,
);
const requestContext = server.makeRequestContext(
localVarPath,
Expand Down Expand Up @@ -160,6 +162,7 @@ export class AgentlessScanningApiRequestFactory extends BaseAPIRequestFactory {
// Make Request Context
const { server, overrides } = _config.getServerAndOverrides(
"AgentlessScanningApi.v2.deleteAwsScanOptions",
AgentlessScanningApi.operationServers,
);
const requestContext = server.makeRequestContext(
localVarPath,
Expand Down Expand Up @@ -204,6 +207,7 @@ export class AgentlessScanningApiRequestFactory extends BaseAPIRequestFactory {
// Make Request Context
const { server, overrides } = _config.getServerAndOverrides(
"AgentlessScanningApi.v2.getAwsOnDemandTask",
AgentlessScanningApi.operationServers,
);
const requestContext = server.makeRequestContext(
localVarPath,
Expand Down Expand Up @@ -238,6 +242,7 @@ export class AgentlessScanningApiRequestFactory extends BaseAPIRequestFactory {
// Make Request Context
const { server, overrides } = _config.getServerAndOverrides(
"AgentlessScanningApi.v2.listAwsOnDemandTasks",
AgentlessScanningApi.operationServers,
);
const requestContext = server.makeRequestContext(
localVarPath,
Expand Down Expand Up @@ -272,6 +277,7 @@ export class AgentlessScanningApiRequestFactory extends BaseAPIRequestFactory {
// Make Request Context
const { server, overrides } = _config.getServerAndOverrides(
"AgentlessScanningApi.v2.listAwsScanOptions",
AgentlessScanningApi.operationServers,
);
const requestContext = server.makeRequestContext(
localVarPath,
Expand Down Expand Up @@ -322,6 +328,7 @@ export class AgentlessScanningApiRequestFactory extends BaseAPIRequestFactory {
// Make Request Context
const { server, overrides } = _config.getServerAndOverrides(
"AgentlessScanningApi.v2.updateAwsScanOptions",
AgentlessScanningApi.operationServers,
);
const requestContext = server.makeRequestContext(
localVarPath,
Expand Down Expand Up @@ -810,13 +817,6 @@ export class AgentlessScanningApi {
new AgentlessScanningApiRequestFactory(this.configuration);
this.responseProcessor =
responseProcessor || new AgentlessScanningApiResponseProcessor();

// Add operation servers to the configuration
if (Object.keys(AgentlessScanningApi.operationServers).length > 0) {
this.configuration.addOperationServers(
AgentlessScanningApi.operationServers,
);
}
}

/**
Expand Down
10 changes: 5 additions & 5 deletions services/api_management/src/v2/APIManagementApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ export class APIManagementApiRequestFactory extends BaseAPIRequestFactory {
// Make Request Context
const { server, overrides } = _config.getServerAndOverrides(
"APIManagementApi.v2.createOpenAPI",
APIManagementApi.operationServers,
);
const requestContext = server.makeRequestContext(
localVarPath,
Expand Down Expand Up @@ -117,6 +118,7 @@ export class APIManagementApiRequestFactory extends BaseAPIRequestFactory {
// Make Request Context
const { server, overrides } = _config.getServerAndOverrides(
"APIManagementApi.v2.deleteOpenAPI",
APIManagementApi.operationServers,
);
const requestContext = server.makeRequestContext(
localVarPath,
Expand Down Expand Up @@ -167,6 +169,7 @@ export class APIManagementApiRequestFactory extends BaseAPIRequestFactory {
// Make Request Context
const { server, overrides } = _config.getServerAndOverrides(
"APIManagementApi.v2.getOpenAPI",
APIManagementApi.operationServers,
);
const requestContext = server.makeRequestContext(
localVarPath,
Expand Down Expand Up @@ -214,6 +217,7 @@ export class APIManagementApiRequestFactory extends BaseAPIRequestFactory {
// Make Request Context
const { server, overrides } = _config.getServerAndOverrides(
"APIManagementApi.v2.listAPIs",
APIManagementApi.operationServers,
);
const requestContext = server.makeRequestContext(
localVarPath,
Expand Down Expand Up @@ -288,6 +292,7 @@ export class APIManagementApiRequestFactory extends BaseAPIRequestFactory {
// Make Request Context
const { server, overrides } = _config.getServerAndOverrides(
"APIManagementApi.v2.updateOpenAPI",
APIManagementApi.operationServers,
);
const requestContext = server.makeRequestContext(
localVarPath,
Expand Down Expand Up @@ -767,11 +772,6 @@ export class APIManagementApi {
requestFactory || new APIManagementApiRequestFactory(this.configuration);
this.responseProcessor =
responseProcessor || new APIManagementApiResponseProcessor();

// Add operation servers to the configuration
if (Object.keys(APIManagementApi.operationServers).length > 0) {
this.configuration.addOperationServers(APIManagementApi.operationServers);
}
}

/**
Expand Down
13 changes: 6 additions & 7 deletions services/apm_retention_filters/src/v2/APMRetentionFiltersApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ export class APMRetentionFiltersApiRequestFactory extends BaseAPIRequestFactory
// Make Request Context
const { server, overrides } = _config.getServerAndOverrides(
"APMRetentionFiltersApi.v2.createApmRetentionFilter",
APMRetentionFiltersApi.operationServers,
);
const requestContext = server.makeRequestContext(
localVarPath,
Expand Down Expand Up @@ -110,6 +111,7 @@ export class APMRetentionFiltersApiRequestFactory extends BaseAPIRequestFactory
// Make Request Context
const { server, overrides } = _config.getServerAndOverrides(
"APMRetentionFiltersApi.v2.deleteApmRetentionFilter",
APMRetentionFiltersApi.operationServers,
);
const requestContext = server.makeRequestContext(
localVarPath,
Expand Down Expand Up @@ -154,6 +156,7 @@ export class APMRetentionFiltersApiRequestFactory extends BaseAPIRequestFactory
// Make Request Context
const { server, overrides } = _config.getServerAndOverrides(
"APMRetentionFiltersApi.v2.getApmRetentionFilter",
APMRetentionFiltersApi.operationServers,
);
const requestContext = server.makeRequestContext(
localVarPath,
Expand Down Expand Up @@ -188,6 +191,7 @@ export class APMRetentionFiltersApiRequestFactory extends BaseAPIRequestFactory
// Make Request Context
const { server, overrides } = _config.getServerAndOverrides(
"APMRetentionFiltersApi.v2.listApmRetentionFilters",
APMRetentionFiltersApi.operationServers,
);
const requestContext = server.makeRequestContext(
localVarPath,
Expand Down Expand Up @@ -228,6 +232,7 @@ export class APMRetentionFiltersApiRequestFactory extends BaseAPIRequestFactory
// Make Request Context
const { server, overrides } = _config.getServerAndOverrides(
"APMRetentionFiltersApi.v2.reorderApmRetentionFilters",
APMRetentionFiltersApi.operationServers,
);
const requestContext = server.makeRequestContext(
localVarPath,
Expand Down Expand Up @@ -287,6 +292,7 @@ export class APMRetentionFiltersApiRequestFactory extends BaseAPIRequestFactory
// Make Request Context
const { server, overrides } = _config.getServerAndOverrides(
"APMRetentionFiltersApi.v2.updateApmRetentionFilter",
APMRetentionFiltersApi.operationServers,
);
const requestContext = server.makeRequestContext(
localVarPath,
Expand Down Expand Up @@ -721,13 +727,6 @@ export class APMRetentionFiltersApi {
new APMRetentionFiltersApiRequestFactory(this.configuration);
this.responseProcessor =
responseProcessor || new APMRetentionFiltersApiResponseProcessor();

// Add operation servers to the configuration
if (Object.keys(APMRetentionFiltersApi.operationServers).length > 0) {
this.configuration.addOperationServers(
APMRetentionFiltersApi.operationServers,
);
}
}

/**
Expand Down
13 changes: 8 additions & 5 deletions services/app_builder/src/v2/AppBuilderApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ export class AppBuilderApiRequestFactory extends BaseAPIRequestFactory {
// Make Request Context
const { server, overrides } = _config.getServerAndOverrides(
"AppBuilderApi.v2.createApp",
AppBuilderApi.operationServers,
);
const requestContext = server.makeRequestContext(
localVarPath,
Expand Down Expand Up @@ -116,6 +117,7 @@ export class AppBuilderApiRequestFactory extends BaseAPIRequestFactory {
// Make Request Context
const { server, overrides } = _config.getServerAndOverrides(
"AppBuilderApi.v2.deleteApp",
AppBuilderApi.operationServers,
);
const requestContext = server.makeRequestContext(
localVarPath,
Expand Down Expand Up @@ -156,6 +158,7 @@ export class AppBuilderApiRequestFactory extends BaseAPIRequestFactory {
// Make Request Context
const { server, overrides } = _config.getServerAndOverrides(
"AppBuilderApi.v2.deleteApps",
AppBuilderApi.operationServers,
);
const requestContext = server.makeRequestContext(
localVarPath,
Expand Down Expand Up @@ -209,6 +212,7 @@ export class AppBuilderApiRequestFactory extends BaseAPIRequestFactory {
// Make Request Context
const { server, overrides } = _config.getServerAndOverrides(
"AppBuilderApi.v2.getApp",
AppBuilderApi.operationServers,
);
const requestContext = server.makeRequestContext(
localVarPath,
Expand Down Expand Up @@ -263,6 +267,7 @@ export class AppBuilderApiRequestFactory extends BaseAPIRequestFactory {
// Make Request Context
const { server, overrides } = _config.getServerAndOverrides(
"AppBuilderApi.v2.listApps",
AppBuilderApi.operationServers,
);
const requestContext = server.makeRequestContext(
localVarPath,
Expand Down Expand Up @@ -385,6 +390,7 @@ export class AppBuilderApiRequestFactory extends BaseAPIRequestFactory {
// Make Request Context
const { server, overrides } = _config.getServerAndOverrides(
"AppBuilderApi.v2.publishApp",
AppBuilderApi.operationServers,
);
const requestContext = server.makeRequestContext(
localVarPath,
Expand Down Expand Up @@ -428,6 +434,7 @@ export class AppBuilderApiRequestFactory extends BaseAPIRequestFactory {
// Make Request Context
const { server, overrides } = _config.getServerAndOverrides(
"AppBuilderApi.v2.unpublishApp",
AppBuilderApi.operationServers,
);
const requestContext = server.makeRequestContext(
localVarPath,
Expand Down Expand Up @@ -477,6 +484,7 @@ export class AppBuilderApiRequestFactory extends BaseAPIRequestFactory {
// Make Request Context
const { server, overrides } = _config.getServerAndOverrides(
"AppBuilderApi.v2.updateApp",
AppBuilderApi.operationServers,
);
const requestContext = server.makeRequestContext(
localVarPath,
Expand Down Expand Up @@ -1284,11 +1292,6 @@ export class AppBuilderApi {
requestFactory || new AppBuilderApiRequestFactory(this.configuration);
this.responseProcessor =
responseProcessor || new AppBuilderApiResponseProcessor();

// Add operation servers to the configuration
if (Object.keys(AppBuilderApi.operationServers).length > 0) {
this.configuration.addOperationServers(AppBuilderApi.operationServers);
}
}

/**
Expand Down
Loading