generate client for #322 (#339)

Co-authored-by: Thomas Hervé <[email protected]>

Author: NouemanKHAL

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

@@ -87,9 +87,7 @@ export function createConfiguration(
     const serverConf = server1.getConfiguration();
     server1.setVariables({ site: process.env.DD_SITE } as typeof serverConf);
     for (const op in operationServers) {
-      (operationServers[op][0] as any).setVariables({
-        site: process.env.DD_SITE,
-      });
+      operationServers[op][0].setVariables({ site: process.env.DD_SITE });
     }
   }
 
@@ -135,3 +133,25 @@ export function getServer(
     ? operationServers[endpoint][index]
     : servers[index];
 }
+
+/**
+ * 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 }
+) {
+  if (conf.baseServer !== undefined) {
+    conf.baseServer.setVariables(serverVariables);
+    return;
+  }
+
+  const index = conf.serverIndex;
+  servers[index].setVariables(serverVariables);
+
+  for (const op in operationServers) {
+    operationServers[op][0].setVariables(serverVariables);
+  }
+}

packages/datadog-api-client-v1/index.ts

@@ -1,6 +1,8 @@
 export * from "./http/http";
 export * from "./auth/auth";
 export { createConfiguration } from "./configuration";
+export { setServerVariables } from "./configuration";
+
 export { Configuration } from "./configuration";
 export * from "./apis/exception";
 export * from "./servers";

packages/datadog-api-client-v1/servers.ts

@@ -1,30 +1,26 @@
 import { RequestContext, HttpMethod } from "./http/http";
 
-export interface BaseServerConfiguration {
-  makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext;
-}
-
 /**
  *
- * Represents the configuration of a server including its
- * url template and variable configuration based on the url.
+ * Represents the configuration of a server
  *
  */
-export class ServerConfiguration<T extends { [key: string]: string }>
-  implements BaseServerConfiguration
-{
-  public constructor(private url: string, private variableConfiguration: T) {}
+export class BaseServerConfiguration {
+  public constructor(
+    private url: string,
+    private variableConfiguration: { [key: string]: string }
+  ) {}
 
   /**
    * Sets the value of the variables of this server.
    *
    * @param variableConfiguration a partial variable configuration for the variables contained in the url
    */
-  public setVariables(variableConfiguration: Partial<T>) {
+  public setVariables(variableConfiguration: { [key: string]: string }) {
     Object.assign(this.variableConfiguration, variableConfiguration);
   }
 
-  public getConfiguration(): T {
+  public getConfiguration(): { [key: string]: string } {
     return this.variableConfiguration;
   }
 
@@ -53,6 +49,16 @@ export class ServerConfiguration<T extends { [key: string]: string }>
   }
 }
 
+/**
+ *
+ * Represents the configuration of a server including its
+ * url template and variable configuration based on the url.
+ *
+ */
+export class ServerConfiguration<
+  T extends { [key: string]: string }
+> extends BaseServerConfiguration {}
+
 export const server1 = new ServerConfiguration<{
   site:
     | "datadoghq.com"

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

@@ -87,9 +87,7 @@ export function createConfiguration(
     const serverConf = server1.getConfiguration();
     server1.setVariables({ site: process.env.DD_SITE } as typeof serverConf);
     for (const op in operationServers) {
-      (operationServers[op][0] as any).setVariables({
-        site: process.env.DD_SITE,
-      });
+      operationServers[op][0].setVariables({ site: process.env.DD_SITE });
     }
   }
 
@@ -135,3 +133,25 @@ export function getServer(
     ? operationServers[endpoint][index]
     : servers[index];
 }
+
+/**
+ * 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 }
+) {
+  if (conf.baseServer !== undefined) {
+    conf.baseServer.setVariables(serverVariables);
+    return;
+  }
+
+  const index = conf.serverIndex;
+  servers[index].setVariables(serverVariables);
+
+  for (const op in operationServers) {
+    operationServers[op][0].setVariables(serverVariables);
+  }
+}

packages/datadog-api-client-v2/index.ts

@@ -1,6 +1,8 @@
 export * from "./http/http";
 export * from "./auth/auth";
 export { createConfiguration } from "./configuration";
+export { setServerVariables } from "./configuration";
+
 export { Configuration } from "./configuration";
 export * from "./apis/exception";
 export * from "./servers";

packages/datadog-api-client-v2/servers.ts

@@ -1,30 +1,26 @@
 import { RequestContext, HttpMethod } from "./http/http";
 
-export interface BaseServerConfiguration {
-  makeRequestContext(endpoint: string, httpMethod: HttpMethod): RequestContext;
-}
-
 /**
  *
- * Represents the configuration of a server including its
- * url template and variable configuration based on the url.
+ * Represents the configuration of a server
  *
  */
-export class ServerConfiguration<T extends { [key: string]: string }>
-  implements BaseServerConfiguration
-{
-  public constructor(private url: string, private variableConfiguration: T) {}
+export class BaseServerConfiguration {
+  public constructor(
+    private url: string,
+    private variableConfiguration: { [key: string]: string }
+  ) {}
 
   /**
    * Sets the value of the variables of this server.
    *
    * @param variableConfiguration a partial variable configuration for the variables contained in the url
    */
-  public setVariables(variableConfiguration: Partial<T>) {
+  public setVariables(variableConfiguration: { [key: string]: string }) {
     Object.assign(this.variableConfiguration, variableConfiguration);
   }
 
-  public getConfiguration(): T {
+  public getConfiguration(): { [key: string]: string } {
     return this.variableConfiguration;
   }
 
@@ -53,6 +49,16 @@ export class ServerConfiguration<T extends { [key: string]: string }>
   }
 }
 
+/**
+ *
+ * Represents the configuration of a server including its
+ * url template and variable configuration based on the url.
+ *
+ */
+export class ServerConfiguration<
+  T extends { [key: string]: string }
+> extends BaseServerConfiguration {}
+
 export const server1 = new ServerConfiguration<{
   site:
     | "datadoghq.com"