From 3f02b4391eed6ea999cde89b1962f4bd07257291 Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Wed, 9 Mar 2022 03:52:05 +0000 Subject: [PATCH] CodeGen from PR 18145 in Azure/azure-rest-api-specs Merge edb0732186ebe5865ea10ad1197e1d935539e714 into ef5677519414f25524105ae9e792d660d65bfb81 --- common/config/rush/pnpm-lock.yaml | 20 +++-- sdk/appplatform/arm-appplatform/CHANGELOG.md | 16 +--- sdk/appplatform/arm-appplatform/README.md | 11 --- sdk/appplatform/arm-appplatform/_meta.json | 7 +- sdk/appplatform/arm-appplatform/package.json | 24 ++---- .../review/arm-appplatform.api.md | 14 ++++ .../arm-appplatform/rollup.config.js | 78 +++++++++++++++++-- .../src/appPlatformManagementClient.ts | 2 +- .../arm-appplatform/src/models/index.ts | 28 ++++++- .../arm-appplatform/src/models/mappers.ts | 41 ++++++++++ .../arm-appplatform/src/models/parameters.ts | 2 +- .../arm-appplatform/test/sampleTest.ts | 48 ++++++++++++ 12 files changed, 227 insertions(+), 64 deletions(-) create mode 100644 sdk/appplatform/arm-appplatform/test/sampleTest.ts diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index b0fd7202376a..f8c0ab61e536 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -9185,28 +9185,27 @@ packages: dev: false file:projects/arm-appplatform.tgz: - resolution: {integrity: sha512-Fd8bWxZRa2mOi+u6ZiEzhy6rwYt95XG9iNapiSjYxQYnIo2eWq2f2P5o1n8goQ8hqYGkN73HR/e2tfchlVts2A==, tarball: file:projects/arm-appplatform.tgz} + resolution: {integrity: sha512-K4blAoqkAzgJhE3KLrPNtqIYeM3m7Q3blc8s+8+wN/2/W8dAAOAS1E+BMQO+Ar3qdLDWn7WjAXa4EJWUOr8M3A==, tarball: file:projects/arm-appplatform.tgz} name: '@rush-temp/arm-appplatform' version: 0.0.0 dependencies: '@azure-tools/test-recorder': 1.0.2 '@azure/identity': 2.0.4 '@microsoft/api-extractor': 7.19.4 - '@rollup/plugin-commonjs': 21.0.2_rollup@2.70.0 - '@rollup/plugin-json': 4.1.0_rollup@2.70.0 - '@rollup/plugin-multi-entry': 4.1.0_rollup@2.70.0 - '@rollup/plugin-node-resolve': 13.1.3_rollup@2.70.0 + '@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.0 - rollup-plugin-sourcemaps: 0.6.3_rollup@2.70.0 + 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.2 transitivePeerDependencies: - - '@types/node' - debug - encoding - supports-color @@ -14652,7 +14651,7 @@ packages: dev: false file:projects/identity-cache-persistence.tgz: - resolution: {integrity: sha512-tFOZJXqQG0aWr7V8/OdK64HeqRQiokRWE9OsBZeoG809e0yooFJ3qb7pgBb/cwYtMTx5fpwb/SUOIwseiBIaVQ==, tarball: file:projects/identity-cache-persistence.tgz} + resolution: {integrity: sha512-Wu82qdfR48RutCq2D4p+KavTGmEOjyN310+4Icpux/1lp9T4OoZQFtKgPrKr+e1LVe2wUr4rMJiJqrDGu+7odA==, tarball: file:projects/identity-cache-persistence.tgz} name: '@rush-temp/identity-cache-persistence' version: 0.0.0 dependencies: @@ -14689,7 +14688,7 @@ packages: dev: false file:projects/identity-vscode.tgz: - resolution: {integrity: sha512-AE+l57LwOGlKDqPX+zzuQiqIy4HxrrGnR+IPJI8vUrPHgIukZisT/UYI1vgpDc/0/h/jxWXPNLlLaMwdv5BebQ==, tarball: file:projects/identity-vscode.tgz} + resolution: {integrity: sha512-TNas20f7WYNZmAmRFFGI8Q+lX/B8jpY0gPCASb7aC8jRgPqRbmM9jlAOpKwaPGQSaMWVqU8kC7wpr8ael9MBmQ==, tarball: file:projects/identity-vscode.tgz} name: '@rush-temp/identity-vscode' version: 0.0.0 dependencies: @@ -14718,7 +14717,6 @@ packages: util: 0.12.4 transitivePeerDependencies: - bufferutil - - debug - encoding - supports-color - utf-8-validate diff --git a/sdk/appplatform/arm-appplatform/CHANGELOG.md b/sdk/appplatform/arm-appplatform/CHANGELOG.md index ec1c05c95c8b..5a6b7ebd103a 100644 --- a/sdk/appplatform/arm-appplatform/CHANGELOG.md +++ b/sdk/appplatform/arm-appplatform/CHANGELOG.md @@ -1,18 +1,8 @@ # Release History + +## 2.0.0-beta.4 (2022-03-09) -## 2.0.0-beta.4 (Unreleased) - -### Features Added - -### Breaking Changes - -### Bugs Fixed - -### Other Changes - -## 2.0.0-beta.3 (2022-03-02) - -The package of @azure/arm-appplatform is using our next generation design principles since version 2.0.0-beta.3, which contains breaking changes. +The package of @azure/arm-appplatform is using our next generation design principles since version 2.0.0-beta.4, which contains breaking changes. To understand the detail of the change, please refer to [Changelog](https://aka.ms/js-track2-changelog). diff --git a/sdk/appplatform/arm-appplatform/README.md b/sdk/appplatform/arm-appplatform/README.md index 1822e3bdf93a..8e517c9526cd 100644 --- a/sdk/appplatform/arm-appplatform/README.md +++ b/sdk/appplatform/arm-appplatform/README.md @@ -16,8 +16,6 @@ REST API for Azure Spring Cloud - [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 { AppPlatformManagementClient } = require("@azure/arm-appplatform"); 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 AppPlatformManagementClient(new DefaultAzureCredential(), subscriptionId); - -// For client-side applications running in the browser, use this code instead: -// const credential = new InteractiveBrowserCredential({ -// tenantId: "", -// clientId: "" -// }); -// const client = new AppPlatformManagementClient(credential, subscriptionId); ``` diff --git a/sdk/appplatform/arm-appplatform/_meta.json b/sdk/appplatform/arm-appplatform/_meta.json index 7033144f4184..c683edf5b3c9 100644 --- a/sdk/appplatform/arm-appplatform/_meta.json +++ b/sdk/appplatform/arm-appplatform/_meta.json @@ -1,7 +1,8 @@ { - "commit": "4042a47cff72c950d35dd72149895b044ed79713", + "commit": "b18bc79ad52157f836497a481a583d624d93c241", "readme": "specification/appplatform/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:\\mydev\\azure-sdk-for-js ..\\azure-rest-api-specs\\specification\\appplatform\\resource-manager\\readme.md --use=@autorest/typescript@6.0.0-beta.16", + "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=/home/vsts/work/1/s/azure-sdk-for-js ../azure-rest-api-specs/specification/appplatform/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", - "use": "@autorest/typescript@6.0.0-beta.16" + "release_tool": "@azure-tools/js-sdk-release-tools@2.1.0", + "use": "@autorest/typescript@6.0.0-alpha.16.20220105.1" } \ No newline at end of file diff --git a/sdk/appplatform/arm-appplatform/package.json b/sdk/appplatform/arm-appplatform/package.json index 4a74d236f425..824c182166e4 100644 --- a/sdk/appplatform/arm-appplatform/package.json +++ b/sdk/appplatform/arm-appplatform/package.json @@ -3,7 +3,7 @@ "sdk-type": "mgmt", "author": "Microsoft Corporation", "description": "A generated SDK for AppPlatformManagementClient.", - "version": "2.0.0-beta.4", + "version": "1.0.0-beta.1", "engines": { "node": ">=12.0.0" }, @@ -29,13 +29,13 @@ "types": "./types/arm-appplatform.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", @@ -98,13 +98,5 @@ "docs": "echo skipped" }, "sideEffects": false, - "//metadata": { - "constantPaths": [ - { - "path": "src/appPlatformManagementClient.ts", - "prefix": "packageDetails" - } - ] - }, "autoPublish": true -} +} \ No newline at end of file diff --git a/sdk/appplatform/arm-appplatform/review/arm-appplatform.api.md b/sdk/appplatform/arm-appplatform/review/arm-appplatform.api.md index c9af9f724440..5fb9cc6cf2a3 100644 --- a/sdk/appplatform/arm-appplatform/review/arm-appplatform.api.md +++ b/sdk/appplatform/arm-appplatform/review/arm-appplatform.api.md @@ -1240,6 +1240,7 @@ export interface CustomContainer { command?: string[]; containerImage?: string; imageRegistryCredential?: ImageRegistryCredential; + languageFramework?: string; server?: string; } @@ -2119,6 +2120,10 @@ export enum KnownProvisioningState { // (undocumented) Moving = "Moving", // (undocumented) + Starting = "Starting", + // (undocumented) + Stopping = "Stopping", + // (undocumented) Succeeded = "Succeeded", // (undocumented) Updating = "Updating" @@ -2229,6 +2234,9 @@ export interface ManagedIdentityProperties { principalId?: string; tenantId?: string; type?: ManagedIdentityType; + userAssignedIdentities?: { + [propertyName: string]: UserAssignedManagedIdentity; + }; } // @public @@ -2956,6 +2964,12 @@ export type UploadedUserSourceInfo = UserSourceInfo & { // @public (undocumented) export type UploadedUserSourceInfoUnion = UploadedUserSourceInfo | JarUploadedUserSourceInfo | SourceUploadedUserSourceInfo | NetCoreZipUploadedUserSourceInfo; +// @public +export interface UserAssignedManagedIdentity { + readonly clientId?: string; + readonly principalId?: string; +} + // @public export interface UserSourceInfo { type: "UploadedUserSourceInfo" | "Jar" | "Source" | "NetCoreZip" | "BuildResult" | "Container"; diff --git a/sdk/appplatform/arm-appplatform/rollup.config.js b/sdk/appplatform/arm-appplatform/rollup.config.js index 3f89d7309da5..9be1955eb7f1 100644 --- a/sdk/appplatform/arm-appplatform/rollup.config.js +++ b/sdk/appplatform/arm-appplatform/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/appplatform/arm-appplatform/src/appPlatformManagementClient.ts b/sdk/appplatform/arm-appplatform/src/appPlatformManagementClient.ts index 7cd6566b6645..7dca6ea144ff 100644 --- a/sdk/appplatform/arm-appplatform/src/appPlatformManagementClient.ts +++ b/sdk/appplatform/arm-appplatform/src/appPlatformManagementClient.ts @@ -116,7 +116,7 @@ export class AppPlatformManagementClient extends coreClient.ServiceClient { // Assigning values to Constant parameters this.$host = options.$host || "https://management.azure.com"; - this.apiVersion = options.apiVersion || "2022-01-01-preview"; + this.apiVersion = options.apiVersion || "2022-03-01-preview"; this.services = new ServicesImpl(this); this.configServers = new ConfigServersImpl(this); this.configurationServices = new ConfigurationServicesImpl(this); diff --git a/sdk/appplatform/arm-appplatform/src/models/index.ts b/sdk/appplatform/arm-appplatform/src/models/index.ts index 13578d641f38..448f414ea767 100644 --- a/sdk/appplatform/arm-appplatform/src/models/index.ts +++ b/sdk/appplatform/arm-appplatform/src/models/index.ts @@ -893,10 +893,28 @@ export interface LoadedCertificate { export interface ManagedIdentityProperties { /** Type of the managed identity */ type?: ManagedIdentityType; - /** Principal Id */ + /** Principal Id of system-assigned managed identity. */ principalId?: string; - /** Tenant Id */ + /** Tenant Id of system-assigned managed identity. */ tenantId?: string; + /** Properties of user-assigned managed identities */ + userAssignedIdentities?: { + [propertyName: string]: UserAssignedManagedIdentity; + }; +} + +/** The details of the user-assigned managed identity assigned to an App. */ +export interface UserAssignedManagedIdentity { + /** + * Principal Id of user-assigned managed identity. + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly principalId?: string; + /** + * Client Id of user-assigned managed identity. + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly clientId?: string; } /** Object that includes an array of App resources and a possible link for next set */ @@ -1744,6 +1762,8 @@ export interface CustomContainer { args?: string[]; /** Credential of the image registry */ imageRegistryCredential?: ImageRegistryCredential; + /** Language framework of the container image uploaded */ + languageFramework?: string; } /** Credential of the image registry */ @@ -2022,6 +2042,8 @@ export type NetCoreZipUploadedUserSourceInfo = UploadedUserSourceInfo & { export enum KnownProvisioningState { Creating = "Creating", Updating = "Updating", + Starting = "Starting", + Stopping = "Stopping", Deleting = "Deleting", Deleted = "Deleted", Succeeded = "Succeeded", @@ -2038,6 +2060,8 @@ export enum KnownProvisioningState { * ### Known values supported by the service * **Creating** \ * **Updating** \ + * **Starting** \ + * **Stopping** \ * **Deleting** \ * **Deleted** \ * **Succeeded** \ diff --git a/sdk/appplatform/arm-appplatform/src/models/mappers.ts b/sdk/appplatform/arm-appplatform/src/models/mappers.ts index 2c14ffc1da45..9d094157b76d 100644 --- a/sdk/appplatform/arm-appplatform/src/models/mappers.ts +++ b/sdk/appplatform/arm-appplatform/src/models/mappers.ts @@ -2163,6 +2163,41 @@ export const ManagedIdentityProperties: coreClient.CompositeMapper = { type: { name: "String" } + }, + userAssignedIdentities: { + serializedName: "userAssignedIdentities", + type: { + name: "Dictionary", + value: { + type: { + name: "Composite", + className: "UserAssignedManagedIdentity" + } + } + } + } + } + } +}; + +export const UserAssignedManagedIdentity: coreClient.CompositeMapper = { + type: { + name: "Composite", + className: "UserAssignedManagedIdentity", + modelProperties: { + principalId: { + serializedName: "principalId", + readOnly: true, + type: { + name: "String" + } + }, + clientId: { + serializedName: "clientId", + readOnly: true, + type: { + name: "String" + } } } } @@ -4333,6 +4368,12 @@ export const CustomContainer: coreClient.CompositeMapper = { name: "Composite", className: "ImageRegistryCredential" } + }, + languageFramework: { + serializedName: "languageFramework", + type: { + name: "String" + } } } } diff --git a/sdk/appplatform/arm-appplatform/src/models/parameters.ts b/sdk/appplatform/arm-appplatform/src/models/parameters.ts index 7f6461c5a744..3aa840e05696 100644 --- a/sdk/appplatform/arm-appplatform/src/models/parameters.ts +++ b/sdk/appplatform/arm-appplatform/src/models/parameters.ts @@ -67,7 +67,7 @@ export const $host: OperationURLParameter = { export const apiVersion: OperationQueryParameter = { parameterPath: "apiVersion", mapper: { - defaultValue: "2022-01-01-preview", + defaultValue: "2022-03-01-preview", isConstant: true, serializedName: "api-version", type: { diff --git a/sdk/appplatform/arm-appplatform/test/sampleTest.ts b/sdk/appplatform/arm-appplatform/test/sampleTest.ts new file mode 100644 index 000000000000..7ed89b043e1b --- /dev/null +++ b/sdk/appplatform/arm-appplatform/test/sampleTest.ts @@ -0,0 +1,48 @@ +/* + * 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. + */ + +import { + env, + record, + RecorderEnvironmentSetup, + Recorder +} from "@azure-tools/test-recorder"; +import * as assert from "assert"; + +const recorderEnvSetup: RecorderEnvironmentSetup = { + replaceableVariables: { + AZURE_CLIENT_ID: "azure_client_id", + AZURE_CLIENT_SECRET: "azure_client_secret", + AZURE_TENANT_ID: "88888888-8888-8888-8888-888888888888", + SUBSCRIPTION_ID: "azure_subscription_id" + }, + customizationsOnRecordings: [ + (recording: any): any => + recording.replace( + /"access_token":"[^"]*"/g, + `"access_token":"access_token"` + ) + ], + queryParametersToSkip: [] +}; + +describe("My test", () => { + let recorder: Recorder; + + beforeEach(async function() { + recorder = record(this, recorderEnvSetup); + }); + + afterEach(async function() { + await recorder.stop(); + }); + + it("sample test", async function() { + console.log("Hi, I'm a test!"); + }); +});