diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index e7edfebdd3c5..12c92e914044 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -2290,7 +2290,7 @@ packages: resolution: {integrity: sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==} dependencies: '@types/connect': 3.4.35 - '@types/node': 14.18.33 + '@types/node': 18.11.9 dev: false /@types/chai-as-promised/7.1.5: @@ -2312,7 +2312,7 @@ packages: /@types/connect/3.4.35: resolution: {integrity: sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==} dependencies: - '@types/node': 14.18.33 + '@types/node': 18.11.9 dev: false /@types/cookie/0.4.1: @@ -2347,7 +2347,7 @@ packages: /@types/express-serve-static-core/4.17.31: resolution: {integrity: sha512-DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q==} dependencies: - '@types/node': 14.18.33 + '@types/node': 18.11.9 '@types/qs': 6.9.7 '@types/range-parser': 1.2.4 dev: false @@ -2364,20 +2364,20 @@ packages: /@types/fs-extra/8.1.2: resolution: {integrity: sha512-SvSrYXfWSc7R4eqnOzbQF4TZmfpNSM9FrSWLU3EUnWBuyZqNBOrv1B1JA3byUDPUl9z4Ab3jeZG2eDdySlgNMg==} dependencies: - '@types/node': 14.18.33 + '@types/node': 18.11.9 dev: false /@types/fs-extra/9.0.13: resolution: {integrity: sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==} dependencies: - '@types/node': 14.18.33 + '@types/node': 18.11.9 dev: false /@types/glob/7.2.0: resolution: {integrity: sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==} dependencies: '@types/minimatch': 5.1.2 - '@types/node': 14.18.33 + '@types/node': 18.11.9 dev: false /@types/inquirer/8.2.5: @@ -2389,7 +2389,7 @@ packages: /@types/is-buffer/2.0.0: resolution: {integrity: sha512-0f7N/e3BAz32qDYvgB4d2cqv1DqUwvGxHkXsrucICn8la1Vb6Yl6Eg8mPScGwUiqHJeE7diXlzaK+QMA9m4Gxw==} dependencies: - '@types/node': 14.18.33 + '@types/node': 18.11.9 dev: false /@types/json-schema/7.0.11: @@ -2403,13 +2403,13 @@ packages: /@types/jsonwebtoken/8.5.9: resolution: {integrity: sha512-272FMnFGzAVMGtu9tkr29hRL6bZj4Zs1KZNeHLnKqAvp06tAIcarTMwOh8/8bz4FmKRcMxZhZNeUAQsNLoiPhg==} dependencies: - '@types/node': 14.18.33 + '@types/node': 18.11.9 dev: false /@types/jws/3.2.4: resolution: {integrity: sha512-aqtH4dPw1wUjFZaeMD1ak/pf8iXlu/odFe+trJrvw0g1sTh93i+SCykg0Ek8C6B7rVK3oBORbfZAsKO7P10etg==} dependencies: - '@types/node': 14.18.33 + '@types/node': 18.11.9 dev: false /@types/md5/2.3.2: @@ -2445,13 +2445,13 @@ packages: /@types/mock-fs/4.13.1: resolution: {integrity: sha512-m6nFAJ3lBSnqbvDZioawRvpLXSaPyn52Srf7OfzjubYbYX8MTUdIgDxQl0wEapm4m/pNYSd9TXocpQ0TvZFlYA==} dependencies: - '@types/node': 14.18.33 + '@types/node': 18.11.9 dev: false /@types/mock-require/2.0.1: resolution: {integrity: sha512-O7U5DVGboY/Crueb5/huUCIRjKtRVRaLmRDbZJBlDQgJn966z3aiFDN+6AtYviu2ExwMkl34LjT/IiC0OPtKuQ==} dependencies: - '@types/node': 14.18.33 + '@types/node': 18.11.9 dev: false /@types/ms/0.7.31: @@ -2469,7 +2469,7 @@ packages: /@types/node-fetch/2.6.2: resolution: {integrity: sha512-DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A==} dependencies: - '@types/node': 14.18.33 + '@types/node': 18.11.9 form-data: 3.0.1 dev: false @@ -2528,7 +2528,7 @@ packages: /@types/resolve/1.17.1: resolution: {integrity: sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==} dependencies: - '@types/node': 14.18.33 + '@types/node': 18.11.9 dev: false /@types/semaphore/1.1.1: @@ -2539,7 +2539,7 @@ packages: resolution: {integrity: sha512-z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg==} dependencies: '@types/mime': 3.0.1 - '@types/node': 14.18.33 + '@types/node': 18.11.9 dev: false /@types/sinon/10.0.13: @@ -2561,13 +2561,13 @@ packages: /@types/stoppable/1.1.1: resolution: {integrity: sha512-b8N+fCADRIYYrGZOcmOR8ZNBOqhktWTB/bMUl5LvGtT201QKJZOOH5UsFyI3qtteM6ZAJbJqZoBcLqqxKIwjhw==} dependencies: - '@types/node': 14.18.33 + '@types/node': 18.11.9 dev: false /@types/through/0.0.30: resolution: {integrity: sha512-FvnCJljyxhPM3gkRgWmxmDZyAQSiBQQWLI0A0VFL0K7W1oRUrPJSqNO0NvTnLkBcotdlp3lKvaT0JrnyRDkzOg==} dependencies: - '@types/node': 14.18.33 + '@types/node': 18.11.9 dev: false /@types/tough-cookie/4.0.2: @@ -2581,13 +2581,13 @@ packages: /@types/tunnel/0.0.1: resolution: {integrity: sha512-AOqu6bQu5MSWwYvehMXLukFHnupHrpZ8nvgae5Ggie9UwzDR1CCwoXgSSWNZJuyOlCdfdsWMA5F2LlmvyoTv8A==} dependencies: - '@types/node': 14.18.33 + '@types/node': 18.11.9 dev: false /@types/tunnel/0.0.3: resolution: {integrity: sha512-sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA==} dependencies: - '@types/node': 14.18.33 + '@types/node': 18.11.9 dev: false /@types/underscore/1.11.4: @@ -2605,19 +2605,19 @@ packages: /@types/ws/7.4.7: resolution: {integrity: sha512-JQbbmxZTZehdc2iszGKs5oC3NFnjeay7mtAWrdt7qNtAVK0g19muApzAy4bm9byz79xa2ZnO/BOBC2R8RC5Lww==} dependencies: - '@types/node': 14.18.33 + '@types/node': 18.11.9 dev: false /@types/ws/8.5.3: resolution: {integrity: sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==} dependencies: - '@types/node': 14.18.33 + '@types/node': 18.11.9 dev: false /@types/xml2js/0.4.11: resolution: {integrity: sha512-JdigeAKmCyoJUiQljjr7tQG3if9NkqGUgwEUqBvV0N7LM4HyQk7UXCnusRa1lnvXAEYJ8mw8GtZWioagNztOwA==} dependencies: - '@types/node': 14.18.33 + '@types/node': 18.11.9 dev: false /@types/yargs-parser/21.0.0: @@ -2634,7 +2634,7 @@ packages: resolution: {integrity: sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==} requiresBuild: true dependencies: - '@types/node': 14.18.33 + '@types/node': 18.11.9 dev: false optional: true @@ -3712,7 +3712,7 @@ packages: resolution: {integrity: sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==} deprecated: Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797) dependencies: - ms: 2.1.1 + ms: 2.1.3 dev: false /debug/3.2.7: @@ -3937,7 +3937,7 @@ packages: dependencies: semver: 7.3.8 shelljs: 0.8.5 - typescript: 4.6.4 + typescript: 4.9.3 dev: false /ecdsa-sig-formatter/1.0.11: @@ -3988,7 +3988,7 @@ packages: dependencies: '@types/cookie': 0.4.1 '@types/cors': 2.8.12 - '@types/node': 14.18.33 + '@types/node': 18.11.9 accepts: 1.3.8 base64id: 2.0.0 cookie: 0.4.2 @@ -4999,7 +4999,7 @@ packages: fs.realpath: 1.0.0 inflight: 1.0.6 inherits: 2.0.4 - minimatch: 3.0.4 + minimatch: 3.1.2 once: 1.4.0 path-is-absolute: 1.0.1 dev: false @@ -12065,7 +12065,7 @@ packages: dev: false file:projects/arm-domainservices.tgz: - resolution: {integrity: sha512-nk+f/Uug0j3wHROJGL9/u5nzv3/F+knryEPeTxXNC3vVdX0K6KZ+69uktvEYP58vjD4ZOZ5phyXhD1Xvu04Qfg==, tarball: file:projects/arm-domainservices.tgz} + resolution: {integrity: sha512-kgkGE47pQtJKL7j1ikjRlfPDbvN+Pn4eJ9RGeAE27LiSI1J1iLHvloNfXX+G/IdoYaOcNkXcHWOBSvoFXp0gEw==, tarball: file:projects/arm-domainservices.tgz} name: '@rush-temp/arm-domainservices' version: 0.0.0 dependencies: @@ -12083,11 +12083,12 @@ packages: mocha: 7.2.0 rimraf: 3.0.2 rollup: 2.79.1 - rollup-plugin-sourcemaps: 0.6.3_1225c068d0546e507df7db46196a6444 + rollup-plugin-sourcemaps: 0.6.3_rollup@2.79.1 tslib: 2.4.1 - typescript: 4.8.4 + typescript: 4.6.4 uglify-js: 3.17.4 transitivePeerDependencies: + - '@types/node' - supports-color dev: false diff --git a/sdk/domainservices/arm-domainservices/CHANGELOG.md b/sdk/domainservices/arm-domainservices/CHANGELOG.md index 0755cde852ee..33d8f4cf8ccc 100644 --- a/sdk/domainservices/arm-domainservices/CHANGELOG.md +++ b/sdk/domainservices/arm-domainservices/CHANGELOG.md @@ -1,15 +1,21 @@ # Release History + +## 4.2.0 (2022-11-28) + +**Features** -## 4.1.1 (Unreleased) - -### Features Added - -### Breaking Changes - -### Bugs Fixed - -### Other Changes - + - Added Type Alias ChannelBinding + - Added Type Alias LdapSigning + - Added Type Alias SyncScope + - Interface DomainSecuritySettings has a new optional parameter channelBinding + - Interface DomainSecuritySettings has a new optional parameter ldapSigning + - Interface DomainService has a new optional parameter syncApplicationId + - Interface DomainService has a new optional parameter syncScope + - Added Enum KnownChannelBinding + - Added Enum KnownLdapSigning + - Added Enum KnownSyncScope + + ## 4.1.0 (2022-11-22) **Features** diff --git a/sdk/domainservices/arm-domainservices/_meta.json b/sdk/domainservices/arm-domainservices/_meta.json index 12aae7a32e6f..7be260522f11 100644 --- a/sdk/domainservices/arm-domainservices/_meta.json +++ b/sdk/domainservices/arm-domainservices/_meta.json @@ -1,8 +1,8 @@ { - "commit": "1f1d5b0b9ce6cc94605b2fd619dce374fb6e033a", - "readme": "specification\\domainservices\\resource-manager\\readme.md", - "autorest_command": "autorest --version=3.8.4 --typescript --modelerfour.lenient-model-deduplication --azure-arm --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=D:\\Git\\azure-sdk-for-js ..\\azure-rest-api-specs\\specification\\domainservices\\resource-manager\\readme.md --use=@autorest/typescript@6.0.0-rc.3.20221108.1 --generate-sample=true", + "commit": "be14580ad5bd53b47d70df09dd94e848cc0f7f6a", + "readme": "specification/domainservices/resource-manager/readme.md", + "autorest_command": "autorest --version=3.8.4 --typescript --modelerfour.lenient-model-deduplication --azure-arm --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-js ../azure-rest-api-specs/specification/domainservices/resource-manager/readme.md --use=@autorest/typescript@6.0.0-rc.2", "repository_url": "https://github.com/Azure/azure-rest-api-specs.git", - "release_tool": "@azure-tools/js-sdk-release-tools@2.4.2", - "use": "@autorest/typescript@6.0.0-rc.3.20221108.1" + "release_tool": "@azure-tools/js-sdk-release-tools@2.5.1", + "use": "@autorest/typescript@6.0.0-rc.2" } \ No newline at end of file diff --git a/sdk/domainservices/arm-domainservices/package.json b/sdk/domainservices/arm-domainservices/package.json index cd9458a0474e..1932aeadd9d3 100644 --- a/sdk/domainservices/arm-domainservices/package.json +++ b/sdk/domainservices/arm-domainservices/package.json @@ -3,7 +3,7 @@ "sdk-type": "mgmt", "author": "Microsoft Corporation", "description": "A generated SDK for DomainServicesResourceProvider.", - "version": "4.1.1", + "version": "4.2.0", "engines": { "node": ">=14.0.0" }, @@ -11,7 +11,7 @@ "@azure/core-lro": "^2.2.0", "@azure/abort-controller": "^1.0.0", "@azure/core-paging": "^1.2.0", - "@azure/core-client": "^1.6.1", + "@azure/core-client": "^1.5.0", "@azure/core-auth": "^1.3.0", "@azure/core-rest-pipeline": "^1.8.0", "tslib": "^2.2.0" @@ -36,7 +36,7 @@ "mkdirp": "^1.0.4", "rollup": "^2.66.1", "rollup-plugin-sourcemaps": "^0.6.3", - "typescript": "~4.8.0", + "typescript": "~4.6.0", "uglify-js": "^3.4.9", "rimraf": "^3.0.0", "@azure/identity": "^2.0.1", @@ -46,7 +46,6 @@ "@types/chai": "^4.2.8", "chai": "^4.2.0", "cross-env": "^7.0.2", - "@types/node": "^14.0.0", "@azure/dev-tool": "^1.0.0" }, "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/domainservices/arm-domainservices", @@ -110,13 +109,5 @@ } ] }, - "autoPublish": true, - "//sampleConfiguration": { - "productName": "", - "productSlugs": [ - "azure" - ], - "disableDocsMs": true, - "apiRefLink": "https://docs.microsoft.com/javascript/api/@azure/arm-domainservices?view=azure-node-preview" - } -} + "autoPublish": true +} \ No newline at end of file diff --git a/sdk/domainservices/arm-domainservices/review/arm-domainservices.api.md b/sdk/domainservices/arm-domainservices/review/arm-domainservices.api.md index 2f7fda68a70e..c5c8de5f7788 100644 --- a/sdk/domainservices/arm-domainservices/review/arm-domainservices.api.md +++ b/sdk/domainservices/arm-domainservices/review/arm-domainservices.api.md @@ -10,6 +10,9 @@ import { PagedAsyncIterableIterator } from '@azure/core-paging'; import { PollerLike } from '@azure/core-lro'; import { PollOperationState } from '@azure/core-lro'; +// @public +export type ChannelBinding = string; + // @public export interface CloudError { error?: CloudErrorBody; @@ -55,8 +58,10 @@ export type CreatedByType = string; // @public export interface DomainSecuritySettings { + channelBinding?: ChannelBinding; kerberosArmoring?: KerberosArmoring; kerberosRc4Encryption?: KerberosRc4Encryption; + ldapSigning?: LdapSigning; ntlmV1?: NtlmV1; syncKerberosPasswords?: SyncKerberosPasswords; syncNtlmPasswords?: SyncNtlmPasswords; @@ -79,7 +84,9 @@ export interface DomainService extends Resource { replicaSets?: ReplicaSet[]; resourceForestSettings?: ResourceForestSettings; sku?: string; + readonly syncApplicationId?: string; readonly syncOwner?: string; + syncScope?: SyncScope; readonly tenantId?: string; readonly version?: number; } @@ -222,9 +229,6 @@ export interface ForestTrust { trustPassword?: string; } -// @public -export function getContinuationToken(page: unknown): string | undefined; - // @public export interface HealthAlert { readonly id?: string; @@ -249,6 +253,12 @@ export type KerberosArmoring = string; // @public export type KerberosRc4Encryption = string; +// @public +export enum KnownChannelBinding { + Disabled = "Disabled", + Enabled = "Enabled" +} + // @public export enum KnownCreatedByType { Application = "Application", @@ -287,6 +297,12 @@ export enum KnownLdaps { Enabled = "Enabled" } +// @public +export enum KnownLdapSigning { + Disabled = "Disabled", + Enabled = "Enabled" +} + // @public export enum KnownNotifyDcAdmins { Disabled = "Disabled", @@ -333,6 +349,12 @@ export enum KnownSyncOnPremPasswords { Enabled = "Enabled" } +// @public +export enum KnownSyncScope { + All = "All", + CloudOnly = "CloudOnly" +} + // @public export enum KnownTlsV1 { Disabled = "Disabled", @@ -342,6 +364,9 @@ export enum KnownTlsV1 { // @public export type Ldaps = string; +// @public +export type LdapSigning = string; + // @public export interface LdapsSettings { readonly certificateNotAfter?: Date; @@ -542,6 +567,9 @@ export type SyncNtlmPasswords = string; // @public export type SyncOnPremPasswords = string; +// @public +export type SyncScope = string; + // @public export interface SystemData { createdAt?: Date; diff --git a/sdk/domainservices/arm-domainservices/src/domainServicesResourceProvider.ts b/sdk/domainservices/arm-domainservices/src/domainServicesResourceProvider.ts index ef5e00f29f75..6584a97abea3 100644 --- a/sdk/domainservices/arm-domainservices/src/domainServicesResourceProvider.ts +++ b/sdk/domainservices/arm-domainservices/src/domainServicesResourceProvider.ts @@ -61,19 +61,22 @@ export class DomainServicesResourceProvider extends coreClient.ServiceClient { credential: credentials }; - const packageDetails = `azsdk-js-arm-domainservices/4.1.1`; + const packageDetails = `azsdk-js-arm-domainservices/4.2.0`; const userAgentPrefix = options.userAgentOptions && options.userAgentOptions.userAgentPrefix ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}` : `${packageDetails}`; + if (!options.credentialScopes) { + options.credentialScopes = ["https://management.azure.com/.default"]; + } const optionsWithDefaults = { ...defaults, ...options, userAgentOptions: { userAgentPrefix }, - endpoint: + baseUri: options.endpoint ?? options.baseUri ?? "https://management.azure.com" }; super(optionsWithDefaults); @@ -99,9 +102,7 @@ export class DomainServicesResourceProvider extends coreClient.ServiceClient { this.pipeline.addPolicy( coreRestPipeline.bearerTokenAuthenticationPolicy({ credential: credentials, - scopes: - optionsWithDefaults.credentialScopes ?? - `${optionsWithDefaults.endpoint}/.default`, + scopes: `${optionsWithDefaults.credentialScopes}`, challengeCallbacks: { authorizeRequestOnChallenge: coreClient.authorizeRequestOnClaimChallenge @@ -114,7 +115,7 @@ export class DomainServicesResourceProvider extends coreClient.ServiceClient { // Assigning values to Constant parameters this.$host = options.$host || "https://management.azure.com"; - this.apiVersion = options.apiVersion || "2021-05-01"; + this.apiVersion = options.apiVersion || "2022-12-01"; this.domainServiceOperations = new DomainServiceOperationsImpl(this); this.domainServices = new DomainServicesImpl(this); this.ouContainerOperations = new OuContainerOperationsImpl(this); diff --git a/sdk/domainservices/arm-domainservices/src/index.ts b/sdk/domainservices/arm-domainservices/src/index.ts index 4cc94247b9bc..1fce94fefe1c 100644 --- a/sdk/domainservices/arm-domainservices/src/index.ts +++ b/sdk/domainservices/arm-domainservices/src/index.ts @@ -7,7 +7,6 @@ */ /// -export { getContinuationToken } from "./pagingHelper"; export * from "./models"; export { DomainServicesResourceProvider } from "./domainServicesResourceProvider"; export * from "./operationsInterfaces"; diff --git a/sdk/domainservices/arm-domainservices/src/models/index.ts b/sdk/domainservices/arm-domainservices/src/models/index.ts index bba4983a26c6..ca9b56e7a06b 100644 --- a/sdk/domainservices/arm-domainservices/src/models/index.ts +++ b/sdk/domainservices/arm-domainservices/src/models/index.ts @@ -241,6 +241,10 @@ export interface DomainSecuritySettings { kerberosRc4Encryption?: KerberosRc4Encryption; /** A flag to determine whether or not KerberosArmoring is enabled or disabled. */ kerberosArmoring?: KerberosArmoring; + /** A flag to determine whether or not LdapSigning is enabled or disabled. */ + ldapSigning?: LdapSigning; + /** A flag to determine whether or not ChannelBinding is enabled or disabled. */ + channelBinding?: ChannelBinding; } /** Settings for notification */ @@ -399,6 +403,11 @@ export interface DomainService extends Resource { * NOTE: This property will not be serialized. It can only be populated by the server. */ readonly syncOwner?: string; + /** + * The unique sync application id of the Azure AD Domain Services deployment. + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly syncApplicationId?: string; /** List of ReplicaSets */ replicaSets?: ReplicaSet[]; /** Secure LDAP Settings */ @@ -413,6 +422,8 @@ export interface DomainService extends Resource { sku?: string; /** Enabled or Disabled flag to turn on Group-based filtered sync */ filteredSync?: FilteredSync; + /** All or CloudOnly, All users in AAD are synced to AAD DS domain or only users actively syncing in the cloud */ + syncScope?: SyncScope; /** Notification Settings */ notificationSettings?: NotificationSettings; /** @@ -632,6 +643,42 @@ export enum KnownKerberosArmoring { */ export type KerberosArmoring = string; +/** Known values of {@link LdapSigning} that the service accepts. */ +export enum KnownLdapSigning { + /** Enabled */ + Enabled = "Enabled", + /** Disabled */ + Disabled = "Disabled" +} + +/** + * Defines values for LdapSigning. \ + * {@link KnownLdapSigning} can be used interchangeably with LdapSigning, + * this enum contains the known values that the service supports. + * ### Known values supported by the service + * **Enabled** \ + * **Disabled** + */ +export type LdapSigning = string; + +/** Known values of {@link ChannelBinding} that the service accepts. */ +export enum KnownChannelBinding { + /** Enabled */ + Enabled = "Enabled", + /** Disabled */ + Disabled = "Disabled" +} + +/** + * Defines values for ChannelBinding. \ + * {@link KnownChannelBinding} can be used interchangeably with ChannelBinding, + * this enum contains the known values that the service supports. + * ### Known values supported by the service + * **Enabled** \ + * **Disabled** + */ +export type ChannelBinding = string; + /** Known values of {@link FilteredSync} that the service accepts. */ export enum KnownFilteredSync { /** Enabled */ @@ -650,6 +697,24 @@ export enum KnownFilteredSync { */ export type FilteredSync = string; +/** Known values of {@link SyncScope} that the service accepts. */ +export enum KnownSyncScope { + /** All */ + All = "All", + /** CloudOnly */ + CloudOnly = "CloudOnly" +} + +/** + * Defines values for SyncScope. \ + * {@link KnownSyncScope} can be used interchangeably with SyncScope, + * this enum contains the known values that the service supports. + * ### Known values supported by the service + * **All** \ + * **CloudOnly** + */ +export type SyncScope = string; + /** Known values of {@link NotifyGlobalAdmins} that the service accepts. */ export enum KnownNotifyGlobalAdmins { /** Enabled */ diff --git a/sdk/domainservices/arm-domainservices/src/models/mappers.ts b/sdk/domainservices/arm-domainservices/src/models/mappers.ts index 4f3eea7f17ff..915900df15d5 100644 --- a/sdk/domainservices/arm-domainservices/src/models/mappers.ts +++ b/sdk/domainservices/arm-domainservices/src/models/mappers.ts @@ -537,6 +537,20 @@ export const DomainSecuritySettings: coreClient.CompositeMapper = { type: { name: "String" } + }, + ldapSigning: { + defaultValue: "Disabled", + serializedName: "ldapSigning", + type: { + name: "String" + } + }, + channelBinding: { + defaultValue: "Disabled", + serializedName: "channelBinding", + type: { + name: "String" + } } } } @@ -914,6 +928,13 @@ export const DomainService: coreClient.CompositeMapper = { name: "String" } }, + syncApplicationId: { + serializedName: "properties.syncApplicationId", + readOnly: true, + type: { + name: "String" + } + }, replicaSets: { serializedName: "properties.replicaSets", type: { @@ -965,6 +986,12 @@ export const DomainService: coreClient.CompositeMapper = { name: "String" } }, + syncScope: { + serializedName: "properties.syncScope", + type: { + name: "String" + } + }, notificationSettings: { serializedName: "properties.notificationSettings", type: { diff --git a/sdk/domainservices/arm-domainservices/src/models/parameters.ts b/sdk/domainservices/arm-domainservices/src/models/parameters.ts index 69de521bfcd9..b8ec1bf25332 100644 --- a/sdk/domainservices/arm-domainservices/src/models/parameters.ts +++ b/sdk/domainservices/arm-domainservices/src/models/parameters.ts @@ -43,7 +43,7 @@ export const $host: OperationURLParameter = { export const apiVersion: OperationQueryParameter = { parameterPath: "apiVersion", mapper: { - defaultValue: "2021-05-01", + defaultValue: "2022-12-01", isConstant: true, serializedName: "api-version", type: { diff --git a/sdk/domainservices/arm-domainservices/src/operations/domainServiceOperations.ts b/sdk/domainservices/arm-domainservices/src/operations/domainServiceOperations.ts index 5d3623b709a7..07ab6940eb53 100644 --- a/sdk/domainservices/arm-domainservices/src/operations/domainServiceOperations.ts +++ b/sdk/domainservices/arm-domainservices/src/operations/domainServiceOperations.ts @@ -6,8 +6,7 @@ * Changes may cause incorrect behavior and will be lost if the code is regenerated. */ -import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging"; -import { setContinuationToken } from "../pagingHelper"; +import { PagedAsyncIterableIterator } from "@azure/core-paging"; import { DomainServiceOperations } from "../operationsInterfaces"; import * as coreClient from "@azure/core-client"; import * as Mappers from "../models/mappers"; @@ -49,34 +48,22 @@ export class DomainServiceOperationsImpl implements DomainServiceOperations { [Symbol.asyncIterator]() { return this; }, - byPage: (settings?: PageSettings) => { - if (settings?.maxPageSize) { - throw new Error("maxPageSize is not supported by this operation."); - } - return this.listPagingPage(options, settings); + byPage: () => { + return this.listPagingPage(options); } }; } private async *listPagingPage( - options?: DomainServiceOperationsListOptionalParams, - settings?: PageSettings + options?: DomainServiceOperationsListOptionalParams ): AsyncIterableIterator { - let result: DomainServiceOperationsListResponse; - let continuationToken = settings?.continuationToken; - if (!continuationToken) { - result = await this._list(options); - let page = result.value || []; - continuationToken = result.nextLink; - setContinuationToken(page, continuationToken); - yield page; - } + let result = await this._list(options); + yield result.value || []; + let continuationToken = result.nextLink; while (continuationToken) { result = await this._listNext(continuationToken, options); continuationToken = result.nextLink; - let page = result.value || []; - setContinuationToken(page, continuationToken); - yield page; + yield result.value || []; } } diff --git a/sdk/domainservices/arm-domainservices/src/operations/domainServices.ts b/sdk/domainservices/arm-domainservices/src/operations/domainServices.ts index 1ea2759158c3..2bf4081b5d1b 100644 --- a/sdk/domainservices/arm-domainservices/src/operations/domainServices.ts +++ b/sdk/domainservices/arm-domainservices/src/operations/domainServices.ts @@ -6,8 +6,7 @@ * Changes may cause incorrect behavior and will be lost if the code is regenerated. */ -import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging"; -import { setContinuationToken } from "../pagingHelper"; +import { PagedAsyncIterableIterator } from "@azure/core-paging"; import { DomainServices } from "../operationsInterfaces"; import * as coreClient from "@azure/core-client"; import * as Mappers from "../models/mappers"; @@ -19,9 +18,9 @@ import { DomainService, DomainServicesListNextOptionalParams, DomainServicesListOptionalParams, - DomainServicesListResponse, DomainServicesListByResourceGroupNextOptionalParams, DomainServicesListByResourceGroupOptionalParams, + DomainServicesListResponse, DomainServicesListByResourceGroupResponse, DomainServicesCreateOrUpdateOptionalParams, DomainServicesCreateOrUpdateResponse, @@ -63,34 +62,22 @@ export class DomainServicesImpl implements DomainServices { [Symbol.asyncIterator]() { return this; }, - byPage: (settings?: PageSettings) => { - if (settings?.maxPageSize) { - throw new Error("maxPageSize is not supported by this operation."); - } - return this.listPagingPage(options, settings); + byPage: () => { + return this.listPagingPage(options); } }; } private async *listPagingPage( - options?: DomainServicesListOptionalParams, - settings?: PageSettings + options?: DomainServicesListOptionalParams ): AsyncIterableIterator { - let result: DomainServicesListResponse; - let continuationToken = settings?.continuationToken; - if (!continuationToken) { - result = await this._list(options); - let page = result.value || []; - continuationToken = result.nextLink; - setContinuationToken(page, continuationToken); - yield page; - } + let result = await this._list(options); + yield result.value || []; + let continuationToken = result.nextLink; while (continuationToken) { result = await this._listNext(continuationToken, options); continuationToken = result.nextLink; - let page = result.value || []; - setContinuationToken(page, continuationToken); - yield page; + yield result.value || []; } } @@ -121,33 +108,19 @@ export class DomainServicesImpl implements DomainServices { [Symbol.asyncIterator]() { return this; }, - byPage: (settings?: PageSettings) => { - if (settings?.maxPageSize) { - throw new Error("maxPageSize is not supported by this operation."); - } - return this.listByResourceGroupPagingPage( - resourceGroupName, - options, - settings - ); + byPage: () => { + return this.listByResourceGroupPagingPage(resourceGroupName, options); } }; } private async *listByResourceGroupPagingPage( resourceGroupName: string, - options?: DomainServicesListByResourceGroupOptionalParams, - settings?: PageSettings + options?: DomainServicesListByResourceGroupOptionalParams ): AsyncIterableIterator { - let result: DomainServicesListByResourceGroupResponse; - let continuationToken = settings?.continuationToken; - if (!continuationToken) { - result = await this._listByResourceGroup(resourceGroupName, options); - let page = result.value || []; - continuationToken = result.nextLink; - setContinuationToken(page, continuationToken); - yield page; - } + let result = await this._listByResourceGroup(resourceGroupName, options); + yield result.value || []; + let continuationToken = result.nextLink; while (continuationToken) { result = await this._listByResourceGroupNext( resourceGroupName, @@ -155,9 +128,7 @@ export class DomainServicesImpl implements DomainServices { options ); continuationToken = result.nextLink; - let page = result.value || []; - setContinuationToken(page, continuationToken); - yield page; + yield result.value || []; } } diff --git a/sdk/domainservices/arm-domainservices/src/operations/ouContainerOperationGrp.ts b/sdk/domainservices/arm-domainservices/src/operations/ouContainerOperationGrp.ts index dee64711bce0..21c38148988c 100644 --- a/sdk/domainservices/arm-domainservices/src/operations/ouContainerOperationGrp.ts +++ b/sdk/domainservices/arm-domainservices/src/operations/ouContainerOperationGrp.ts @@ -6,8 +6,7 @@ * Changes may cause incorrect behavior and will be lost if the code is regenerated. */ -import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging"; -import { setContinuationToken } from "../pagingHelper"; +import { PagedAsyncIterableIterator } from "@azure/core-paging"; import { OuContainerOperationGrp } from "../operationsInterfaces"; import * as coreClient from "@azure/core-client"; import * as Mappers from "../models/mappers"; @@ -68,15 +67,11 @@ export class OuContainerOperationGrpImpl implements OuContainerOperationGrp { [Symbol.asyncIterator]() { return this; }, - byPage: (settings?: PageSettings) => { - if (settings?.maxPageSize) { - throw new Error("maxPageSize is not supported by this operation."); - } + byPage: () => { return this.listPagingPage( resourceGroupName, domainServiceName, - options, - settings + options ); } }; @@ -85,18 +80,15 @@ export class OuContainerOperationGrpImpl implements OuContainerOperationGrp { private async *listPagingPage( resourceGroupName: string, domainServiceName: string, - options?: OuContainerListOptionalParams, - settings?: PageSettings + options?: OuContainerListOptionalParams ): AsyncIterableIterator { - let result: OuContainerListResponse; - let continuationToken = settings?.continuationToken; - if (!continuationToken) { - result = await this._list(resourceGroupName, domainServiceName, options); - let page = result.value || []; - continuationToken = result.nextLink; - setContinuationToken(page, continuationToken); - yield page; - } + let result = await this._list( + resourceGroupName, + domainServiceName, + options + ); + yield result.value || []; + let continuationToken = result.nextLink; while (continuationToken) { result = await this._listNext( resourceGroupName, @@ -105,9 +97,7 @@ export class OuContainerOperationGrpImpl implements OuContainerOperationGrp { options ); continuationToken = result.nextLink; - let page = result.value || []; - setContinuationToken(page, continuationToken); - yield page; + yield result.value || []; } } diff --git a/sdk/domainservices/arm-domainservices/src/operations/ouContainerOperations.ts b/sdk/domainservices/arm-domainservices/src/operations/ouContainerOperations.ts index 0c4e52ce4e57..638cf4d97c28 100644 --- a/sdk/domainservices/arm-domainservices/src/operations/ouContainerOperations.ts +++ b/sdk/domainservices/arm-domainservices/src/operations/ouContainerOperations.ts @@ -6,8 +6,7 @@ * Changes may cause incorrect behavior and will be lost if the code is regenerated. */ -import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging"; -import { setContinuationToken } from "../pagingHelper"; +import { PagedAsyncIterableIterator } from "@azure/core-paging"; import { OuContainerOperations } from "../operationsInterfaces"; import * as coreClient from "@azure/core-client"; import * as Mappers from "../models/mappers"; @@ -49,34 +48,22 @@ export class OuContainerOperationsImpl implements OuContainerOperations { [Symbol.asyncIterator]() { return this; }, - byPage: (settings?: PageSettings) => { - if (settings?.maxPageSize) { - throw new Error("maxPageSize is not supported by this operation."); - } - return this.listPagingPage(options, settings); + byPage: () => { + return this.listPagingPage(options); } }; } private async *listPagingPage( - options?: OuContainerOperationsListOptionalParams, - settings?: PageSettings + options?: OuContainerOperationsListOptionalParams ): AsyncIterableIterator { - let result: OuContainerOperationsListResponse; - let continuationToken = settings?.continuationToken; - if (!continuationToken) { - result = await this._list(options); - let page = result.value || []; - continuationToken = result.nextLink; - setContinuationToken(page, continuationToken); - yield page; - } + let result = await this._list(options); + yield result.value || []; + let continuationToken = result.nextLink; while (continuationToken) { result = await this._listNext(continuationToken, options); continuationToken = result.nextLink; - let page = result.value || []; - setContinuationToken(page, continuationToken); - yield page; + yield result.value || []; } } diff --git a/sdk/domainservices/arm-domainservices/src/pagingHelper.ts b/sdk/domainservices/arm-domainservices/src/pagingHelper.ts deleted file mode 100644 index d85fc13bce1e..000000000000 --- a/sdk/domainservices/arm-domainservices/src/pagingHelper.ts +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) Microsoft Corporation. - * Licensed under the MIT License. - * - * Code generated by Microsoft (R) AutoRest Code Generator. - * Changes may cause incorrect behavior and will be lost if the code is regenerated. - */ - -export interface PageInfo { - continuationToken?: string; -} - -const pageMap = new WeakMap(); - -/** - * Given a result page from a pageable operation, returns a - * continuation token that can be used to begin paging from - * that point later. - * @param page A result object from calling .byPage() on a paged operation. - * @returns The continuation token that can be passed into byPage(). - */ -export function getContinuationToken(page: unknown): string | undefined { - if (typeof page !== "object" || page === null) { - return undefined; - } - return pageMap.get(page)?.continuationToken; -} - -export function setContinuationToken( - page: unknown, - continuationToken: string | undefined -): void { - if (typeof page !== "object" || page === null || !continuationToken) { - return; - } - const pageInfo = pageMap.get(page) ?? {}; - pageInfo.continuationToken = continuationToken; - pageMap.set(page, pageInfo); -} diff --git a/sdk/domainservices/arm-domainservices/tsconfig.json b/sdk/domainservices/arm-domainservices/tsconfig.json index b5a74cbfe488..3e6ae96443f3 100644 --- a/sdk/domainservices/arm-domainservices/tsconfig.json +++ b/sdk/domainservices/arm-domainservices/tsconfig.json @@ -15,17 +15,11 @@ ], "declaration": true, "outDir": "./dist-esm", - "importHelpers": true, - "paths": { - "@azure/arm-domainservices": [ - "./src/index" - ] - } + "importHelpers": true }, "include": [ "./src/**/*.ts", - "./test/**/*.ts", - "samples-dev/**/*.ts" + "./test/**/*.ts" ], "exclude": [ "node_modules"