Skip to content
This repository was archived by the owner on May 5, 2023. It is now read-only.
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
116 changes: 65 additions & 51 deletions lib/services/storageManagement2/lib/models/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -182,13 +182,14 @@ export interface Restriction {
* @member {string} name Gets or sets the sku name. Required for account
* creation; optional for update. Note that in older versions, sku name was
* called accountType. Possible values include: 'Standard_LRS', 'Standard_GRS',
* 'Standard_RAGRS', 'Standard_ZRS', 'Premium_LRS'
* 'Standard_RAGRS', 'Standard_ZRS', 'Premium_LRS', 'Premium_ZRS'
* @member {string} [tier] Gets the sku tier. This is based on the SKU name.
* Possible values include: 'Standard', 'Premium'
* @member {string} [resourceType] The type of the resource, usually it is
* 'storageAccounts'.
* @member {string} [kind] Indicates the type of storage account. Possible
* values include: 'Storage', 'StorageV2', 'BlobStorage'
* values include: 'Storage', 'StorageV2', 'BlobStorage', 'FileStorage',
* 'BlockBlobStorage'
* @member {array} [locations] The set of locations that the SKU is available.
* This will be supported and registered Azure Geo Regions (e.g. West US, East
* US, Southeast Asia, etc.).
Expand Down Expand Up @@ -464,13 +465,14 @@ export interface Identity {
* @member {string} [sku.name] Gets or sets the sku name. Required for account
* creation; optional for update. Note that in older versions, sku name was
* called accountType. Possible values include: 'Standard_LRS', 'Standard_GRS',
* 'Standard_RAGRS', 'Standard_ZRS', 'Premium_LRS'
* 'Standard_RAGRS', 'Standard_ZRS', 'Premium_LRS', 'Premium_ZRS'
* @member {string} [sku.tier] Gets the sku tier. This is based on the SKU
* name. Possible values include: 'Standard', 'Premium'
* @member {string} [sku.resourceType] The type of the resource, usually it is
* 'storageAccounts'.
* @member {string} [sku.kind] Indicates the type of storage account. Possible
* values include: 'Storage', 'StorageV2', 'BlobStorage'
* values include: 'Storage', 'StorageV2', 'BlobStorage', 'FileStorage',
* 'BlockBlobStorage'
* @member {array} [sku.locations] The set of locations that the SKU is
* available. This will be supported and registered Azure Geo Regions (e.g.
* West US, East US, Southeast Asia, etc.).
Expand All @@ -480,7 +482,8 @@ export interface Identity {
* @member {array} [sku.restrictions] The restrictions because of which SKU
* cannot be used. This is empty if there are no restrictions.
* @member {string} kind Required. Indicates the type of storage account.
* Possible values include: 'Storage', 'StorageV2', 'BlobStorage'
* Possible values include: 'Storage', 'StorageV2', 'BlobStorage',
* 'FileStorage', 'BlockBlobStorage'
* @member {string} location Required. Gets or sets the location of the
* resource. This will be one of the supported and registered Azure Geo Regions
* (e.g. West US, East US, Southeast Asia, etc.). The geo region of a resource
Expand Down Expand Up @@ -567,10 +570,12 @@ export interface Identity {
* @member {string} [accessTier] Required for storage accounts where kind =
* BlobStorage. The access tier used for billing. Possible values include:
* 'Hot', 'Cool'
* @member {boolean} [enableAzureFilesAadIntegration] Enables Azure Files AAD
* Integration for SMB if sets to true.
* @member {boolean} [enableHttpsTrafficOnly] Allows https traffic only to
* storage service if sets to true. Default value: false .
* storage service if sets to true.
* @member {boolean} [isHnsEnabled] Account HierarchicalNamespace enabled if
* sets to true. Default value: false .
* sets to true.
*/
export interface StorageAccountCreateParameters {
sku: Sku;
Expand All @@ -582,6 +587,7 @@ export interface StorageAccountCreateParameters {
encryption?: Encryption;
networkRuleSet?: NetworkRuleSet;
accessTier?: string;
enableAzureFilesAadIntegration?: boolean;
enableHttpsTrafficOnly?: boolean;
isHnsEnabled?: boolean;
}
Expand Down Expand Up @@ -649,13 +655,14 @@ export interface TrackedResource extends Resource {
* @member {string} [sku.name] Gets or sets the sku name. Required for account
* creation; optional for update. Note that in older versions, sku name was
* called accountType. Possible values include: 'Standard_LRS', 'Standard_GRS',
* 'Standard_RAGRS', 'Standard_ZRS', 'Premium_LRS'
* 'Standard_RAGRS', 'Standard_ZRS', 'Premium_LRS', 'Premium_ZRS'
* @member {string} [sku.tier] Gets the sku tier. This is based on the SKU
* name. Possible values include: 'Standard', 'Premium'
* @member {string} [sku.resourceType] The type of the resource, usually it is
* 'storageAccounts'.
* @member {string} [sku.kind] Indicates the type of storage account. Possible
* values include: 'Storage', 'StorageV2', 'BlobStorage'
* values include: 'Storage', 'StorageV2', 'BlobStorage', 'FileStorage',
* 'BlockBlobStorage'
* @member {array} [sku.locations] The set of locations that the SKU is
* available. This will be supported and registered Azure Geo Regions (e.g.
* West US, East US, Southeast Asia, etc.).
Expand All @@ -665,7 +672,7 @@ export interface TrackedResource extends Resource {
* @member {array} [sku.restrictions] The restrictions because of which SKU
* cannot be used. This is empty if there are no restrictions.
* @member {string} [kind] Gets the Kind. Possible values include: 'Storage',
* 'StorageV2', 'BlobStorage'
* 'StorageV2', 'BlobStorage', 'FileStorage', 'BlockBlobStorage'
* @member {object} [identity] The identity of the resource.
* @member {string} [identity.principalId] The principal ID of resource
* identity.
Expand Down Expand Up @@ -768,8 +775,10 @@ export interface TrackedResource extends Resource {
* @member {string} [accessTier] Required for storage accounts where kind =
* BlobStorage. The access tier used for billing. Possible values include:
* 'Hot', 'Cool'
* @member {boolean} [enableAzureFilesAadIntegration] Enables Azure Files AAD
* Integration for SMB if sets to true.
* @member {boolean} [enableHttpsTrafficOnly] Allows https traffic only to
* storage service if sets to true. Default value: false .
* storage service if sets to true.
* @member {object} [networkRuleSet] Network rule set
* @member {string} [networkRuleSet.bypass] Specifies whether traffic is
* bypassed for Logging/Metrics/AzureServices. Possible values are any
Expand All @@ -783,7 +792,7 @@ export interface TrackedResource extends Resource {
* of allow or deny when no other rules match. Possible values include:
* 'Allow', 'Deny'
* @member {boolean} [isHnsEnabled] Account HierarchicalNamespace enabled if
* sets to true. Default value: false .
* sets to true.
*/
export interface StorageAccount extends TrackedResource {
readonly sku?: Sku;
Expand All @@ -801,6 +810,7 @@ export interface StorageAccount extends TrackedResource {
readonly secondaryEndpoints?: Endpoints;
readonly encryption?: Encryption;
readonly accessTier?: string;
enableAzureFilesAadIntegration?: boolean;
enableHttpsTrafficOnly?: boolean;
readonly networkRuleSet?: NetworkRuleSet;
isHnsEnabled?: boolean;
Expand Down Expand Up @@ -857,18 +867,19 @@ export interface StorageAccountRegenerateKeyParameters {
* properties.
*
* @member {object} [sku] Gets or sets the SKU name. Note that the SKU name
* cannot be updated to Standard_ZRS or Premium_LRS, nor can accounts of those
* sku names be updated to any other value.
* cannot be updated to Standard_ZRS, Premium_LRS or Premium_ZRS, nor can
* accounts of those sku names be updated to any other value.
* @member {string} [sku.name] Gets or sets the sku name. Required for account
* creation; optional for update. Note that in older versions, sku name was
* called accountType. Possible values include: 'Standard_LRS', 'Standard_GRS',
* 'Standard_RAGRS', 'Standard_ZRS', 'Premium_LRS'
* 'Standard_RAGRS', 'Standard_ZRS', 'Premium_LRS', 'Premium_ZRS'
* @member {string} [sku.tier] Gets the sku tier. This is based on the SKU
* name. Possible values include: 'Standard', 'Premium'
* @member {string} [sku.resourceType] The type of the resource, usually it is
* 'storageAccounts'.
* @member {string} [sku.kind] Indicates the type of storage account. Possible
* values include: 'Storage', 'StorageV2', 'BlobStorage'
* values include: 'Storage', 'StorageV2', 'BlobStorage', 'FileStorage',
* 'BlockBlobStorage'
* @member {array} [sku.locations] The set of locations that the SKU is
* available. This will be supported and registered Azure Geo Regions (e.g.
* West US, East US, Southeast Asia, etc.).
Expand Down Expand Up @@ -945,8 +956,10 @@ export interface StorageAccountRegenerateKeyParameters {
* @member {string} [accessTier] Required for storage accounts where kind =
* BlobStorage. The access tier used for billing. Possible values include:
* 'Hot', 'Cool'
* @member {boolean} [enableAzureFilesAadIntegration] Enables Azure Files AAD
* Integration for SMB if sets to true.
* @member {boolean} [enableHttpsTrafficOnly] Allows https traffic only to
* storage service if sets to true. Default value: false .
* storage service if sets to true.
* @member {object} [networkRuleSet] Network rule set
* @member {string} [networkRuleSet.bypass] Specifies whether traffic is
* bypassed for Logging/Metrics/AzureServices. Possible values are any
Expand All @@ -961,7 +974,7 @@ export interface StorageAccountRegenerateKeyParameters {
* 'Allow', 'Deny'
* @member {string} [kind] Optional. Indicates the type of storage account.
* Currently only StorageV2 value supported by server. Possible values include:
* 'Storage', 'StorageV2', 'BlobStorage'
* 'Storage', 'StorageV2', 'BlobStorage', 'FileStorage', 'BlockBlobStorage'
*/
export interface StorageAccountUpdateParameters {
sku?: Sku;
Expand All @@ -970,6 +983,7 @@ export interface StorageAccountUpdateParameters {
customDomain?: CustomDomain;
encryption?: Encryption;
accessTier?: string;
enableAzureFilesAadIntegration?: boolean;
enableHttpsTrafficOnly?: boolean;
networkRuleSet?: NetworkRuleSet;
kind?: string;
Expand Down Expand Up @@ -1142,39 +1156,6 @@ export interface ListServiceSasResponse {
readonly serviceSasToken?: string;
}

/**
* @class
* Initializes a new instance of the StorageAccountManagementPolicies class.
* @constructor
* The Get Storage Account ManagementPolicies operation response.
*
* @member {object} [policy] The Storage Account ManagementPolicies Rules, in
* JSON format. See more details in:
* https://docs.microsoft.com/en-us/azure/storage/common/storage-lifecycle-managment-concepts.
* @member {date} [lastModifiedTime] Returns the date and time the
* ManagementPolicies was last modified.
*/
export interface StorageAccountManagementPolicies extends Resource {
policy?: any;
readonly lastModifiedTime?: Date;
}

/**
* @class
* Initializes a new instance of the ManagementPoliciesRulesSetParameter class.
* @constructor
* The Storage Account ManagementPolicies Rules, in JSON format. See more
* details in:
* https://docs.microsoft.com/en-us/azure/storage/common/storage-lifecycle-managment-concepts.
*
* @member {object} [policy] The Storage Account ManagementPolicies Rules, in
* JSON format. See more details in:
* https://docs.microsoft.com/en-us/azure/storage/common/storage-lifecycle-managment-concepts.
*/
export interface ManagementPoliciesRulesSetParameter {
policy?: any;
}

/**
* @class
* Initializes a new instance of the ProxyResource class.
Expand Down Expand Up @@ -1465,6 +1446,39 @@ export interface ListContainerItems {
value?: ListContainerItem[];
}

/**
* @class
* Initializes a new instance of the StorageAccountManagementPolicies class.
* @constructor
* The Get Storage Account ManagementPolicies operation response.
*
* @member {object} [policy] The Storage Account ManagementPolicies Rules, in
* JSON format. See more details in:
* https://docs.microsoft.com/en-us/azure/storage/common/storage-lifecycle-managment-concepts.
* @member {date} [lastModifiedTime] Returns the date and time the
* ManagementPolicies was last modified.
*/
export interface StorageAccountManagementPolicies extends Resource {
policy?: any;
readonly lastModifiedTime?: Date;
}

/**
* @class
* Initializes a new instance of the ManagementPoliciesRulesSetParameter class.
* @constructor
* The Storage Account ManagementPolicies Rules, in JSON format. See more
* details in:
* https://docs.microsoft.com/en-us/azure/storage/common/storage-lifecycle-managment-concepts.
*
* @member {object} [policy] The Storage Account ManagementPolicies Rules, in
* JSON format. See more details in:
* https://docs.microsoft.com/en-us/azure/storage/common/storage-lifecycle-managment-concepts.
*/
export interface ManagementPoliciesRulesSetParameter {
policy?: any;
}


/**
* @class
Expand Down
4 changes: 2 additions & 2 deletions lib/services/storageManagement2/lib/models/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ exports.AccountSasParameters = require('./accountSasParameters');
exports.ListAccountSasResponse = require('./listAccountSasResponse');
exports.ServiceSasParameters = require('./serviceSasParameters');
exports.ListServiceSasResponse = require('./listServiceSasResponse');
exports.StorageAccountManagementPolicies = require('./storageAccountManagementPolicies');
exports.ManagementPoliciesRulesSetParameter = require('./managementPoliciesRulesSetParameter');
exports.ProxyResource = require('./proxyResource');
exports.AzureEntityResource = require('./azureEntityResource');
exports.UpdateHistoryProperty = require('./updateHistoryProperty');
Expand All @@ -65,6 +63,8 @@ exports.ImmutabilityPolicy = require('./immutabilityPolicy');
exports.LegalHold = require('./legalHold');
exports.ListContainerItem = require('./listContainerItem');
exports.ListContainerItems = require('./listContainerItems');
exports.StorageAccountManagementPolicies = require('./storageAccountManagementPolicies');
exports.ManagementPoliciesRulesSetParameter = require('./managementPoliciesRulesSetParameter');
exports.OperationListResult = require('./operationListResult');
exports.StorageSkuListResult = require('./storageSkuListResult');
exports.StorageAccountListResult = require('./storageAccountListResult');
Expand Down
10 changes: 6 additions & 4 deletions lib/services/storageManagement2/lib/models/sku.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,15 @@ class Sku {
* @member {string} name Gets or sets the sku name. Required for account
* creation; optional for update. Note that in older versions, sku name was
* called accountType. Possible values include: 'Standard_LRS',
* 'Standard_GRS', 'Standard_RAGRS', 'Standard_ZRS', 'Premium_LRS'
* 'Standard_GRS', 'Standard_RAGRS', 'Standard_ZRS', 'Premium_LRS',
* 'Premium_ZRS'
* @member {string} [tier] Gets the sku tier. This is based on the SKU name.
* Possible values include: 'Standard', 'Premium'
* @member {string} [resourceType] The type of the resource, usually it is
* 'storageAccounts'.
* @member {string} [kind] Indicates the type of storage account. Possible
* values include: 'Storage', 'StorageV2', 'BlobStorage'
* values include: 'Storage', 'StorageV2', 'BlobStorage', 'FileStorage',
* 'BlockBlobStorage'
* @member {array} [locations] The set of locations that the SKU is
* available. This will be supported and registered Azure Geo Regions (e.g.
* West US, East US, Southeast Asia, etc.).
Expand Down Expand Up @@ -57,7 +59,7 @@ class Sku {
serializedName: 'name',
type: {
name: 'Enum',
allowedValues: [ 'Standard_LRS', 'Standard_GRS', 'Standard_RAGRS', 'Standard_ZRS', 'Premium_LRS' ]
allowedValues: [ 'Standard_LRS', 'Standard_GRS', 'Standard_RAGRS', 'Standard_ZRS', 'Premium_LRS', 'Premium_ZRS' ]
}
},
tier: {
Expand All @@ -83,7 +85,7 @@ class Sku {
serializedName: 'kind',
type: {
name: 'Enum',
allowedValues: [ 'Storage', 'StorageV2', 'BlobStorage' ]
allowedValues: [ 'Storage', 'StorageV2', 'BlobStorage', 'FileStorage', 'BlockBlobStorage' ]
}
},
locations: {
Expand Down
25 changes: 17 additions & 8 deletions lib/services/storageManagement2/lib/models/storageAccount.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,15 @@ class StorageAccount extends models['TrackedResource'] {
* @member {string} [sku.name] Gets or sets the sku name. Required for
* account creation; optional for update. Note that in older versions, sku
* name was called accountType. Possible values include: 'Standard_LRS',
* 'Standard_GRS', 'Standard_RAGRS', 'Standard_ZRS', 'Premium_LRS'
* 'Standard_GRS', 'Standard_RAGRS', 'Standard_ZRS', 'Premium_LRS',
* 'Premium_ZRS'
* @member {string} [sku.tier] Gets the sku tier. This is based on the SKU
* name. Possible values include: 'Standard', 'Premium'
* @member {string} [sku.resourceType] The type of the resource, usually it
* is 'storageAccounts'.
* @member {string} [sku.kind] Indicates the type of storage account.
* Possible values include: 'Storage', 'StorageV2', 'BlobStorage'
* Possible values include: 'Storage', 'StorageV2', 'BlobStorage',
* 'FileStorage', 'BlockBlobStorage'
* @member {array} [sku.locations] The set of locations that the SKU is
* available. This will be supported and registered Azure Geo Regions (e.g.
* West US, East US, Southeast Asia, etc.).
Expand All @@ -40,7 +42,7 @@ class StorageAccount extends models['TrackedResource'] {
* @member {array} [sku.restrictions] The restrictions because of which SKU
* cannot be used. This is empty if there are no restrictions.
* @member {string} [kind] Gets the Kind. Possible values include: 'Storage',
* 'StorageV2', 'BlobStorage'
* 'StorageV2', 'BlobStorage', 'FileStorage', 'BlockBlobStorage'
* @member {object} [identity] The identity of the resource.
* @member {string} [identity.principalId] The principal ID of resource
* identity.
Expand Down Expand Up @@ -148,8 +150,10 @@ class StorageAccount extends models['TrackedResource'] {
* @member {string} [accessTier] Required for storage accounts where kind =
* BlobStorage. The access tier used for billing. Possible values include:
* 'Hot', 'Cool'
* @member {boolean} [enableAzureFilesAadIntegration] Enables Azure Files AAD
* Integration for SMB if sets to true.
* @member {boolean} [enableHttpsTrafficOnly] Allows https traffic only to
* storage service if sets to true. Default value: false .
* storage service if sets to true.
* @member {object} [networkRuleSet] Network rule set
* @member {string} [networkRuleSet.bypass] Specifies whether traffic is
* bypassed for Logging/Metrics/AzureServices. Possible values are any
Expand All @@ -163,7 +167,7 @@ class StorageAccount extends models['TrackedResource'] {
* action of allow or deny when no other rules match. Possible values
* include: 'Allow', 'Deny'
* @member {boolean} [isHnsEnabled] Account HierarchicalNamespace enabled if
* sets to true. Default value: false .
* sets to true.
*/
constructor() {
super();
Expand Down Expand Up @@ -243,7 +247,7 @@ class StorageAccount extends models['TrackedResource'] {
serializedName: 'kind',
type: {
name: 'Enum',
allowedValues: [ 'Storage', 'StorageV2', 'BlobStorage' ]
allowedValues: [ 'Storage', 'StorageV2', 'BlobStorage', 'FileStorage', 'BlockBlobStorage' ]
}
},
identity: {
Expand Down Expand Up @@ -358,10 +362,16 @@ class StorageAccount extends models['TrackedResource'] {
allowedValues: [ 'Hot', 'Cool' ]
}
},
enableAzureFilesAadIntegration: {
required: false,
serializedName: 'properties.azureFilesAadIntegration',
type: {
name: 'Boolean'
}
},
enableHttpsTrafficOnly: {
required: false,
serializedName: 'properties.supportsHttpsTrafficOnly',
defaultValue: false,
type: {
name: 'Boolean'
}
Expand All @@ -378,7 +388,6 @@ class StorageAccount extends models['TrackedResource'] {
isHnsEnabled: {
required: false,
serializedName: 'properties.isHnsEnabled',
defaultValue: false,
type: {
name: 'Boolean'
}
Expand Down
Loading