diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index d12f7697902b..8fa177b92b93 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -3928,7 +3928,7 @@ packages: dependencies: semver: 7.3.8 shelljs: 0.8.5 - typescript: 5.0.0-dev.20221128 + typescript: 5.0.0-dev.20221129 dev: false /downlevel-dts/0.8.0: @@ -8972,8 +8972,8 @@ packages: hasBin: true dev: false - /typescript/5.0.0-dev.20221128: - resolution: {integrity: sha512-cNV/osEHGNKTyjj/Ivi8s8x7MPkh0Kd/t53QjyXfM3jO3cC2jhL6kor57ziWqvyfl6paWjdNUVO/jxGsQOyfug==} + /typescript/5.0.0-dev.20221129: + resolution: {integrity: sha512-KYJlVn//fGz46EMIXlq2dri8ivw/Nc312RKbTLilThGolVUTTvaunJBViCZTE3JhVBZLlE0KYp0j19uklQVXVw==} engines: {node: '>=4.2.0'} hasBin: true dev: false @@ -11509,9 +11509,9 @@ packages: '@rollup/plugin-json': 4.1.0_rollup@2.79.1 '@rollup/plugin-multi-entry': 4.1.0_rollup@2.79.1 '@rollup/plugin-node-resolve': 13.3.0_rollup@2.79.1 - '@types/chai': 4.3.3 + '@types/chai': 4.3.4 '@types/node': 14.18.33 - chai: 4.3.6 + chai: 4.3.7 cross-env: 7.0.3 mkdirp: 1.0.4 mocha: 7.2.0 @@ -11564,9 +11564,9 @@ packages: '@rollup/plugin-json': 4.1.0_rollup@2.79.1 '@rollup/plugin-multi-entry': 4.1.0_rollup@2.79.1 '@rollup/plugin-node-resolve': 13.3.0_rollup@2.79.1 - '@types/chai': 4.3.3 + '@types/chai': 4.3.4 '@types/node': 14.18.33 - chai: 4.3.6 + chai: 4.3.7 cross-env: 7.0.3 mkdirp: 1.0.4 mocha: 7.2.0 @@ -11592,9 +11592,9 @@ packages: '@rollup/plugin-json': 4.1.0_rollup@2.79.1 '@rollup/plugin-multi-entry': 4.1.0_rollup@2.79.1 '@rollup/plugin-node-resolve': 13.3.0_rollup@2.79.1 - '@types/chai': 4.3.3 + '@types/chai': 4.3.4 '@types/node': 14.18.33 - chai: 4.3.6 + chai: 4.3.7 cross-env: 7.0.3 mkdirp: 1.0.4 mocha: 7.2.0 @@ -11963,7 +11963,7 @@ packages: dev: false file:projects/arm-digitaltwins.tgz: - resolution: {integrity: sha512-Cj29elLflzxgsWuVLqfLwmGuxr3G6LBRfqQheg8cU13+wkrVBCNnTz+AdyYAcVIWvn9w9rvSqZCBhg1afOc05Q==, tarball: file:projects/arm-digitaltwins.tgz} + resolution: {integrity: sha512-diK367mdNtM7OOeZWKABtRiK0NVKCwEFqdwE0X00CB794BBhkGwILS2seDr7XGfwV9bM3cwpgA6Oi0+tAHsw9w==, tarball: file:projects/arm-digitaltwins.tgz} name: '@rush-temp/arm-digitaltwins' version: 0.0.0 dependencies: @@ -11982,7 +11982,7 @@ packages: rollup: 2.79.1 rollup-plugin-sourcemaps: 0.6.3_rollup@2.79.1 tslib: 2.4.1 - typescript: 4.2.4 + typescript: 4.6.4 uglify-js: 3.17.4 transitivePeerDependencies: - '@types/node' @@ -19851,7 +19851,7 @@ packages: dev: false file:projects/test-utils.tgz: - resolution: {integrity: sha512-Dmo3usvsR7NnLEgv9M03xcaCz6X3l0bamstzq95KLC3Rzt88e8h1hLb6TFZoSBV1EvlLNQUkMI2uHPHpI9W7WQ==, tarball: file:projects/test-utils.tgz} + resolution: {integrity: sha512-YZE/nBZ4/+anJj7A4z2j6eyOuG135QH3mzaCUQs/MEtp4xaTK5hjmwugvY64f3hYeM2l7EEINQrpLhIQ3Boc3w==, tarball: file:projects/test-utils.tgz} name: '@rush-temp/test-utils' version: 0.0.0 dependencies: @@ -19881,7 +19881,6 @@ packages: transitivePeerDependencies: - bufferutil - debug - - encoding - supports-color - utf-8-validate dev: false diff --git a/sdk/digitaltwins/arm-digitaltwins/CHANGELOG.md b/sdk/digitaltwins/arm-digitaltwins/CHANGELOG.md index 6e41723edd7f..242c0d4a70f6 100644 --- a/sdk/digitaltwins/arm-digitaltwins/CHANGELOG.md +++ b/sdk/digitaltwins/arm-digitaltwins/CHANGELOG.md @@ -1,15 +1,29 @@ # Release History + +## 3.2.0 (2022-11-30) + +**Features** -## 3.1.1 (Unreleased) - -### Features Added - -### Breaking Changes - -### Bugs Fixed - -### Other Changes - + - Added Interface AzureDataExplorerConnectionProperties + - Added Interface ConnectionPropertiesPrivateLinkServiceConnectionState + - Added Interface DigitalTwinsDescription + - Added Interface DigitalTwinsEndpointResource + - Added Interface EventGrid + - Added Interface EventHub + - Added Interface ManagedIdentityReference + - Added Interface ServiceBus + - Added Interface TimeSeriesDatabaseConnection + - Added Interface UserAssignedIdentity + - Added Type Alias ConnectionType + - Added Type Alias IdentityType + - Interface DigitalTwinsEndpointResourceProperties has a new optional parameter identity + - Interface DigitalTwinsIdentity has a new optional parameter userAssignedIdentities + - Interface TimeSeriesDatabaseConnectionProperties has a new optional parameter identity + - Added Enum KnownIdentityType + - Enum KnownDigitalTwinsIdentityType has a new value SystemAssignedUserAssigned + - Enum KnownDigitalTwinsIdentityType has a new value UserAssigned + + ## 3.1.0 (2022-06-22) **Features** diff --git a/sdk/digitaltwins/arm-digitaltwins/_meta.json b/sdk/digitaltwins/arm-digitaltwins/_meta.json index 0875c938ca4f..b86a1d09530f 100644 --- a/sdk/digitaltwins/arm-digitaltwins/_meta.json +++ b/sdk/digitaltwins/arm-digitaltwins/_meta.json @@ -1,8 +1,8 @@ { - "commit": "93207d1a3cbabfd418273f4a6ace1f4984b138e5", + "commit": "750ec43bdd137935cea70888634dbc9730c99fec", "readme": "specification/digitaltwins/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:\\Git\\azure-sdk-for-js ..\\azure-rest-api-specs\\specification\\digitaltwins\\resource-manager\\readme.md --use=@autorest/typescript@6.0.0-beta.20 --generate-sample=true", + "autorest_command": "autorest --version=3.8.4 --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/digitaltwins/resource-manager/readme.md --use=@autorest/typescript@6.0.0-rc.2", "repository_url": "https://github.com/Azure/azure-rest-api-specs.git", - "release_tool": "@azure-tools/js-sdk-release-tools@2.3.2", - "use": "@autorest/typescript@6.0.0-beta.20" + "release_tool": "@azure-tools/js-sdk-release-tools@2.5.1", + "use": "@autorest/typescript@6.0.0-rc.2" } \ No newline at end of file diff --git a/sdk/digitaltwins/arm-digitaltwins/package.json b/sdk/digitaltwins/arm-digitaltwins/package.json index 251cd438b1aa..61fe4e575a50 100644 --- a/sdk/digitaltwins/arm-digitaltwins/package.json +++ b/sdk/digitaltwins/arm-digitaltwins/package.json @@ -3,7 +3,7 @@ "sdk-type": "mgmt", "author": "Microsoft Corporation", "description": "A generated SDK for AzureDigitalTwinsManagementClient.", - "version": "3.1.1", + "version": "3.2.0", "engines": { "node": ">=14.0.0" }, @@ -36,7 +36,7 @@ "mkdirp": "^1.0.4", "rollup": "^2.66.1", "rollup-plugin-sourcemaps": "^0.6.3", - "typescript": "~4.2.0", + "typescript": "~4.6.0", "uglify-js": "^3.4.9", "rimraf": "^3.0.0", "@azure/identity": "^2.0.1", @@ -98,8 +98,7 @@ "unit-test:browser": "echo skipped", "integration-test": "npm run integration-test:node && npm run integration-test:browser", "integration-test:node": "dev-tool run test:node-ts-input -- --timeout 1200000 'test/*.ts'", - "integration-test:browser": "echo skipped", - "docs": "echo skipped" + "integration-test:browser": "echo skipped" }, "sideEffects": false, "//metadata": { @@ -110,13 +109,5 @@ } ] }, - "autoPublish": true, - "//sampleConfiguration": { - "productName": "", - "productSlugs": [ - "azure" - ], - "disableDocsMs": true, - "apiRefLink": "https://docs.microsoft.com/javascript/api/@azure/arm-digitaltwins?view=azure-node-preview" - } -} + "autoPublish": true +} \ No newline at end of file diff --git a/sdk/digitaltwins/arm-digitaltwins/review/arm-digitaltwins.api.md b/sdk/digitaltwins/arm-digitaltwins/review/arm-digitaltwins.api.md index c199dba94f80..2f67307a22ce 100644 --- a/sdk/digitaltwins/arm-digitaltwins/review/arm-digitaltwins.api.md +++ b/sdk/digitaltwins/arm-digitaltwins/review/arm-digitaltwins.api.md @@ -14,17 +14,17 @@ import { PollOperationState } from '@azure/core-lro'; export type AuthenticationType = string; // @public -export type AzureDataExplorerConnectionProperties = TimeSeriesDatabaseConnectionProperties & { - connectionType: "AzureDataExplorer"; - adxResourceId: string; - adxEndpointUri: string; +export interface AzureDataExplorerConnectionProperties extends TimeSeriesDatabaseConnectionProperties { adxDatabaseName: string; + adxEndpointUri: string; + adxResourceId: string; adxTableName?: string; + connectionType: "AzureDataExplorer"; + eventHubConsumerGroup?: string; eventHubEndpointUri: string; eventHubEntityPath: string; eventHubNamespaceResourceId: string; - eventHubConsumerGroup?: string; -}; +} // @public (undocumented) export class AzureDigitalTwinsManagementClient extends coreClient.ServiceClient { @@ -78,7 +78,8 @@ export interface ConnectionProperties { } // @public -export type ConnectionPropertiesPrivateLinkServiceConnectionState = ConnectionState; +export interface ConnectionPropertiesPrivateLinkServiceConnectionState extends ConnectionState { +} // @public export type ConnectionPropertiesProvisioningState = string; @@ -136,14 +137,14 @@ export interface DigitalTwinsDeleteOptionalParams extends coreClient.OperationOp export type DigitalTwinsDeleteResponse = DigitalTwinsDescription; // @public -export type DigitalTwinsDescription = DigitalTwinsResource & { +export interface DigitalTwinsDescription extends DigitalTwinsResource { readonly createdTime?: Date; - readonly lastUpdatedTime?: Date; - readonly provisioningState?: ProvisioningState; readonly hostName?: string; + readonly lastUpdatedTime?: Date; privateEndpointConnections?: PrivateEndpointConnection[]; + readonly provisioningState?: ProvisioningState; publicNetworkAccess?: PublicNetworkAccess; -}; +} // @public export interface DigitalTwinsDescriptionListResult { @@ -201,9 +202,9 @@ export interface DigitalTwinsEndpointListOptionalParams extends coreClient.Opera export type DigitalTwinsEndpointListResponse = DigitalTwinsEndpointResourceListResult; // @public -export type DigitalTwinsEndpointResource = ExternalResource & { +export interface DigitalTwinsEndpointResource extends ExternalResource { properties: DigitalTwinsEndpointResourcePropertiesUnion; -}; +} // @public export interface DigitalTwinsEndpointResourceListResult { @@ -218,6 +219,7 @@ export interface DigitalTwinsEndpointResourceProperties { deadLetterSecret?: string; deadLetterUri?: string; endpointType: "ServiceBus" | "EventHub" | "EventGrid"; + identity?: ManagedIdentityReference; readonly provisioningState?: EndpointProvisioningState; } @@ -236,6 +238,9 @@ export interface DigitalTwinsIdentity { readonly principalId?: string; readonly tenantId?: string; type?: DigitalTwinsIdentityType; + userAssignedIdentities?: { + [propertyName: string]: UserAssignedIdentity; + }; } // @public @@ -324,21 +329,21 @@ export interface ErrorResponse { } // @public -export type EventGrid = DigitalTwinsEndpointResourceProperties & { - endpointType: "EventGrid"; - topicEndpoint: string; +export interface EventGrid extends DigitalTwinsEndpointResourceProperties { accessKey1: string | null; accessKey2?: string; -}; + endpointType: "EventGrid"; + topicEndpoint: string; +} // @public -export type EventHub = DigitalTwinsEndpointResourceProperties & { - endpointType: "EventHub"; +export interface EventHub extends DigitalTwinsEndpointResourceProperties { connectionStringPrimaryKey?: string; connectionStringSecondaryKey?: string; + endpointType: "EventHub"; endpointUri?: string; entityPath?: string; -}; +} // @public export interface ExternalResource { @@ -368,172 +373,130 @@ export interface GroupIdInformationResponse { value?: GroupIdInformation[]; } +// @public +export type IdentityType = string; + // @public export enum KnownAuthenticationType { - // (undocumented) IdentityBased = "IdentityBased", - // (undocumented) KeyBased = "KeyBased" } // @public export enum KnownConnectionPropertiesProvisioningState { - // (undocumented) Approved = "Approved", - // (undocumented) Disconnected = "Disconnected", - // (undocumented) Pending = "Pending", - // (undocumented) Rejected = "Rejected" } // @public export enum KnownConnectionType { - // (undocumented) AzureDataExplorer = "AzureDataExplorer" } // @public export enum KnownCreatedByType { - // (undocumented) Application = "Application", - // (undocumented) Key = "Key", - // (undocumented) ManagedIdentity = "ManagedIdentity", - // (undocumented) User = "User" } // @public export enum KnownDigitalTwinsIdentityType { - // (undocumented) None = "None", - // (undocumented) - SystemAssigned = "SystemAssigned" + SystemAssigned = "SystemAssigned", + SystemAssignedUserAssigned = "SystemAssigned,UserAssigned", + UserAssigned = "UserAssigned" } // @public export enum KnownEndpointProvisioningState { - // (undocumented) Canceled = "Canceled", - // (undocumented) Deleted = "Deleted", - // (undocumented) Deleting = "Deleting", - // (undocumented) Disabled = "Disabled", - // (undocumented) Failed = "Failed", - // (undocumented) Moving = "Moving", - // (undocumented) Provisioning = "Provisioning", - // (undocumented) Restoring = "Restoring", - // (undocumented) Succeeded = "Succeeded", - // (undocumented) Suspending = "Suspending", - // (undocumented) Updating = "Updating", - // (undocumented) Warning = "Warning" } // @public export enum KnownEndpointType { - // (undocumented) EventGrid = "EventGrid", - // (undocumented) EventHub = "EventHub", - // (undocumented) ServiceBus = "ServiceBus" } +// @public +export enum KnownIdentityType { + SystemAssigned = "SystemAssigned", + UserAssigned = "UserAssigned" +} + // @public export enum KnownPrivateLinkServiceConnectionStatus { - // (undocumented) Approved = "Approved", - // (undocumented) Disconnected = "Disconnected", - // (undocumented) Pending = "Pending", - // (undocumented) Rejected = "Rejected" } // @public export enum KnownProvisioningState { - // (undocumented) Canceled = "Canceled", - // (undocumented) Deleted = "Deleted", - // (undocumented) Deleting = "Deleting", - // (undocumented) Failed = "Failed", - // (undocumented) Moving = "Moving", - // (undocumented) Provisioning = "Provisioning", - // (undocumented) Restoring = "Restoring", - // (undocumented) Succeeded = "Succeeded", - // (undocumented) Suspending = "Suspending", - // (undocumented) Updating = "Updating", - // (undocumented) Warning = "Warning" } // @public export enum KnownPublicNetworkAccess { - // (undocumented) Disabled = "Disabled", - // (undocumented) Enabled = "Enabled" } // @public export enum KnownReason { - // (undocumented) AlreadyExists = "AlreadyExists", - // (undocumented) Invalid = "Invalid" } // @public export enum KnownTimeSeriesDatabaseConnectionState { - // (undocumented) Canceled = "Canceled", - // (undocumented) Deleted = "Deleted", - // (undocumented) Deleting = "Deleting", - // (undocumented) Disabled = "Disabled", - // (undocumented) Failed = "Failed", - // (undocumented) Moving = "Moving", - // (undocumented) Provisioning = "Provisioning", - // (undocumented) Restoring = "Restoring", - // (undocumented) Succeeded = "Succeeded", - // (undocumented) Suspending = "Suspending", - // (undocumented) Updating = "Updating", - // (undocumented) Warning = "Warning" } +// @public +export interface ManagedIdentityReference { + type?: IdentityType; + userAssignedIdentity?: string; +} + // @public export interface Operation { display?: OperationDisplay; @@ -669,13 +632,13 @@ export type PublicNetworkAccess = string; export type Reason = string; // @public -export type ServiceBus = DigitalTwinsEndpointResourceProperties & { +export interface ServiceBus extends DigitalTwinsEndpointResourceProperties { endpointType: "ServiceBus"; - primaryConnectionString?: string; - secondaryConnectionString?: string; endpointUri?: string; entityPath?: string; -}; + primaryConnectionString?: string; + secondaryConnectionString?: string; +} // @public export interface SystemData { @@ -688,9 +651,9 @@ export interface SystemData { } // @public -export type TimeSeriesDatabaseConnection = ExternalResource & { +export interface TimeSeriesDatabaseConnection extends ExternalResource { properties?: TimeSeriesDatabaseConnectionPropertiesUnion; -}; +} // @public export interface TimeSeriesDatabaseConnectionListResult { @@ -701,6 +664,7 @@ export interface TimeSeriesDatabaseConnectionListResult { // @public export interface TimeSeriesDatabaseConnectionProperties { connectionType: "AzureDataExplorer"; + identity?: ManagedIdentityReference; readonly provisioningState?: TimeSeriesDatabaseConnectionState; } @@ -759,6 +723,12 @@ export type TimeSeriesDatabaseConnectionsListResponse = TimeSeriesDatabaseConnec // @public export type TimeSeriesDatabaseConnectionState = string; +// @public +export interface UserAssignedIdentity { + readonly clientId?: string; + readonly principalId?: string; +} + // (No @packageDocumentation comment for this package) ``` diff --git a/sdk/digitaltwins/arm-digitaltwins/src/azureDigitalTwinsManagementClient.ts b/sdk/digitaltwins/arm-digitaltwins/src/azureDigitalTwinsManagementClient.ts index 0e5aafb569b7..f6a81582f3c9 100644 --- a/sdk/digitaltwins/arm-digitaltwins/src/azureDigitalTwinsManagementClient.ts +++ b/sdk/digitaltwins/arm-digitaltwins/src/azureDigitalTwinsManagementClient.ts @@ -64,7 +64,7 @@ export class AzureDigitalTwinsManagementClient extends coreClient.ServiceClient credential: credentials }; - const packageDetails = `azsdk-js-arm-digitaltwins/3.1.1`; + const packageDetails = `azsdk-js-arm-digitaltwins/3.2.0`; const userAgentPrefix = options.userAgentOptions && options.userAgentOptions.userAgentPrefix ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}` @@ -84,34 +84,41 @@ export class AzureDigitalTwinsManagementClient extends coreClient.ServiceClient }; super(optionsWithDefaults); + let bearerTokenAuthenticationPolicyFound: boolean = false; if (options?.pipeline && options.pipeline.getOrderedPolicies().length > 0) { const pipelinePolicies: coreRestPipeline.PipelinePolicy[] = options.pipeline.getOrderedPolicies(); - const bearerTokenAuthenticationPolicyFound = pipelinePolicies.some( + 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 - } - }) - ); - } + } + if ( + !options || + !options.pipeline || + options.pipeline.getOrderedPolicies().length == 0 || + !bearerTokenAuthenticationPolicyFound + ) { + this.pipeline.removePolicy({ + name: coreRestPipeline.bearerTokenAuthenticationPolicyName + }); + this.pipeline.addPolicy( + coreRestPipeline.bearerTokenAuthenticationPolicy({ + credential: credentials, + scopes: `${optionsWithDefaults.credentialScopes}`, + 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 || "2022-05-31"; + this.apiVersion = options.apiVersion || "2022-10-31"; this.digitalTwins = new DigitalTwinsImpl(this); this.digitalTwinsEndpoint = new DigitalTwinsEndpointImpl(this); this.operations = new OperationsImpl(this); @@ -138,7 +145,7 @@ export class AzureDigitalTwinsManagementClient extends coreClient.ServiceClient if (param.length > 1) { const newParams = param[1].split("&").map((item) => { if (item.indexOf("api-version") > -1) { - return item.replace(/(?<==).*$/, apiVersion); + return "api-version=" + apiVersion; } else { return item; } diff --git a/sdk/digitaltwins/arm-digitaltwins/src/models/index.ts b/sdk/digitaltwins/arm-digitaltwins/src/models/index.ts index 39a8182ed5ad..7767a44fd3a4 100644 --- a/sdk/digitaltwins/arm-digitaltwins/src/models/index.ts +++ b/sdk/digitaltwins/arm-digitaltwins/src/models/index.ts @@ -125,7 +125,7 @@ export interface DigitalTwinsResource { /** The managed identity for the DigitalTwinsInstance. */ export interface DigitalTwinsIdentity { - /** The type of Managed Identity used by the DigitalTwinsInstance. Only SystemAssigned is supported. */ + /** The type of Managed Identity used by the DigitalTwinsInstance. */ type?: DigitalTwinsIdentityType; /** * The object id of the Managed Identity Resource. This will be sent to the RP from ARM via the x-ms-identity-principal-id header in the PUT request if the resource has a systemAssigned(implicit) identity @@ -137,6 +137,26 @@ export interface DigitalTwinsIdentity { * NOTE: This property will not be serialized. It can only be populated by the server. */ readonly tenantId?: string; + /** + * The list of user identities associated with the resource. The user identity dictionary key references will be ARM resource ids in the form: + * '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'. + * . + */ + userAssignedIdentities?: { [propertyName: string]: UserAssignedIdentity }; +} + +/** The information about the user assigned identity. */ +export interface UserAssignedIdentity { + /** + * The client id of the User Assigned Identity Resource. + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly clientId?: string; + /** + * The object id of the User Assigned Identity Resource. + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly principalId?: string; } /** Error response. */ @@ -208,6 +228,16 @@ export interface DigitalTwinsEndpointResourceProperties { deadLetterSecret?: string; /** Dead letter storage URL for identity-based authentication. */ deadLetterUri?: string; + /** Managed identity properties for the endpoint. */ + identity?: ManagedIdentityReference; +} + +/** The properties of the Managed Identity. */ +export interface ManagedIdentityReference { + /** The type of managed identity used. */ + type?: IdentityType; + /** The user identity ARM resource id if the managed identity type is 'UserAssigned'. */ + userAssignedIdentity?: string; } /** Definition of a resource. */ @@ -378,13 +408,16 @@ export interface TimeSeriesDatabaseConnectionProperties { * NOTE: This property will not be serialized. It can only be populated by the server. */ readonly provisioningState?: TimeSeriesDatabaseConnectionState; + /** Managed identity properties for the time series database connection resource. */ + identity?: ManagedIdentityReference; } /** The connection state. */ -export type ConnectionPropertiesPrivateLinkServiceConnectionState = ConnectionState; +export interface ConnectionPropertiesPrivateLinkServiceConnectionState + extends ConnectionState {} /** The description of the DigitalTwins service. */ -export type DigitalTwinsDescription = DigitalTwinsResource & { +export interface DigitalTwinsDescription extends DigitalTwinsResource { /** * Time when DigitalTwinsInstance was created. * NOTE: This property will not be serialized. It can only be populated by the server. @@ -409,10 +442,10 @@ export type DigitalTwinsDescription = DigitalTwinsResource & { privateEndpointConnections?: PrivateEndpointConnection[]; /** Public network access for the DigitalTwinsInstance. */ publicNetworkAccess?: PublicNetworkAccess; -}; +} /** Properties related to ServiceBus. */ -export type ServiceBus = DigitalTwinsEndpointResourceProperties & { +export interface ServiceBus extends DigitalTwinsEndpointResourceProperties { /** Polymorphic discriminator, which specifies the different types this object can be */ endpointType: "ServiceBus"; /** PrimaryConnectionString of the endpoint for key-based authentication. Will be obfuscated during read. */ @@ -423,10 +456,10 @@ export type ServiceBus = DigitalTwinsEndpointResourceProperties & { endpointUri?: string; /** The ServiceBus Topic name for identity-based authentication. */ entityPath?: string; -}; +} /** Properties related to EventHub. */ -export type EventHub = DigitalTwinsEndpointResourceProperties & { +export interface EventHub extends DigitalTwinsEndpointResourceProperties { /** Polymorphic discriminator, which specifies the different types this object can be */ endpointType: "EventHub"; /** PrimaryConnectionString of the endpoint for key-based authentication. Will be obfuscated during read. */ @@ -437,10 +470,10 @@ export type EventHub = DigitalTwinsEndpointResourceProperties & { endpointUri?: string; /** The EventHub name in the EventHub namespace for identity-based authentication. */ entityPath?: string; -}; +} /** Properties related to EventGrid. */ -export type EventGrid = DigitalTwinsEndpointResourceProperties & { +export interface EventGrid extends DigitalTwinsEndpointResourceProperties { /** Polymorphic discriminator, which specifies the different types this object can be */ endpointType: "EventGrid"; /** EventGrid Topic Endpoint. */ @@ -449,22 +482,23 @@ export type EventGrid = DigitalTwinsEndpointResourceProperties & { accessKey1: string | null; /** EventGrid secondary accesskey. Will be obfuscated during read. */ accessKey2?: string; -}; +} /** DigitalTwinsInstance endpoint resource. */ -export type DigitalTwinsEndpointResource = ExternalResource & { +export interface DigitalTwinsEndpointResource extends ExternalResource { /** DigitalTwinsInstance endpoint resource properties. */ properties: DigitalTwinsEndpointResourcePropertiesUnion; -}; +} /** Describes a time series database connection resource. */ -export type TimeSeriesDatabaseConnection = ExternalResource & { +export interface TimeSeriesDatabaseConnection extends ExternalResource { /** Properties of a specific time series database connection. */ properties?: TimeSeriesDatabaseConnectionPropertiesUnion; -}; +} /** Properties of a time series database connection to Azure Data Explorer with data being sent via an EventHub. */ -export type AzureDataExplorerConnectionProperties = TimeSeriesDatabaseConnectionProperties & { +export interface AzureDataExplorerConnectionProperties + extends TimeSeriesDatabaseConnectionProperties { /** Polymorphic discriminator, which specifies the different types this object can be */ connectionType: "AzureDataExplorer"; /** The resource ID of the Azure Data Explorer cluster. */ @@ -473,7 +507,7 @@ export type AzureDataExplorerConnectionProperties = TimeSeriesDatabaseConnection adxEndpointUri: string; /** The name of the Azure Data Explorer database. */ adxDatabaseName: string; - /** The name of the Azure Data Explorer table. */ + /** The name of the Azure Data Explorer table. Defaults to AdtPropertyEvents. */ adxTableName?: string; /** The URL of the EventHub namespace for identity-based authentication. It must include the protocol sb:// */ eventHubEndpointUri: string; @@ -483,20 +517,31 @@ export type AzureDataExplorerConnectionProperties = TimeSeriesDatabaseConnection eventHubNamespaceResourceId: string; /** The EventHub consumer group to use when ADX reads from EventHub. Defaults to $Default. */ eventHubConsumerGroup?: string; -}; +} /** Known values of {@link ProvisioningState} that the service accepts. */ export enum KnownProvisioningState { + /** Provisioning */ Provisioning = "Provisioning", + /** Deleting */ Deleting = "Deleting", + /** Updating */ Updating = "Updating", + /** Succeeded */ Succeeded = "Succeeded", + /** Failed */ Failed = "Failed", + /** Canceled */ Canceled = "Canceled", + /** Deleted */ Deleted = "Deleted", + /** Warning */ Warning = "Warning", + /** Suspending */ Suspending = "Suspending", + /** Restoring */ Restoring = "Restoring", + /** Moving */ Moving = "Moving" } @@ -521,9 +566,13 @@ export type ProvisioningState = string; /** Known values of {@link ConnectionPropertiesProvisioningState} that the service accepts. */ export enum KnownConnectionPropertiesProvisioningState { + /** Pending */ Pending = "Pending", + /** Approved */ Approved = "Approved", + /** Rejected */ Rejected = "Rejected", + /** Disconnected */ Disconnected = "Disconnected" } @@ -541,9 +590,13 @@ export type ConnectionPropertiesProvisioningState = string; /** Known values of {@link PrivateLinkServiceConnectionStatus} that the service accepts. */ export enum KnownPrivateLinkServiceConnectionStatus { + /** Pending */ Pending = "Pending", + /** Approved */ Approved = "Approved", + /** Rejected */ Rejected = "Rejected", + /** Disconnected */ Disconnected = "Disconnected" } @@ -561,9 +614,13 @@ export type PrivateLinkServiceConnectionStatus = string; /** Known values of {@link CreatedByType} that the service accepts. */ export enum KnownCreatedByType { + /** User */ User = "User", + /** Application */ Application = "Application", + /** ManagedIdentity */ ManagedIdentity = "ManagedIdentity", + /** Key */ Key = "Key" } @@ -581,7 +638,9 @@ export type CreatedByType = string; /** Known values of {@link PublicNetworkAccess} that the service accepts. */ export enum KnownPublicNetworkAccess { + /** Enabled */ Enabled = "Enabled", + /** Disabled */ Disabled = "Disabled" } @@ -597,8 +656,14 @@ export type PublicNetworkAccess = string; /** Known values of {@link DigitalTwinsIdentityType} that the service accepts. */ export enum KnownDigitalTwinsIdentityType { + /** None */ None = "None", - SystemAssigned = "SystemAssigned" + /** SystemAssigned */ + SystemAssigned = "SystemAssigned", + /** UserAssigned */ + UserAssigned = "UserAssigned", + /** SystemAssignedUserAssigned */ + SystemAssignedUserAssigned = "SystemAssigned,UserAssigned" } /** @@ -607,14 +672,19 @@ export enum KnownDigitalTwinsIdentityType { * this enum contains the known values that the service supports. * ### Known values supported by the service * **None** \ - * **SystemAssigned** + * **SystemAssigned** \ + * **UserAssigned** \ + * **SystemAssigned,UserAssigned** */ export type DigitalTwinsIdentityType = string; /** Known values of {@link EndpointType} that the service accepts. */ export enum KnownEndpointType { + /** EventHub */ EventHub = "EventHub", + /** EventGrid */ EventGrid = "EventGrid", + /** ServiceBus */ ServiceBus = "ServiceBus" } @@ -631,17 +701,29 @@ export type EndpointType = string; /** Known values of {@link EndpointProvisioningState} that the service accepts. */ export enum KnownEndpointProvisioningState { + /** Provisioning */ Provisioning = "Provisioning", + /** Deleting */ Deleting = "Deleting", + /** Updating */ Updating = "Updating", + /** Succeeded */ Succeeded = "Succeeded", + /** Failed */ Failed = "Failed", + /** Canceled */ Canceled = "Canceled", + /** Deleted */ Deleted = "Deleted", + /** Warning */ Warning = "Warning", + /** Suspending */ Suspending = "Suspending", + /** Restoring */ Restoring = "Restoring", + /** Moving */ Moving = "Moving", + /** Disabled */ Disabled = "Disabled" } @@ -667,7 +749,9 @@ export type EndpointProvisioningState = string; /** Known values of {@link AuthenticationType} that the service accepts. */ export enum KnownAuthenticationType { + /** KeyBased */ KeyBased = "KeyBased", + /** IdentityBased */ IdentityBased = "IdentityBased" } @@ -681,9 +765,29 @@ export enum KnownAuthenticationType { */ export type AuthenticationType = string; +/** Known values of {@link IdentityType} that the service accepts. */ +export enum KnownIdentityType { + /** SystemAssigned */ + SystemAssigned = "SystemAssigned", + /** UserAssigned */ + UserAssigned = "UserAssigned" +} + +/** + * Defines values for IdentityType. \ + * {@link KnownIdentityType} can be used interchangeably with IdentityType, + * this enum contains the known values that the service supports. + * ### Known values supported by the service + * **SystemAssigned** \ + * **UserAssigned** + */ +export type IdentityType = string; + /** Known values of {@link Reason} that the service accepts. */ export enum KnownReason { + /** Invalid */ Invalid = "Invalid", + /** AlreadyExists */ AlreadyExists = "AlreadyExists" } @@ -699,6 +803,7 @@ export type Reason = string; /** Known values of {@link ConnectionType} that the service accepts. */ export enum KnownConnectionType { + /** AzureDataExplorer */ AzureDataExplorer = "AzureDataExplorer" } @@ -713,17 +818,29 @@ export type ConnectionType = string; /** Known values of {@link TimeSeriesDatabaseConnectionState} that the service accepts. */ export enum KnownTimeSeriesDatabaseConnectionState { + /** Provisioning */ Provisioning = "Provisioning", + /** Deleting */ Deleting = "Deleting", + /** Updating */ Updating = "Updating", + /** Succeeded */ Succeeded = "Succeeded", + /** Failed */ Failed = "Failed", + /** Canceled */ Canceled = "Canceled", + /** Deleted */ Deleted = "Deleted", + /** Warning */ Warning = "Warning", + /** Suspending */ Suspending = "Suspending", + /** Restoring */ Restoring = "Restoring", + /** Moving */ Moving = "Moving", + /** Disabled */ Disabled = "Disabled" } diff --git a/sdk/digitaltwins/arm-digitaltwins/src/models/mappers.ts b/sdk/digitaltwins/arm-digitaltwins/src/models/mappers.ts index 9b067f959d5d..a37f096ae62f 100644 --- a/sdk/digitaltwins/arm-digitaltwins/src/models/mappers.ts +++ b/sdk/digitaltwins/arm-digitaltwins/src/models/mappers.ts @@ -281,6 +281,39 @@ export const DigitalTwinsIdentity: coreClient.CompositeMapper = { type: { name: "String" } + }, + userAssignedIdentities: { + serializedName: "userAssignedIdentities", + nullable: true, + type: { + name: "Dictionary", + value: { + type: { name: "Composite", className: "UserAssignedIdentity" } + } + } + } + } + } +}; + +export const UserAssignedIdentity: coreClient.CompositeMapper = { + type: { + name: "Composite", + className: "UserAssignedIdentity", + modelProperties: { + clientId: { + serializedName: "clientId", + readOnly: true, + type: { + name: "String" + } + }, + principalId: { + serializedName: "principalId", + readOnly: true, + type: { + name: "String" + } } } } @@ -466,6 +499,35 @@ export const DigitalTwinsEndpointResourceProperties: coreClient.CompositeMapper type: { name: "String" } + }, + identity: { + serializedName: "identity", + type: { + name: "Composite", + className: "ManagedIdentityReference" + } + } + } + } +}; + +export const ManagedIdentityReference: coreClient.CompositeMapper = { + type: { + name: "Composite", + className: "ManagedIdentityReference", + modelProperties: { + type: { + serializedName: "type", + type: { + name: "String" + } + }, + userAssignedIdentity: { + serializedName: "userAssignedIdentity", + nullable: true, + type: { + name: "String" + } } } } @@ -876,6 +938,13 @@ export const TimeSeriesDatabaseConnectionProperties: coreClient.CompositeMapper type: { name: "String" } + }, + identity: { + serializedName: "identity", + type: { + name: "Composite", + className: "ManagedIdentityReference" + } } } } @@ -1136,6 +1205,7 @@ export const AzureDataExplorerConnectionProperties: coreClient.CompositeMapper = } }, adxTableName: { + defaultValue: "AdtPropertyEvents", serializedName: "adxTableName", nullable: true, type: { @@ -1164,6 +1234,7 @@ export const AzureDataExplorerConnectionProperties: coreClient.CompositeMapper = } }, eventHubConsumerGroup: { + defaultValue: "$Default", serializedName: "eventHubConsumerGroup", nullable: true, type: { diff --git a/sdk/digitaltwins/arm-digitaltwins/src/models/parameters.ts b/sdk/digitaltwins/arm-digitaltwins/src/models/parameters.ts index 31b31d025c7a..fa7ceb425b0f 100644 --- a/sdk/digitaltwins/arm-digitaltwins/src/models/parameters.ts +++ b/sdk/digitaltwins/arm-digitaltwins/src/models/parameters.ts @@ -47,7 +47,7 @@ export const $host: OperationURLParameter = { export const apiVersion: OperationQueryParameter = { parameterPath: "apiVersion", mapper: { - defaultValue: "2022-05-31", + defaultValue: "2022-10-31", isConstant: true, serializedName: "api-version", type: { diff --git a/sdk/digitaltwins/arm-digitaltwins/tsconfig.json b/sdk/digitaltwins/arm-digitaltwins/tsconfig.json index 15e8d9a4ecc7..3e6ae96443f3 100644 --- a/sdk/digitaltwins/arm-digitaltwins/tsconfig.json +++ b/sdk/digitaltwins/arm-digitaltwins/tsconfig.json @@ -15,17 +15,11 @@ ], "declaration": true, "outDir": "./dist-esm", - "importHelpers": true, - "paths": { - "@azure/arm-digitaltwins": [ - "./src/index" - ] - } + "importHelpers": true }, "include": [ "./src/**/*.ts", - "./test/**/*.ts", - "samples-dev/**/*.ts" + "./test/**/*.ts" ], "exclude": [ "node_modules"