Reduce number of circular dependencies (#616)

We have a bunch of them, which can be fairly easily avoid, mostly by intruducing the top level logger file and moving some objects around.
DataDog · Apr 5, 2022 · 6ed1588 · 6ed1588
1 parent 7c26f94
commit 6ed1588
Show file tree

Hide file tree

Showing 889 changed files with 939 additions and 940 deletions.
diff --git a/.generator/templates/api/api.mustache b/.generator/templates/api/api.mustache
@@ -1,7 +1,7 @@
 import { BaseAPIRequestFactory, RequiredError } from './baseapi{{extensionForDeno}}';
 import {Configuration, getServer, applySecurityAuthentication} from '../configuration{{extensionForDeno}}';
 import { RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http{{extensionForDeno}}';
-import { logger } from "../../../index";
+import { logger } from "../../../logger";
 {{#platforms}}
 {{#node}}
 import FormData from "form-data";

diff --git a/.generator/templates/http/http.mustache b/.generator/templates/http/http.mustache
@@ -14,9 +14,6 @@ import URLParse from "url-parse";
 {{#platforms}}
 {{^deno}}
 {{#frameworks}}
-{{#fetch-api}}
-export * from './isomorphic-fetch';
-{{/fetch-api}}
 {{#jquery}}
 export * from './jquery';
 {{/jquery}}

diff --git a/.generator/templates/index.mustache b/.generator/templates/index.mustache
@@ -1,4 +1,5 @@
 export * from "./http/http{{extensionForDeno}}";
+export * from './http/isomorphic-fetch';
 export * from "./auth/auth{{extensionForDeno}}";
 export { createConfiguration } from "./configuration{{extensionForDeno}}"
 export { setServerVariables } from "./configuration{{extensionForDeno}}"

diff --git a/.generator/templates/model/ObjectSerializer.mustache b/.generator/templates/model/ObjectSerializer.mustache
@@ -3,7 +3,8 @@
 import { {{classname}}{{#hasEnums}}{{#vars}}{{#isEnum}}, {{classname}}{{enumName}} {{/isEnum}} {{/vars}}{{/hasEnums}} } from './{{{ classFilename }}}{{extensionForDeno}}';
 {{/model}}
 {{/models}}
-import { logger } from "../../../index";
+import { UnparsedObject } from "../util";
+import { logger } from "../../../logger";
 
 const primitives = [
     "string",
@@ -287,19 +288,3 @@ export class ObjectSerializer {
         }
     }
 }
-
-export class UnparsedObject {
-    unparsedObject:any;
-    constructor(data:any) {
-        this.unparsedObject = data;
-    }
-}
-
-export type AttributeTypeMap = {
-    [key: string]: {
-      baseName: string;
-      type: string;
-      required?: boolean;
-      format?: string;
-    };
-}
diff --git a/.generator/templates/model/model.mustache b/.generator/templates/model/model.mustache
@@ -5,7 +5,7 @@
 import { {{classname}} } from './{{filename}}{{extensionForDeno}}';
 {{/tsImports}}
 import { HttpFile } from '../http/http{{extensionForDeno}}';
-import { AttributeTypeMap, UnparsedObject } from './ObjectSerializer';
+import { AttributeTypeMap, UnparsedObject } from '../util';
 
 {{#description}}
 /**

diff --git a/.generator/templates/util.mustache b/.generator/templates/util.mustache
@@ -26,3 +26,19 @@ export function isCodeInRange(codeRange: string, code: number): boolean {
         return true;
     }
 }
+
+export class UnparsedObject {
+    unparsedObject:any;
+    constructor(data:any) {
+        this.unparsedObject = data;
+    }
+}
+
+export type AttributeTypeMap = {
+    [key: string]: {
+      baseName: string;
+      type: string;
+      required?: boolean;
+      format?: string;
+    };
+}
diff --git a/index.ts b/index.ts
@@ -1,9 +1,3 @@
 export * as v1 from "./packages/datadog-api-client-v1";
 export * as v2 from "./packages/datadog-api-client-v2";
-
-import log from "loglevel";
-
-const logger = log.noConflict();
-logger.setLevel((process !== undefined && process.env.DEBUG) ? logger.levels.DEBUG : logger.levels.INFO);
-
-export { logger };
+export * from "./logger";
diff --git a/logger.ts b/logger.ts
@@ -0,0 +1,6 @@
+import log from "loglevel";
+
+const logger = log.noConflict();
+logger.setLevel((process !== undefined && process.env.DEBUG) ? logger.levels.DEBUG : logger.levels.INFO);
+
+export { logger };
diff --git a/packages/datadog-api-client-v1/apis/ServiceLevelObjectiveCorrectionsApi.ts b/packages/datadog-api-client-v1/apis/ServiceLevelObjectiveCorrectionsApi.ts
@@ -5,7 +5,7 @@ import {
   applySecurityAuthentication,
 } from "../configuration";
 import { RequestContext, HttpMethod, ResponseContext } from "../http/http";
-import { logger } from "../../../index";
+import { logger } from "../../../logger";
 import { ObjectSerializer } from "../models/ObjectSerializer";
 import { ApiException } from "./exception";
 import { isCodeInRange } from "../util";

diff --git a/packages/datadog-api-client-v1/apis/ServiceLevelObjectivesApi.ts b/packages/datadog-api-client-v1/apis/ServiceLevelObjectivesApi.ts
@@ -5,7 +5,7 @@ import {
   applySecurityAuthentication,
 } from "../configuration";
 import { RequestContext, HttpMethod, ResponseContext } from "../http/http";
-import { logger } from "../../../index";
+import { logger } from "../../../logger";
 import { ObjectSerializer } from "../models/ObjectSerializer";
 import { ApiException } from "./exception";
 import { isCodeInRange } from "../util";

diff --git a/packages/datadog-api-client-v1/apis/UsageMeteringApi.ts b/packages/datadog-api-client-v1/apis/UsageMeteringApi.ts
@@ -5,7 +5,7 @@ import {
   applySecurityAuthentication,
 } from "../configuration";
 import { RequestContext, HttpMethod, ResponseContext } from "../http/http";
-import { logger } from "../../../index";
+import { logger } from "../../../logger";
 import { ObjectSerializer } from "../models/ObjectSerializer";
 import { ApiException } from "./exception";
 import { isCodeInRange } from "../util";

diff --git a/packages/datadog-api-client-v1/http/http.ts b/packages/datadog-api-client-v1/http/http.ts
@@ -3,8 +3,6 @@ import { userAgent } from "../../../userAgent";
 import FormData from "form-data";
 import URLParse from "url-parse";
 
-export * from "./isomorphic-fetch";
-
 /**
  * Interface for aborting fetch requests.
  */

diff --git a/packages/datadog-api-client-v1/index.ts b/packages/datadog-api-client-v1/index.ts
@@ -1,4 +1,5 @@
 export * from "./http/http";
+export * from "./http/isomorphic-fetch";
 export * from "./auth/auth";
 export { createConfiguration } from "./configuration";
 export { setServerVariables } from "./configuration";

diff --git a/packages/datadog-api-client-v1/models/APIErrorResponse.ts b/packages/datadog-api-client-v1/models/APIErrorResponse.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Error response object.

diff --git a/packages/datadog-api-client-v1/models/AWSAccount.ts b/packages/datadog-api-client-v1/models/AWSAccount.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Returns the AWS account associated with this integration.

diff --git a/packages/datadog-api-client-v1/models/AWSAccountAndLambdaRequest.ts b/packages/datadog-api-client-v1/models/AWSAccountAndLambdaRequest.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * AWS account ID and Lambda ARN.

diff --git a/packages/datadog-api-client-v1/models/AWSAccountCreateResponse.ts b/packages/datadog-api-client-v1/models/AWSAccountCreateResponse.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The Response returned by the AWS Create Account call.

diff --git a/packages/datadog-api-client-v1/models/AWSAccountDeleteRequest.ts b/packages/datadog-api-client-v1/models/AWSAccountDeleteRequest.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * List of AWS accounts to delete.

diff --git a/packages/datadog-api-client-v1/models/AWSAccountListResponse.ts b/packages/datadog-api-client-v1/models/AWSAccountListResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { AWSAccount } from "./AWSAccount";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * List of enabled AWS accounts.

diff --git a/packages/datadog-api-client-v1/models/AWSLogsAsyncError.ts b/packages/datadog-api-client-v1/models/AWSLogsAsyncError.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Description of errors.

diff --git a/packages/datadog-api-client-v1/models/AWSLogsAsyncResponse.ts b/packages/datadog-api-client-v1/models/AWSLogsAsyncResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { AWSLogsAsyncError } from "./AWSLogsAsyncError";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A list of all Datadog-AWS logs integrations available in your Datadog organization.

diff --git a/packages/datadog-api-client-v1/models/AWSLogsLambda.ts b/packages/datadog-api-client-v1/models/AWSLogsLambda.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Description of the Lambdas.

diff --git a/packages/datadog-api-client-v1/models/AWSLogsListResponse.ts b/packages/datadog-api-client-v1/models/AWSLogsListResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { AWSLogsLambda } from "./AWSLogsLambda";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A list of all Datadog-AWS logs integrations available in your Datadog organization.

diff --git a/packages/datadog-api-client-v1/models/AWSLogsListServicesResponse.ts b/packages/datadog-api-client-v1/models/AWSLogsListServicesResponse.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The list of current AWS services for which Datadog offers automatic log collection.

diff --git a/packages/datadog-api-client-v1/models/AWSLogsServicesRequest.ts b/packages/datadog-api-client-v1/models/AWSLogsServicesRequest.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A list of current AWS services for which Datadog offers automatic log collection.

diff --git a/packages/datadog-api-client-v1/models/AWSTagFilter.ts b/packages/datadog-api-client-v1/models/AWSTagFilter.ts
@@ -9,7 +9,7 @@
  */
 
 import { AWSNamespace } from "./AWSNamespace";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * A tag filter.

diff --git a/packages/datadog-api-client-v1/models/AWSTagFilterCreateRequest.ts b/packages/datadog-api-client-v1/models/AWSTagFilterCreateRequest.ts
@@ -9,7 +9,7 @@
  */
 
 import { AWSNamespace } from "./AWSNamespace";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The objects used to set an AWS tag filter.

diff --git a/packages/datadog-api-client-v1/models/AWSTagFilterDeleteRequest.ts b/packages/datadog-api-client-v1/models/AWSTagFilterDeleteRequest.ts
@@ -9,7 +9,7 @@
  */
 
 import { AWSNamespace } from "./AWSNamespace";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The objects used to delete an AWS tag filter entry.

diff --git a/packages/datadog-api-client-v1/models/AWSTagFilterListResponse.ts b/packages/datadog-api-client-v1/models/AWSTagFilterListResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { AWSTagFilter } from "./AWSTagFilter";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * An array of tag filter rules by `namespace` and tag filter string.

diff --git a/packages/datadog-api-client-v1/models/AlertGraphWidgetDefinition.ts b/packages/datadog-api-client-v1/models/AlertGraphWidgetDefinition.ts
@@ -12,7 +12,7 @@ import { AlertGraphWidgetDefinitionType } from "./AlertGraphWidgetDefinitionType
 import { WidgetTextAlign } from "./WidgetTextAlign";
 import { WidgetTime } from "./WidgetTime";
 import { WidgetVizType } from "./WidgetVizType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Alert graphs are timeseries graphs showing the current status of any monitor defined on your system.

diff --git a/packages/datadog-api-client-v1/models/AlertValueWidgetDefinition.ts b/packages/datadog-api-client-v1/models/AlertValueWidgetDefinition.ts
@@ -10,7 +10,7 @@
 
 import { AlertValueWidgetDefinitionType } from "./AlertValueWidgetDefinitionType";
 import { WidgetTextAlign } from "./WidgetTextAlign";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Alert values are query values showing the current value of the metric in any monitor defined on your system.

diff --git a/packages/datadog-api-client-v1/models/ApiKey.ts b/packages/datadog-api-client-v1/models/ApiKey.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Datadog API key.

diff --git a/packages/datadog-api-client-v1/models/ApiKeyListResponse.ts b/packages/datadog-api-client-v1/models/ApiKeyListResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { ApiKey } from "./ApiKey";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * List of API and application keys available for a given organization.

diff --git a/packages/datadog-api-client-v1/models/ApiKeyResponse.ts b/packages/datadog-api-client-v1/models/ApiKeyResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { ApiKey } from "./ApiKey";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * An API key with its associated metadata.

diff --git a/packages/datadog-api-client-v1/models/ApmStatsQueryColumnType.ts b/packages/datadog-api-client-v1/models/ApmStatsQueryColumnType.ts
@@ -10,7 +10,7 @@
 
 import { TableWidgetCellDisplayMode } from "./TableWidgetCellDisplayMode";
 import { WidgetSort } from "./WidgetSort";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Column properties.

diff --git a/packages/datadog-api-client-v1/models/ApmStatsQueryDefinition.ts b/packages/datadog-api-client-v1/models/ApmStatsQueryDefinition.ts
@@ -10,7 +10,7 @@
 
 import { ApmStatsQueryColumnType } from "./ApmStatsQueryColumnType";
 import { ApmStatsQueryRowType } from "./ApmStatsQueryRowType";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * The APM stats query for table and distributions widgets.

diff --git a/packages/datadog-api-client-v1/models/ApplicationKey.ts b/packages/datadog-api-client-v1/models/ApplicationKey.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * An application key with its associated metadata.

diff --git a/packages/datadog-api-client-v1/models/ApplicationKeyListResponse.ts b/packages/datadog-api-client-v1/models/ApplicationKeyListResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { ApplicationKey } from "./ApplicationKey";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * An application key response.

diff --git a/packages/datadog-api-client-v1/models/ApplicationKeyResponse.ts b/packages/datadog-api-client-v1/models/ApplicationKeyResponse.ts
@@ -9,7 +9,7 @@
  */
 
 import { ApplicationKey } from "./ApplicationKey";
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * An application key response.

diff --git a/packages/datadog-api-client-v1/models/AuthenticationValidationResponse.ts b/packages/datadog-api-client-v1/models/AuthenticationValidationResponse.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Represent validation endpoint responses.

diff --git a/packages/datadog-api-client-v1/models/AzureAccount.ts b/packages/datadog-api-client-v1/models/AzureAccount.ts
@@ -8,7 +8,7 @@
  * Do not edit the class manually.
  */
 
-import { AttributeTypeMap } from "./ObjectSerializer";
+import { AttributeTypeMap } from "../util";
 
 /**
  * Datadog-Azure integrations configured for your organization.