diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index d37dbec8470c..51e46e7edef8 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -10564,28 +10564,27 @@ packages: dev: false file:projects/arm-deviceprovisioningservices.tgz: - resolution: {integrity: sha512-XDNuzgCr0FhdYtH89+GO1jX6nVV+XYLK+xEBUHTEEEGqleGxEOyrMQ1UOH/GCew95p2H7uEthsGm35KXlDB4Pg==, tarball: file:projects/arm-deviceprovisioningservices.tgz} + resolution: {integrity: sha512-+mZUHYK1KgZzdi0Oemfac3JDyIXl7KEo+DXL/ke1sv8VPOx9M+LdFrtoe5L0wRyd63AuUQPY1BD5zCb0vSCncQ==, tarball: file:projects/arm-deviceprovisioningservices.tgz} name: '@rush-temp/arm-deviceprovisioningservices' 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/deviceprovisioningservices/arm-deviceprovisioningservices/CHANGELOG.md b/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/CHANGELOG.md index 796ca213290b..e386c8a793cc 100644 --- a/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/CHANGELOG.md +++ b/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/CHANGELOG.md @@ -1,15 +1,17 @@ # Release History + +## 5.0.0 (2022-04-24) + +**Features** -## 4.1.2 (Unreleased) - -### Features Added - -### Breaking Changes - -### Bugs Fixed + - Added Interface ErrorMessage + - Added Interface IotDpsResourceDeletePrivateEndpointConnectionHeaders -### Other Changes +**Breaking Changes** + - Operation DpsCertificate.createOrUpdate has a new signature + + ## 4.1.1 (2022-04-18) **features** diff --git a/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/README.md b/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/README.md index 9be3f4bbaa44..c464628e2494 100644 --- a/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/README.md +++ b/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/README.md @@ -16,8 +16,6 @@ API for using the Azure IoT Hub Device Provisioning Service features. - [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 { IotDpsClient } = require("@azure/arm-deviceprovisioningservices"); 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 IotDpsClient(new DefaultAzureCredential(), subscriptionId); - -// For client-side applications running in the browser, use this code instead: -// const credential = new InteractiveBrowserCredential({ -// tenantId: "", -// clientId: "" -// }); -// const client = new IotDpsClient(credential, subscriptionId); ``` diff --git a/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/_meta.json b/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/_meta.json index 88d8eb0f0a46..b015ed982a27 100644 --- a/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/_meta.json +++ b/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/_meta.json @@ -1,8 +1,8 @@ { - "commit": "2a2aa10bc5e772934d22628faf45a53055ee96c6", - "readme": "specification\\deviceprovisioningservices\\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\\deviceprovisioningservices\\resource-manager\\readme.md --use=@autorest/typescript@6.0.0-alpha.19.20220408.1 --generate-sample=true", + "commit": "b16a1be91b895ef35d432b103d2e004efdb52e56", + "readme": "specification/deviceprovisioningservices/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=/mnt/vss/_work/1/s/azure-sdk-for-js ../azure-rest-api-specs/specification/deviceprovisioningservices/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.2.6", - "use": "@autorest/typescript@6.0.0-alpha.19.20220408.1" + "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/deviceprovisioningservices/arm-deviceprovisioningservices/package.json b/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/package.json index 33949787ab88..e0749439fd6c 100644 --- a/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/package.json +++ b/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/package.json @@ -3,7 +3,7 @@ "sdk-type": "mgmt", "author": "Microsoft Corporation", "description": "A generated SDK for IotDpsClient.", - "version": "4.1.2", + "version": "5.0.0", "engines": { "node": ">=12.0.0" }, @@ -11,9 +11,9 @@ "@azure/core-lro": "^2.2.0", "@azure/abort-controller": "^1.0.0", "@azure/core-paging": "^1.2.0", - "@azure/core-client": "^1.5.0", + "@azure/core-client": "^1.0.0", "@azure/core-auth": "^1.3.0", - "@azure/core-rest-pipeline": "^1.8.0", + "@azure/core-rest-pipeline": "^1.1.0", "tslib": "^2.2.0" }, "keywords": [ @@ -28,14 +28,14 @@ "module": "./dist-esm/src/index.js", "types": "./types/arm-deviceprovisioningservices.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/iotDpsClient.ts", - "prefix": "packageDetails" - } - ] - }, - "autoPublish": true, - "//sampleConfiguration": { - "productName": "", - "productSlugs": [ - "azure" - ], - "disableDocsMs": true, - "apiRefLink": "https://docs.microsoft.com/javascript/api/@azure/arm-deviceprovisioningservices?view=azure-node-preview" - } -} + "autoPublish": true +} \ No newline at end of file diff --git a/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/review/arm-deviceprovisioningservices.api.md b/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/review/arm-deviceprovisioningservices.api.md index a8888bef3276..6b7cd036e411 100644 --- a/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/review/arm-deviceprovisioningservices.api.md +++ b/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/review/arm-deviceprovisioningservices.api.md @@ -18,7 +18,7 @@ export type AllocationPolicy = string; // @public export interface AsyncOperationResult { - error?: ErrorMesssage; + error?: ErrorMessage; status?: string; } @@ -35,10 +35,10 @@ export interface CertificateListDescription { // @public export interface CertificateProperties { - readonly certificate?: Uint8Array; + certificate?: Uint8Array; readonly created?: Date; readonly expiry?: Date; - readonly isVerified?: boolean; + isVerified?: boolean; readonly subject?: string; readonly thumbprint?: string; readonly updated?: Date; @@ -62,7 +62,7 @@ export type CreatedByType = string; // @public export interface DpsCertificate { - createOrUpdate(resourceGroupName: string, provisioningServiceName: string, certificateName: string, certificateDescription: CertificateBodyDescription, options?: DpsCertificateCreateOrUpdateOptionalParams): Promise; + createOrUpdate(resourceGroupName: string, provisioningServiceName: string, certificateName: string, certificateDescription: CertificateResponse, options?: DpsCertificateCreateOrUpdateOptionalParams): Promise; delete(resourceGroupName: string, ifMatch: string, provisioningServiceName: string, certificateName: string, options?: DpsCertificateDeleteOptionalParams): Promise; generateVerificationCode(certificateName: string, ifMatch: string, resourceGroupName: string, provisioningServiceName: string, options?: DpsCertificateGenerateVerificationCodeOptionalParams): Promise; get(certificateName: string, resourceGroupName: string, provisioningServiceName: string, options?: DpsCertificateGetOptionalParams): Promise; @@ -144,7 +144,7 @@ export interface ErrorDetails { } // @public -export interface ErrorMesssage { +export interface ErrorMessage { code?: string; details?: string; message?: string; @@ -262,6 +262,13 @@ export interface IotDpsResourceDeleteOptionalParams extends coreClient.Operation updateIntervalInMs?: number; } +// @public +export interface IotDpsResourceDeletePrivateEndpointConnectionHeaders { + azureAsyncOperation?: string; + location?: string; + retryAfter?: string; +} + // @public export interface IotDpsResourceDeletePrivateEndpointConnectionOptionalParams extends coreClient.OperationOptions { resumeFrom?: string; diff --git a/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/rollup.config.js b/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/rollup.config.js index 3f89d7309da5..9be1955eb7f1 100644 --- a/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/rollup.config.js +++ b/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/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/deviceprovisioningservices/arm-deviceprovisioningservices/src/iotDpsClient.ts b/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/src/iotDpsClient.ts index 96d33ee9e436..9b7a016fe41b 100644 --- a/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/src/iotDpsClient.ts +++ b/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/src/iotDpsClient.ts @@ -7,7 +7,6 @@ */ import * as coreClient from "@azure/core-client"; -import * as coreRestPipeline from "@azure/core-rest-pipeline"; import * as coreAuth from "@azure/core-auth"; import { OperationsImpl, @@ -53,7 +52,7 @@ export class IotDpsClient extends coreClient.ServiceClient { credential: credentials }; - const packageDetails = `azsdk-js-arm-deviceprovisioningservices/4.1.2`; + const packageDetails = `azsdk-js-arm-deviceprovisioningservices/5.0.0`; const userAgentPrefix = options.userAgentOptions && options.userAgentOptions.userAgentPrefix ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}` @@ -68,39 +67,15 @@ export class IotDpsClient extends coreClient.ServiceClient { userAgentOptions: { userAgentPrefix }, - baseUri: - options.endpoint ?? options.baseUri ?? "https://management.azure.com" + baseUri: options.endpoint || "https://management.azure.com" }; super(optionsWithDefaults); - - if (options?.pipeline && options.pipeline.getOrderedPolicies().length > 0) { - const pipelinePolicies: coreRestPipeline.PipelinePolicy[] = options.pipeline.getOrderedPolicies(); - const bearerTokenAuthenticationPolicyFound = pipelinePolicies.some( - (pipelinePolicy) => - pipelinePolicy.name === - coreRestPipeline.bearerTokenAuthenticationPolicyName - ); - if (!bearerTokenAuthenticationPolicyFound) { - this.pipeline.removePolicy({ - name: coreRestPipeline.bearerTokenAuthenticationPolicyName - }); - this.pipeline.addPolicy( - coreRestPipeline.bearerTokenAuthenticationPolicy({ - scopes: `${optionsWithDefaults.baseUri}/.default`, - challengeCallbacks: { - authorizeRequestOnChallenge: - coreClient.authorizeRequestOnClaimChallenge - } - }) - ); - } - } // Parameter assignments this.subscriptionId = subscriptionId; // Assigning values to Constant parameters this.$host = options.$host || "https://management.azure.com"; - this.apiVersion = options.apiVersion || "2021-10-15"; + this.apiVersion = options.apiVersion || "2022-02-05"; this.operations = new OperationsImpl(this); this.dpsCertificate = new DpsCertificateImpl(this); this.iotDpsResource = new IotDpsResourceImpl(this); diff --git a/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/src/models/index.ts b/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/src/models/index.ts index 82917a8231e3..4dc8a1946724 100644 --- a/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/src/models/index.ts +++ b/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/src/models/index.ts @@ -124,16 +124,10 @@ export interface CertificateProperties { * NOTE: This property will not be serialized. It can only be populated by the server. */ readonly thumbprint?: string; - /** - * Determines whether certificate has been verified. - * NOTE: This property will not be serialized. It can only be populated by the server. - */ - readonly isVerified?: boolean; - /** - * base-64 representation of X509 certificate .cer file or just .pem file content. - * NOTE: This property will not be serialized. It can only be populated by the server. - */ - readonly certificate?: Uint8Array; + /** Determines whether certificate has been verified. */ + isVerified?: boolean; + /** base-64 representation of X509 certificate .cer file or just .pem file content. */ + certificate?: Uint8Array; /** * The certificate's creation date and time. * NOTE: This property will not be serialized. It can only be populated by the server. @@ -162,14 +156,6 @@ export interface SystemData { lastModifiedAt?: Date; } -/** The JSON-serialized X509 Certificate. */ -export interface CertificateBodyDescription { - /** Base-64 representation of the X509 leaf certificate .cer file or just .pem file content. */ - certificate?: string; - /** True indicates that the certificate will be created in verified state and proof of possession will not be required. */ - isVerified?: boolean; -} - /** the service specific properties of a provisioning service, including keys, linked iot hubs, current state, and system generated properties such as hostname and idScope */ export interface IotDpsPropertiesDescription { /** Current state of the provisioning service. */ @@ -368,11 +354,11 @@ export interface AsyncOperationResult { /** current status of a long running operation. */ status?: string; /** Error message containing code, description and details */ - error?: ErrorMesssage; + error?: ErrorMessage; } /** Error response containing message and code. */ -export interface ErrorMesssage { +export interface ErrorMessage { /** standard error code */ code?: string; /** standard error description */ @@ -512,6 +498,14 @@ export interface GroupIdInformationProperties { requiredZoneNames?: string[]; } +/** The JSON-serialized X509 Certificate. */ +export interface CertificateBodyDescription { + /** Base-64 representation of the X509 leaf certificate .cer file or just .pem file content. */ + certificate?: string; + /** True indicates that the certificate will be created in verified state and proof of possession will not be required. */ + isVerified?: boolean; +} + /** The description of the provisioning service. */ export type ProvisioningServiceDescription = Resource & { /** The Etag field is *not* required. If it is provided in the response body, it must also be provided as a header per the normal ETag convention. */ @@ -527,6 +521,16 @@ export type ProvisioningServiceDescription = Resource & { readonly systemData?: SystemData; }; +/** Defines headers for IotDpsResource_deletePrivateEndpointConnection operation. */ +export interface IotDpsResourceDeletePrivateEndpointConnectionHeaders { + /** Operation Status Location URI */ + azureAsyncOperation?: string; + /** Operation Status Location URI */ + location?: string; + /** Retry After */ + retryAfter?: string; +} + /** Known values of {@link CreatedByType} that the service accepts. */ export enum KnownCreatedByType { User = "User", diff --git a/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/src/models/mappers.ts b/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/src/models/mappers.ts index ec855e5e8301..d7eca15c9269 100644 --- a/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/src/models/mappers.ts +++ b/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/src/models/mappers.ts @@ -206,14 +206,12 @@ export const CertificateProperties: coreClient.CompositeMapper = { }, isVerified: { serializedName: "isVerified", - readOnly: true, type: { name: "Boolean" } }, certificate: { serializedName: "certificate", - readOnly: true, type: { name: "ByteArray" } @@ -281,27 +279,6 @@ export const SystemData: coreClient.CompositeMapper = { } }; -export const CertificateBodyDescription: coreClient.CompositeMapper = { - type: { - name: "Composite", - className: "CertificateBodyDescription", - modelProperties: { - certificate: { - serializedName: "certificate", - type: { - name: "String" - } - }, - isVerified: { - serializedName: "isVerified", - type: { - name: "Boolean" - } - } - } - } -}; - export const IotDpsPropertiesDescription: coreClient.CompositeMapper = { type: { name: "Composite", @@ -796,17 +773,17 @@ export const AsyncOperationResult: coreClient.CompositeMapper = { serializedName: "error", type: { name: "Composite", - className: "ErrorMesssage" + className: "ErrorMessage" } } } } }; -export const ErrorMesssage: coreClient.CompositeMapper = { +export const ErrorMessage: coreClient.CompositeMapper = { type: { name: "Composite", - className: "ErrorMesssage", + className: "ErrorMessage", modelProperties: { code: { serializedName: "code", @@ -1159,6 +1136,27 @@ export const GroupIdInformationProperties: coreClient.CompositeMapper = { } }; +export const CertificateBodyDescription: coreClient.CompositeMapper = { + type: { + name: "Composite", + className: "CertificateBodyDescription", + modelProperties: { + certificate: { + serializedName: "certificate", + type: { + name: "String" + } + }, + isVerified: { + serializedName: "isVerified", + type: { + name: "Boolean" + } + } + } + } +}; + export const ProvisioningServiceDescription: coreClient.CompositeMapper = { type: { name: "Composite", @@ -1195,3 +1193,30 @@ export const ProvisioningServiceDescription: coreClient.CompositeMapper = { } } }; + +export const IotDpsResourceDeletePrivateEndpointConnectionHeaders: coreClient.CompositeMapper = { + type: { + name: "Composite", + className: "IotDpsResourceDeletePrivateEndpointConnectionHeaders", + modelProperties: { + azureAsyncOperation: { + serializedName: "azure-asyncoperation", + type: { + name: "String" + } + }, + location: { + serializedName: "location", + type: { + name: "String" + } + }, + retryAfter: { + serializedName: "retry-after", + type: { + name: "String" + } + } + } + } +}; diff --git a/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/src/models/parameters.ts b/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/src/models/parameters.ts index 2f707e5046ee..6acfc7566dae 100644 --- a/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/src/models/parameters.ts +++ b/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/src/models/parameters.ts @@ -12,7 +12,7 @@ import { OperationQueryParameter } from "@azure/core-client"; import { - CertificateBodyDescription as CertificateBodyDescriptionMapper, + CertificateResponse as CertificateResponseMapper, VerificationCodeRequest as VerificationCodeRequestMapper, ProvisioningServiceDescription as ProvisioningServiceDescriptionMapper, TagsResource as TagsResourceMapper, @@ -47,7 +47,7 @@ export const $host: OperationURLParameter = { export const apiVersion: OperationQueryParameter = { parameterPath: "apiVersion", mapper: { - defaultValue: "2021-10-15", + defaultValue: "2022-02-05", isConstant: true, serializedName: "api-version", type: { @@ -136,7 +136,7 @@ export const contentType: OperationParameter = { export const certificateDescription: OperationParameter = { parameterPath: "certificateDescription", - mapper: CertificateBodyDescriptionMapper + mapper: CertificateResponseMapper }; export const certificateName1: OperationURLParameter = { diff --git a/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/src/operations/dpsCertificate.ts b/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/src/operations/dpsCertificate.ts index 7b774cfabcc9..94860ac1f0bd 100644 --- a/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/src/operations/dpsCertificate.ts +++ b/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/src/operations/dpsCertificate.ts @@ -14,7 +14,7 @@ import { IotDpsClient } from "../iotDpsClient"; import { DpsCertificateGetOptionalParams, DpsCertificateGetResponse, - CertificateBodyDescription, + CertificateResponse, DpsCertificateCreateOrUpdateOptionalParams, DpsCertificateCreateOrUpdateResponse, DpsCertificateDeleteOptionalParams, @@ -70,7 +70,7 @@ export class DpsCertificateImpl implements DpsCertificate { resourceGroupName: string, provisioningServiceName: string, certificateName: string, - certificateDescription: CertificateBodyDescription, + certificateDescription: CertificateResponse, options?: DpsCertificateCreateOrUpdateOptionalParams ): Promise { return this.client.sendOperationRequest( diff --git a/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/src/operations/iotDpsResource.ts b/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/src/operations/iotDpsResource.ts index 71185f130ad9..3cfc2a29a88f 100644 --- a/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/src/operations/iotDpsResource.ts +++ b/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/src/operations/iotDpsResource.ts @@ -406,12 +406,10 @@ export class IotDpsResourceImpl implements IotDpsResource { }, createOrUpdateOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** @@ -506,12 +504,10 @@ export class IotDpsResourceImpl implements IotDpsResource { }, updateOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** @@ -592,12 +588,10 @@ export class IotDpsResourceImpl implements IotDpsResource { { provisioningServiceName, resourceGroupName, options }, deleteOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** @@ -896,12 +890,10 @@ export class IotDpsResourceImpl implements IotDpsResource { }, createOrUpdatePrivateEndpointConnectionOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** @@ -996,12 +988,10 @@ export class IotDpsResourceImpl implements IotDpsResource { }, deletePrivateEndpointConnectionOperationSpec ); - const poller = new LroEngine(lro, { + return new LroEngine(lro, { resumeFrom: options?.resumeFrom, intervalInMs: options?.updateIntervalInMs }); - await poller.poll(); - return poller; } /** diff --git a/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/src/operationsInterfaces/dpsCertificate.ts b/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/src/operationsInterfaces/dpsCertificate.ts index a834a973aee3..a1682492b9d5 100644 --- a/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/src/operationsInterfaces/dpsCertificate.ts +++ b/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/src/operationsInterfaces/dpsCertificate.ts @@ -9,7 +9,7 @@ import { DpsCertificateGetOptionalParams, DpsCertificateGetResponse, - CertificateBodyDescription, + CertificateResponse, DpsCertificateCreateOrUpdateOptionalParams, DpsCertificateCreateOrUpdateResponse, DpsCertificateDeleteOptionalParams, @@ -49,7 +49,7 @@ export interface DpsCertificate { resourceGroupName: string, provisioningServiceName: string, certificateName: string, - certificateDescription: CertificateBodyDescription, + certificateDescription: CertificateResponse, options?: DpsCertificateCreateOrUpdateOptionalParams ): Promise; /** diff --git a/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/tsconfig.json b/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/tsconfig.json index 8bfdb03c3341..3e6ae96443f3 100644 --- a/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/tsconfig.json +++ b/sdk/deviceprovisioningservices/arm-deviceprovisioningservices/tsconfig.json @@ -15,17 +15,11 @@ ], "declaration": true, "outDir": "./dist-esm", - "importHelpers": true, - "paths": { - "@azure/arm-deviceprovisioningservices": [ - "./src/index" - ] - } + "importHelpers": true }, "include": [ "./src/**/*.ts", - "./test/**/*.ts", - "samples-dev/**/*.ts" + "./test/**/*.ts" ], "exclude": [ "node_modules"