Skip to content
This repository has been archived by the owner on May 5, 2023. It is now read-only.

[AutoPR] containerinstance/resource-manager #3753

Merged
merged 4 commits into from
Oct 3, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ export default class ContainerInstanceManagementClient extends AzureServiceClien
operations: operations.Operations;
containerGroupUsage: operations.ContainerGroupUsage;
containerOperations: operations.ContainerOperations;
serviceAssociationLink: operations.ServiceAssociationLink;
}

export { ContainerInstanceManagementClient, models as ContainerInstanceManagementModels };
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class ContainerInstanceManagementClient extends ServiceClient {

super(credentials, options);

this.apiVersion = '2018-09-01';
this.apiVersion = '2018-10-01';
this.acceptLanguage = 'en-US';
this.longRunningOperationRetryTimeout = 30;
this.generateClientRequestId = true;
Expand All @@ -76,6 +76,7 @@ class ContainerInstanceManagementClient extends ServiceClient {
this.operations = new operations.Operations(this);
this.containerGroupUsage = new operations.ContainerGroupUsage(this);
this.containerOperations = new operations.ContainerOperations(this);
this.serviceAssociationLink = new operations.ServiceAssociationLink(this);
this.models = models;
msRest.addSerializationMixin(this);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,24 @@ const models = require('./index');
class ContainerGroup extends models['Resource'] {
/**
* Create a ContainerGroup.
* @member {object} [identity] The identity of the container group, if
* configured.
* @member {string} [identity.principalId] The principal id of the container
* group identity. This property will only be provided for a system assigned
* identity.
* @member {string} [identity.tenantId] The tenant id associated with the
* container group. This property will only be provided for a system assigned
* identity.
* @member {string} [identity.type] The type of identity used for the
* container group. 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 container group. Possible
* values include: 'SystemAssigned', 'UserAssigned', 'SystemAssigned,
* UserAssigned', 'None'
* @member {object} [identity.userAssignedIdentities] The list of user
* identities associated with the container group. The user identity
* dictionary key references will be ARM resource ids in the form:
* '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'.
* @member {string} [provisioningState] The provisioning state of the
* container group. This only appears in the response.
* @member {array} containers The containers within the container group.
Expand All @@ -35,7 +53,8 @@ class ContainerGroup extends models['Resource'] {
* @member {array} [ipAddress.ports] The list of ports exposed on the
* container group.
* @member {string} [ipAddress.type] Specifies if the IP is exposed to the
* public internet. Possible values include: 'Public', 'Private'
* public internet or private VNET. Possible values include: 'Public',
* 'Private'
* @member {string} [ipAddress.ip] The IP exposed to the public internet.
* @member {string} [ipAddress.dnsNameLabel] The Dns name label for the IP.
* @member {string} [ipAddress.fqdn] The FQDN for the IP.
Expand Down Expand Up @@ -129,6 +148,14 @@ class ContainerGroup extends models['Resource'] {
}
}
},
identity: {
required: false,
serializedName: 'identity',
type: {
name: 'Composite',
className: 'ContainerGroupIdentity'
}
},
provisioningState: {
required: false,
readOnly: true,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for
* license information.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is
* regenerated.
*/

'use strict';

/**
* Identity for the container group.
*
*/
class ContainerGroupIdentity {
/**
* Create a ContainerGroupIdentity.
* @member {string} [principalId] The principal id of the container group
* identity. This property will only be provided for a system assigned
* identity.
* @member {string} [tenantId] The tenant id associated with the container
* group. This property will only be provided for a system assigned identity.
* @member {string} [type] The type of identity used for the container group.
* 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 container group. Possible values
* include: 'SystemAssigned', 'UserAssigned', 'SystemAssigned, UserAssigned',
* 'None'
* @member {object} [userAssignedIdentities] The list of user identities
* associated with the container group. The user identity dictionary key
* references will be ARM resource ids in the form:
* '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'.
*/
constructor() {
}

/**
* Defines the metadata of ContainerGroupIdentity
*
* @returns {object} metadata of ContainerGroupIdentity
*
*/
mapper() {
return {
required: false,
serializedName: 'ContainerGroupIdentity',
type: {
name: 'Composite',
className: 'ContainerGroupIdentity',
modelProperties: {
principalId: {
required: false,
readOnly: true,
serializedName: 'principalId',
type: {
name: 'String'
}
},
tenantId: {
required: false,
readOnly: true,
serializedName: 'tenantId',
type: {
name: 'String'
}
},
type: {
required: false,
serializedName: 'type',
type: {
name: 'Enum',
allowedValues: [ 'SystemAssigned', 'UserAssigned', 'SystemAssigned, UserAssigned', 'None' ]
}
},
userAssignedIdentities: {
required: false,
serializedName: 'userAssignedIdentities',
type: {
name: 'Dictionary',
value: {
required: false,
serializedName: 'ContainerGroupIdentityUserAssignedIdentitiesValueElementType',
type: {
name: 'Composite',
className: 'ContainerGroupIdentityUserAssignedIdentitiesValue'
}
}
}
}
}
}
};
}
}

module.exports = ContainerGroupIdentity;
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for
* license information.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is
* regenerated.
*/

'use strict';

/**
* Class representing a ContainerGroupIdentityUserAssignedIdentitiesValue.
*/
class ContainerGroupIdentityUserAssignedIdentitiesValue {
/**
* Create a ContainerGroupIdentityUserAssignedIdentitiesValue.
* @member {string} [principalId] The principal id of user assigned identity.
* @member {string} [clientId] The client id of user assigned identity.
*/
constructor() {
}

/**
* Defines the metadata of ContainerGroupIdentityUserAssignedIdentitiesValue
*
* @returns {object} metadata of ContainerGroupIdentityUserAssignedIdentitiesValue
*
*/
mapper() {
return {
required: false,
serializedName: 'ContainerGroupIdentity_userAssignedIdentitiesValue',
type: {
name: 'Composite',
className: 'ContainerGroupIdentityUserAssignedIdentitiesValue',
modelProperties: {
principalId: {
required: false,
readOnly: true,
serializedName: 'principalId',
type: {
name: 'String'
}
},
clientId: {
required: false,
readOnly: true,
serializedName: 'clientId',
type: {
name: 'String'
}
}
}
}
};
}
}

module.exports = ContainerGroupIdentityUserAssignedIdentitiesValue;
65 changes: 62 additions & 3 deletions lib/services/containerinstanceManagement/lib/models/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -435,6 +435,46 @@ export interface Volume {
gitRepo?: GitRepoVolume;
}

/**
* @class
* Initializes a new instance of the ContainerGroupIdentityUserAssignedIdentitiesValue class.
* @constructor
* @member {string} [principalId] The principal id of user assigned identity.
* @member {string} [clientId] The client id of user assigned identity.
*/
export interface ContainerGroupIdentityUserAssignedIdentitiesValue {
readonly principalId?: string;
readonly clientId?: string;
}

/**
* @class
* Initializes a new instance of the ContainerGroupIdentity class.
* @constructor
* Identity for the container group.
*
* @member {string} [principalId] The principal id of the container group
* identity. This property will only be provided for a system assigned
* identity.
* @member {string} [tenantId] The tenant id associated with the container
* group. This property will only be provided for a system assigned identity.
* @member {string} [type] The type of identity used for the container group.
* 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 container group. Possible values include:
* 'SystemAssigned', 'UserAssigned', 'SystemAssigned, UserAssigned', 'None'
* @member {object} [userAssignedIdentities] The list of user identities
* associated with the container group. The user identity dictionary key
* references will be ARM resource ids in the form:
* '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'.
*/
export interface ContainerGroupIdentity {
readonly principalId?: string;
readonly tenantId?: string;
type?: string;
userAssignedIdentities?: { [propertyName: string]: ContainerGroupIdentityUserAssignedIdentitiesValue };
}

/**
* @class
* Initializes a new instance of the ImageRegistryCredential class.
Expand Down Expand Up @@ -474,8 +514,8 @@ export interface Port {
* IP address for the container group.
*
* @member {array} ports The list of ports exposed on the container group.
* @member {string} type Specifies if the IP is exposed to the public internet.
* Possible values include: 'Public', 'Private'
* @member {string} type Specifies if the IP is exposed to the public internet
* or private VNET. Possible values include: 'Public', 'Private'
* @member {string} [ip] The IP exposed to the public internet.
* @member {string} [dnsNameLabel] The Dns name label for the IP.
* @member {string} [fqdn] The FQDN for the IP.
Expand Down Expand Up @@ -579,6 +619,23 @@ export interface Resource extends BaseResource {
* @constructor
* A container group.
*
* @member {object} [identity] The identity of the container group, if
* configured.
* @member {string} [identity.principalId] The principal id of the container
* group identity. This property will only be provided for a system assigned
* identity.
* @member {string} [identity.tenantId] The tenant id associated with the
* container group. This property will only be provided for a system assigned
* identity.
* @member {string} [identity.type] The type of identity used for the container
* group. 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 container group. Possible values include:
* 'SystemAssigned', 'UserAssigned', 'SystemAssigned, UserAssigned', 'None'
* @member {object} [identity.userAssignedIdentities] The list of user
* identities associated with the container group. The user identity dictionary
* key references will be ARM resource ids in the form:
* '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'.
* @member {string} [provisioningState] The provisioning state of the container
* group. This only appears in the response.
* @member {array} containers The containers within the container group.
Expand All @@ -594,7 +651,8 @@ export interface Resource extends BaseResource {
* @member {array} [ipAddress.ports] The list of ports exposed on the container
* group.
* @member {string} [ipAddress.type] Specifies if the IP is exposed to the
* public internet. Possible values include: 'Public', 'Private'
* public internet or private VNET. Possible values include: 'Public',
* 'Private'
* @member {string} [ipAddress.ip] The IP exposed to the public internet.
* @member {string} [ipAddress.dnsNameLabel] The Dns name label for the IP.
* @member {string} [ipAddress.fqdn] The FQDN for the IP.
Expand Down Expand Up @@ -624,6 +682,7 @@ export interface Resource extends BaseResource {
* @member {string} [networkProfile.id] The identifier for a network profile.
*/
export interface ContainerGroup extends Resource {
identity?: ContainerGroupIdentity;
readonly provisioningState?: string;
containers: Container[];
imageRegistryCredentials?: ImageRegistryCredential[];
Expand Down
2 changes: 2 additions & 0 deletions lib/services/containerinstanceManagement/lib/models/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ exports.Container = require('./container');
exports.AzureFileVolume = require('./azureFileVolume');
exports.GitRepoVolume = require('./gitRepoVolume');
exports.Volume = require('./volume');
exports.ContainerGroupIdentityUserAssignedIdentitiesValue = require('./containerGroupIdentityUserAssignedIdentitiesValue');
exports.ContainerGroupIdentity = require('./containerGroupIdentity');
exports.ImageRegistryCredential = require('./imageRegistryCredential');
exports.Port = require('./port');
exports.IpAddress = require('./ipAddress');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class IpAddress {
* Create a IpAddress.
* @member {array} ports The list of ports exposed on the container group.
* @member {string} type Specifies if the IP is exposed to the public
* internet. Possible values include: 'Public', 'Private'
* internet or private VNET. Possible values include: 'Public', 'Private'
* @member {string} [ip] The IP exposed to the public internet.
* @member {string} [dnsNameLabel] The Dns name label for the IP.
* @member {string} [fqdn] The FQDN for the IP.
Expand Down
Loading