[AAWF-460] Regenerate client and fix tests (#2321)

* regen and fix tests

Author: skarimo

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

@@ -5,12 +5,7 @@ import {
   ZstdCompressorCallback,
 } from "./http/http";
 import { IsomorphicFetchHttpLibrary as DefaultHttpLibrary } from "./http/isomorphic-fetch";
-import {
-  BaseServerConfiguration,
-  server1,
-  servers,
-  operationServers,
-} from "./servers";
+import { BaseServerConfiguration, server1, servers } from "./servers";
 import {
   configureAuthMethods,
   AuthMethods,
@@ -21,7 +16,11 @@ import { logger } from "./logger";
 export class Configuration {
   readonly baseServer?: BaseServerConfiguration;
   readonly serverIndex: number;
+  readonly serverVariables: { [key: string]: string };
   readonly operationServerIndices: { [name: string]: number };
+  readonly operationServerVariables: {
+    [name: string]: { [key: string]: string };
+  };
   readonly httpApi: HttpLibrary;
   readonly authMethods: AuthMethods;
   readonly httpConfig: HttpConfiguration;
@@ -37,7 +36,9 @@ export class Configuration {
   public constructor(
     baseServer: BaseServerConfiguration | undefined,
     serverIndex: number,
+    serverVariables: { [key: string]: string },
     operationServerIndices: { [name: string]: number },
+    operationServerVariables: { [name: string]: { [key: string]: string } },
     httpApi: HttpLibrary,
     authMethods: AuthMethods,
     httpConfig: HttpConfiguration,
@@ -50,7 +51,9 @@ export class Configuration {
   ) {
     this.baseServer = baseServer;
     this.serverIndex = serverIndex;
+    this.serverVariables = serverVariables;
     this.operationServerIndices = operationServerIndices;
+    this.operationServerVariables = operationServerVariables;
     this.httpApi = httpApi;
     this.authMethods = authMethods;
     this.httpConfig = httpConfig;
@@ -65,46 +68,38 @@ export class Configuration {
       this.servers.push(server.clone());
     }
     this.operationServers = {};
-    for (const endpoint in operationServers) {
-      this.operationServers[endpoint] = [];
-      for (const server of operationServers[endpoint]) {
-        this.operationServers[endpoint].push(server.clone());
-      }
-    }
     if (backoffBase && backoffBase < 2) {
       throw new Error("Backoff base must be at least 2");
     }
   }
 
-  setServerVariables(serverVariables: { [key: string]: string }): void {
+  getServerAndOverrides(key: string): {
+    server: BaseServerConfiguration;
+    overrides?: { [key: string]: string };
+  } {
     if (this.baseServer !== undefined) {
-      this.baseServer.setVariables(serverVariables);
-      return;
+      return { server: this.baseServer, overrides: this.serverVariables };
     }
 
-    const index = this.serverIndex;
-    this.servers[index].setVariables(serverVariables);
-
-    for (const op in this.operationServers) {
-      const index =
-        op in this.operationServerIndices
-          ? this.operationServerIndices[op]
-          : this.serverIndex;
-      this.operationServers[op][index].setVariables(serverVariables);
+    let server: BaseServerConfiguration;
+    let overrides: { [key: string]: string } | undefined;
+    if (key in this.operationServers) {
+      const index = this.operationServerIndices[key] || 0;
+      server = this.operationServers[key][index];
+      overrides = this.operationServerVariables[key];
+    } else {
+      const index = this.serverIndex;
+      server = this.servers[index];
+      overrides = this.serverVariables;
     }
+
+    return { server, overrides };
   }
 
-  getServer(endpoint: string): BaseServerConfiguration {
-    if (this.baseServer !== undefined) {
-      return this.baseServer;
-    }
-    const index =
-      endpoint in this.operationServerIndices
-        ? this.operationServerIndices[endpoint]
-        : this.serverIndex;
-    return endpoint in operationServers
-      ? this.operationServers[endpoint][index]
-      : this.servers[index];
+  addOperationServers(operationServers: {
+    [key: string]: BaseServerConfiguration[];
+  }): void {
+    this.operationServers = { ...operationServers, ...this.operationServers };
   }
 }
 
@@ -121,9 +116,31 @@ export interface ConfigurationParameters {
    */
   serverIndex?: number;
   /**
-   * Default index of a server to use for an operation from the predefined server operation map
+   * Default server variables to override the default server variables
+   * Example:
+   * ```
+   * {
+   *   "site": "datadoghq.com",
+   * }
+   */
+  serverVariables?: { [name: string]: string };
+  /**
+   * Default index of a server to use for an operation from the API server list
+   * Key is the `{ApiName}.{ApiVersion}.{OperationName}`, value is the index of the server to use. Example:
+   * ```
+   * {
+   *   "IPRangesApi.v1.getIPRanges": 0,
+   * }
    */
   operationServerIndices?: { [name: string]: number };
+  /**
+   * Operation servers. Key is the `{ApiName}.{ApiVersion}.{OperationName}`, value is the object of variables to use. Example:
+   * ```
+   * {
+   *   "IPRangesApi.v1.getIPRanges": { site: "datadoghq.com" },
+   * }
+   */
+  operationServerVariables?: { [name: string]: { [key: string]: string } };
   /**
    * Custom `fetch` function
    */
@@ -172,7 +189,9 @@ export interface ConfigurationParameters {
  * If a property is not included in conf, a default is used:
  *    - baseServer: null
  *    - serverIndex: 0
+ *    - serverVariables: {}
  *    - operationServerIndices: {}
+ *    - operationServerVariables: {}
  *    - httpApi: IsomorphicFetchHttpLibrary
  *    - authMethods: {}
  *    - httpConfig: {}
@@ -186,9 +205,6 @@ export function createConfiguration(
   if (typeof process !== "undefined" && process.env && process.env.DD_SITE) {
     const serverConf = server1.getConfiguration();
     server1.setVariables({ site: process.env.DD_SITE } as typeof serverConf);
-    for (const op in operationServers) {
-      operationServers[op][0].setVariables({ site: process.env.DD_SITE });
-    }
   }
 
   const authMethods = conf.authMethods || {};
@@ -212,7 +228,9 @@ export function createConfiguration(
   const configuration = new Configuration(
     conf.baseServer,
     conf.serverIndex || 0,
+    conf.serverVariables || {},
     conf.operationServerIndices || {},
+    conf.operationServerVariables || {},
     conf.httpApi || new DefaultHttpLibrary(),
     configureAuthMethods(authMethods),
     conf.httpConfig || {},
@@ -221,93 +239,7 @@ export function createConfiguration(
     conf.maxRetries || 3,
     conf.backoffBase || 2,
     conf.backoffMultiplier || 2,
-    {
-      "v2.createAWSAccount": false,
-      "v2.createNewAWSExternalID": false,
-      "v2.deleteAWSAccount": false,
-      "v2.getAWSAccount": false,
-      "v2.listAWSAccounts": false,
-      "v2.listAWSNamespaces": false,
-      "v2.updateAWSAccount": false,
-      "v2.listAWSLogsServices": false,
-      "v2.createMonitorNotificationRule": false,
-      "v2.deleteMonitorNotificationRule": false,
-      "v2.getMonitorNotificationRule": false,
-      "v2.getMonitorNotificationRules": false,
-      "v2.updateMonitorNotificationRule": false,
-      "v2.cancelHistoricalJob": false,
-      "v2.convertJobResultToSignal": false,
-      "v2.deleteHistoricalJob": false,
-      "v2.getFinding": false,
-      "v2.getHistoricalJob": false,
-      "v2.getRuleVersionHistory": false,
-      "v2.getSBOM": false,
-      "v2.listFindings": false,
-      "v2.listHistoricalJobs": false,
-      "v2.listVulnerabilities": false,
-      "v2.listVulnerableAssets": false,
-      "v2.muteFindings": false,
-      "v2.runHistoricalJob": false,
-      "v2.createSLOReportJob": false,
-      "v2.getSLOReport": false,
-      "v2.getSLOReportJobStatus": false,
-      "v2.createOpenAPI": false,
-      "v2.deleteOpenAPI": false,
-      "v2.getOpenAPI": false,
-      "v2.listAPIs": false,
-      "v2.updateOpenAPI": false,
-      "v2.cancelDataDeletionRequest": false,
-      "v2.createDataDeletionRequest": false,
-      "v2.getDataDeletionRequests": false,
-      "v2.createDORADeployment": false,
-      "v2.createDORAIncident": false,
-      "v2.createIncident": false,
-      "v2.createIncidentIntegration": false,
-      "v2.createIncidentTodo": false,
-      "v2.createIncidentType": false,
-      "v2.deleteIncident": false,
-      "v2.deleteIncidentIntegration": false,
-      "v2.deleteIncidentTodo": false,
-      "v2.deleteIncidentType": false,
-      "v2.getIncident": false,
-      "v2.getIncidentIntegration": false,
-      "v2.getIncidentTodo": false,
-      "v2.getIncidentType": false,
-      "v2.listIncidentAttachments": false,
-      "v2.listIncidentIntegrations": false,
-      "v2.listIncidents": false,
-      "v2.listIncidentTodos": false,
-      "v2.listIncidentTypes": false,
-      "v2.searchIncidents": false,
-      "v2.updateIncident": false,
-      "v2.updateIncidentAttachments": false,
-      "v2.updateIncidentIntegration": false,
-      "v2.updateIncidentTodo": false,
-      "v2.updateIncidentType": false,
-      "v2.getAggregatedConnections": false,
-      "v2.createPipeline": false,
-      "v2.deletePipeline": false,
-      "v2.getPipeline": false,
-      "v2.listPipelines": false,
-      "v2.updatePipeline": false,
-      "v2.validatePipeline": false,
-      "v2.createScorecardOutcomesBatch": false,
-      "v2.createScorecardRule": false,
-      "v2.deleteScorecardRule": false,
-      "v2.listScorecardOutcomes": false,
-      "v2.listScorecardRules": false,
-      "v2.updateScorecardRule": false,
-      "v2.createIncidentService": false,
-      "v2.deleteIncidentService": false,
-      "v2.getIncidentService": false,
-      "v2.listIncidentServices": false,
-      "v2.updateIncidentService": false,
-      "v2.createIncidentTeam": false,
-      "v2.deleteIncidentTeam": false,
-      "v2.getIncidentTeam": false,
-      "v2.listIncidentTeams": false,
-      "v2.updateIncidentTeam": false,
-    },
+    {},
   );
   configuration.httpApi.zstdCompressorCallback = conf.zstdCompressorCallback;
   configuration.httpApi.debug = configuration.debug;
@@ -319,31 +251,6 @@ export function createConfiguration(
   return configuration;
 }
 
-export function getServer(
-  conf: Configuration,
-  endpoint: string,
-): BaseServerConfiguration {
-  logger.warn(
-    "getServer is deprecated, please use Configuration.getServer instead.",
-  );
-  return conf.getServer(endpoint);
-}
-
-/**
- * Sets the server variables.
- *
- * @param serverVariables key/value object representing the server variables (site, name, protocol, ...)
- */
-export function setServerVariables(
-  conf: Configuration,
-  serverVariables: { [key: string]: string },
-): void {
-  logger.warn(
-    "setServerVariables is deprecated, please use Configuration.setServerVariables instead.",
-  );
-  return conf.setServerVariables(serverVariables);
-}
-
 /**
  * Apply given security authentication method if avaiable in configuration.
  */