diff --git a/sdk/keyvault/keyvault-certificates/.eslintignore b/sdk/keyvault/keyvault-certificates/.eslintignore deleted file mode 100644 index c92bb15b91ea..000000000000 --- a/sdk/keyvault/keyvault-certificates/.eslintignore +++ /dev/null @@ -1,2 +0,0 @@ -# Ignoring the core files since they're auto-generated. Eventually, the auto-generated code will be on par with our current eslint rules, but in the mean time we should ignore them. -src/core diff --git a/sdk/keyvault/keyvault-certificates/package.json b/sdk/keyvault/keyvault-certificates/package.json index cb0c9f389057..827728fbff34 100644 --- a/sdk/keyvault/keyvault-certificates/package.json +++ b/sdk/keyvault/keyvault-certificates/package.json @@ -73,11 +73,11 @@ "//metadata": { "constantPaths": [ { - "path": "src/core/keyVaultClientContext.ts", + "path": "src/generated/keyVaultClientContext.ts", "prefix": "packageVersion" }, { - "path": "src/core/utils/constants.ts", + "path": "src/generated/utils/constants.ts", "prefix": "SDK_VERSION" } ] diff --git a/sdk/keyvault/keyvault-certificates/src/certificatesModels.ts b/sdk/keyvault/keyvault-certificates/src/certificatesModels.ts index f784a2d90263..98e6d6bc07ed 100644 --- a/sdk/keyvault/keyvault-certificates/src/certificatesModels.ts +++ b/sdk/keyvault/keyvault-certificates/src/certificatesModels.ts @@ -2,7 +2,7 @@ // Licensed under the MIT license. import * as coreHttp from "@azure/core-http"; -import { DeletionRecoveryLevel, KeyUsageType } from "./core/models"; +import { DeletionRecoveryLevel, KeyUsageType } from "./generated/models"; /** * Defines values for CertificateKeyType. diff --git a/sdk/keyvault/keyvault-certificates/src/core/clientOptions.ts b/sdk/keyvault/keyvault-certificates/src/generated/clientOptions.ts similarity index 100% rename from sdk/keyvault/keyvault-certificates/src/core/clientOptions.ts rename to sdk/keyvault/keyvault-certificates/src/generated/clientOptions.ts diff --git a/sdk/keyvault/keyvault-certificates/src/core/index.ts b/sdk/keyvault/keyvault-certificates/src/generated/index.ts similarity index 100% rename from sdk/keyvault/keyvault-certificates/src/core/index.ts rename to sdk/keyvault/keyvault-certificates/src/generated/index.ts diff --git a/sdk/keyvault/keyvault-certificates/src/core/keyVaultBase.ts b/sdk/keyvault/keyvault-certificates/src/generated/keyVaultBase.ts similarity index 100% rename from sdk/keyvault/keyvault-certificates/src/core/keyVaultBase.ts rename to sdk/keyvault/keyvault-certificates/src/generated/keyVaultBase.ts diff --git a/sdk/keyvault/keyvault-certificates/src/core/keyVaultClient.ts b/sdk/keyvault/keyvault-certificates/src/generated/keyVaultClient.ts similarity index 100% rename from sdk/keyvault/keyvault-certificates/src/core/keyVaultClient.ts rename to sdk/keyvault/keyvault-certificates/src/generated/keyVaultClient.ts diff --git a/sdk/keyvault/keyvault-certificates/src/core/keyVaultClientContext.ts b/sdk/keyvault/keyvault-certificates/src/generated/keyVaultClientContext.ts similarity index 100% rename from sdk/keyvault/keyvault-certificates/src/core/keyVaultClientContext.ts rename to sdk/keyvault/keyvault-certificates/src/generated/keyVaultClientContext.ts diff --git a/sdk/keyvault/keyvault-certificates/src/core/models/index.ts b/sdk/keyvault/keyvault-certificates/src/generated/models/index.ts similarity index 100% rename from sdk/keyvault/keyvault-certificates/src/core/models/index.ts rename to sdk/keyvault/keyvault-certificates/src/generated/models/index.ts diff --git a/sdk/keyvault/keyvault-certificates/src/core/models/mappers.ts b/sdk/keyvault/keyvault-certificates/src/generated/models/mappers.ts similarity index 100% rename from sdk/keyvault/keyvault-certificates/src/core/models/mappers.ts rename to sdk/keyvault/keyvault-certificates/src/generated/models/mappers.ts diff --git a/sdk/keyvault/keyvault-certificates/src/core/models/parameters.ts b/sdk/keyvault/keyvault-certificates/src/generated/models/parameters.ts similarity index 100% rename from sdk/keyvault/keyvault-certificates/src/core/models/parameters.ts rename to sdk/keyvault/keyvault-certificates/src/generated/models/parameters.ts diff --git a/sdk/keyvault/keyvault-certificates/src/core/utils.ts b/sdk/keyvault/keyvault-certificates/src/generated/utils.ts similarity index 100% rename from sdk/keyvault/keyvault-certificates/src/core/utils.ts rename to sdk/keyvault/keyvault-certificates/src/generated/utils.ts diff --git a/sdk/keyvault/keyvault-certificates/src/core/utils/constants.ts b/sdk/keyvault/keyvault-certificates/src/generated/utils/constants.ts similarity index 100% rename from sdk/keyvault/keyvault-certificates/src/core/utils/constants.ts rename to sdk/keyvault/keyvault-certificates/src/generated/utils/constants.ts diff --git a/sdk/keyvault/keyvault-certificates/src/index.ts b/sdk/keyvault/keyvault-certificates/src/index.ts index af0b9bd5611b..fa99fce5b05a 100644 --- a/sdk/keyvault/keyvault-certificates/src/index.ts +++ b/sdk/keyvault/keyvault-certificates/src/index.ts @@ -136,10 +136,10 @@ import { CertificateAttributes, Contacts as CoreContacts, IssuerBundle -} from "./core/models"; -import { KeyVaultClient } from "./core/keyVaultClient"; -import { SDK_VERSION } from "./core/utils/constants"; -import { parseKeyvaultIdentifier as parseKeyvaultEntityIdentifier } from "./core/utils"; +} from "./generated/models"; +import { KeyVaultClient } from "./generated/keyVaultClient"; +import { SDK_VERSION } from "./generated/utils/constants"; +import { parseKeyvaultIdentifier as parseKeyvaultEntityIdentifier } from "./generated/utils"; import "@azure/core-paging"; import { PageSettings, PagedAsyncIterableIterator } from "@azure/core-paging"; import { challengeBasedAuthenticationPolicy } from "../../keyvault-common/src"; diff --git a/sdk/keyvault/keyvault-certificates/src/lro/create/operation.ts b/sdk/keyvault/keyvault-certificates/src/lro/create/operation.ts index cd9eed521c4e..601a62779d9d 100644 --- a/sdk/keyvault/keyvault-certificates/src/lro/create/operation.ts +++ b/sdk/keyvault/keyvault-certificates/src/lro/create/operation.ts @@ -10,7 +10,7 @@ import { CertificatePolicy, CertificateClientInterface } from "../../certificatesModels"; -import { CertificateOperation } from "../../core/models"; +import { CertificateOperation } from "../../generated/models"; /** * The public representation of the CreateCertificatePoller operation state. diff --git a/sdk/keyvault/keyvault-certificates/test/internal/userAgent.spec.ts b/sdk/keyvault/keyvault-certificates/test/internal/userAgent.spec.ts index b8758871c0e4..8ec7965324f5 100644 --- a/sdk/keyvault/keyvault-certificates/test/internal/userAgent.spec.ts +++ b/sdk/keyvault/keyvault-certificates/test/internal/userAgent.spec.ts @@ -3,8 +3,8 @@ import * as assert from "assert"; import { version } from "../../package.json"; -import { SDK_VERSION } from "../../src/core/utils/constants"; -import { packageVersion } from "../../src/core/keyVaultClientContext"; +import { SDK_VERSION } from "../../src/generated/utils/constants"; +import { packageVersion } from "../../src/generated/keyVaultClientContext"; describe("Certificates client's user agent", () => { // The tests follow diff --git a/sdk/keyvault/keyvault-certificates/typedoc.json b/sdk/keyvault/keyvault-certificates/typedoc.json index e2d6a7a75854..ee712dc67f39 100644 --- a/sdk/keyvault/keyvault-certificates/typedoc.json +++ b/sdk/keyvault/keyvault-certificates/typedoc.json @@ -3,6 +3,6 @@ "out": "../../../docGen/keyvault-certificates", "excludeNotExported": true, "excludePrivate": true, - "exclude": ["node_modules/**/*", "src/core/**/*"], + "exclude": ["node_modules/**/*", "src/generated/**/*"], "ignoreCompilerErrors": true } diff --git a/sdk/keyvault/keyvault-keys/.eslintignore b/sdk/keyvault/keyvault-keys/.eslintignore deleted file mode 100644 index c92bb15b91ea..000000000000 --- a/sdk/keyvault/keyvault-keys/.eslintignore +++ /dev/null @@ -1,2 +0,0 @@ -# Ignoring the core files since they're auto-generated. Eventually, the auto-generated code will be on par with our current eslint rules, but in the mean time we should ignore them. -src/core diff --git a/sdk/keyvault/keyvault-keys/package.json b/sdk/keyvault/keyvault-keys/package.json index 488bd135a187..8aa28dfeb3f8 100644 --- a/sdk/keyvault/keyvault-keys/package.json +++ b/sdk/keyvault/keyvault-keys/package.json @@ -73,11 +73,11 @@ "//metadata": { "constantPaths": [ { - "path": "src/core/keyVaultClientContext.ts", + "path": "src/generated/keyVaultClientContext.ts", "prefix": "packageVersion" }, { - "path": "src/core/utils/constants.ts", + "path": "src/generated/utils/constants.ts", "prefix": "SDK_VERSION" } ] diff --git a/sdk/keyvault/keyvault-keys/src/cryptographyClient.ts b/sdk/keyvault/keyvault-keys/src/cryptographyClient.ts index f3ac708bf8f0..dae0afd54c6f 100644 --- a/sdk/keyvault/keyvault-keys/src/cryptographyClient.ts +++ b/sdk/keyvault/keyvault-keys/src/cryptographyClient.ts @@ -23,9 +23,9 @@ import { import { getTracer } from "@azure/core-tracing"; import { Span } from "@opentelemetry/api"; import { logger } from "./log"; -import { parseKeyvaultIdentifier } from "./core/utils"; -import { SDK_VERSION } from "./core/utils/constants"; -import { KeyVaultClient } from "./core/keyVaultClient"; +import { parseKeyvaultIdentifier } from "./generated/utils"; +import { SDK_VERSION } from "./generated/utils/constants"; +import { KeyVaultClient } from "./generated/keyVaultClient"; import { challengeBasedAuthenticationPolicy } from "../../keyvault-common/src"; import { createHash as cryptoCreateHash, createVerify, publicEncrypt } from "crypto"; import * as constants from "constants"; diff --git a/sdk/keyvault/keyvault-keys/src/core/index.ts b/sdk/keyvault/keyvault-keys/src/generated/index.ts similarity index 100% rename from sdk/keyvault/keyvault-keys/src/core/index.ts rename to sdk/keyvault/keyvault-keys/src/generated/index.ts diff --git a/sdk/keyvault/keyvault-keys/src/core/keyVaultBase.ts b/sdk/keyvault/keyvault-keys/src/generated/keyVaultBase.ts similarity index 100% rename from sdk/keyvault/keyvault-keys/src/core/keyVaultBase.ts rename to sdk/keyvault/keyvault-keys/src/generated/keyVaultBase.ts diff --git a/sdk/keyvault/keyvault-keys/src/core/keyVaultClient.ts b/sdk/keyvault/keyvault-keys/src/generated/keyVaultClient.ts similarity index 100% rename from sdk/keyvault/keyvault-keys/src/core/keyVaultClient.ts rename to sdk/keyvault/keyvault-keys/src/generated/keyVaultClient.ts diff --git a/sdk/keyvault/keyvault-keys/src/core/keyVaultClientContext.ts b/sdk/keyvault/keyvault-keys/src/generated/keyVaultClientContext.ts similarity index 100% rename from sdk/keyvault/keyvault-keys/src/core/keyVaultClientContext.ts rename to sdk/keyvault/keyvault-keys/src/generated/keyVaultClientContext.ts diff --git a/sdk/keyvault/keyvault-keys/src/core/models/index.ts b/sdk/keyvault/keyvault-keys/src/generated/models/index.ts similarity index 100% rename from sdk/keyvault/keyvault-keys/src/core/models/index.ts rename to sdk/keyvault/keyvault-keys/src/generated/models/index.ts diff --git a/sdk/keyvault/keyvault-keys/src/core/models/mappers.ts b/sdk/keyvault/keyvault-keys/src/generated/models/mappers.ts similarity index 100% rename from sdk/keyvault/keyvault-keys/src/core/models/mappers.ts rename to sdk/keyvault/keyvault-keys/src/generated/models/mappers.ts diff --git a/sdk/keyvault/keyvault-keys/src/core/models/parameters.ts b/sdk/keyvault/keyvault-keys/src/generated/models/parameters.ts similarity index 100% rename from sdk/keyvault/keyvault-keys/src/core/models/parameters.ts rename to sdk/keyvault/keyvault-keys/src/generated/models/parameters.ts diff --git a/sdk/keyvault/keyvault-keys/src/core/utils.ts b/sdk/keyvault/keyvault-keys/src/generated/utils.ts similarity index 100% rename from sdk/keyvault/keyvault-keys/src/core/utils.ts rename to sdk/keyvault/keyvault-keys/src/generated/utils.ts diff --git a/sdk/keyvault/keyvault-keys/src/core/utils/constants.ts b/sdk/keyvault/keyvault-keys/src/generated/utils/constants.ts similarity index 100% rename from sdk/keyvault/keyvault-keys/src/core/utils/constants.ts rename to sdk/keyvault/keyvault-keys/src/generated/utils/constants.ts diff --git a/sdk/keyvault/keyvault-keys/src/index.ts b/sdk/keyvault/keyvault-keys/src/index.ts index f5412818a657..998595a67c27 100644 --- a/sdk/keyvault/keyvault-keys/src/index.ts +++ b/sdk/keyvault/keyvault-keys/src/index.ts @@ -36,9 +36,9 @@ import { RecoverDeletedKeyResponse, RestoreKeyResponse, UpdateKeyResponse -} from "./core/models"; -import { KeyVaultClient } from "./core/keyVaultClient"; -import { SDK_VERSION } from "./core/utils/constants"; +} from "./generated/models"; +import { KeyVaultClient } from "./generated/keyVaultClient"; +import { SDK_VERSION } from "./generated/utils/constants"; import { challengeBasedAuthenticationPolicy } from "../../keyvault-common/src"; import { DeleteKeyPoller } from "./lro/delete/poller"; @@ -77,7 +77,7 @@ import { LATEST_API_VERSION, CryptographyClientOptions } from "./keysModels"; -import { parseKeyvaultIdentifier as parseKeyvaultEntityIdentifier } from "./core/utils"; +import { parseKeyvaultIdentifier as parseKeyvaultEntityIdentifier } from "./generated/utils"; import { CryptographyClient, diff --git a/sdk/keyvault/keyvault-keys/src/keysModels.ts b/sdk/keyvault/keyvault-keys/src/keysModels.ts index 0307cd8bc8d9..c26222e701f7 100644 --- a/sdk/keyvault/keyvault-keys/src/keysModels.ts +++ b/sdk/keyvault/keyvault-keys/src/keysModels.ts @@ -2,7 +2,7 @@ // Licensed under the MIT license. import * as coreHttp from "@azure/core-http"; -import { DeletionRecoveryLevel } from "./core/models"; +import { DeletionRecoveryLevel } from "./generated/models"; /** * Defines values for EncryptionAlgorithm. diff --git a/sdk/keyvault/keyvault-keys/test/internal/userAgent.spec.ts b/sdk/keyvault/keyvault-keys/test/internal/userAgent.spec.ts index 6e5a998e6fc8..5dc88fdd1bf7 100644 --- a/sdk/keyvault/keyvault-keys/test/internal/userAgent.spec.ts +++ b/sdk/keyvault/keyvault-keys/test/internal/userAgent.spec.ts @@ -3,8 +3,8 @@ import * as assert from "assert"; import { version } from "../../package.json"; -import { SDK_VERSION } from "../../src/core/utils/constants"; -import { packageVersion } from "../../src/core/keyVaultClientContext"; +import { SDK_VERSION } from "../../src/generated/utils/constants"; +import { packageVersion } from "../../src/generated/keyVaultClientContext"; describe("Keys client's user agent", () => { // The tests follow diff --git a/sdk/keyvault/keyvault-keys/typedoc.json b/sdk/keyvault/keyvault-keys/typedoc.json index 3cf18e6dd77e..4b9d7ea9ac27 100644 --- a/sdk/keyvault/keyvault-keys/typedoc.json +++ b/sdk/keyvault/keyvault-keys/typedoc.json @@ -3,6 +3,6 @@ "out": "../../../docGen/keyvault-keys", "excludeNotExported": true, "excludePrivate": true, - "exclude": ["node_modules/**/*", "src/core/**/*"], + "exclude": ["node_modules/**/*", "src/generated/**/*"], "ignoreCompilerErrors": true } diff --git a/sdk/keyvault/keyvault-secrets/.eslintignore b/sdk/keyvault/keyvault-secrets/.eslintignore deleted file mode 100644 index c92bb15b91ea..000000000000 --- a/sdk/keyvault/keyvault-secrets/.eslintignore +++ /dev/null @@ -1,2 +0,0 @@ -# Ignoring the core files since they're auto-generated. Eventually, the auto-generated code will be on par with our current eslint rules, but in the mean time we should ignore them. -src/core diff --git a/sdk/keyvault/keyvault-secrets/package.json b/sdk/keyvault/keyvault-secrets/package.json index 706f319c3d15..93c729963ba7 100644 --- a/sdk/keyvault/keyvault-secrets/package.json +++ b/sdk/keyvault/keyvault-secrets/package.json @@ -76,11 +76,11 @@ "//metadata": { "constantPaths": [ { - "path": "src/core/keyVaultClientContext.ts", + "path": "src/generated/keyVaultClientContext.ts", "prefix": "packageVersion" }, { - "path": "src/core/utils/constants.ts", + "path": "src/generated/utils/constants.ts", "prefix": "SDK_VERSION" } ] diff --git a/sdk/keyvault/keyvault-secrets/src/core/index.ts b/sdk/keyvault/keyvault-secrets/src/generated/index.ts similarity index 100% rename from sdk/keyvault/keyvault-secrets/src/core/index.ts rename to sdk/keyvault/keyvault-secrets/src/generated/index.ts diff --git a/sdk/keyvault/keyvault-secrets/src/core/keyVaultBase.ts b/sdk/keyvault/keyvault-secrets/src/generated/keyVaultBase.ts similarity index 100% rename from sdk/keyvault/keyvault-secrets/src/core/keyVaultBase.ts rename to sdk/keyvault/keyvault-secrets/src/generated/keyVaultBase.ts diff --git a/sdk/keyvault/keyvault-secrets/src/core/keyVaultClient.ts b/sdk/keyvault/keyvault-secrets/src/generated/keyVaultClient.ts similarity index 100% rename from sdk/keyvault/keyvault-secrets/src/core/keyVaultClient.ts rename to sdk/keyvault/keyvault-secrets/src/generated/keyVaultClient.ts diff --git a/sdk/keyvault/keyvault-secrets/src/core/keyVaultClientContext.ts b/sdk/keyvault/keyvault-secrets/src/generated/keyVaultClientContext.ts similarity index 100% rename from sdk/keyvault/keyvault-secrets/src/core/keyVaultClientContext.ts rename to sdk/keyvault/keyvault-secrets/src/generated/keyVaultClientContext.ts diff --git a/sdk/keyvault/keyvault-secrets/src/core/models/index.ts b/sdk/keyvault/keyvault-secrets/src/generated/models/index.ts similarity index 100% rename from sdk/keyvault/keyvault-secrets/src/core/models/index.ts rename to sdk/keyvault/keyvault-secrets/src/generated/models/index.ts diff --git a/sdk/keyvault/keyvault-secrets/src/core/models/mappers.ts b/sdk/keyvault/keyvault-secrets/src/generated/models/mappers.ts similarity index 100% rename from sdk/keyvault/keyvault-secrets/src/core/models/mappers.ts rename to sdk/keyvault/keyvault-secrets/src/generated/models/mappers.ts diff --git a/sdk/keyvault/keyvault-secrets/src/core/models/parameters.ts b/sdk/keyvault/keyvault-secrets/src/generated/models/parameters.ts similarity index 100% rename from sdk/keyvault/keyvault-secrets/src/core/models/parameters.ts rename to sdk/keyvault/keyvault-secrets/src/generated/models/parameters.ts diff --git a/sdk/keyvault/keyvault-secrets/src/core/utils.ts b/sdk/keyvault/keyvault-secrets/src/generated/utils.ts similarity index 100% rename from sdk/keyvault/keyvault-secrets/src/core/utils.ts rename to sdk/keyvault/keyvault-secrets/src/generated/utils.ts diff --git a/sdk/keyvault/keyvault-secrets/src/core/utils/constants.ts b/sdk/keyvault/keyvault-secrets/src/generated/utils/constants.ts similarity index 100% rename from sdk/keyvault/keyvault-secrets/src/core/utils/constants.ts rename to sdk/keyvault/keyvault-secrets/src/generated/utils/constants.ts diff --git a/sdk/keyvault/keyvault-secrets/src/index.ts b/sdk/keyvault/keyvault-secrets/src/index.ts index a89829b7cc43..54e2795302d4 100644 --- a/sdk/keyvault/keyvault-secrets/src/index.ts +++ b/sdk/keyvault/keyvault-secrets/src/index.ts @@ -32,9 +32,9 @@ import { GetDeletedSecretResponse, BackupSecretResponse, RestoreSecretResponse -} from "./core/models"; -import { KeyVaultClient } from "./core/keyVaultClient"; -import { SDK_VERSION } from "./core/utils/constants"; +} from "./generated/models"; +import { KeyVaultClient } from "./generated/keyVaultClient"; +import { SDK_VERSION } from "./generated/utils/constants"; import { challengeBasedAuthenticationPolicy } from "../../keyvault-common/src"; import { DeleteSecretPoller } from "./lro/delete/poller"; @@ -63,7 +63,7 @@ import { SecretClientOptions, LATEST_API_VERSION } from "./secretsModels"; -import { parseKeyvaultIdentifier as parseKeyvaultEntityIdentifier } from "./core/utils"; +import { parseKeyvaultIdentifier as parseKeyvaultEntityIdentifier } from "./generated/utils"; export { SecretClientOptions, diff --git a/sdk/keyvault/keyvault-secrets/src/secretsModels.ts b/sdk/keyvault/keyvault-secrets/src/secretsModels.ts index 223e3a929c59..2e5d48d7dd93 100644 --- a/sdk/keyvault/keyvault-secrets/src/secretsModels.ts +++ b/sdk/keyvault/keyvault-secrets/src/secretsModels.ts @@ -2,7 +2,7 @@ // Licensed under the MIT license. import * as coreHttp from "@azure/core-http"; -import { DeletionRecoveryLevel } from "./core/models"; +import { DeletionRecoveryLevel } from "./generated/models"; /** * @internal diff --git a/sdk/keyvault/keyvault-secrets/test/internal/userAgent.spec.ts b/sdk/keyvault/keyvault-secrets/test/internal/userAgent.spec.ts index a4455589c5b6..841861a29ade 100644 --- a/sdk/keyvault/keyvault-secrets/test/internal/userAgent.spec.ts +++ b/sdk/keyvault/keyvault-secrets/test/internal/userAgent.spec.ts @@ -3,8 +3,8 @@ import * as assert from "assert"; import { version } from "../../package.json"; -import { SDK_VERSION } from "../../src/core/utils/constants"; -import { packageVersion } from "../../src/core/keyVaultClientContext"; +import { SDK_VERSION } from "../../src/generated/utils/constants"; +import { packageVersion } from "../../src/generated/keyVaultClientContext"; describe("Secrets client's user agent", () => { // The tests follow diff --git a/sdk/keyvault/keyvault-secrets/typedoc.json b/sdk/keyvault/keyvault-secrets/typedoc.json index 16778297ea8c..f0b700bd872a 100644 --- a/sdk/keyvault/keyvault-secrets/typedoc.json +++ b/sdk/keyvault/keyvault-secrets/typedoc.json @@ -3,6 +3,6 @@ "out": "../../../docGen/keyvault-secrets", "excludeNotExported": true, "excludePrivate": true, - "exclude": ["node_modules/**/*", "src/core/**/*"], + "exclude": ["node_modules/**/*", "src/generated/**/*"], "ignoreCompilerErrors": true }