diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 26dd81248d97..a88c5fc1dc4a 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -3928,7 +3928,7 @@ packages: dependencies: semver: 7.3.8 shelljs: 0.8.5 - typescript: 5.0.0-dev.20221128 + typescript: 5.0.0-dev.20221201 dev: false /downlevel-dts/0.8.0: @@ -8972,8 +8972,8 @@ packages: hasBin: true dev: false - /typescript/5.0.0-dev.20221128: - resolution: {integrity: sha512-cNV/osEHGNKTyjj/Ivi8s8x7MPkh0Kd/t53QjyXfM3jO3cC2jhL6kor57ziWqvyfl6paWjdNUVO/jxGsQOyfug==} + /typescript/5.0.0-dev.20221201: + resolution: {integrity: sha512-0GunPFtrZITqx11PJQThb8MdXJwjk88mhOgNBXeme1d9i0mJzymceJysDpwu6sfajognk2yiN86P82xAvbJ0Lw==} engines: {node: '>=4.2.0'} hasBin: true dev: false @@ -10136,7 +10136,7 @@ packages: dev: false file:projects/app-configuration.tgz: - resolution: {integrity: sha512-qMJ4lF5xn+N1xqlLqtBC2XUXjlcK4Zkdje7AIRdRJg7b1nNZSyRffxYAD2pbxHtVTNvMJH128ZP/FOL1pbMkyg==, tarball: file:projects/app-configuration.tgz} + resolution: {integrity: sha512-NgRh+H5HMhNgiANqQHaI+TZiKVds3XwKZetdRU8wUUISh8XOiVglw3oqALR/0JdwnLC1DMNNilT1kxHyCn6shw==, tarball: file:projects/app-configuration.tgz} name: '@rush-temp/app-configuration' version: 0.0.0 dependencies: @@ -11509,9 +11509,9 @@ packages: '@rollup/plugin-json': 4.1.0_rollup@2.79.1 '@rollup/plugin-multi-entry': 4.1.0_rollup@2.79.1 '@rollup/plugin-node-resolve': 13.3.0_rollup@2.79.1 - '@types/chai': 4.3.3 + '@types/chai': 4.3.4 '@types/node': 14.18.33 - chai: 4.3.6 + chai: 4.3.7 cross-env: 7.0.3 mkdirp: 1.0.4 mocha: 7.2.0 @@ -11564,9 +11564,9 @@ packages: '@rollup/plugin-json': 4.1.0_rollup@2.79.1 '@rollup/plugin-multi-entry': 4.1.0_rollup@2.79.1 '@rollup/plugin-node-resolve': 13.3.0_rollup@2.79.1 - '@types/chai': 4.3.3 + '@types/chai': 4.3.4 '@types/node': 14.18.33 - chai: 4.3.6 + chai: 4.3.7 cross-env: 7.0.3 mkdirp: 1.0.4 mocha: 7.2.0 @@ -11592,9 +11592,9 @@ packages: '@rollup/plugin-json': 4.1.0_rollup@2.79.1 '@rollup/plugin-multi-entry': 4.1.0_rollup@2.79.1 '@rollup/plugin-node-resolve': 13.3.0_rollup@2.79.1 - '@types/chai': 4.3.3 + '@types/chai': 4.3.4 '@types/node': 14.18.33 - chai: 4.3.6 + chai: 4.3.7 cross-env: 7.0.3 mkdirp: 1.0.4 mocha: 7.2.0 @@ -12508,7 +12508,7 @@ packages: dev: false file:projects/arm-healthcareapis.tgz: - resolution: {integrity: sha512-41r3LlnQx9Qw7Bl2VkkoFWA8A19CldqH/fnfGJGlZ/VgYpSMRUlOuckPfkiZJcU9iuuIjCsuqDK3FJDVmR2lkw==, tarball: file:projects/arm-healthcareapis.tgz} + resolution: {integrity: sha512-+DieeH0fWaUOOYC0c+t8yxNC6uRbxpviZHNrxaw4oR2p765mcW2OTQVYASBMsOuNYkDmfGXcB7I37StZnOL1qA==, tarball: file:projects/arm-healthcareapis.tgz} name: '@rush-temp/arm-healthcareapis' version: 0.0.0 dependencies: @@ -12527,11 +12527,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 @@ -15598,7 +15599,7 @@ packages: dev: false file:projects/communication-alpha-ids.tgz: - resolution: {integrity: sha512-VDawX81b68aByEGinY3gez7Fl3WjFtR2KAmBcf1nIcf3aLxBBQo/Fltm7999/Yps8kV2/moq85W60VuoDea0yg==, tarball: file:projects/communication-alpha-ids.tgz} + resolution: {integrity: sha512-TUbgIvlOHzobouXg8NiwFMKqCedHZsVzCnFEn+UlWaZTT2BeSUVUXHaqS+4L3MxvS29jjC4UaDXO9vUMsL5s2w==, tarball: file:projects/communication-alpha-ids.tgz} name: '@rush-temp/communication-alpha-ids' version: 0.0.0 dependencies: @@ -15640,7 +15641,7 @@ packages: dev: false file:projects/communication-chat.tgz: - resolution: {integrity: sha512-2lYLaPdw2iqjdSTXbDn+XB1ZVmBmmA/8S+s9n1+lpmSUQpyS/SaIGiF3CfSDd18Bn3SXImo38wRI6O/f0h1AWQ==, tarball: file:projects/communication-chat.tgz} + resolution: {integrity: sha512-oPMnnfgoyDbUuw52rbeatteCxxxZYOWBwK/hEHHiElQlsyXxpZ95yddki60JvlON1N5xYdVDLqEzadVtFMMc8Q==, tarball: file:projects/communication-chat.tgz} name: '@rush-temp/communication-chat' version: 0.0.0 dependencies: @@ -15734,7 +15735,7 @@ packages: dev: false file:projects/communication-email.tgz: - resolution: {integrity: sha512-dMoeydxb3Z7UZR57tB7tQBpbX94B23M9igELXy2kb8+LCMwf5MOajIvOFNdWleSPD0DDIFOuKBZ/vD9U8jWmAw==, tarball: file:projects/communication-email.tgz} + resolution: {integrity: sha512-DdaO6/tvliL35FritJw5WlO3eZTs7pP8x6AKS7hBTb6szkzixFVKaOfNZDi/5N/KrFR1Ghb2f4KMG93bhXODjw==, tarball: file:projects/communication-email.tgz} name: '@rush-temp/communication-email' version: 0.0.0 dependencies: @@ -15775,7 +15776,7 @@ packages: dev: false file:projects/communication-identity.tgz: - resolution: {integrity: sha512-mI7X0TJ/8P5JQJ6V953iVrcutDIj3Mmcwt51TPX4SWn9GFm4JrNKU3WweuEnwQ7FBru413rwf8Ymwte9PVsQMA==, tarball: file:projects/communication-identity.tgz} + resolution: {integrity: sha512-Ql6y+rpT2v6a0lAKv+YiWuhym6q/1X7+9EfWhphDIclrzyOMzgQt6GPCZdZ7YmCBhlYyeIiin26mHDVB6PLlHA==, tarball: file:projects/communication-identity.tgz} name: '@rush-temp/communication-identity' version: 0.0.0 dependencies: @@ -15820,7 +15821,7 @@ packages: dev: false file:projects/communication-job-router.tgz: - resolution: {integrity: sha512-UQIAjzokL3UPlFW+cKP3w0BnUIoku1Tix+cx0F0pxR6E7CS4u/fudugSdM7J+Ph6OGRAPLj/V1qHAhKw31vHGg==, tarball: file:projects/communication-job-router.tgz} + resolution: {integrity: sha512-/i/QMGXP/g10uWLW/0Wrait10N30QJaEJKnNioHUwg6wLgaZKnKkGQCyZgbHKAB7o8rkQsNSLIYBz920/Mt1Fg==, tarball: file:projects/communication-job-router.tgz} name: '@rush-temp/communication-job-router' version: 0.0.0 dependencies: @@ -15872,7 +15873,7 @@ packages: dev: false file:projects/communication-network-traversal.tgz: - resolution: {integrity: sha512-L175Qmvu6ZaANsSRWLB6/EH34BtueeoUzB5HMYgjDmuf6L5+WQWUbymEesifIs31WT40hbGqeNrqZdnflZUKfA==, tarball: file:projects/communication-network-traversal.tgz} + resolution: {integrity: sha512-8BxjW4TN+CR+jUFtm7WWGCLTSlmwVL5tHETlolRYZ4pT7mbg5u5U4g90FNC2cuVcWD21efKwcxwqtG7YuPF3pw==, tarball: file:projects/communication-network-traversal.tgz} name: '@rush-temp/communication-network-traversal' version: 0.0.0 dependencies: @@ -15927,7 +15928,7 @@ packages: dev: false file:projects/communication-phone-numbers.tgz: - resolution: {integrity: sha512-n0WldmZ9534KNR/6j+TCBqsqEhFNjYwEnRVAJFeIUxpe3aTmDRg7uRgV+dVacjLn31xKpGe7bQ3kCFIgNWFOJw==, tarball: file:projects/communication-phone-numbers.tgz} + resolution: {integrity: sha512-HFnOQQou0XwLnN9oEwbjSxt41+JwJm2ZO/+Fh9gnnPfUgWqMIMHcR75ty0tZQQN54py1TiqCFvy4nAjX3fiPvQ==, tarball: file:projects/communication-phone-numbers.tgz} name: '@rush-temp/communication-phone-numbers' version: 0.0.0 dependencies: @@ -15970,7 +15971,7 @@ packages: dev: false file:projects/communication-rooms.tgz: - resolution: {integrity: sha512-IRP/zZ5/gbGVX7O1X6+Adl0loPhQAmnvTNZEr4IIWLC035nQR+uhlUUiSbxb2U8CuZgzT7V2spjnGyZASlkp+g==, tarball: file:projects/communication-rooms.tgz} + resolution: {integrity: sha512-lEzSLkRu+lvfpF5+CCS2gZBsePd83N9snbeMwCMZFNaTZBY5SWJaa5XlhD5cUN0r+VhJqjoe+lMkUbN/eBHczQ==, tarball: file:projects/communication-rooms.tgz} name: '@rush-temp/communication-rooms' version: 0.0.0 dependencies: @@ -16005,7 +16006,7 @@ packages: dev: false file:projects/communication-short-codes.tgz: - resolution: {integrity: sha512-lNSE8Yij50hCyTd2WLkKvu2RCpAx1Q8KxpcpB34Jx+OObP7FEdmluMg6wIBzg8Nn3JTSLrDqefAIpqYsiXYQBw==, tarball: file:projects/communication-short-codes.tgz} + resolution: {integrity: sha512-2k+OTIQ2mAyM8TkxQ86T5yO7JSmaLLEmKXLAxKr64hjhs3tlwtUigjhBB2vDyvxefN1iCCDNxre3LLG2XxBmkg==, tarball: file:projects/communication-short-codes.tgz} name: '@rush-temp/communication-short-codes' version: 0.0.0 dependencies: @@ -16050,7 +16051,7 @@ packages: dev: false file:projects/communication-sms.tgz: - resolution: {integrity: sha512-VgXFc2IfQO20WBo9OG2V24nCTAqZfbz+ISha192BPkr6ZNm9o0p1ttxiifbKnl9CgtLWFDRekzSwTtjHmBpJjg==, tarball: file:projects/communication-sms.tgz} + resolution: {integrity: sha512-WgKEMxyh2xqT49oPWNaFMEG4rvlN5l1fdefZKe/P1VsnTg8YOWjV8ykQupaZtSIyfgi1XsjcGCFHDe0Yk69rOQ==, tarball: file:projects/communication-sms.tgz} name: '@rush-temp/communication-sms' version: 0.0.0 dependencies: @@ -19855,7 +19856,7 @@ packages: dev: false file:projects/test-utils.tgz: - resolution: {integrity: sha512-Dmo3usvsR7NnLEgv9M03xcaCz6X3l0bamstzq95KLC3Rzt88e8h1hLb6TFZoSBV1EvlLNQUkMI2uHPHpI9W7WQ==, tarball: file:projects/test-utils.tgz} + resolution: {integrity: sha512-YZE/nBZ4/+anJj7A4z2j6eyOuG135QH3mzaCUQs/MEtp4xaTK5hjmwugvY64f3hYeM2l7EEINQrpLhIQ3Boc3w==, tarball: file:projects/test-utils.tgz} name: '@rush-temp/test-utils' version: 0.0.0 dependencies: @@ -19885,7 +19886,6 @@ packages: transitivePeerDependencies: - bufferutil - debug - - encoding - supports-color - utf-8-validate dev: false diff --git a/sdk/healthcareapis/arm-healthcareapis/CHANGELOG.md b/sdk/healthcareapis/arm-healthcareapis/CHANGELOG.md index 8dbc990984b8..9bf5d8ebf1b2 100644 --- a/sdk/healthcareapis/arm-healthcareapis/CHANGELOG.md +++ b/sdk/healthcareapis/arm-healthcareapis/CHANGELOG.md @@ -1,15 +1,22 @@ # Release History + +## 2.3.0 (2022-12-01) + +**Features** -## 2.2.1 (Unreleased) - -### Features Added - -### Breaking Changes - -### Bugs Fixed - -### Other Changes - + - Added Interface CorsConfiguration + - Added Interface FhirServiceImportConfiguration + - Added Interface ServiceImportConfigurationInfo + - Interface DicomService has a new optional parameter corsConfiguration + - Interface FhirService has a new optional parameter importConfiguration + - Interface MetricSpecification has a new optional parameter enableRegionalMdmAccount + - Interface MetricSpecification has a new optional parameter isInternal + - Interface MetricSpecification has a new optional parameter metricFilterPattern + - Interface MetricSpecification has a new optional parameter resourceIdDimensionNameOverride + - Interface MetricSpecification has a new optional parameter sourceMdmAccount + - Interface ServicesProperties has a new optional parameter importConfiguration + + ## 2.2.0 (2022-11-25) **Features** diff --git a/sdk/healthcareapis/arm-healthcareapis/_meta.json b/sdk/healthcareapis/arm-healthcareapis/_meta.json index a03927738859..e670991f70ab 100644 --- a/sdk/healthcareapis/arm-healthcareapis/_meta.json +++ b/sdk/healthcareapis/arm-healthcareapis/_meta.json @@ -1,8 +1,8 @@ { - "commit": "c583b05741fadfdca116be3b9ccb1c4be8a73258", + "commit": "b8a8ddaec558489206a4803e3d7575ebf624d4fe", "readme": "specification/healthcareapis/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\\healthcareapis\\resource-manager\\readme.md --use=@autorest/typescript@6.0.0-rc.3.20221108.1 --generate-sample=true", + "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/healthcareapis/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/healthcareapis/arm-healthcareapis/package.json b/sdk/healthcareapis/arm-healthcareapis/package.json index 9fb6333e2eec..7bc81dc75d96 100644 --- a/sdk/healthcareapis/arm-healthcareapis/package.json +++ b/sdk/healthcareapis/arm-healthcareapis/package.json @@ -3,7 +3,7 @@ "sdk-type": "mgmt", "author": "Microsoft Corporation", "description": "A generated SDK for HealthcareApisManagementClient.", - "version": "2.2.1", + "version": "2.3.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/healthcareapis/arm-healthcareapis", @@ -110,13 +109,5 @@ } ] }, - "autoPublish": true, - "//sampleConfiguration": { - "productName": "", - "productSlugs": [ - "azure" - ], - "disableDocsMs": true, - "apiRefLink": "https://docs.microsoft.com/javascript/api/@azure/arm-healthcareapis?view=azure-node-preview" - } -} + "autoPublish": true +} \ No newline at end of file diff --git a/sdk/healthcareapis/arm-healthcareapis/review/arm-healthcareapis.api.md b/sdk/healthcareapis/arm-healthcareapis/review/arm-healthcareapis.api.md index 2c2e6499644d..bfd62d8f44ac 100644 --- a/sdk/healthcareapis/arm-healthcareapis/review/arm-healthcareapis.api.md +++ b/sdk/healthcareapis/arm-healthcareapis/review/arm-healthcareapis.api.md @@ -19,12 +19,22 @@ export interface CheckNameAvailabilityParameters { type: string; } +// @public +export interface CorsConfiguration { + allowCredentials?: boolean; + headers?: string[]; + maxAge?: number; + methods?: string[]; + origins?: string[]; +} + // @public export type CreatedByType = string; // @public export interface DicomService extends TaggedResource, ServiceManagedIdentity { authenticationConfiguration?: DicomServiceAuthenticationConfiguration; + corsConfiguration?: CorsConfiguration; readonly privateEndpointConnections?: PrivateEndpointConnection[]; readonly provisioningState?: ProvisioningState; publicNetworkAccess?: PublicNetworkAccess; @@ -152,6 +162,7 @@ export interface FhirService extends TaggedResource, ServiceManagedIdentity { corsConfiguration?: FhirServiceCorsConfiguration; readonly eventState?: ServiceEventState; exportConfiguration?: FhirServiceExportConfiguration; + importConfiguration?: FhirServiceImportConfiguration; kind?: FhirServiceKind; readonly privateEndpointConnections?: PrivateEndpointConnection[]; readonly provisioningState?: ProvisioningState; @@ -198,6 +209,13 @@ export interface FhirServiceExportConfiguration { storageAccountName?: string; } +// @public +export interface FhirServiceImportConfiguration { + enabled?: boolean; + initialImportMode?: boolean; + integrationDataStore?: string; +} + // @public export type FhirServiceKind = string; @@ -262,9 +280,6 @@ export interface FhirServicesUpdateOptionalParams extends coreClient.OperationOp // @public export type FhirServicesUpdateResponse = FhirService; -// @public -export function getContinuationToken(page: unknown): string | undefined; - // @public (undocumented) export class HealthcareApisManagementClient extends coreClient.ServiceClient { // (undocumented) @@ -595,8 +610,13 @@ export interface MetricSpecification { dimensions?: MetricDimension[]; displayDescription?: string; displayName?: string; + enableRegionalMdmAccount?: boolean; fillGapWithZero?: boolean; + isInternal?: boolean; + metricFilterPattern?: string; name?: string; + resourceIdDimensionNameOverride?: string; + sourceMdmAccount?: string; sourceMdmNamespace?: string; supportedAggregationTypes?: string[]; supportedTimeGrainTypes?: string[]; @@ -863,6 +883,13 @@ export interface ServiceExportConfigurationInfo { storageAccountName?: string; } +// @public +export interface ServiceImportConfigurationInfo { + enabled?: boolean; + initialImportMode?: boolean; + integrationDataStore?: string; +} + // @public export interface ServiceManagedIdentity { identity?: ServiceManagedIdentityIdentity; @@ -1003,6 +1030,7 @@ export interface ServicesProperties { corsConfiguration?: ServiceCorsConfigurationInfo; cosmosDbConfiguration?: ServiceCosmosDbConfigurationInfo; exportConfiguration?: ServiceExportConfigurationInfo; + importConfiguration?: ServiceImportConfigurationInfo; privateEndpointConnections?: PrivateEndpointConnection[]; readonly provisioningState?: ProvisioningState; publicNetworkAccess?: PublicNetworkAccess; diff --git a/sdk/healthcareapis/arm-healthcareapis/src/healthcareApisManagementClient.ts b/sdk/healthcareapis/arm-healthcareapis/src/healthcareApisManagementClient.ts index bb4d3344229e..87135a5bbc7e 100644 --- a/sdk/healthcareapis/arm-healthcareapis/src/healthcareApisManagementClient.ts +++ b/sdk/healthcareapis/arm-healthcareapis/src/healthcareApisManagementClient.ts @@ -78,19 +78,22 @@ export class HealthcareApisManagementClient extends coreClient.ServiceClient { credential: credentials }; - const packageDetails = `azsdk-js-arm-healthcareapis/2.2.1`; + const packageDetails = `azsdk-js-arm-healthcareapis/2.3.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); @@ -116,9 +119,7 @@ export class HealthcareApisManagementClient extends coreClient.ServiceClient { this.pipeline.addPolicy( coreRestPipeline.bearerTokenAuthenticationPolicy({ credential: credentials, - scopes: - optionsWithDefaults.credentialScopes ?? - `${optionsWithDefaults.endpoint}/.default`, + scopes: `${optionsWithDefaults.credentialScopes}`, challengeCallbacks: { authorizeRequestOnChallenge: coreClient.authorizeRequestOnClaimChallenge @@ -131,7 +132,7 @@ export class HealthcareApisManagementClient extends coreClient.ServiceClient { // Assigning values to Constant parameters this.$host = options.$host || "https://management.azure.com"; - this.apiVersion = options.apiVersion || "2021-11-01"; + this.apiVersion = options.apiVersion || "2022-06-01"; this.services = new ServicesImpl(this); this.privateEndpointConnections = new PrivateEndpointConnectionsImpl(this); this.privateLinkResources = new PrivateLinkResourcesImpl(this); diff --git a/sdk/healthcareapis/arm-healthcareapis/src/index.ts b/sdk/healthcareapis/arm-healthcareapis/src/index.ts index e624ecb82b8f..e13cb006361f 100644 --- a/sdk/healthcareapis/arm-healthcareapis/src/index.ts +++ b/sdk/healthcareapis/arm-healthcareapis/src/index.ts @@ -7,7 +7,6 @@ */ /// -export { getContinuationToken } from "./pagingHelper"; export * from "./models"; export { HealthcareApisManagementClient } from "./healthcareApisManagementClient"; export * from "./operationsInterfaces"; diff --git a/sdk/healthcareapis/arm-healthcareapis/src/models/index.ts b/sdk/healthcareapis/arm-healthcareapis/src/models/index.ts index ad5104818263..5353d1bb47d4 100644 --- a/sdk/healthcareapis/arm-healthcareapis/src/models/index.ts +++ b/sdk/healthcareapis/arm-healthcareapis/src/models/index.ts @@ -31,6 +31,8 @@ export interface ServicesProperties { publicNetworkAccess?: PublicNetworkAccess; /** The azure container registry settings used for convert data operation of the service instance. */ acrConfiguration?: ServiceAcrConfigurationInfo; + /** The settings for the import operation of the service instance. */ + importConfiguration?: ServiceImportConfigurationInfo; } /** An access policy entry. */ @@ -133,6 +135,16 @@ export interface ServiceOciArtifactEntry { digest?: string; } +/** Import operation configuration information */ +export interface ServiceImportConfigurationInfo { + /** The name of the default integration storage account. */ + integrationDataStore?: string; + /** If the FHIR service is in InitialImportMode. */ + initialImportMode?: boolean; + /** If the import operation is enabled. */ + enabled?: boolean; +} + /** Metadata pertaining to creation and last modification of the resource. */ export interface SystemData { /** The identity that created the resource. */ @@ -350,6 +362,20 @@ export interface DicomServiceAuthenticationConfiguration { readonly audiences?: string[]; } +/** The settings for the CORS configuration of the service instance. */ +export interface CorsConfiguration { + /** The origins to be allowed via CORS. */ + origins?: string[]; + /** The headers to be allowed via CORS. */ + headers?: string[]; + /** The methods to be allowed via CORS. */ + methods?: string[]; + /** The max age to be allowed via CORS. */ + maxAge?: number; + /** If credentials are allowed via CORS. */ + allowCredentials?: boolean; +} + /** Managed service identity (system assigned and/or user assigned identities) */ export interface ServiceManagedIdentity { /** Setting indicating whether the service has a managed identity associated with it. */ @@ -489,6 +515,16 @@ export interface ResourceVersionPolicyConfiguration { resourceTypeOverrides?: { [propertyName: string]: FhirResourceVersionPolicy }; } +/** Import operation configuration information */ +export interface FhirServiceImportConfiguration { + /** The name of the default integration storage account. */ + integrationDataStore?: string; + /** If the FHIR service is in InitialImportMode. */ + initialImportMode?: boolean; + /** If the import operation is enabled. */ + enabled?: boolean; +} + /** Available operations of the service */ export interface ListOperations { /** @@ -599,10 +635,20 @@ export interface MetricSpecification { supportedTimeGrainTypes?: string[]; /** Optional. If set to true, then zero will be returned for time duration where no metric is emitted/published. */ fillGapWithZero?: boolean; + /** Pattern for the filter of the metric. */ + metricFilterPattern?: string; /** Dimensions of the metric */ dimensions?: MetricDimension[]; - /** Name of the MDM namespace. Optional. */ + /** Whether the metric is internal. */ + isInternal?: boolean; + /** The source MDM account. */ + sourceMdmAccount?: string; + /** The source MDM namespace. */ sourceMdmNamespace?: string; + /** Whether regional MDM account enabled. */ + enableRegionalMdmAccount?: boolean; + /** The resource Id dimension name override. */ + resourceIdDimensionNameOverride?: string; } /** Specifications of the Dimension of metrics */ @@ -733,6 +779,8 @@ export interface DicomService extends TaggedResource, ServiceManagedIdentity { readonly provisioningState?: ProvisioningState; /** Dicom Service authentication configuration. */ authenticationConfiguration?: DicomServiceAuthenticationConfiguration; + /** Dicom Service Cors configuration. */ + corsConfiguration?: CorsConfiguration; /** * The url of the Dicom Services. * NOTE: This property will not be serialized. It can only be populated by the server. @@ -803,6 +851,8 @@ export interface FhirService extends TaggedResource, ServiceManagedIdentity { readonly eventState?: ServiceEventState; /** Determines tracking of history for resources. */ resourceVersionPolicyConfiguration?: ResourceVersionPolicyConfiguration; + /** Fhir Service import configuration. */ + importConfiguration?: FhirServiceImportConfiguration; } /** IoT Connector destination properties for an Azure FHIR service. */ diff --git a/sdk/healthcareapis/arm-healthcareapis/src/models/mappers.ts b/sdk/healthcareapis/arm-healthcareapis/src/models/mappers.ts index 4766cbd62843..b06de16d9a0b 100644 --- a/sdk/healthcareapis/arm-healthcareapis/src/models/mappers.ts +++ b/sdk/healthcareapis/arm-healthcareapis/src/models/mappers.ts @@ -84,6 +84,13 @@ export const ServicesProperties: coreClient.CompositeMapper = { name: "Composite", className: "ServiceAcrConfigurationInfo" } + }, + importConfiguration: { + serializedName: "importConfiguration", + type: { + name: "Composite", + className: "ServiceImportConfigurationInfo" + } } } } @@ -371,6 +378,33 @@ export const ServiceOciArtifactEntry: coreClient.CompositeMapper = { } }; +export const ServiceImportConfigurationInfo: coreClient.CompositeMapper = { + type: { + name: "Composite", + className: "ServiceImportConfigurationInfo", + modelProperties: { + integrationDataStore: { + serializedName: "integrationDataStore", + type: { + name: "String" + } + }, + initialImportMode: { + serializedName: "initialImportMode", + type: { + name: "Boolean" + } + }, + enabled: { + serializedName: "enabled", + type: { + name: "Boolean" + } + } + } + } +}; + export const SystemData: coreClient.CompositeMapper = { type: { name: "Composite", @@ -891,6 +925,69 @@ export const DicomServiceAuthenticationConfiguration: coreClient.CompositeMapper } }; +export const CorsConfiguration: coreClient.CompositeMapper = { + type: { + name: "Composite", + className: "CorsConfiguration", + modelProperties: { + origins: { + serializedName: "origins", + type: { + name: "Sequence", + element: { + constraints: { + Pattern: new RegExp( + "^(?:(?:(?:[hH][tT][tT][pP](?:[sS]|))\\:\\/\\/(?:[a-zA-Z0-9-]+[.]?)+(?:\\:[0-9]{1,5})?|[*]))$" + ) + }, + type: { + name: "String" + } + } + } + }, + headers: { + serializedName: "headers", + type: { + name: "Sequence", + element: { + type: { + name: "String" + } + } + } + }, + methods: { + serializedName: "methods", + type: { + name: "Sequence", + element: { + type: { + name: "String" + } + } + } + }, + maxAge: { + constraints: { + InclusiveMaximum: 99999, + InclusiveMinimum: 0 + }, + serializedName: "maxAge", + type: { + name: "Number" + } + }, + allowCredentials: { + serializedName: "allowCredentials", + type: { + name: "Boolean" + } + } + } + } +}; + export const ServiceManagedIdentity: coreClient.CompositeMapper = { type: { name: "Composite", @@ -1289,6 +1386,33 @@ export const ResourceVersionPolicyConfiguration: coreClient.CompositeMapper = { } }; +export const FhirServiceImportConfiguration: coreClient.CompositeMapper = { + type: { + name: "Composite", + className: "FhirServiceImportConfiguration", + modelProperties: { + integrationDataStore: { + serializedName: "integrationDataStore", + type: { + name: "String" + } + }, + initialImportMode: { + serializedName: "initialImportMode", + type: { + name: "Boolean" + } + }, + enabled: { + serializedName: "enabled", + type: { + name: "Boolean" + } + } + } + } +}; + export const ListOperations: coreClient.CompositeMapper = { type: { name: "Composite", @@ -1550,6 +1674,12 @@ export const MetricSpecification: coreClient.CompositeMapper = { name: "Boolean" } }, + metricFilterPattern: { + serializedName: "metricFilterPattern", + type: { + name: "String" + } + }, dimensions: { serializedName: "dimensions", type: { @@ -1562,11 +1692,35 @@ export const MetricSpecification: coreClient.CompositeMapper = { } } }, + isInternal: { + serializedName: "isInternal", + type: { + name: "Boolean" + } + }, + sourceMdmAccount: { + serializedName: "sourceMdmAccount", + type: { + name: "String" + } + }, sourceMdmNamespace: { serializedName: "sourceMdmNamespace", type: { name: "String" } + }, + enableRegionalMdmAccount: { + serializedName: "enableRegionalMdmAccount", + type: { + name: "Boolean" + } + }, + resourceIdDimensionNameOverride: { + serializedName: "resourceIdDimensionNameOverride", + type: { + name: "String" + } } } } @@ -1864,6 +2018,13 @@ export const DicomService: coreClient.CompositeMapper = { className: "DicomServiceAuthenticationConfiguration" } }, + corsConfiguration: { + serializedName: "properties.corsConfiguration", + type: { + name: "Composite", + className: "CorsConfiguration" + } + }, serviceUrl: { serializedName: "properties.serviceUrl", readOnly: true, @@ -2032,6 +2193,13 @@ export const FhirService: coreClient.CompositeMapper = { name: "Composite", className: "ResourceVersionPolicyConfiguration" } + }, + importConfiguration: { + serializedName: "properties.importConfiguration", + type: { + name: "Composite", + className: "FhirServiceImportConfiguration" + } } } } diff --git a/sdk/healthcareapis/arm-healthcareapis/src/models/parameters.ts b/sdk/healthcareapis/arm-healthcareapis/src/models/parameters.ts index a4cc731cb932..51642e394db7 100644 --- a/sdk/healthcareapis/arm-healthcareapis/src/models/parameters.ts +++ b/sdk/healthcareapis/arm-healthcareapis/src/models/parameters.ts @@ -55,7 +55,7 @@ export const $host: OperationURLParameter = { export const apiVersion: OperationQueryParameter = { parameterPath: "apiVersion", mapper: { - defaultValue: "2021-11-01", + defaultValue: "2022-06-01", isConstant: true, serializedName: "api-version", type: { diff --git a/sdk/healthcareapis/arm-healthcareapis/src/operations/dicomServices.ts b/sdk/healthcareapis/arm-healthcareapis/src/operations/dicomServices.ts index dec26f51d1c3..fcb48938972f 100644 --- a/sdk/healthcareapis/arm-healthcareapis/src/operations/dicomServices.ts +++ b/sdk/healthcareapis/arm-healthcareapis/src/operations/dicomServices.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 { DicomServices } from "../operationsInterfaces"; import * as coreClient from "@azure/core-client"; import * as Mappers from "../models/mappers"; @@ -67,15 +66,11 @@ export class DicomServicesImpl implements DicomServices { [Symbol.asyncIterator]() { return this; }, - byPage: (settings?: PageSettings) => { - if (settings?.maxPageSize) { - throw new Error("maxPageSize is not supported by this operation."); - } + byPage: () => { return this.listByWorkspacePagingPage( resourceGroupName, workspaceName, - options, - settings + options ); } }; @@ -84,22 +79,15 @@ export class DicomServicesImpl implements DicomServices { private async *listByWorkspacePagingPage( resourceGroupName: string, workspaceName: string, - options?: DicomServicesListByWorkspaceOptionalParams, - settings?: PageSettings + options?: DicomServicesListByWorkspaceOptionalParams ): AsyncIterableIterator { - let result: DicomServicesListByWorkspaceResponse; - let continuationToken = settings?.continuationToken; - if (!continuationToken) { - result = await this._listByWorkspace( - resourceGroupName, - workspaceName, - options - ); - let page = result.value || []; - continuationToken = result.nextLink; - setContinuationToken(page, continuationToken); - yield page; - } + let result = await this._listByWorkspace( + resourceGroupName, + workspaceName, + options + ); + yield result.value || []; + let continuationToken = result.nextLink; while (continuationToken) { result = await this._listByWorkspaceNext( resourceGroupName, @@ -108,9 +96,7 @@ export class DicomServicesImpl implements DicomServices { options ); continuationToken = result.nextLink; - let page = result.value || []; - setContinuationToken(page, continuationToken); - yield page; + yield result.value || []; } } diff --git a/sdk/healthcareapis/arm-healthcareapis/src/operations/fhirDestinations.ts b/sdk/healthcareapis/arm-healthcareapis/src/operations/fhirDestinations.ts index 63c0b5e0fb82..9283c62aaa06 100644 --- a/sdk/healthcareapis/arm-healthcareapis/src/operations/fhirDestinations.ts +++ b/sdk/healthcareapis/arm-healthcareapis/src/operations/fhirDestinations.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 { FhirDestinations } from "../operationsInterfaces"; import * as coreClient from "@azure/core-client"; import * as Mappers from "../models/mappers"; @@ -60,16 +59,12 @@ export class FhirDestinationsImpl implements FhirDestinations { [Symbol.asyncIterator]() { return this; }, - byPage: (settings?: PageSettings) => { - if (settings?.maxPageSize) { - throw new Error("maxPageSize is not supported by this operation."); - } + byPage: () => { return this.listByIotConnectorPagingPage( resourceGroupName, workspaceName, iotConnectorName, - options, - settings + options ); } }; @@ -79,23 +74,16 @@ export class FhirDestinationsImpl implements FhirDestinations { resourceGroupName: string, workspaceName: string, iotConnectorName: string, - options?: FhirDestinationsListByIotConnectorOptionalParams, - settings?: PageSettings + options?: FhirDestinationsListByIotConnectorOptionalParams ): AsyncIterableIterator { - let result: FhirDestinationsListByIotConnectorResponse; - let continuationToken = settings?.continuationToken; - if (!continuationToken) { - result = await this._listByIotConnector( - resourceGroupName, - workspaceName, - iotConnectorName, - options - ); - let page = result.value || []; - continuationToken = result.nextLink; - setContinuationToken(page, continuationToken); - yield page; - } + let result = await this._listByIotConnector( + resourceGroupName, + workspaceName, + iotConnectorName, + options + ); + yield result.value || []; + let continuationToken = result.nextLink; while (continuationToken) { result = await this._listByIotConnectorNext( resourceGroupName, @@ -105,9 +93,7 @@ export class FhirDestinationsImpl implements FhirDestinations { options ); continuationToken = result.nextLink; - let page = result.value || []; - setContinuationToken(page, continuationToken); - yield page; + yield result.value || []; } } diff --git a/sdk/healthcareapis/arm-healthcareapis/src/operations/fhirServices.ts b/sdk/healthcareapis/arm-healthcareapis/src/operations/fhirServices.ts index 7eff04ee0291..38cfe8167673 100644 --- a/sdk/healthcareapis/arm-healthcareapis/src/operations/fhirServices.ts +++ b/sdk/healthcareapis/arm-healthcareapis/src/operations/fhirServices.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 { FhirServices } from "../operationsInterfaces"; import * as coreClient from "@azure/core-client"; import * as Mappers from "../models/mappers"; @@ -67,15 +66,11 @@ export class FhirServicesImpl implements FhirServices { [Symbol.asyncIterator]() { return this; }, - byPage: (settings?: PageSettings) => { - if (settings?.maxPageSize) { - throw new Error("maxPageSize is not supported by this operation."); - } + byPage: () => { return this.listByWorkspacePagingPage( resourceGroupName, workspaceName, - options, - settings + options ); } }; @@ -84,22 +79,15 @@ export class FhirServicesImpl implements FhirServices { private async *listByWorkspacePagingPage( resourceGroupName: string, workspaceName: string, - options?: FhirServicesListByWorkspaceOptionalParams, - settings?: PageSettings + options?: FhirServicesListByWorkspaceOptionalParams ): AsyncIterableIterator { - let result: FhirServicesListByWorkspaceResponse; - let continuationToken = settings?.continuationToken; - if (!continuationToken) { - result = await this._listByWorkspace( - resourceGroupName, - workspaceName, - options - ); - let page = result.value || []; - continuationToken = result.nextLink; - setContinuationToken(page, continuationToken); - yield page; - } + let result = await this._listByWorkspace( + resourceGroupName, + workspaceName, + options + ); + yield result.value || []; + let continuationToken = result.nextLink; while (continuationToken) { result = await this._listByWorkspaceNext( resourceGroupName, @@ -108,9 +96,7 @@ export class FhirServicesImpl implements FhirServices { options ); continuationToken = result.nextLink; - let page = result.value || []; - setContinuationToken(page, continuationToken); - yield page; + yield result.value || []; } } diff --git a/sdk/healthcareapis/arm-healthcareapis/src/operations/iotConnectors.ts b/sdk/healthcareapis/arm-healthcareapis/src/operations/iotConnectors.ts index 0b8892cda774..d5ab336d0c88 100644 --- a/sdk/healthcareapis/arm-healthcareapis/src/operations/iotConnectors.ts +++ b/sdk/healthcareapis/arm-healthcareapis/src/operations/iotConnectors.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 { IotConnectors } from "../operationsInterfaces"; import * as coreClient from "@azure/core-client"; import * as Mappers from "../models/mappers"; @@ -67,15 +66,11 @@ export class IotConnectorsImpl implements IotConnectors { [Symbol.asyncIterator]() { return this; }, - byPage: (settings?: PageSettings) => { - if (settings?.maxPageSize) { - throw new Error("maxPageSize is not supported by this operation."); - } + byPage: () => { return this.listByWorkspacePagingPage( resourceGroupName, workspaceName, - options, - settings + options ); } }; @@ -84,22 +79,15 @@ export class IotConnectorsImpl implements IotConnectors { private async *listByWorkspacePagingPage( resourceGroupName: string, workspaceName: string, - options?: IotConnectorsListByWorkspaceOptionalParams, - settings?: PageSettings + options?: IotConnectorsListByWorkspaceOptionalParams ): AsyncIterableIterator { - let result: IotConnectorsListByWorkspaceResponse; - let continuationToken = settings?.continuationToken; - if (!continuationToken) { - result = await this._listByWorkspace( - resourceGroupName, - workspaceName, - options - ); - let page = result.value || []; - continuationToken = result.nextLink; - setContinuationToken(page, continuationToken); - yield page; - } + let result = await this._listByWorkspace( + resourceGroupName, + workspaceName, + options + ); + yield result.value || []; + let continuationToken = result.nextLink; while (continuationToken) { result = await this._listByWorkspaceNext( resourceGroupName, @@ -108,9 +96,7 @@ export class IotConnectorsImpl implements IotConnectors { options ); continuationToken = result.nextLink; - let page = result.value || []; - setContinuationToken(page, continuationToken); - yield page; + yield result.value || []; } } diff --git a/sdk/healthcareapis/arm-healthcareapis/src/operations/operations.ts b/sdk/healthcareapis/arm-healthcareapis/src/operations/operations.ts index 34179c53088d..0a00878508d1 100644 --- a/sdk/healthcareapis/arm-healthcareapis/src/operations/operations.ts +++ b/sdk/healthcareapis/arm-healthcareapis/src/operations/operations.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 { Operations } from "../operationsInterfaces"; import * as coreClient from "@azure/core-client"; import * as Mappers from "../models/mappers"; @@ -49,34 +48,22 @@ export class OperationsImpl implements Operations { [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?: OperationsListOptionalParams, - settings?: PageSettings + options?: OperationsListOptionalParams ): AsyncIterableIterator { - let result: OperationsListResponse; - 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/healthcareapis/arm-healthcareapis/src/operations/privateEndpointConnections.ts b/sdk/healthcareapis/arm-healthcareapis/src/operations/privateEndpointConnections.ts index 692847d3d3c6..d70795f8fa6e 100644 --- a/sdk/healthcareapis/arm-healthcareapis/src/operations/privateEndpointConnections.ts +++ b/sdk/healthcareapis/arm-healthcareapis/src/operations/privateEndpointConnections.ts @@ -6,7 +6,7 @@ * Changes may cause incorrect behavior and will be lost if the code is regenerated. */ -import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging"; +import { PagedAsyncIterableIterator } from "@azure/core-paging"; import { PrivateEndpointConnections } from "../operationsInterfaces"; import * as coreClient from "@azure/core-client"; import * as Mappers from "../models/mappers"; @@ -63,15 +63,11 @@ export class PrivateEndpointConnectionsImpl [Symbol.asyncIterator]() { return this; }, - byPage: (settings?: PageSettings) => { - if (settings?.maxPageSize) { - throw new Error("maxPageSize is not supported by this operation."); - } + byPage: () => { return this.listByServicePagingPage( resourceGroupName, resourceName, - options, - settings + options ); } }; @@ -80,11 +76,9 @@ export class PrivateEndpointConnectionsImpl private async *listByServicePagingPage( resourceGroupName: string, resourceName: string, - options?: PrivateEndpointConnectionsListByServiceOptionalParams, - _settings?: PageSettings + options?: PrivateEndpointConnectionsListByServiceOptionalParams ): AsyncIterableIterator { - let result: PrivateEndpointConnectionsListByServiceResponse; - result = await this._listByService( + let result = await this._listByService( resourceGroupName, resourceName, options diff --git a/sdk/healthcareapis/arm-healthcareapis/src/operations/services.ts b/sdk/healthcareapis/arm-healthcareapis/src/operations/services.ts index 8e7c16f195ad..d44a219a1d87 100644 --- a/sdk/healthcareapis/arm-healthcareapis/src/operations/services.ts +++ b/sdk/healthcareapis/arm-healthcareapis/src/operations/services.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 { Services } from "../operationsInterfaces"; import * as coreClient from "@azure/core-client"; import * as Mappers from "../models/mappers"; @@ -19,10 +18,8 @@ import { ServicesDescription, ServicesListNextOptionalParams, ServicesListOptionalParams, - ServicesListResponse, ServicesListByResourceGroupNextOptionalParams, ServicesListByResourceGroupOptionalParams, - ServicesListByResourceGroupResponse, ServicesGetOptionalParams, ServicesGetResponse, ServicesCreateOrUpdateOptionalParams, @@ -31,6 +28,8 @@ import { ServicesUpdateOptionalParams, ServicesUpdateResponse, ServicesDeleteOptionalParams, + ServicesListResponse, + ServicesListByResourceGroupResponse, CheckNameAvailabilityParameters, ServicesCheckNameAvailabilityOptionalParams, ServicesCheckNameAvailabilityResponse, @@ -66,34 +65,22 @@ export class ServicesImpl implements Services { [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?: ServicesListOptionalParams, - settings?: PageSettings + options?: ServicesListOptionalParams ): AsyncIterableIterator { - let result: ServicesListResponse; - 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 || []; } } @@ -122,33 +109,19 @@ export class ServicesImpl implements Services { [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?: ServicesListByResourceGroupOptionalParams, - settings?: PageSettings + options?: ServicesListByResourceGroupOptionalParams ): AsyncIterableIterator { - let result: ServicesListByResourceGroupResponse; - 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, @@ -156,9 +129,7 @@ export class ServicesImpl implements Services { options ); continuationToken = result.nextLink; - let page = result.value || []; - setContinuationToken(page, continuationToken); - yield page; + yield result.value || []; } } diff --git a/sdk/healthcareapis/arm-healthcareapis/src/operations/workspacePrivateEndpointConnections.ts b/sdk/healthcareapis/arm-healthcareapis/src/operations/workspacePrivateEndpointConnections.ts index 317c46096e8f..ea4ec716cf35 100644 --- a/sdk/healthcareapis/arm-healthcareapis/src/operations/workspacePrivateEndpointConnections.ts +++ b/sdk/healthcareapis/arm-healthcareapis/src/operations/workspacePrivateEndpointConnections.ts @@ -6,7 +6,7 @@ * Changes may cause incorrect behavior and will be lost if the code is regenerated. */ -import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging"; +import { PagedAsyncIterableIterator } from "@azure/core-paging"; import { WorkspacePrivateEndpointConnections } from "../operationsInterfaces"; import * as coreClient from "@azure/core-client"; import * as Mappers from "../models/mappers"; @@ -62,15 +62,11 @@ export class WorkspacePrivateEndpointConnectionsImpl [Symbol.asyncIterator]() { return this; }, - byPage: (settings?: PageSettings) => { - if (settings?.maxPageSize) { - throw new Error("maxPageSize is not supported by this operation."); - } + byPage: () => { return this.listByWorkspacePagingPage( resourceGroupName, workspaceName, - options, - settings + options ); } }; @@ -79,11 +75,9 @@ export class WorkspacePrivateEndpointConnectionsImpl private async *listByWorkspacePagingPage( resourceGroupName: string, workspaceName: string, - options?: WorkspacePrivateEndpointConnectionsListByWorkspaceOptionalParams, - _settings?: PageSettings + options?: WorkspacePrivateEndpointConnectionsListByWorkspaceOptionalParams ): AsyncIterableIterator { - let result: WorkspacePrivateEndpointConnectionsListByWorkspaceResponse; - result = await this._listByWorkspace( + let result = await this._listByWorkspace( resourceGroupName, workspaceName, options diff --git a/sdk/healthcareapis/arm-healthcareapis/src/operations/workspacePrivateLinkResources.ts b/sdk/healthcareapis/arm-healthcareapis/src/operations/workspacePrivateLinkResources.ts index a221cd3ea191..92c6510628b4 100644 --- a/sdk/healthcareapis/arm-healthcareapis/src/operations/workspacePrivateLinkResources.ts +++ b/sdk/healthcareapis/arm-healthcareapis/src/operations/workspacePrivateLinkResources.ts @@ -6,7 +6,7 @@ * Changes may cause incorrect behavior and will be lost if the code is regenerated. */ -import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging"; +import { PagedAsyncIterableIterator } from "@azure/core-paging"; import { WorkspacePrivateLinkResources } from "../operationsInterfaces"; import * as coreClient from "@azure/core-client"; import * as Mappers from "../models/mappers"; @@ -57,15 +57,11 @@ export class WorkspacePrivateLinkResourcesImpl [Symbol.asyncIterator]() { return this; }, - byPage: (settings?: PageSettings) => { - if (settings?.maxPageSize) { - throw new Error("maxPageSize is not supported by this operation."); - } + byPage: () => { return this.listByWorkspacePagingPage( resourceGroupName, workspaceName, - options, - settings + options ); } }; @@ -74,11 +70,9 @@ export class WorkspacePrivateLinkResourcesImpl private async *listByWorkspacePagingPage( resourceGroupName: string, workspaceName: string, - options?: WorkspacePrivateLinkResourcesListByWorkspaceOptionalParams, - _settings?: PageSettings + options?: WorkspacePrivateLinkResourcesListByWorkspaceOptionalParams ): AsyncIterableIterator { - let result: WorkspacePrivateLinkResourcesListByWorkspaceResponse; - result = await this._listByWorkspace( + let result = await this._listByWorkspace( resourceGroupName, workspaceName, options diff --git a/sdk/healthcareapis/arm-healthcareapis/src/operations/workspaces.ts b/sdk/healthcareapis/arm-healthcareapis/src/operations/workspaces.ts index 3047fa1bcd3c..e837d92c4483 100644 --- a/sdk/healthcareapis/arm-healthcareapis/src/operations/workspaces.ts +++ b/sdk/healthcareapis/arm-healthcareapis/src/operations/workspaces.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 { Workspaces } from "../operationsInterfaces"; import * as coreClient from "@azure/core-client"; import * as Mappers from "../models/mappers"; @@ -19,9 +18,9 @@ import { Workspace, WorkspacesListBySubscriptionNextOptionalParams, WorkspacesListBySubscriptionOptionalParams, - WorkspacesListBySubscriptionResponse, WorkspacesListByResourceGroupNextOptionalParams, WorkspacesListByResourceGroupOptionalParams, + WorkspacesListBySubscriptionResponse, WorkspacesListByResourceGroupResponse, WorkspacesGetOptionalParams, WorkspacesGetResponse, @@ -63,34 +62,22 @@ export class WorkspacesImpl implements Workspaces { [Symbol.asyncIterator]() { return this; }, - byPage: (settings?: PageSettings) => { - if (settings?.maxPageSize) { - throw new Error("maxPageSize is not supported by this operation."); - } - return this.listBySubscriptionPagingPage(options, settings); + byPage: () => { + return this.listBySubscriptionPagingPage(options); } }; } private async *listBySubscriptionPagingPage( - options?: WorkspacesListBySubscriptionOptionalParams, - settings?: PageSettings + options?: WorkspacesListBySubscriptionOptionalParams ): AsyncIterableIterator { - let result: WorkspacesListBySubscriptionResponse; - let continuationToken = settings?.continuationToken; - if (!continuationToken) { - result = await this._listBySubscription(options); - let page = result.value || []; - continuationToken = result.nextLink; - setContinuationToken(page, continuationToken); - yield page; - } + let result = await this._listBySubscription(options); + yield result.value || []; + let continuationToken = result.nextLink; while (continuationToken) { result = await this._listBySubscriptionNext(continuationToken, options); continuationToken = result.nextLink; - let page = result.value || []; - setContinuationToken(page, continuationToken); - yield page; + yield result.value || []; } } @@ -119,33 +106,19 @@ export class WorkspacesImpl implements Workspaces { [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?: WorkspacesListByResourceGroupOptionalParams, - settings?: PageSettings + options?: WorkspacesListByResourceGroupOptionalParams ): AsyncIterableIterator { - let result: WorkspacesListByResourceGroupResponse; - 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, @@ -153,9 +126,7 @@ export class WorkspacesImpl implements Workspaces { options ); continuationToken = result.nextLink; - let page = result.value || []; - setContinuationToken(page, continuationToken); - yield page; + yield result.value || []; } } diff --git a/sdk/healthcareapis/arm-healthcareapis/src/pagingHelper.ts b/sdk/healthcareapis/arm-healthcareapis/src/pagingHelper.ts deleted file mode 100644 index d85fc13bce1e..000000000000 --- a/sdk/healthcareapis/arm-healthcareapis/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/healthcareapis/arm-healthcareapis/tsconfig.json b/sdk/healthcareapis/arm-healthcareapis/tsconfig.json index c8e6903ace68..3e6ae96443f3 100644 --- a/sdk/healthcareapis/arm-healthcareapis/tsconfig.json +++ b/sdk/healthcareapis/arm-healthcareapis/tsconfig.json @@ -15,17 +15,11 @@ ], "declaration": true, "outDir": "./dist-esm", - "importHelpers": true, - "paths": { - "@azure/arm-healthcareapis": [ - "./src/index" - ] - } + "importHelpers": true }, "include": [ "./src/**/*.ts", - "./test/**/*.ts", - "samples-dev/**/*.ts" + "./test/**/*.ts" ], "exclude": [ "node_modules"