Skip to content

Commit

Permalink
CodeGen from PR 14043 in Azure/azure-rest-api-specs
Browse files Browse the repository at this point in the history
Merge c94955036da65a155fc361a355b6d06584b44024 into c318f87abae92d38a223b3d168a75dd5d239d28b
  • Loading branch information
SDKAuto committed Apr 21, 2021
1 parent 8d6abbe commit df56b6a
Show file tree
Hide file tree
Showing 23 changed files with 469 additions and 64 deletions.
2 changes: 1 addition & 1 deletion sdk/iothub/arm-iothub/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2020 Microsoft
Copyright (c) 2021 Microsoft

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
9 changes: 4 additions & 5 deletions sdk/iothub/arm-iothub/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ npm install @azure/arm-iothub

### How to use

#### nodejs - Authentication, client creation and list operations as an example written in TypeScript.
#### nodejs - client creation and list operations as an example written in TypeScript.

##### Install @azure/ms-rest-nodeauth

Expand All @@ -26,11 +26,10 @@ npm install @azure/ms-rest-nodeauth@"^3.0.0"

##### Sample code

While the below sample uses the interactive login, other authentication options can be found in the [README.md file of @azure/ms-rest-nodeauth](https://www.npmjs.com/package/@azure/ms-rest-nodeauth) package
```typescript
import * as msRest from "@azure/ms-rest-js";
import * as msRestAzure from "@azure/ms-rest-azure-js";
import * as msRestNodeAuth from "@azure/ms-rest-nodeauth";
import { IotHubClient, IotHubModels, IotHubMappers } from "@azure/arm-iothub";
const msRestNodeAuth = require("@azure/ms-rest-nodeauth");
const { IotHubClient } = require("@azure/arm-iothub");
const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"];

msRestNodeAuth.interactiveLogin().then((creds) => {
Expand Down
4 changes: 2 additions & 2 deletions sdk/iothub/arm-iothub/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ const config = {
"@azure/ms-rest-azure-js": "msRestAzure"
},
banner: `/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
* Copyright (c) Microsoft Corporation.
* Licensed under the MIT License.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
Expand Down
5 changes: 2 additions & 3 deletions sdk/iothub/arm-iothub/src/iotHubClient.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for
* license information.
* Copyright (c) Microsoft Corporation.
* Licensed under the MIT License.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is
Expand Down
7 changes: 3 additions & 4 deletions sdk/iothub/arm-iothub/src/iotHubClientContext.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for
* license information.
* Copyright (c) Microsoft Corporation.
* Licensed under the MIT License.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is
Expand Down Expand Up @@ -44,7 +43,7 @@ export class IotHubClientContext extends msRestAzure.AzureServiceClient {

super(credentials, options);

this.apiVersion = '2020-07-10-preview';
this.apiVersion = '2021-03-03-preview';
this.acceptLanguage = 'en-US';
this.longRunningOperationRetryTimeout = 30;
this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com";
Expand Down
9 changes: 7 additions & 2 deletions sdk/iothub/arm-iothub/src/models/certificatesMappers.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
* Copyright (c) Microsoft Corporation.
* Licensed under the MIT License.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/

export {
ArmIdentity,
ArmUserIdentity,
BaseResource,
CertificateDescription,
CertificateListDescription,
Expand All @@ -29,7 +31,10 @@ export {
IotHubSkuInfo,
IpFilterRule,
KeyVaultKeyProperties,
ManagedIdentity,
MessagingEndpointProperties,
NetworkRuleSetIpRule,
NetworkRuleSetProperties,
PrivateEndpoint,
PrivateEndpointConnection,
PrivateEndpointConnectionProperties,
Expand Down
161 changes: 155 additions & 6 deletions sdk/iothub/arm-iothub/src/models/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
* Copyright (c) Microsoft Corporation.
* Licensed under the MIT License.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
Expand Down Expand Up @@ -229,6 +229,43 @@ export interface IpFilterRule {
ipMask: string;
}

/**
* IP Rule to be applied as part of Network Rule Set
*/
export interface NetworkRuleSetIpRule {
/**
* Name of the IP filter rule.
*/
filterName: string;
/**
* IP Filter Action. Possible values include: 'Allow'. Default value: 'Allow'.
*/
action?: NetworkRuleIPAction;
/**
* A string that contains the IP address range in CIDR notation for the rule.
*/
ipMask: string;
}

/**
* Network Rule Set Properties of IotHub
*/
export interface NetworkRuleSetProperties {
/**
* Default Action for Network Rule Set. Possible values include: 'Deny', 'Allow'. Default value:
* 'Deny'.
*/
defaultAction?: DefaultAction;
/**
* If True, then Network Rule Set is also applied to BuiltIn EventHub EndPoint of IotHub
*/
applyToBuiltInEventHubEndpoint: boolean;
/**
* List of IP Rules
*/
ipRules: NetworkRuleSetIpRule[];
}

/**
* The private endpoint property of a private endpoint connection
*/
Expand Down Expand Up @@ -321,6 +358,16 @@ export interface EventHubProperties {
readonly endpoint?: string;
}

/**
* The properties of the Managed identity.
*/
export interface ManagedIdentity {
/**
* The user assigned identity.
*/
userAssignedIdentity?: string;
}

/**
* The properties related to service bus queue endpoint types.
*/
Expand All @@ -346,6 +393,10 @@ export interface RoutingServiceBusQueueEndpointProperties {
* 'keyBased', 'identityBased'
*/
authenticationType?: AuthenticationType;
/**
* Managed identity properties of routing service bus queue endpoint.
*/
identity?: ManagedIdentity;
/**
* The name that identifies this endpoint. The name can only include alphanumeric characters,
* periods, underscores, hyphens and has a maximum length of 64 characters. The following names
Expand Down Expand Up @@ -388,6 +439,10 @@ export interface RoutingServiceBusTopicEndpointProperties {
* 'keyBased', 'identityBased'
*/
authenticationType?: AuthenticationType;
/**
* Managed identity properties of routing service bus topic endpoint.
*/
identity?: ManagedIdentity;
/**
* The name that identifies this endpoint. The name can only include alphanumeric characters,
* periods, underscores, hyphens and has a maximum length of 64 characters. The following names
Expand Down Expand Up @@ -430,6 +485,10 @@ export interface RoutingEventHubProperties {
* 'keyBased', 'identityBased'
*/
authenticationType?: AuthenticationType;
/**
* Managed identity properties of routing event hub endpoint.
*/
identity?: ManagedIdentity;
/**
* The name that identifies this endpoint. The name can only include alphanumeric characters,
* periods, underscores, hyphens and has a maximum length of 64 characters. The following names
Expand Down Expand Up @@ -468,6 +527,10 @@ export interface RoutingStorageContainerProperties {
* 'identityBased'
*/
authenticationType?: AuthenticationType;
/**
* Managed identity properties of routing storage endpoint.
*/
identity?: ManagedIdentity;
/**
* The name that identifies this endpoint. The name can only include alphanumeric characters,
* periods, underscores, hyphens and has a maximum length of 64 characters. The following names
Expand Down Expand Up @@ -551,7 +614,7 @@ export interface RouteProperties {
/**
* The source that the routing rule is to be applied to, such as DeviceMessages. Possible values
* include: 'Invalid', 'DeviceMessages', 'TwinChangeEvents', 'DeviceLifecycleEvents',
* 'DeviceJobLifecycleEvents', 'DigitalTwinChangeEvents'
* 'DeviceJobLifecycleEvents', 'DigitalTwinChangeEvents', 'DeviceConnectionStateEvents'
*/
source: RoutingSource;
/**
Expand Down Expand Up @@ -665,6 +728,10 @@ export interface StorageEndpointProperties {
* values include: 'keyBased', 'identityBased'
*/
authenticationType?: AuthenticationType;
/**
* Managed identity properties of storage endpoint for file upload.
*/
identity?: ManagedIdentity;
}

/**
Expand Down Expand Up @@ -744,6 +811,10 @@ export interface KeyVaultKeyProperties {
* The identifier of the key.
*/
keyIdentifier?: string;
/**
* Managed identity properties of KeyVault Key.
*/
identity?: ManagedIdentity;
}

/**
Expand Down Expand Up @@ -794,6 +865,7 @@ export interface IotHubProperties {
* The IP filter rules.
*/
ipFilterRules?: IpFilterRule[];
networkRuleSets?: NetworkRuleSetProperties;
/**
* Specifies the minimum TLS version to support for this hub. Can be set to "1.2" to have clients
* that use a TLS version below 1.2 to be rejected.
Expand Down Expand Up @@ -935,6 +1007,44 @@ export interface PrivateLinkResources {
value?: GroupIdInformation[];
}

/**
* An interface representing ArmUserIdentity.
*/
export interface ArmUserIdentity {
/**
* **NOTE: This property will not be serialized. It can only be populated by the server.**
*/
readonly principalId?: string;
/**
* **NOTE: This property will not be serialized. It can only be populated by the server.**
*/
readonly clientId?: string;
}

/**
* An interface representing ArmIdentity.
*/
export interface ArmIdentity {
/**
* Principal Id
* **NOTE: This property will not be serialized. It can only be populated by the server.**
*/
readonly principalId?: string;
/**
* Tenant Id
* **NOTE: This property will not be serialized. It can only be populated by the server.**
*/
readonly tenantId?: string;
/**
* The type of identity used for the resource. The type 'SystemAssigned,UserAssigned' includes
* both an implicitly created identity and a set of user assigned identities. The type 'None'
* will remove any identities from the service. Possible values include: 'SystemAssigned',
* 'UserAssigned', 'SystemAssigned, UserAssigned', 'None'
*/
type?: ResourceIdentityType;
userAssignedIdentities?: { [propertyName: string]: ArmUserIdentity };
}

/**
* The common properties of an Azure resource.
*/
Expand Down Expand Up @@ -981,6 +1091,10 @@ export interface IotHubDescription extends Resource {
* IotHub SKU info
*/
sku: IotHubSkuInfo;
/**
* The managed identities for the IotHub.
*/
identity?: ArmIdentity;
}

/**
Expand Down Expand Up @@ -1417,7 +1531,8 @@ export interface RoutingTwin {
export interface TestAllRoutesInput {
/**
* Routing source. Possible values include: 'Invalid', 'DeviceMessages', 'TwinChangeEvents',
* 'DeviceLifecycleEvents', 'DeviceJobLifecycleEvents', 'DigitalTwinChangeEvents'
* 'DeviceLifecycleEvents', 'DeviceJobLifecycleEvents', 'DigitalTwinChangeEvents',
* 'DeviceConnectionStateEvents'
*/
routingSource?: RoutingSource;
/**
Expand Down Expand Up @@ -1560,6 +1675,10 @@ export interface ExportDevicesRequest {
* values include: 'keyBased', 'identityBased'
*/
authenticationType?: AuthenticationType;
/**
* Managed identity properties of storage endpoint for export devices.
*/
identity?: ManagedIdentity;
}

/**
Expand Down Expand Up @@ -1587,6 +1706,10 @@ export interface ImportDevicesRequest {
* values include: 'keyBased', 'identityBased'
*/
authenticationType?: AuthenticationType;
/**
* Managed identity properties of storage endpoint for import devices.
*/
identity?: ManagedIdentity;
}

/**
Expand Down Expand Up @@ -1811,6 +1934,22 @@ export type PublicNetworkAccess = 'Enabled' | 'Disabled';
*/
export type IpFilterActionType = 'Accept' | 'Reject';

/**
* Defines values for DefaultAction.
* Possible values include: 'Deny', 'Allow'
* @readonly
* @enum {string}
*/
export type DefaultAction = 'Deny' | 'Allow';

/**
* Defines values for NetworkRuleIPAction.
* Possible values include: 'Allow'
* @readonly
* @enum {string}
*/
export type NetworkRuleIPAction = 'Allow';

/**
* Defines values for PrivateLinkServiceConnectionStatus.
* Possible values include: 'Pending', 'Approved', 'Rejected', 'Disconnected'
Expand All @@ -1830,11 +1969,12 @@ export type AuthenticationType = 'keyBased' | 'identityBased';
/**
* Defines values for RoutingSource.
* Possible values include: 'Invalid', 'DeviceMessages', 'TwinChangeEvents',
* 'DeviceLifecycleEvents', 'DeviceJobLifecycleEvents', 'DigitalTwinChangeEvents'
* 'DeviceLifecycleEvents', 'DeviceJobLifecycleEvents', 'DigitalTwinChangeEvents',
* 'DeviceConnectionStateEvents'
* @readonly
* @enum {string}
*/
export type RoutingSource = 'Invalid' | 'DeviceMessages' | 'TwinChangeEvents' | 'DeviceLifecycleEvents' | 'DeviceJobLifecycleEvents' | 'DigitalTwinChangeEvents';
export type RoutingSource = 'Invalid' | 'DeviceMessages' | 'TwinChangeEvents' | 'DeviceLifecycleEvents' | 'DeviceJobLifecycleEvents' | 'DigitalTwinChangeEvents' | 'DeviceConnectionStateEvents';

/**
* Defines values for Capabilities.
Expand Down Expand Up @@ -1868,6 +2008,15 @@ export type IotHubSku = 'F1' | 'S1' | 'S2' | 'S3' | 'B1' | 'B2' | 'B3';
*/
export type IotHubSkuTier = 'Free' | 'Standard' | 'Basic';

/**
* Defines values for ResourceIdentityType.
* Possible values include: 'SystemAssigned', 'UserAssigned', 'SystemAssigned, UserAssigned',
* 'None'
* @readonly
* @enum {string}
*/
export type ResourceIdentityType = 'SystemAssigned' | 'UserAssigned' | 'SystemAssigned, UserAssigned' | 'None';

/**
* Defines values for EndpointHealthStatus.
* Possible values include: 'unknown', 'healthy', 'degraded', 'unhealthy', 'dead'
Expand Down
Loading

0 comments on commit df56b6a

Please sign in to comment.