Skip to content
Closed
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
2 changes: 1 addition & 1 deletion sdk/batch/arm-batch/src/batchManagementClientContext.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export class BatchManagementClientContext extends msRestAzure.AzureServiceClient

super(credentials, options);

this.apiVersion = '2020-03-01';
this.apiVersion = '2020-05-01';
this.acceptLanguage = 'en-US';
this.longRunningOperationRetryTimeout = 30;
this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ export {
AzureFileShareConfiguration,
BaseResource,
BatchAccount,
BatchAccountIdentity,
Certificate,
CertificateCreateOrUpdateParameters,
CertificateReference,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export {
AzureFileShareConfiguration,
BaseResource,
BatchAccount,
BatchAccountIdentity,
Certificate,
CertificateCreateOrUpdateParameters,
CertificateReference,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export {
BatchAccountCreateHeaders,
BatchAccountCreateParameters,
BatchAccountDeleteHeaders,
BatchAccountIdentity,
BatchAccountKeys,
BatchAccountListResult,
BatchAccountRegenerateKeyParameters,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ export {
AzureFileShareConfiguration,
BaseResource,
BatchAccount,
BatchAccountIdentity,
Certificate,
CertificateCancelDeletionHeaders,
CertificateCreateHeaders,
Expand Down
93 changes: 82 additions & 11 deletions sdk/batch/arm-batch/src/models/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,25 @@ export interface AutoStorageBaseProperties {
}

/**
* An interface representing KeyVaultProperties.
* KeyVault configuration when using an encryption KeySource of Microsoft.KeyVault.
*/
export interface KeyVaultProperties {
/**
* Full path to the versioned secret. Example
* https://mykeyvault.vault.azure.net/keys/testkey/6e34a81fef704045975661e297a4c053
* https://mykeyvault.vault.azure.net/keys/testkey/6e34a81fef704045975661e297a4c053. To be usable
* the following prerequisites must be met:
*
* The Batch Account has a System Assigned identity
* The account identity has been granted Key/Get, Key/Unwrap and Key/Wrap permissions
* The KeyVault has soft-delete and purge protection enabled
*/
keyIdentifier?: string;
}

/**
* An interface representing EncryptionProperties.
* Configures how customer data is encrypted inside the Batch account. By default, accounts are
* encrypted using a Microsoft managed key. For additional control, a customer-managed key can be
* used instead.
*/
export interface EncryptionProperties {
/**
Expand All @@ -60,6 +67,30 @@ export interface KeyVaultReference {
url: string;
}

/**
* The identity of the Batch account, if configured. This is only used when the user specifies
* 'Azure.KeyVault' as their Batch account encryption configuration.
*/
export interface BatchAccountIdentity {
/**
* The principal id of the Batch account. This property will only be provided for a system
* assigned identity.
* **NOTE: This property will not be serialized. It can only be populated by the server.**
*/
readonly principalId?: string;
/**
* The tenant id associated with the Batch account. This property will only be provided for a
* system assigned identity.
* **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 Batch account. Possible values include: 'SystemAssigned',
* 'None'
*/
type: ResourceIdentityType;
}

/**
* Parameters supplied to the Create operation.
*/
Expand Down Expand Up @@ -94,9 +125,15 @@ export interface BatchAccountCreateParameters {
*/
publicNetworkAccess?: PublicNetworkAccessType;
/**
* The encryption configuration for the Batch account.
* The encryption configuration for the Batch account. Configures how customer data is encrypted
* inside the Batch account. By default, accounts are encrypted using a Microsoft managed key.
* For additional control, a customer-managed key can be used instead.
*/
encryption?: EncryptionProperties;
/**
* The identity of the Batch account.
*/
identity?: BatchAccountIdentity;
}

/**
Expand Down Expand Up @@ -278,8 +315,10 @@ export interface BatchAccount extends Resource {
*/
readonly autoStorage?: AutoStorageProperties;
/**
* The encryption configuration for the Batch account. **NOTE: This property will not be
* serialized. It can only be populated by the server.**
* The encryption configuration for the Batch account. Configures how customer data is encrypted
* inside the Batch account. By default, accounts are encrypted using a Microsoft managed key.
* For additional control, a customer-managed key can be used instead.
* **NOTE: This property will not be serialized. It can only be populated by the server.**
*/
readonly encryption?: EncryptionProperties;
/**
Expand Down Expand Up @@ -323,6 +362,10 @@ export interface BatchAccount extends Resource {
* serialized. It can only be populated by the server.**
*/
readonly activeJobAndJobScheduleQuota?: number;
/**
* The identity of the Batch account.
*/
identity?: BatchAccountIdentity;
}

/**
Expand All @@ -338,9 +381,15 @@ export interface BatchAccountUpdateParameters {
*/
autoStorage?: AutoStorageBaseProperties;
/**
* The encryption configuration for the Batch account.
* The encryption configuration for the Batch account. Configures how customer data is encrypted
* inside the Batch account. By default, accounts are encrypted using a Microsoft managed key.
* For additional control, a customer-managed key can be used instead.
*/
encryption?: EncryptionProperties;
/**
* The identity of the Batch account.
*/
identity?: BatchAccountIdentity;
}

/**
Expand Down Expand Up @@ -2016,6 +2065,17 @@ export interface PrivateEndpointConnectionUpdateOptionalParams extends msRest.Re
ifMatch?: string;
}

/**
* Optional Parameters.
*/
export interface PrivateEndpointConnectionBeginUpdateOptionalParams extends msRest.RequestOptionsBase {
/**
* The state (ETag) version of the private endpoint connection to update. This value can be
* omitted or set to "*" to apply the operation unconditionally.
*/
ifMatch?: string;
}

/**
* Optional Parameters.
*/
Expand Down Expand Up @@ -2196,11 +2256,14 @@ export interface CertificateCancelDeletionHeaders {
*/
export interface PrivateEndpointConnectionUpdateHeaders {
/**
* The ETag HTTP response header. This is an opaque string. You can use it to detect whether the
* resource has changed between requests. In particular, you can pass the ETag to one of the
* If-Match or If-None-Match headers.
* The URL of the resource used to check the status of the asynchronous operation.
*/
eTag: string;
location: string;
/**
* Suggested delay to check the status of the asynchronous operation. The value is an integer
* that represents the seconds.
*/
retryAfter: number;
}

/**
Expand Down Expand Up @@ -2397,6 +2460,14 @@ export type PoolAllocationMode = 'BatchService' | 'UserSubscription';
*/
export type PublicNetworkAccessType = 'Enabled' | 'Disabled';

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

/**
* Defines values for ProvisioningState.
* Possible values include: 'Invalid', 'Creating', 'Deleting', 'Succeeded', 'Failed', 'Cancelled'
Expand Down
66 changes: 64 additions & 2 deletions sdk/batch/arm-batch/src/models/mappers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,41 @@ export const KeyVaultReference: msRest.CompositeMapper = {
}
};

export const BatchAccountIdentity: msRest.CompositeMapper = {
serializedName: "BatchAccountIdentity",
type: {
name: "Composite",
className: "BatchAccountIdentity",
modelProperties: {
principalId: {
readOnly: true,
serializedName: "principalId",
type: {
name: "String"
}
},
tenantId: {
readOnly: true,
serializedName: "tenantId",
type: {
name: "String"
}
},
type: {
required: true,
serializedName: "type",
type: {
name: "Enum",
allowedValues: [
"SystemAssigned",
"None"
]
}
}
}
}
};

export const BatchAccountCreateParameters: msRest.CompositeMapper = {
serializedName: "BatchAccountCreateParameters",
type: {
Expand Down Expand Up @@ -161,6 +196,13 @@ export const BatchAccountCreateParameters: msRest.CompositeMapper = {
name: "Composite",
className: "EncryptionProperties"
}
},
identity: {
serializedName: "identity",
type: {
name: "Composite",
className: "BatchAccountIdentity"
}
}
}
}
Expand Down Expand Up @@ -533,6 +575,13 @@ export const BatchAccount: msRest.CompositeMapper = {
type: {
name: "Number"
}
},
identity: {
serializedName: "identity",
type: {
name: "Composite",
className: "BatchAccountIdentity"
}
}
}
}
Expand Down Expand Up @@ -568,6 +617,13 @@ export const BatchAccountUpdateParameters: msRest.CompositeMapper = {
name: "Composite",
className: "EncryptionProperties"
}
},
identity: {
serializedName: "identity",
type: {
name: "Composite",
className: "BatchAccountIdentity"
}
}
}
}
Expand Down Expand Up @@ -2877,11 +2933,17 @@ export const PrivateEndpointConnectionUpdateHeaders: msRest.CompositeMapper = {
name: "Composite",
className: "PrivateEndpointConnectionUpdateHeaders",
modelProperties: {
eTag: {
serializedName: "etag",
location: {
serializedName: "location",
type: {
name: "String"
}
},
retryAfter: {
serializedName: "retry-after",
type: {
name: "Number"
}
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions sdk/batch/arm-batch/src/models/parameters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -180,9 +180,9 @@ export const privateEndpointConnectionName: msRest.OperationURLParameter = {
required: true,
serializedName: "privateEndpointConnectionName",
constraints: {
MaxLength: 64,
MaxLength: 101,
MinLength: 1,
Pattern: /^[a-zA-Z0-9_-]+$/
Pattern: /^[a-zA-Z0-9_-]+\.?[a-fA-F0-9-]*$/
},
type: {
name: "String"
Expand All @@ -195,9 +195,9 @@ export const privateLinkResourceName: msRest.OperationURLParameter = {
required: true,
serializedName: "privateLinkResourceName",
constraints: {
MaxLength: 64,
MaxLength: 101,
MinLength: 1,
Pattern: /^[a-zA-Z0-9_-]+$/
Pattern: /^[a-zA-Z0-9_-]+\.?[a-fA-F0-9-]*$/
},
type: {
name: "String"
Expand Down
1 change: 1 addition & 0 deletions sdk/batch/arm-batch/src/models/poolOperationsMappers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ export {
AzureFileShareConfiguration,
BaseResource,
BatchAccount,
BatchAccountIdentity,
Certificate,
CertificateCreateOrUpdateParameters,
CertificateReference,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ export {
AzureFileShareConfiguration,
BaseResource,
BatchAccount,
BatchAccountIdentity,
Certificate,
CertificateCreateOrUpdateParameters,
CertificateReference,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ export {
AzureFileShareConfiguration,
BaseResource,
BatchAccount,
BatchAccountIdentity,
Certificate,
CertificateCreateOrUpdateParameters,
CertificateReference,
Expand Down
Loading