Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions common/config/rush/pnpm-lock.yaml

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

16 changes: 3 additions & 13 deletions sdk/appplatform/arm-appplatform/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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).

Expand Down
11 changes: 0 additions & 11 deletions sdk/appplatform/arm-appplatform/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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].
Expand Down Expand Up @@ -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: "<YOUR_TENANT_ID>",
// clientId: "<YOUR_CLIENT_ID>"
// });
// const client = new AppPlatformManagementClient(credential, subscriptionId);
```


Expand Down
7 changes: 4 additions & 3 deletions sdk/appplatform/arm-appplatform/_meta.json
Original file line number Diff line number Diff line change
@@ -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/[email protected]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/[email protected]alpha.16.20220105.1",
"repository_url": "https://github.com/Azure/azure-rest-api-specs.git",
"use": "@autorest/[email protected]"
"release_tool": "@azure-tools/[email protected]",
"use": "@autorest/[email protected]"
}
24 changes: 8 additions & 16 deletions sdk/appplatform/arm-appplatform/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 AppPlatformManagementClient.",
"version": "2.0.0-beta.4",
"version": "1.0.0-beta.1",
"engines": {
"node": ">=12.0.0"
},
Expand All @@ -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",
Expand Down Expand Up @@ -98,13 +98,5 @@
"docs": "echo skipped"
},
"sideEffects": false,
"//metadata": {
"constantPaths": [
{
"path": "src/appPlatformManagementClient.ts",
"prefix": "packageDetails"
}
]
},
"autoPublish": true
}
}
14 changes: 14 additions & 0 deletions sdk/appplatform/arm-appplatform/review/arm-appplatform.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -1240,6 +1240,7 @@ export interface CustomContainer {
command?: string[];
containerImage?: string;
imageRegistryCredential?: ImageRegistryCredential;
languageFramework?: string;
server?: string;
}

Expand Down Expand Up @@ -2119,6 +2120,10 @@ export enum KnownProvisioningState {
// (undocumented)
Moving = "Moving",
// (undocumented)
Starting = "Starting",
// (undocumented)
Stopping = "Stopping",
// (undocumented)
Succeeded = "Succeeded",
// (undocumented)
Updating = "Updating"
Expand Down Expand Up @@ -2229,6 +2234,9 @@ export interface ManagedIdentityProperties {
principalId?: string;
tenantId?: string;
type?: ManagedIdentityType;
userAssignedIdentities?: {
[propertyName: string]: UserAssignedManagedIdentity;
};
}

// @public
Expand Down Expand Up @@ -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";
Expand Down
78 changes: 72 additions & 6 deletions sdk/appplatform/arm-appplatform/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 @@ -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);
Expand Down
28 changes: 26 additions & 2 deletions sdk/appplatform/arm-appplatform/src/models/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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 */
Expand Down Expand Up @@ -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",
Expand All @@ -2038,6 +2060,8 @@ export enum KnownProvisioningState {
* ### Known values supported by the service
* **Creating** \
* **Updating** \
* **Starting** \
* **Stopping** \
* **Deleting** \
* **Deleted** \
* **Succeeded** \
Expand Down
Loading