Skip to content

Commit

Permalink
CodeGen from PR 17920 in Azure/azure-rest-api-specs
Browse files Browse the repository at this point in the history
Merge 512e1e969fabdc100493e3c9ad6edb0df5083030 into 07c58564f3a96efa314f0ec32ab0b7053eff609d
  • Loading branch information
SDKAuto committed Apr 19, 2022
1 parent edb1569 commit 321f109
Show file tree
Hide file tree
Showing 20 changed files with 238 additions and 141 deletions.
15 changes: 7 additions & 8 deletions common/config/rush/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions sdk/healthcareapis/arm-healthcareapis/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# Release History

## 2.2.0-beta.1 (2022-04-19)

**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**
Expand Down
13 changes: 1 addition & 12 deletions sdk/healthcareapis/arm-healthcareapis/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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].
Expand Down Expand Up @@ -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: "<YOUR_TENANT_ID>",
// clientId: "<YOUR_CLIENT_ID>"
// });
// const client = new HealthcareApisManagementClient(credential, subscriptionId);
```


Expand Down
8 changes: 4 additions & 4 deletions sdk/healthcareapis/arm-healthcareapis/_meta.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"commit": "f9d30725a27ef68bb547cdcc72ce92965e22f2b0",
"commit": "81d5b49a0159472904f7c79ffcdfbee89f449180",
"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"
}
34 changes: 9 additions & 25 deletions sdk/healthcareapis/arm-healthcareapis/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand All @@ -29,13 +29,13 @@
"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",
"@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",
Expand Down Expand Up @@ -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
}
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ export type FhirService = TaggedResource & ServiceManagedIdentity & {
publicNetworkAccess?: PublicNetworkAccess;
readonly eventState?: ServiceEventState;
resourceVersionPolicyConfiguration?: ResourceVersionPolicyConfiguration;
importConfiguration?: FhirServiceImportConfiguration;
};

// @public
Expand Down Expand Up @@ -197,6 +198,13 @@ export interface FhirServiceExportConfiguration {
storageAccountName?: string;
}

// @public
export interface FhirServiceImportConfiguration {
enabled?: boolean;
initialImportMode?: boolean;
integrationDataStore?: string;
}

// @public
export type FhirServiceKind = string;

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -1045,6 +1060,7 @@ export interface ServicesProperties {
corsConfiguration?: ServiceCorsConfigurationInfo;
cosmosDbConfiguration?: ServiceCosmosDbConfigurationInfo;
exportConfiguration?: ServiceExportConfigurationInfo;
importConfiguration?: ServiceImportConfigurationInfo;
privateEndpointConnections?: PrivateEndpointConnection[];
readonly provisioningState?: ProvisioningState;
publicNetworkAccess?: PublicNetworkAccess;
Expand Down
78 changes: 72 additions & 6 deletions sdk/healthcareapis/arm-healthcareapis/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&
Expand All @@ -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
Expand Down Expand Up @@ -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 })
Expand Down Expand Up @@ -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];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}`
Expand All @@ -87,16 +87,15 @@ 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
this.subscriptionId = subscriptionId;

// 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);
Expand Down
Loading

0 comments on commit 321f109

Please sign in to comment.