From a140621076bc50ab02be807de4c88759bcaa7e46 Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Fri, 22 Apr 2022 06:46:58 +0000 Subject: [PATCH] CodeGen from PR 17920 in Azure/azure-rest-api-specs Healthcareapis microsoft.healthcare apis 2022 01 31 preview (#17920) * Adds base for updating Microsoft.HealthcareApis from version preview/2021-06-01-preview to version 2021-11-01 * Updates readme * Updates API version in new specs and examples * Initial updates for 2021-11-01 version * Fix prettier errors and resolve systemData error * Add missing type definitions * Remove pattern for validating Cors Origin. Regex was found to have DDoS issues. New correct pattern triggeres backwards breaking change alerts. Removing patterns in latest iteration to avoid error. Regexes are validated service side with updated logic already. * Add missing endtime from OperationResult * Revert CorsOriginEntry pattern removal to avoid false positive cross version breaking change * Add definition for Properties property in operation definition that was missing. * Test updating default verison per recommendation * Update services and workspaces to use some provisioning state to remove .NET SDK error * Resolve System.InvalidOperationException: Swagger document contains two or more x-ms-enum extensions with the same name 'ManagedServiceIdentityType' and different values: SystemAssigned,None vs. None,SystemAssigned,UserAssigned,SystemAssigned,UserAssigned * Revert "Resolve System.InvalidOperationException: Swagger document contains two or more x-ms-enum extensions with the same name 'ManagedServiceIdentityType' and different values: SystemAssigned,None vs. None,SystemAssigned,UserAssigned,SystemAssigned,UserAssigned" This reverts commit d44373c296808b50764b648279c60590a104a4b8. * Resolve System.InvalidOperationException: Swagger document contains two or more x-ms-enum extensions with the same name 'ManagedServiceIdentityType' and different values: SystemAssigned,None vs. None,SystemAssigned,UserAssigned,SystemAssigned,UserAssigned" * Change default back to 2021-01-11 version * Change default version back in 2021-11-01 in anticipation of new release * Revert changes that removed common-type references for local references * Add async headers to patch examples * Add managed identity settings to dicomservices * Add resourceVersionPolicyCOnfiguration to workspaces/fhirservices * Fix prettier errors * Add missing description for resourceTypeOverrides * Add missing "x-ms-identifiers" property for arrays. * add preview version 2021-11-01 * add api version 2022-01-31-preview * fix path * trigger GitHub actions * fix path Co-authored-by: Dustin Burson <47367432+dustinburson@users.noreply.github.com> Co-authored-by: Dustin Burson --- common/config/rush/pnpm-lock.yaml | 23 +++--- .../arm-healthcareapis/CHANGELOG.md | 20 ++--- .../arm-healthcareapis/README.md | 13 +--- .../arm-healthcareapis/_meta.json | 8 +- .../arm-healthcareapis/package.json | 36 +++------ .../review/arm-healthcareapis.api.md | 16 ++++ .../arm-healthcareapis/rollup.config.js | 78 +++++++++++++++++-- .../src/healthcareApisManagementClient.ts | 7 +- .../arm-healthcareapis/src/models/index.ts | 24 ++++++ .../arm-healthcareapis/src/models/mappers.ts | 68 ++++++++++++++++ .../src/models/parameters.ts | 2 +- .../src/operations/dicomServices.ts | 12 +-- .../src/operations/fhirServices.ts | 12 +-- .../operations/iotConnectorFhirDestination.ts | 8 +- .../src/operations/iotConnectors.ts | 12 +-- .../operations/privateEndpointConnections.ts | 8 +- .../src/operations/services.ts | 12 +-- .../workspacePrivateEndpointConnections.ts | 8 +- .../src/operations/workspaces.ts | 12 +-- .../arm-healthcareapis/tsconfig.json | 10 +-- 20 files changed, 243 insertions(+), 146 deletions(-) diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index d37dbec8470c..d10047276726 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -11061,28 +11061,27 @@ packages: dev: false file:projects/arm-healthcareapis.tgz: - resolution: {integrity: sha512-6LToa2pjwS8uRYOu8BhQKzjXr/1gvtRuO2kAuW2OjvZXKJJQ6Y0w0C3sdoj7nF1pS9iv/eQ+kNBAsOlArZ4mIQ==, tarball: file:projects/arm-healthcareapis.tgz} + resolution: {integrity: sha512-BOxkVMEe57HJy089QBPuvAzojH3LVjaGqV60K0N3brNNCl7WrOU+z926qB7Lha8XBev7DrDUw/djQnIzeE2OSQ==, tarball: file:projects/arm-healthcareapis.tgz} name: '@rush-temp/arm-healthcareapis' version: 0.0.0 dependencies: '@azure-tools/test-recorder': 1.0.2 '@azure/identity': 2.0.4 - '@microsoft/api-extractor': 7.18.11 - '@rollup/plugin-commonjs': 21.0.3_rollup@2.70.1 - '@rollup/plugin-json': 4.1.0_rollup@2.70.1 - '@rollup/plugin-multi-entry': 4.1.0_rollup@2.70.1 - '@rollup/plugin-node-resolve': 13.2.0_rollup@2.70.1 + '@microsoft/api-extractor': 7.22.1 + '@rollup/plugin-commonjs': 11.0.2_rollup@1.32.1 + '@rollup/plugin-json': 4.1.0_rollup@1.32.1 + '@rollup/plugin-multi-entry': 3.0.1_rollup@1.32.1 + '@rollup/plugin-node-resolve': 8.4.0_rollup@1.32.1 cross-env: 7.0.3 mkdirp: 1.0.4 mocha: 7.2.0 rimraf: 3.0.2 - rollup: 2.70.1 - rollup-plugin-sourcemaps: 0.6.3_rollup@2.70.1 + rollup: 1.32.1 + rollup-plugin-sourcemaps: 0.4.2_rollup@1.32.1 tslib: 2.3.1 typescript: 4.2.4 uglify-js: 3.15.4 transitivePeerDependencies: - - '@types/node' - debug - encoding - supports-color @@ -15021,7 +15020,7 @@ packages: dev: false file:projects/dtdl-parser.tgz: - resolution: {integrity: sha512-/Dpf2haY7btQZGQuvHBOvp+FV73jJdRtvEb9Iq2FlChhxnlxi3rnU+c5d3RiTER/V7CN2eTqZTmGqU81I5hofA==, tarball: file:projects/dtdl-parser.tgz} + resolution: {integrity: sha512-4fU57xg4ogr10JRjNfFZSQHD/efBKZZGYEsX6yLNQLr7d+v8DeUkBR6wL01Eu2X4BVVSWkhB+Hg+cgnbhlxQfg==, tarball: file:projects/dtdl-parser.tgz} name: '@rush-temp/dtdl-parser' version: 0.0.0 dependencies: @@ -15468,7 +15467,7 @@ packages: dev: false file:projects/iot-device-update.tgz: - resolution: {integrity: sha512-eYZc1OhjpW+iMs7ckvpoPSXLSq0Z4otKFuEFl8wcsvlTyeqq/bjRElOHVmNwl4dtRw1fNy4DGQUdoH5aXsT17w==, tarball: file:projects/iot-device-update.tgz} + resolution: {integrity: sha512-qEzFrCUOGxmgQ19d6cFJDtwdEhlb6Dn9yYLO5yrMg8KYyH6hLQa5JaxVbgvfK6ZFneTaYVaLnEMiZzmzXMgZVg==, tarball: file:projects/iot-device-update.tgz} name: '@rush-temp/iot-device-update' version: 0.0.0 dependencies: @@ -15989,7 +15988,7 @@ packages: dev: false file:projects/opentelemetry-instrumentation-azure-sdk.tgz: - resolution: {integrity: sha512-Fe2F+/VXo+2tFHmXPDJLFMmhQOYnX5wSqu+TG6Msek9ViI1x/cL8DhW3LcMwUvw5ohysFX8QsTfd9OPKO1msaQ==, tarball: file:projects/opentelemetry-instrumentation-azure-sdk.tgz} + resolution: {integrity: sha512-rWiPsZxSnuYGdFux77mxyZBjJ1I9LgMWvb+x04sDyizzAp4495+V81pN9O+9btqu1hr72zKv/hNseMEpUEf31A==, tarball: file:projects/opentelemetry-instrumentation-azure-sdk.tgz} name: '@rush-temp/opentelemetry-instrumentation-azure-sdk' version: 0.0.0 dependencies: diff --git a/sdk/healthcareapis/arm-healthcareapis/CHANGELOG.md b/sdk/healthcareapis/arm-healthcareapis/CHANGELOG.md index c8b7d99b20a9..4481069e742f 100644 --- a/sdk/healthcareapis/arm-healthcareapis/CHANGELOG.md +++ b/sdk/healthcareapis/arm-healthcareapis/CHANGELOG.md @@ -1,15 +1,15 @@ # Release History + +## 2.2.0-beta.1 (2022-04-22) + +**Features** -## 2.1.1 (Unreleased) - -### Features Added - -### Breaking Changes - -### Bugs Fixed - -### Other Changes - + - Added Interface FhirServiceImportConfiguration + - Added Interface ServiceImportConfigurationInfo + - Interface ServicesProperties has a new optional parameter importConfiguration + - Type Alias FhirService has a new parameter importConfiguration + + ## 2.1.0 (2022-03-22) **Features** diff --git a/sdk/healthcareapis/arm-healthcareapis/README.md b/sdk/healthcareapis/arm-healthcareapis/README.md index d795624b9f98..250f4278898b 100644 --- a/sdk/healthcareapis/arm-healthcareapis/README.md +++ b/sdk/healthcareapis/arm-healthcareapis/README.md @@ -6,7 +6,7 @@ Azure Healthcare APIs Client [Source code](https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/healthcareapis/arm-healthcareapis) | [Package (NPM)](https://www.npmjs.com/package/@azure/arm-healthcareapis) | -[API reference documentation](https://docs.microsoft.com/javascript/api/@azure/arm-healthcareapis) | +[API reference documentation](https://docs.microsoft.com/javascript/api/@azure/arm-healthcareapis?view=azure-node-preview) | [Samples](https://github.com/Azure-Samples/azure-samples-js-management) ## Getting started @@ -16,8 +16,6 @@ Azure Healthcare APIs Client - [LTS versions of Node.js](https://nodejs.org/about/releases/) - Latest versions of Safari, Chrome, Edge and Firefox. -See our [support policy](https://github.com/Azure/azure-sdk-for-js/blob/main/SUPPORT.md) for more details. - ### Prerequisites - An [Azure subscription][azure_sub]. @@ -51,17 +49,8 @@ For more information about how to create an Azure AD Application check out [this ```javascript const { HealthcareApisManagementClient } = require("@azure/arm-healthcareapis"); const { DefaultAzureCredential } = require("@azure/identity"); -// For client-side applications running in the browser, use InteractiveBrowserCredential instead of DefaultAzureCredential. See https://aka.ms/azsdk/js/identity/examples for more details. - const subscriptionId = "00000000-0000-0000-0000-000000000000"; const client = new HealthcareApisManagementClient(new DefaultAzureCredential(), subscriptionId); - -// For client-side applications running in the browser, use this code instead: -// const credential = new InteractiveBrowserCredential({ -// tenantId: "", -// clientId: "" -// }); -// const client = new HealthcareApisManagementClient(credential, subscriptionId); ``` diff --git a/sdk/healthcareapis/arm-healthcareapis/_meta.json b/sdk/healthcareapis/arm-healthcareapis/_meta.json index 1e4747271e73..1b945bb4a5eb 100644 --- a/sdk/healthcareapis/arm-healthcareapis/_meta.json +++ b/sdk/healthcareapis/arm-healthcareapis/_meta.json @@ -1,8 +1,8 @@ { - "commit": "f9d30725a27ef68bb547cdcc72ce92965e22f2b0", + "commit": "8f67d564e191f0811dd24c81d21d11491798032f", "readme": "specification/healthcareapis/resource-manager/readme.md", - "autorest_command": "autorest --version=3.7.3 --typescript --modelerfour.lenient-model-deduplication --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=D:\\work\\azure-sdk-for-js ..\\azure-rest-api-specs\\specification\\healthcareapis\\resource-manager\\readme.md --use=@autorest/typescript@6.0.0-beta.17 --generate-sample=true", + "autorest_command": "autorest --version=3.7.3 --typescript --modelerfour.lenient-model-deduplication --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-alpha.16.20220105.1", "repository_url": "https://github.com/Azure/azure-rest-api-specs.git", - "release_tool": "@azure-tools/js-sdk-release-tools@2.1.3", - "use": "@autorest/typescript@6.0.0-beta.17" + "release_tool": "@azure-tools/js-sdk-release-tools@2.3.0", + "use": "@autorest/typescript@6.0.0-alpha.16.20220105.1" } \ No newline at end of file diff --git a/sdk/healthcareapis/arm-healthcareapis/package.json b/sdk/healthcareapis/arm-healthcareapis/package.json index 78f8610d3736..287f5fc59ee9 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.1.1", + "version": "2.2.0-beta.1", "engines": { "node": ">=12.0.0" }, @@ -28,14 +28,14 @@ "module": "./dist-esm/src/index.js", "types": "./types/arm-healthcareapis.d.ts", "devDependencies": { - "@microsoft/api-extractor": "7.18.11", - "@rollup/plugin-commonjs": "^21.0.1", - "@rollup/plugin-json": "^4.1.0", - "@rollup/plugin-multi-entry": "^4.1.0", - "@rollup/plugin-node-resolve": "^13.1.3", + "@microsoft/api-extractor": "^7.18.11", + "@rollup/plugin-commonjs": "11.0.2", + "@rollup/plugin-json": "^4.0.0", + "@rollup/plugin-multi-entry": "^3.0.0", + "@rollup/plugin-node-resolve": "^8.0.0", "mkdirp": "^1.0.4", - "rollup": "^2.66.1", - "rollup-plugin-sourcemaps": "^0.6.3", + "rollup": "^1.16.3", + "rollup-plugin-sourcemaps": "^0.4.2", "typescript": "~4.2.0", "uglify-js": "^3.4.9", "rimraf": "^3.0.0", @@ -98,21 +98,5 @@ "docs": "echo skipped" }, "sideEffects": false, - "//metadata": { - "constantPaths": [ - { - "path": "src/healthcareApisManagementClient.ts", - "prefix": "packageDetails" - } - ] - }, - "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 ab892a24e425..395bc78c0c5b 100644 --- a/sdk/healthcareapis/arm-healthcareapis/review/arm-healthcareapis.api.md +++ b/sdk/healthcareapis/arm-healthcareapis/review/arm-healthcareapis.api.md @@ -157,6 +157,7 @@ export type FhirService = TaggedResource & ServiceManagedIdentity & { publicNetworkAccess?: PublicNetworkAccess; readonly eventState?: ServiceEventState; resourceVersionPolicyConfiguration?: ResourceVersionPolicyConfiguration; + importConfiguration?: FhirServiceImportConfiguration; }; // @public @@ -197,6 +198,13 @@ export interface FhirServiceExportConfiguration { storageAccountName?: string; } +// @public +export interface FhirServiceImportConfiguration { + enabled?: boolean; + initialImportMode?: boolean; + integrationDataStore?: string; +} + // @public export type FhirServiceKind = string; @@ -905,6 +913,13 @@ export interface ServiceExportConfigurationInfo { storageAccountName?: string; } +// @public +export interface ServiceImportConfigurationInfo { + enabled?: boolean; + initialImportMode?: boolean; + integrationDataStore?: string; +} + // @public export interface ServiceManagedIdentity { identity?: ServiceManagedIdentityIdentity; @@ -1045,6 +1060,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/rollup.config.js b/sdk/healthcareapis/arm-healthcareapis/rollup.config.js index 3f89d7309da5..9be1955eb7f1 100644 --- a/sdk/healthcareapis/arm-healthcareapis/rollup.config.js +++ b/sdk/healthcareapis/arm-healthcareapis/rollup.config.js @@ -14,14 +14,62 @@ import json from "@rollup/plugin-json"; import nodeBuiltins from "builtin-modules"; +/** + * Gets the proper configuration needed for rollup's commonJS plugin for @opentelemetry/api. + * + * NOTE: this manual configuration is only needed because OpenTelemetry uses an + * __exportStar downleveled helper function to declare its exports which confuses + * rollup's automatic discovery mechanism. + * + * @returns an object reference that can be `...`'d into your cjs() configuration. + */ +export function openTelemetryCommonJs() { + const namedExports = {}; + + for (const key of [ + "@opentelemetry/api", + "@azure/core-tracing/node_modules/@opentelemetry/api" + ]) { + namedExports[key] = [ + "SpanKind", + "TraceFlags", + "getSpan", + "setSpan", + "SpanStatusCode", + "getSpanContext", + "setSpanContext" + ]; + } + + const releasedOpenTelemetryVersions = ["0.10.2", "1.0.0-rc.0"]; + + for (const version of releasedOpenTelemetryVersions) { + namedExports[ + // working around a limitation in the rollup common.js plugin - it's not able to resolve these modules so the named exports listed above will not get applied. We have to drill down to the actual path. + `../../../common/temp/node_modules/.pnpm/@opentelemetry/api@${version}/node_modules/@opentelemetry/api/build/src/index.js` + ] = [ + "SpanKind", + "TraceFlags", + "getSpan", + "setSpan", + "StatusCode", + "CanonicalCode", + "getSpanContext", + "setSpanContext" + ]; + } + + return namedExports; +} + // #region Warning Handler /** - * A function that can determine whether a rollup warning should be ignored. If + * A function that can determine whether a rollupwarning should be ignored. If * the function returns `true`, then the warning will not be displayed. */ -function ignoreNiseSinonEval(warning) { +function ignoreNiseSinonEvalWarnings(warning) { return ( warning.code === "EVAL" && warning.id && @@ -30,14 +78,17 @@ function ignoreNiseSinonEval(warning) { ); } -function ignoreChaiCircularDependency(warning) { +function ignoreChaiCircularDependencyWarnings(warning) { return ( warning.code === "CIRCULAR_DEPENDENCY" && warning.importer && warning.importer.includes("node_modules/chai") === true ); } -const warningInhibitors = [ignoreChaiCircularDependency, ignoreNiseSinonEval]; +const warningInhibitors = [ + ignoreChaiCircularDependencyWarnings, + ignoreNiseSinonEvalWarnings +]; /** * Construct a warning handler for the shared rollup configuration @@ -71,7 +122,22 @@ function makeBrowserTestConfig() { nodeResolve({ mainFields: ["module", "browser"] }), - cjs(), + cjs({ + namedExports: { + // Chai's strange internal architecture makes it impossible to statically + // analyze its exports. + chai: [ + "version", + "use", + "util", + "config", + "expect", + "should", + "assert" + ], + ...openTelemetryCommonJs() + } + }), json(), sourcemaps() //viz({ filename: "dist-test/browser-stats.html", sourcemap: true }) @@ -107,7 +173,7 @@ export function makeConfig(pkg, options) { ], output: { file: "dist/index.js", format: "cjs", sourcemap: true }, preserveSymlinks: false, - plugins: [sourcemaps(), nodeResolve()] + plugins: [sourcemaps(), nodeResolve(), cjs()] }; const config = [baseConfig]; diff --git a/sdk/healthcareapis/arm-healthcareapis/src/healthcareApisManagementClient.ts b/sdk/healthcareapis/arm-healthcareapis/src/healthcareApisManagementClient.ts index c69f9c8eae45..c12305ece493 100644 --- a/sdk/healthcareapis/arm-healthcareapis/src/healthcareApisManagementClient.ts +++ b/sdk/healthcareapis/arm-healthcareapis/src/healthcareApisManagementClient.ts @@ -72,7 +72,7 @@ export class HealthcareApisManagementClient extends coreClient.ServiceClient { credential: credentials }; - const packageDetails = `azsdk-js-arm-healthcareapis/2.1.1`; + const packageDetails = `azsdk-js-arm-healthcareapis/2.2.0-beta.1`; const userAgentPrefix = options.userAgentOptions && options.userAgentOptions.userAgentPrefix ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}` @@ -87,8 +87,7 @@ export class HealthcareApisManagementClient extends coreClient.ServiceClient { userAgentOptions: { userAgentPrefix }, - baseUri: - options.endpoint ?? options.baseUri ?? "https://management.azure.com" + baseUri: options.endpoint || "https://management.azure.com" }; super(optionsWithDefaults); // Parameter assignments @@ -96,7 +95,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-01-31-preview"; this.services = new ServicesImpl(this); this.privateEndpointConnections = new PrivateEndpointConnectionsImpl(this); this.privateLinkResources = new PrivateLinkResourcesImpl(this); diff --git a/sdk/healthcareapis/arm-healthcareapis/src/models/index.ts b/sdk/healthcareapis/arm-healthcareapis/src/models/index.ts index db860e005f4c..c853dcefd6bf 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. */ @@ -489,6 +501,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 { /** @@ -803,6 +825,8 @@ export type FhirService = TaggedResource & 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 ab8daba5f2cc..d73860002261 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" + } } } } @@ -372,6 +379,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", @@ -1290,6 +1324,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", @@ -2033,6 +2094,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..e5ad99867308 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-01-31-preview", 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 fcb48938972f..4774759caf89 100644 --- a/sdk/healthcareapis/arm-healthcareapis/src/operations/dicomServices.ts +++ b/sdk/healthcareapis/arm-healthcareapis/src/operations/dicomServices.ts @@ -220,12 +220,10 @@ export class DicomServicesImpl implements DicomServices { }, createOrUpdateOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** @@ -323,12 +321,10 @@ export class DicomServicesImpl implements DicomServices { }, updateOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** @@ -413,12 +409,10 @@ export class DicomServicesImpl implements DicomServices { { resourceGroupName, dicomServiceName, workspaceName, options }, deleteOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** diff --git a/sdk/healthcareapis/arm-healthcareapis/src/operations/fhirServices.ts b/sdk/healthcareapis/arm-healthcareapis/src/operations/fhirServices.ts index 38cfe8167673..152efc9769a9 100644 --- a/sdk/healthcareapis/arm-healthcareapis/src/operations/fhirServices.ts +++ b/sdk/healthcareapis/arm-healthcareapis/src/operations/fhirServices.ts @@ -220,12 +220,10 @@ export class FhirServicesImpl implements FhirServices { }, createOrUpdateOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** @@ -323,12 +321,10 @@ export class FhirServicesImpl implements FhirServices { }, updateOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** @@ -413,12 +409,10 @@ export class FhirServicesImpl implements FhirServices { { resourceGroupName, fhirServiceName, workspaceName, options }, deleteOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** diff --git a/sdk/healthcareapis/arm-healthcareapis/src/operations/iotConnectorFhirDestination.ts b/sdk/healthcareapis/arm-healthcareapis/src/operations/iotConnectorFhirDestination.ts index 064029281ade..11f5ded31d9d 100644 --- a/sdk/healthcareapis/arm-healthcareapis/src/operations/iotConnectorFhirDestination.ts +++ b/sdk/healthcareapis/arm-healthcareapis/src/operations/iotConnectorFhirDestination.ts @@ -136,12 +136,10 @@ export class IotConnectorFhirDestinationImpl }, createOrUpdateOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** @@ -238,12 +236,10 @@ export class IotConnectorFhirDestinationImpl }, deleteOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** diff --git a/sdk/healthcareapis/arm-healthcareapis/src/operations/iotConnectors.ts b/sdk/healthcareapis/arm-healthcareapis/src/operations/iotConnectors.ts index d5ab336d0c88..95c368aa3ae0 100644 --- a/sdk/healthcareapis/arm-healthcareapis/src/operations/iotConnectors.ts +++ b/sdk/healthcareapis/arm-healthcareapis/src/operations/iotConnectors.ts @@ -220,12 +220,10 @@ export class IotConnectorsImpl implements IotConnectors { }, createOrUpdateOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** @@ -323,12 +321,10 @@ export class IotConnectorsImpl implements IotConnectors { }, updateOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** @@ -413,12 +409,10 @@ export class IotConnectorsImpl implements IotConnectors { { resourceGroupName, iotConnectorName, workspaceName, options }, deleteOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** diff --git a/sdk/healthcareapis/arm-healthcareapis/src/operations/privateEndpointConnections.ts b/sdk/healthcareapis/arm-healthcareapis/src/operations/privateEndpointConnections.ts index d70795f8fa6e..caab2d3aa6d1 100644 --- a/sdk/healthcareapis/arm-healthcareapis/src/operations/privateEndpointConnections.ts +++ b/sdk/healthcareapis/arm-healthcareapis/src/operations/privateEndpointConnections.ts @@ -213,12 +213,10 @@ export class PrivateEndpointConnectionsImpl }, createOrUpdateOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** @@ -310,12 +308,10 @@ export class PrivateEndpointConnectionsImpl }, deleteOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** diff --git a/sdk/healthcareapis/arm-healthcareapis/src/operations/services.ts b/sdk/healthcareapis/arm-healthcareapis/src/operations/services.ts index d44a219a1d87..eef0bbd69346 100644 --- a/sdk/healthcareapis/arm-healthcareapis/src/operations/services.ts +++ b/sdk/healthcareapis/arm-healthcareapis/src/operations/services.ts @@ -224,12 +224,10 @@ export class ServicesImpl implements Services { { resourceGroupName, resourceName, serviceDescription, options }, createOrUpdateOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** @@ -316,12 +314,10 @@ export class ServicesImpl implements Services { { resourceGroupName, resourceName, servicePatchDescription, options }, updateOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** @@ -401,12 +397,10 @@ export class ServicesImpl implements Services { { resourceGroupName, resourceName, options }, deleteOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** diff --git a/sdk/healthcareapis/arm-healthcareapis/src/operations/workspacePrivateEndpointConnections.ts b/sdk/healthcareapis/arm-healthcareapis/src/operations/workspacePrivateEndpointConnections.ts index ea4ec716cf35..cba31fd54c9a 100644 --- a/sdk/healthcareapis/arm-healthcareapis/src/operations/workspacePrivateEndpointConnections.ts +++ b/sdk/healthcareapis/arm-healthcareapis/src/operations/workspacePrivateEndpointConnections.ts @@ -214,12 +214,10 @@ export class WorkspacePrivateEndpointConnectionsImpl }, createOrUpdateOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** @@ -311,12 +309,10 @@ export class WorkspacePrivateEndpointConnectionsImpl }, deleteOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** diff --git a/sdk/healthcareapis/arm-healthcareapis/src/operations/workspaces.ts b/sdk/healthcareapis/arm-healthcareapis/src/operations/workspaces.ts index e837d92c4483..561788776530 100644 --- a/sdk/healthcareapis/arm-healthcareapis/src/operations/workspaces.ts +++ b/sdk/healthcareapis/arm-healthcareapis/src/operations/workspaces.ts @@ -249,12 +249,10 @@ export class WorkspacesImpl implements Workspaces { { resourceGroupName, workspaceName, workspace, options }, createOrUpdateOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** @@ -341,12 +339,10 @@ export class WorkspacesImpl implements Workspaces { { resourceGroupName, workspaceName, workspacePatchResource, options }, updateOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** @@ -426,12 +422,10 @@ export class WorkspacesImpl implements Workspaces { { resourceGroupName, workspaceName, options }, deleteOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** 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"