diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index a98f8aec09b6..0a5eaa7578d5 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -704,6 +704,19 @@ packages: - supports-color dev: false + /@azure-tools/test-recorder/2.0.0: + resolution: {integrity: sha512-OTic1OwOk25B8ecdMQ4wgyDaUNMMw0qzO4/0sy9ScPXWLmUFGMlkS0+BOQ2K9t8WCksM/wU+NjUZo/5T4zaG6A==} + engines: {node: '>=12.0.0'} + dependencies: + '@azure/core-auth': 1.4.0 + '@azure/core-http': 2.3.1 + '@azure/core-rest-pipeline': 1.10.2 + '@azure/core-util': 1.2.0 + transitivePeerDependencies: + - encoding + - supports-color + dev: false + /@azure/abort-controller/1.1.0: resolution: {integrity: sha512-TrRLIoSQVzfAJX9H1JeFjzAoDGcoK1IYX1UImfceTZpsyYfWr09Ss1aHW1y5TrrR3iq6RZLBwJ3E24uwPhwahw==} engines: {node: '>=12.0.0'} @@ -14571,10 +14584,11 @@ packages: dev: false file:projects/arm-servicefabricmesh.tgz: - resolution: {integrity: sha512-/qetaRJy783L82Mm4VsUYKg+WOM2h87iWBGHePBSU526fA5spOfdJ+MKUEHiyAZD21MqIFFiP2SUfelWmdmkQw==, tarball: file:projects/arm-servicefabricmesh.tgz} + resolution: {integrity: sha512-aYKGT2g27Sob6dMH7QqNAkcwqokA6d8pMN39ntWC1z6F37z+017lGKppUPYl6IM1WIzfLnwxPfsULdWazwve2w==, tarball: file:projects/arm-servicefabricmesh.tgz} name: '@rush-temp/arm-servicefabricmesh' version: 0.0.0 dependencies: + '@azure-tools/test-recorder': 2.0.0 '@azure/identity': 2.1.0 '@microsoft/api-extractor': 7.34.4_@types+node@14.18.37 '@rollup/plugin-commonjs': 24.0.1_rollup@2.79.1 @@ -14585,8 +14599,8 @@ packages: '@types/node': 14.18.37 chai: 4.3.7 cross-env: 7.0.3 - dotenv: 8.6.0 - mkdirp: 1.0.4 + dotenv: 16.0.3 + mkdirp: 2.1.5 mocha: 7.2.0 rimraf: 3.0.2 rollup: 2.79.1 @@ -14595,6 +14609,7 @@ packages: typescript: 4.8.4 uglify-js: 3.17.4 transitivePeerDependencies: + - encoding - supports-color dev: false diff --git a/sdk/servicefabricmesh/arm-servicefabricmesh/CHANGELOG.md b/sdk/servicefabricmesh/arm-servicefabricmesh/CHANGELOG.md index 1ee4bcfcb3d8..29b4d2748123 100644 --- a/sdk/servicefabricmesh/arm-servicefabricmesh/CHANGELOG.md +++ b/sdk/servicefabricmesh/arm-servicefabricmesh/CHANGELOG.md @@ -1,18 +1,8 @@ # Release History + +## 3.0.0-beta.5 (2023-03-14) -## 3.0.0-beta.5 (Unreleased) - -### Features Added - -### Breaking Changes - -### Bugs Fixed - -### Other Changes - -## 3.0.0-beta.4 (2023-02-02) - -The package of @azure/arm-servicefabricmesh is using our next generation design principles since version 3.0.0-beta.4, which contains breaking changes. +The package of @azure/arm-servicefabricmesh is using our next generation design principles since version 3.0.0-beta.5, 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/servicefabricmesh/arm-servicefabricmesh/_meta.json b/sdk/servicefabricmesh/arm-servicefabricmesh/_meta.json index 76aaec6bb0c5..70afccd677a9 100644 --- a/sdk/servicefabricmesh/arm-servicefabricmesh/_meta.json +++ b/sdk/servicefabricmesh/arm-servicefabricmesh/_meta.json @@ -1,8 +1,8 @@ { - "commit": "aa42d66d5b919ea80c8dde04ae19d30a9c974d7d", - "readme": "specification\\servicefabricmesh\\resource-manager\\readme.md", - "autorest_command": "autorest --version=3.9.3 --typescript --modelerfour.lenient-model-deduplication --azure-arm --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=F:\\azure-sdk-for-js ..\\azure-rest-api-specs\\specification\\servicefabricmesh\\resource-manager\\readme.md --use=@autorest/typescript@6.0.0-rc.7 --generate-sample=true", + "commit": "e99cc530a256770bd4e47253e59798fba5beb4dc", + "readme": "specification/servicefabricmesh/resource-manager/readme.md", + "autorest_command": "autorest --version=3.9.3 --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/servicefabricmesh/resource-manager/readme.md --use=@autorest/typescript@6.0.0-rc.9", "repository_url": "https://github.com/Azure/azure-rest-api-specs.git", - "release_tool": "@azure-tools/js-sdk-release-tools@2.6.0", - "use": "@autorest/typescript@6.0.0-rc.7" + "release_tool": "@azure-tools/js-sdk-release-tools@2.6.2", + "use": "@autorest/typescript@6.0.0-rc.9" } \ No newline at end of file diff --git a/sdk/servicefabricmesh/arm-servicefabricmesh/package.json b/sdk/servicefabricmesh/arm-servicefabricmesh/package.json index 048748ed1f4a..30651123e58e 100644 --- a/sdk/servicefabricmesh/arm-servicefabricmesh/package.json +++ b/sdk/servicefabricmesh/arm-servicefabricmesh/package.json @@ -9,7 +9,7 @@ }, "dependencies": { "@azure/core-paging": "^1.2.0", - "@azure/core-client": "^1.6.1", + "@azure/core-client": "^1.7.0", "@azure/core-auth": "^1.3.0", "@azure/core-rest-pipeline": "^1.8.0", "tslib": "^2.2.0" @@ -31,15 +31,15 @@ "@rollup/plugin-json": "^6.0.0", "@rollup/plugin-multi-entry": "^6.0.0", "@rollup/plugin-node-resolve": "^13.1.3", - "mkdirp": "^1.0.4", + "mkdirp": "^2.1.2", "rollup": "^2.66.1", "rollup-plugin-sourcemaps": "^0.6.3", "typescript": "~4.8.0", "uglify-js": "^3.4.9", "rimraf": "^3.0.0", - "dotenv": "^8.2.0", + "dotenv": "^16.0.0", "@azure/identity": "^2.0.1", - "@azure-tools/test-recorder": "^3.0.0", + "@azure-tools/test-recorder": "^2.0.0", "@azure-tools/test-credential": "^1.0.0", "mocha": "^7.1.1", "@types/chai": "^4.2.8", @@ -109,13 +109,5 @@ ] }, "autoPublish": true, - "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/servicefabricmesh/arm-servicefabricmesh", - "//sampleConfiguration": { - "productName": "", - "productSlugs": [ - "azure" - ], - "disableDocsMs": true, - "apiRefLink": "https://docs.microsoft.com/javascript/api/@azure/arm-servicefabricmesh?view=azure-node-preview" - } -} + "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/servicefabricmesh/arm-servicefabricmesh" +} \ No newline at end of file diff --git a/sdk/servicefabricmesh/arm-servicefabricmesh/review/arm-servicefabricmesh.api.md b/sdk/servicefabricmesh/arm-servicefabricmesh/review/arm-servicefabricmesh.api.md index 0144d9bc9469..bd967d738223 100644 --- a/sdk/servicefabricmesh/arm-servicefabricmesh/review/arm-servicefabricmesh.api.md +++ b/sdk/servicefabricmesh/arm-servicefabricmesh/review/arm-servicefabricmesh.api.md @@ -180,6 +180,11 @@ export type AutoScalingTriggerKind = string; // @public (undocumented) export type AutoScalingTriggerUnion = AutoScalingTrigger | AverageLoadScalingTrigger; +// @public +export interface AvailableOperationDescriptionProperties { + serviceSpecification?: ServiceSpecification; +} + // @public export interface AvailableOperationDisplay { description?: string; @@ -303,6 +308,18 @@ export interface DiagnosticsSinkProperties { // @public (undocumented) export type DiagnosticsSinkPropertiesUnion = DiagnosticsSinkProperties | AzureInternalMonitoringPipelineSinkDescription; +// @public +export interface Dimension { + // (undocumented) + displayName?: string; + // (undocumented) + internalName?: string; + // (undocumented) + name?: string; + // (undocumented) + toBeExportedForShoebox?: boolean; +} + // @public export interface EndpointProperties { name: string; @@ -595,6 +612,18 @@ export interface LocalNetworkResourceProperties extends NetworkResourcePropertie networkAddressPrefix?: string; } +// @public +export interface LogSpecification { + // (undocumented) + blobDuration?: string; + // (undocumented) + displayName?: string; + // (undocumented) + logFilterPattern?: string; + // (undocumented) + name?: string; +} + // @public export interface ManagedProxyResource { readonly id?: string; @@ -602,6 +631,52 @@ export interface ManagedProxyResource { readonly type?: string; } +// @public +export interface MetricAvailability { + // (undocumented) + blobDuration?: string; + // (undocumented) + timeGrain?: string; +} + +// @public +export interface MetricSpecification { + // (undocumented) + aggregationType?: string; + // (undocumented) + availabilities?: MetricAvailability[]; + // (undocumented) + category?: string; + // (undocumented) + dimensions?: Dimension[]; + // (undocumented) + displayDescription?: string; + // (undocumented) + displayName?: string; + // (undocumented) + enableRegionalMdmAccount?: boolean; + // (undocumented) + fillGapWithZero?: boolean; + // (undocumented) + isInternal?: boolean; + // (undocumented) + metricFilterPattern?: string; + // (undocumented) + name?: string; + // (undocumented) + sourceMdmAccount?: string; + // (undocumented) + sourceMdmNamespace?: string; + // (undocumented) + supportedAggregationTypes?: string[]; + // (undocumented) + supportedTimeGrainTypes?: string[]; + // (undocumented) + supportsInstanceLevelAggregation?: boolean; + // (undocumented) + unit?: string; +} + // @public export interface Network { create(resourceGroupName: string, networkResourceName: string, networkResourceDescription: NetworkResourceDescription, options?: NetworkCreateOptionalParams): Promise; @@ -711,6 +786,7 @@ export interface OperationResult { name?: string; nextLink?: string; origin?: string; + properties?: AvailableOperationDescriptionProperties; } // @public @@ -1089,6 +1165,14 @@ export interface ServiceResourceDescriptionList { export interface ServiceResourceProperties extends ProvisionedResourceProperties, ServiceReplicaProperties, ServiceProperties { } +// @public +export interface ServiceSpecification { + // (undocumented) + logSpecifications?: LogSpecification[]; + // (undocumented) + metricSpecifications?: MetricSpecification[]; +} + // @public export interface Setting { name?: string; diff --git a/sdk/servicefabricmesh/arm-servicefabricmesh/src/models/index.ts b/sdk/servicefabricmesh/arm-servicefabricmesh/src/models/index.ts index 26a6ebe843e5..035d59665f41 100644 --- a/sdk/servicefabricmesh/arm-servicefabricmesh/src/models/index.ts +++ b/sdk/servicefabricmesh/arm-servicefabricmesh/src/models/index.ts @@ -57,6 +57,8 @@ export interface OperationResult { origin?: string; /** The URL to use for getting the next set of results. */ nextLink?: string; + /** Properties of the operation */ + properties?: AvailableOperationDescriptionProperties; } /** An operation available at the listed Azure resource provider. */ @@ -71,6 +73,64 @@ export interface AvailableOperationDisplay { description?: string; } +/** Properties available for a Microsoft.Web resource provider operation. */ +export interface AvailableOperationDescriptionProperties { + /** Resource metrics service provided by Microsoft.Insights resource provider. */ + serviceSpecification?: ServiceSpecification; +} + +/** Resource metrics service provided by Microsoft.Insights resource provider. */ +export interface ServiceSpecification { + metricSpecifications?: MetricSpecification[]; + logSpecifications?: LogSpecification[]; +} + +/** Definition of a single resource metric. */ +export interface MetricSpecification { + name?: string; + displayName?: string; + displayDescription?: string; + unit?: string; + aggregationType?: string; + supportsInstanceLevelAggregation?: boolean; + enableRegionalMdmAccount?: boolean; + sourceMdmAccount?: string; + sourceMdmNamespace?: string; + metricFilterPattern?: string; + fillGapWithZero?: boolean; + isInternal?: boolean; + dimensions?: Dimension[]; + category?: string; + availabilities?: MetricAvailability[]; + supportedTimeGrainTypes?: string[]; + supportedAggregationTypes?: string[]; +} + +/** + * Dimension of a resource metric. For e.g. instance specific HTTP requests for a web app, + * where instance name is dimension of the metric HTTP request + */ +export interface Dimension { + name?: string; + displayName?: string; + internalName?: string; + toBeExportedForShoebox?: boolean; +} + +/** Retention policy of a resource metric. */ +export interface MetricAvailability { + timeGrain?: string; + blobDuration?: string; +} + +/** Log Definition of a single resource metric. */ +export interface LogSpecification { + name?: string; + displayName?: string; + blobDuration?: string; + logFilterPattern?: string; +} + /** The error details. */ export interface ErrorModel { /** Error model information */ diff --git a/sdk/servicefabricmesh/arm-servicefabricmesh/src/models/mappers.ts b/sdk/servicefabricmesh/arm-servicefabricmesh/src/models/mappers.ts index f532f60040eb..ac6cc3f8e31e 100644 --- a/sdk/servicefabricmesh/arm-servicefabricmesh/src/models/mappers.ts +++ b/sdk/servicefabricmesh/arm-servicefabricmesh/src/models/mappers.ts @@ -65,6 +65,13 @@ export const OperationResult: coreClient.CompositeMapper = { type: { name: "String" } + }, + properties: { + serializedName: "properties", + type: { + name: "Composite", + className: "AvailableOperationDescriptionProperties" + } } } } @@ -103,6 +110,275 @@ export const AvailableOperationDisplay: coreClient.CompositeMapper = { } }; +export const AvailableOperationDescriptionProperties: coreClient.CompositeMapper = { + type: { + name: "Composite", + className: "AvailableOperationDescriptionProperties", + modelProperties: { + serviceSpecification: { + serializedName: "serviceSpecification", + type: { + name: "Composite", + className: "ServiceSpecification" + } + } + } + } +}; + +export const ServiceSpecification: coreClient.CompositeMapper = { + type: { + name: "Composite", + className: "ServiceSpecification", + modelProperties: { + metricSpecifications: { + serializedName: "metricSpecifications", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "MetricSpecification" + } + } + } + }, + logSpecifications: { + serializedName: "logSpecifications", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "LogSpecification" + } + } + } + } + } + } +}; + +export const MetricSpecification: coreClient.CompositeMapper = { + type: { + name: "Composite", + className: "MetricSpecification", + modelProperties: { + name: { + serializedName: "name", + type: { + name: "String" + } + }, + displayName: { + serializedName: "displayName", + type: { + name: "String" + } + }, + displayDescription: { + serializedName: "displayDescription", + type: { + name: "String" + } + }, + unit: { + serializedName: "unit", + type: { + name: "String" + } + }, + aggregationType: { + serializedName: "aggregationType", + type: { + name: "String" + } + }, + supportsInstanceLevelAggregation: { + serializedName: "supportsInstanceLevelAggregation", + type: { + name: "Boolean" + } + }, + enableRegionalMdmAccount: { + serializedName: "enableRegionalMdmAccount", + type: { + name: "Boolean" + } + }, + sourceMdmAccount: { + serializedName: "sourceMdmAccount", + type: { + name: "String" + } + }, + sourceMdmNamespace: { + serializedName: "sourceMdmNamespace", + type: { + name: "String" + } + }, + metricFilterPattern: { + serializedName: "metricFilterPattern", + type: { + name: "String" + } + }, + fillGapWithZero: { + serializedName: "fillGapWithZero", + type: { + name: "Boolean" + } + }, + isInternal: { + serializedName: "isInternal", + type: { + name: "Boolean" + } + }, + dimensions: { + serializedName: "dimensions", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "Dimension" + } + } + } + }, + category: { + serializedName: "category", + type: { + name: "String" + } + }, + availabilities: { + serializedName: "availabilities", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "MetricAvailability" + } + } + } + }, + supportedTimeGrainTypes: { + serializedName: "supportedTimeGrainTypes", + type: { + name: "Sequence", + element: { + type: { + name: "String" + } + } + } + }, + supportedAggregationTypes: { + serializedName: "supportedAggregationTypes", + type: { + name: "Sequence", + element: { + type: { + name: "String" + } + } + } + } + } + } +}; + +export const Dimension: coreClient.CompositeMapper = { + type: { + name: "Composite", + className: "Dimension", + modelProperties: { + name: { + serializedName: "name", + type: { + name: "String" + } + }, + displayName: { + serializedName: "displayName", + type: { + name: "String" + } + }, + internalName: { + serializedName: "internalName", + type: { + name: "String" + } + }, + toBeExportedForShoebox: { + serializedName: "toBeExportedForShoebox", + type: { + name: "Boolean" + } + } + } + } +}; + +export const MetricAvailability: coreClient.CompositeMapper = { + type: { + name: "Composite", + className: "MetricAvailability", + modelProperties: { + timeGrain: { + serializedName: "timeGrain", + type: { + name: "String" + } + }, + blobDuration: { + serializedName: "blobDuration", + type: { + name: "String" + } + } + } + } +}; + +export const LogSpecification: coreClient.CompositeMapper = { + type: { + name: "Composite", + className: "LogSpecification", + modelProperties: { + name: { + serializedName: "name", + type: { + name: "String" + } + }, + displayName: { + serializedName: "displayName", + type: { + name: "String" + } + }, + blobDuration: { + serializedName: "blobDuration", + type: { + name: "String" + } + }, + logFilterPattern: { + serializedName: "logFilterPattern", + type: { + name: "String" + } + } + } + } +}; + export const ErrorModel: coreClient.CompositeMapper = { type: { name: "Composite", diff --git a/sdk/servicefabricmesh/arm-servicefabricmesh/tsconfig.json b/sdk/servicefabricmesh/arm-servicefabricmesh/tsconfig.json index b352b9a4ca89..3e6ae96443f3 100644 --- a/sdk/servicefabricmesh/arm-servicefabricmesh/tsconfig.json +++ b/sdk/servicefabricmesh/arm-servicefabricmesh/tsconfig.json @@ -15,17 +15,11 @@ ], "declaration": true, "outDir": "./dist-esm", - "importHelpers": true, - "paths": { - "@azure/arm-servicefabricmesh": [ - "./src/index" - ] - } + "importHelpers": true }, "include": [ "./src/**/*.ts", - "./test/**/*.ts", - "samples-dev/**/*.ts" + "./test/**/*.ts" ], "exclude": [ "node_modules"