Skip to content

Commit 327defa

Browse files
skarimoskarimo
authored
regen (#2322)
1 parent e1915cd commit 327defa

File tree

102 files changed

+743
-615
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+743
-615
lines changed

‎packages/datadog-api-client/src/configuration.ts

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ export class Configuration {
3131
readonly backoffMultiplier: number | undefined;
3232
unstableOperations: { [name: string]: boolean };
3333
servers: BaseServerConfiguration[];
34-
operationServers: { [endpoint: string]: BaseServerConfiguration[] };
3534

3635
public constructor(
3736
baseServer: BaseServerConfiguration | undefined,
@@ -67,13 +66,15 @@ export class Configuration {
6766
for (const server of servers) {
6867
this.servers.push(server.clone());
6968
}
70-
this.operationServers = {};
7169
if (backoffBase && backoffBase < 2) {
7270
throw new Error("Backoff base must be at least 2");
7371
}
7472
}
7573

76-
getServerAndOverrides(key: string): {
74+
getServerAndOverrides(
75+
key: string,
76+
operationServers?: { [key: string]: BaseServerConfiguration[] },
77+
): {
7778
server: BaseServerConfiguration;
7879
overrides?: { [key: string]: string };
7980
} {
@@ -83,9 +84,9 @@ export class Configuration {
8384

8485
let server: BaseServerConfiguration;
8586
let overrides: { [key: string]: string } | undefined;
86-
if (key in this.operationServers) {
87+
if (operationServers && key in operationServers) {
8788
const index = this.operationServerIndices[key] || 0;
88-
server = this.operationServers[key][index];
89+
server = operationServers[key][index];
8990
overrides = this.operationServerVariables[key];
9091
} else {
9192
const index = this.serverIndex;
@@ -95,12 +96,6 @@ export class Configuration {
9596

9697
return { server, overrides };
9798
}
98-
99-
addOperationServers(operationServers: {
100-
[key: string]: BaseServerConfiguration[];
101-
}): void {
102-
this.operationServers = { ...operationServers, ...this.operationServers };
103-
}
10499
}
105100

106101
/**

‎services/action_connection/src/v2/ActionConnectionApi.ts

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ export class ActionConnectionApiRequestFactory extends BaseAPIRequestFactory {
5656
// Make Request Context
5757
const { server, overrides } = _config.getServerAndOverrides(
5858
"ActionConnectionApi.v2.createActionConnection",
59+
ActionConnectionApi.operationServers,
5960
);
6061
const requestContext = server.makeRequestContext(
6162
localVarPath,
@@ -108,6 +109,7 @@ export class ActionConnectionApiRequestFactory extends BaseAPIRequestFactory {
108109
// Make Request Context
109110
const { server, overrides } = _config.getServerAndOverrides(
110111
"ActionConnectionApi.v2.deleteActionConnection",
112+
ActionConnectionApi.operationServers,
111113
);
112114
const requestContext = server.makeRequestContext(
113115
localVarPath,
@@ -151,6 +153,7 @@ export class ActionConnectionApiRequestFactory extends BaseAPIRequestFactory {
151153
// Make Request Context
152154
const { server, overrides } = _config.getServerAndOverrides(
153155
"ActionConnectionApi.v2.getActionConnection",
156+
ActionConnectionApi.operationServers,
154157
);
155158
const requestContext = server.makeRequestContext(
156159
localVarPath,
@@ -200,6 +203,7 @@ export class ActionConnectionApiRequestFactory extends BaseAPIRequestFactory {
200203
// Make Request Context
201204
const { server, overrides } = _config.getServerAndOverrides(
202205
"ActionConnectionApi.v2.updateActionConnection",
206+
ActionConnectionApi.operationServers,
203207
);
204208
const requestContext = server.makeRequestContext(
205209
localVarPath,
@@ -532,13 +536,6 @@ export class ActionConnectionApi {
532536
new ActionConnectionApiRequestFactory(this.configuration);
533537
this.responseProcessor =
534538
responseProcessor || new ActionConnectionApiResponseProcessor();
535-
536-
// Add operation servers to the configuration
537-
if (Object.keys(ActionConnectionApi.operationServers).length > 0) {
538-
this.configuration.addOperationServers(
539-
ActionConnectionApi.operationServers,
540-
);
541-
}
542539
}
543540

544541
/**

‎services/agentless_scanning/src/v2/AgentlessScanningApi.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ export class AgentlessScanningApiRequestFactory extends BaseAPIRequestFactory {
5858
// Make Request Context
5959
const { server, overrides } = _config.getServerAndOverrides(
6060
"AgentlessScanningApi.v2.createAwsOnDemandTask",
61+
AgentlessScanningApi.operationServers,
6162
);
6263
const requestContext = server.makeRequestContext(
6364
localVarPath,
@@ -107,6 +108,7 @@ export class AgentlessScanningApiRequestFactory extends BaseAPIRequestFactory {
107108
// Make Request Context
108109
const { server, overrides } = _config.getServerAndOverrides(
109110
"AgentlessScanningApi.v2.createAwsScanOptions",
111+
AgentlessScanningApi.operationServers,
110112
);
111113
const requestContext = server.makeRequestContext(
112114
localVarPath,
@@ -160,6 +162,7 @@ export class AgentlessScanningApiRequestFactory extends BaseAPIRequestFactory {
160162
// Make Request Context
161163
const { server, overrides } = _config.getServerAndOverrides(
162164
"AgentlessScanningApi.v2.deleteAwsScanOptions",
165+
AgentlessScanningApi.operationServers,
163166
);
164167
const requestContext = server.makeRequestContext(
165168
localVarPath,
@@ -204,6 +207,7 @@ export class AgentlessScanningApiRequestFactory extends BaseAPIRequestFactory {
204207
// Make Request Context
205208
const { server, overrides } = _config.getServerAndOverrides(
206209
"AgentlessScanningApi.v2.getAwsOnDemandTask",
210+
AgentlessScanningApi.operationServers,
207211
);
208212
const requestContext = server.makeRequestContext(
209213
localVarPath,
@@ -238,6 +242,7 @@ export class AgentlessScanningApiRequestFactory extends BaseAPIRequestFactory {
238242
// Make Request Context
239243
const { server, overrides } = _config.getServerAndOverrides(
240244
"AgentlessScanningApi.v2.listAwsOnDemandTasks",
245+
AgentlessScanningApi.operationServers,
241246
);
242247
const requestContext = server.makeRequestContext(
243248
localVarPath,
@@ -272,6 +277,7 @@ export class AgentlessScanningApiRequestFactory extends BaseAPIRequestFactory {
272277
// Make Request Context
273278
const { server, overrides } = _config.getServerAndOverrides(
274279
"AgentlessScanningApi.v2.listAwsScanOptions",
280+
AgentlessScanningApi.operationServers,
275281
);
276282
const requestContext = server.makeRequestContext(
277283
localVarPath,
@@ -322,6 +328,7 @@ export class AgentlessScanningApiRequestFactory extends BaseAPIRequestFactory {
322328
// Make Request Context
323329
const { server, overrides } = _config.getServerAndOverrides(
324330
"AgentlessScanningApi.v2.updateAwsScanOptions",
331+
AgentlessScanningApi.operationServers,
325332
);
326333
const requestContext = server.makeRequestContext(
327334
localVarPath,
@@ -810,13 +817,6 @@ export class AgentlessScanningApi {
810817
new AgentlessScanningApiRequestFactory(this.configuration);
811818
this.responseProcessor =
812819
responseProcessor || new AgentlessScanningApiResponseProcessor();
813-
814-
// Add operation servers to the configuration
815-
if (Object.keys(AgentlessScanningApi.operationServers).length > 0) {
816-
this.configuration.addOperationServers(
817-
AgentlessScanningApi.operationServers,
818-
);
819-
}
820820
}
821821

822822
/**

‎services/api_management/src/v2/APIManagementApi.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ export class APIManagementApiRequestFactory extends BaseAPIRequestFactory {
5959
// Make Request Context
6060
const { server, overrides } = _config.getServerAndOverrides(
6161
"APIManagementApi.v2.createOpenAPI",
62+
APIManagementApi.operationServers,
6263
);
6364
const requestContext = server.makeRequestContext(
6465
localVarPath,
@@ -117,6 +118,7 @@ export class APIManagementApiRequestFactory extends BaseAPIRequestFactory {
117118
// Make Request Context
118119
const { server, overrides } = _config.getServerAndOverrides(
119120
"APIManagementApi.v2.deleteOpenAPI",
121+
APIManagementApi.operationServers,
120122
);
121123
const requestContext = server.makeRequestContext(
122124
localVarPath,
@@ -167,6 +169,7 @@ export class APIManagementApiRequestFactory extends BaseAPIRequestFactory {
167169
// Make Request Context
168170
const { server, overrides } = _config.getServerAndOverrides(
169171
"APIManagementApi.v2.getOpenAPI",
172+
APIManagementApi.operationServers,
170173
);
171174
const requestContext = server.makeRequestContext(
172175
localVarPath,
@@ -214,6 +217,7 @@ export class APIManagementApiRequestFactory extends BaseAPIRequestFactory {
214217
// Make Request Context
215218
const { server, overrides } = _config.getServerAndOverrides(
216219
"APIManagementApi.v2.listAPIs",
220+
APIManagementApi.operationServers,
217221
);
218222
const requestContext = server.makeRequestContext(
219223
localVarPath,
@@ -288,6 +292,7 @@ export class APIManagementApiRequestFactory extends BaseAPIRequestFactory {
288292
// Make Request Context
289293
const { server, overrides } = _config.getServerAndOverrides(
290294
"APIManagementApi.v2.updateOpenAPI",
295+
APIManagementApi.operationServers,
291296
);
292297
const requestContext = server.makeRequestContext(
293298
localVarPath,
@@ -767,11 +772,6 @@ export class APIManagementApi {
767772
requestFactory || new APIManagementApiRequestFactory(this.configuration);
768773
this.responseProcessor =
769774
responseProcessor || new APIManagementApiResponseProcessor();
770-
771-
// Add operation servers to the configuration
772-
if (Object.keys(APIManagementApi.operationServers).length > 0) {
773-
this.configuration.addOperationServers(APIManagementApi.operationServers);
774-
}
775775
}
776776

777777
/**

‎services/apm_retention_filters/src/v2/APMRetentionFiltersApi.ts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ export class APMRetentionFiltersApiRequestFactory extends BaseAPIRequestFactory
5757
// Make Request Context
5858
const { server, overrides } = _config.getServerAndOverrides(
5959
"APMRetentionFiltersApi.v2.createApmRetentionFilter",
60+
APMRetentionFiltersApi.operationServers,
6061
);
6162
const requestContext = server.makeRequestContext(
6263
localVarPath,
@@ -110,6 +111,7 @@ export class APMRetentionFiltersApiRequestFactory extends BaseAPIRequestFactory
110111
// Make Request Context
111112
const { server, overrides } = _config.getServerAndOverrides(
112113
"APMRetentionFiltersApi.v2.deleteApmRetentionFilter",
114+
APMRetentionFiltersApi.operationServers,
113115
);
114116
const requestContext = server.makeRequestContext(
115117
localVarPath,
@@ -154,6 +156,7 @@ export class APMRetentionFiltersApiRequestFactory extends BaseAPIRequestFactory
154156
// Make Request Context
155157
const { server, overrides } = _config.getServerAndOverrides(
156158
"APMRetentionFiltersApi.v2.getApmRetentionFilter",
159+
APMRetentionFiltersApi.operationServers,
157160
);
158161
const requestContext = server.makeRequestContext(
159162
localVarPath,
@@ -188,6 +191,7 @@ export class APMRetentionFiltersApiRequestFactory extends BaseAPIRequestFactory
188191
// Make Request Context
189192
const { server, overrides } = _config.getServerAndOverrides(
190193
"APMRetentionFiltersApi.v2.listApmRetentionFilters",
194+
APMRetentionFiltersApi.operationServers,
191195
);
192196
const requestContext = server.makeRequestContext(
193197
localVarPath,
@@ -228,6 +232,7 @@ export class APMRetentionFiltersApiRequestFactory extends BaseAPIRequestFactory
228232
// Make Request Context
229233
const { server, overrides } = _config.getServerAndOverrides(
230234
"APMRetentionFiltersApi.v2.reorderApmRetentionFilters",
235+
APMRetentionFiltersApi.operationServers,
231236
);
232237
const requestContext = server.makeRequestContext(
233238
localVarPath,
@@ -287,6 +292,7 @@ export class APMRetentionFiltersApiRequestFactory extends BaseAPIRequestFactory
287292
// Make Request Context
288293
const { server, overrides } = _config.getServerAndOverrides(
289294
"APMRetentionFiltersApi.v2.updateApmRetentionFilter",
295+
APMRetentionFiltersApi.operationServers,
290296
);
291297
const requestContext = server.makeRequestContext(
292298
localVarPath,
@@ -721,13 +727,6 @@ export class APMRetentionFiltersApi {
721727
new APMRetentionFiltersApiRequestFactory(this.configuration);
722728
this.responseProcessor =
723729
responseProcessor || new APMRetentionFiltersApiResponseProcessor();
724-
725-
// Add operation servers to the configuration
726-
if (Object.keys(APMRetentionFiltersApi.operationServers).length > 0) {
727-
this.configuration.addOperationServers(
728-
APMRetentionFiltersApi.operationServers,
729-
);
730-
}
731730
}
732731

733732
/**

‎services/app_builder/src/v2/AppBuilderApi.ts

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ export class AppBuilderApiRequestFactory extends BaseAPIRequestFactory {
6464
// Make Request Context
6565
const { server, overrides } = _config.getServerAndOverrides(
6666
"AppBuilderApi.v2.createApp",
67+
AppBuilderApi.operationServers,
6768
);
6869
const requestContext = server.makeRequestContext(
6970
localVarPath,
@@ -116,6 +117,7 @@ export class AppBuilderApiRequestFactory extends BaseAPIRequestFactory {
116117
// Make Request Context
117118
const { server, overrides } = _config.getServerAndOverrides(
118119
"AppBuilderApi.v2.deleteApp",
120+
AppBuilderApi.operationServers,
119121
);
120122
const requestContext = server.makeRequestContext(
121123
localVarPath,
@@ -156,6 +158,7 @@ export class AppBuilderApiRequestFactory extends BaseAPIRequestFactory {
156158
// Make Request Context
157159
const { server, overrides } = _config.getServerAndOverrides(
158160
"AppBuilderApi.v2.deleteApps",
161+
AppBuilderApi.operationServers,
159162
);
160163
const requestContext = server.makeRequestContext(
161164
localVarPath,
@@ -209,6 +212,7 @@ export class AppBuilderApiRequestFactory extends BaseAPIRequestFactory {
209212
// Make Request Context
210213
const { server, overrides } = _config.getServerAndOverrides(
211214
"AppBuilderApi.v2.getApp",
215+
AppBuilderApi.operationServers,
212216
);
213217
const requestContext = server.makeRequestContext(
214218
localVarPath,
@@ -263,6 +267,7 @@ export class AppBuilderApiRequestFactory extends BaseAPIRequestFactory {
263267
// Make Request Context
264268
const { server, overrides } = _config.getServerAndOverrides(
265269
"AppBuilderApi.v2.listApps",
270+
AppBuilderApi.operationServers,
266271
);
267272
const requestContext = server.makeRequestContext(
268273
localVarPath,
@@ -385,6 +390,7 @@ export class AppBuilderApiRequestFactory extends BaseAPIRequestFactory {
385390
// Make Request Context
386391
const { server, overrides } = _config.getServerAndOverrides(
387392
"AppBuilderApi.v2.publishApp",
393+
AppBuilderApi.operationServers,
388394
);
389395
const requestContext = server.makeRequestContext(
390396
localVarPath,
@@ -428,6 +434,7 @@ export class AppBuilderApiRequestFactory extends BaseAPIRequestFactory {
428434
// Make Request Context
429435
const { server, overrides } = _config.getServerAndOverrides(
430436
"AppBuilderApi.v2.unpublishApp",
437+
AppBuilderApi.operationServers,
431438
);
432439
const requestContext = server.makeRequestContext(
433440
localVarPath,
@@ -477,6 +484,7 @@ export class AppBuilderApiRequestFactory extends BaseAPIRequestFactory {
477484
// Make Request Context
478485
const { server, overrides } = _config.getServerAndOverrides(
479486
"AppBuilderApi.v2.updateApp",
487+
AppBuilderApi.operationServers,
480488
);
481489
const requestContext = server.makeRequestContext(
482490
localVarPath,
@@ -1284,11 +1292,6 @@ export class AppBuilderApi {
12841292
requestFactory || new AppBuilderApiRequestFactory(this.configuration);
12851293
this.responseProcessor =
12861294
responseProcessor || new AppBuilderApiResponseProcessor();
1287-
1288-
// Add operation servers to the configuration
1289-
if (Object.keys(AppBuilderApi.operationServers).length > 0) {
1290-
this.configuration.addOperationServers(AppBuilderApi.operationServers);
1291-
}
12921295
}
12931296

12941297
/**

0 commit comments

Comments
 (0)