Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Storage: Update 2019 06 01 #7308

Merged
merged 2 commits into from
Jan 9, 2020
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
2 changes: 1 addition & 1 deletion sdk/storage/mgmt-v2019_06_01/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<relativePath>../../../pom.management.xml</relativePath>
</parent>
<artifactId>azure-mgmt-storage</artifactId>
<version>1.0.0-beta-1</version>
<version>1.0.0-beta-2</version>
<packaging>jar</packaging>
<name>Microsoft Azure SDK for Storage Management</name>
<description>This package contains Microsoft Storage Management SDK.</description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,15 @@ public class EncryptionService {
@JsonProperty(value = "lastEnabledTime", access = JsonProperty.Access.WRITE_ONLY)
private DateTime lastEnabledTime;

/**
* Encryption key type to be used for the encryption service. 'Account' key
* type implies that an account-scoped encryption key will be used.
* 'Service' key type implies that a default service key is used. Possible
* values include: 'Service', 'Account'.
*/
@JsonProperty(value = "keyType")
private KeyType keyType;

/**
* Get a boolean indicating whether or not the service encrypts the data as it is stored.
*
Expand Down Expand Up @@ -60,4 +69,24 @@ public DateTime lastEnabledTime() {
return this.lastEnabledTime;
}

/**
* Get encryption key type to be used for the encryption service. 'Account' key type implies that an account-scoped encryption key will be used. 'Service' key type implies that a default service key is used. Possible values include: 'Service', 'Account'.
*
* @return the keyType value
*/
public KeyType keyType() {
return this.keyType;
}

/**
* Set encryption key type to be used for the encryption service. 'Account' key type implies that an account-scoped encryption key will be used. 'Service' key type implies that a default service key is used. Possible values include: 'Service', 'Account'.
*
* @param keyType the keyType value to set
* @return the EncryptionService object itself.
*/
public EncryptionService withKeyType(KeyType keyType) {
this.keyType = keyType;
return this;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ public class EncryptionServices {
/**
* The encryption function of the table storage service.
*/
@JsonProperty(value = "table", access = JsonProperty.Access.WRITE_ONLY)
@JsonProperty(value = "table")
private EncryptionService table;

/**
* The encryption function of the queue storage service.
*/
@JsonProperty(value = "queue", access = JsonProperty.Access.WRITE_ONLY)
@JsonProperty(value = "queue")
private EncryptionService queue;

/**
Expand Down Expand Up @@ -87,6 +87,17 @@ public EncryptionService table() {
return this.table;
}

/**
* Set the encryption function of the table storage service.
*
* @param table the table value to set
* @return the EncryptionServices object itself.
*/
public EncryptionServices withTable(EncryptionService table) {
this.table = table;
return this;
}

/**
* Get the encryption function of the queue storage service.
*
Expand All @@ -96,4 +107,15 @@ public EncryptionService queue() {
return this.queue;
}

/**
* Set the encryption function of the queue storage service.
*
* @param queue the queue value to set
* @return the EncryptionServices object itself.
*/
public EncryptionServices withQueue(EncryptionService queue) {
this.queue = queue;
return this;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import com.microsoft.azure.arm.resources.models.HasManager;
import com.microsoft.azure.management.storage.v2019_06_01.implementation.StorageManager;
import com.microsoft.azure.management.storage.v2019_06_01.implementation.SkuInner;

import java.util.List;

/**
* Type representing FileServiceProperties.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ interface WithMetadata {
interface WithShareQuota {
/**
* Specifies shareQuota.
* @param shareQuota The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large File Shares, the maximum size is 100000
* @param shareQuota The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large File Shares, the maximum size is 102400
* @return the next definition stage
*/
WithCreate withShareQuota(Integer shareQuota);
Expand Down Expand Up @@ -147,7 +147,7 @@ interface WithMetadata {
interface WithShareQuota {
/**
* Specifies shareQuota.
* @param shareQuota The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large File Shares, the maximum size is 100000
* @param shareQuota The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large File Shares, the maximum size is 102400
* @return the next update stage
*/
Update withShareQuota(Integer shareQuota);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
/**
* 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.
*/

package com.microsoft.azure.management.storage.v2019_06_01;

import java.util.Collection;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.microsoft.rest.ExpandableStringEnum;

/**
* Defines values for KeyType.
*/
public final class KeyType extends ExpandableStringEnum<KeyType> {
/** Static value Service for KeyType. */
public static final KeyType SERVICE = fromString("Service");

/** Static value Account for KeyType. */
public static final KeyType ACCOUNT = fromString("Account");

/**
* Creates or finds a KeyType from its string representation.
* @param name a name to look for
* @return the corresponding KeyType
*/
@JsonCreator
public static KeyType fromString(String name) {
return fromString(name, KeyType.class);
}

/**
* @return known KeyType values
*/
public static Collection<KeyType> values() {
return values(KeyType.class);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public class FileShareInner extends AzureEntityResource {
/**
* The maximum size of the share, in gigabytes. Must be greater than 0, and
* less than or equal to 5TB (5120). For Large File Shares, the maximum
* size is 100000.
* size is 102400.
*/
@JsonProperty(value = "properties.shareQuota")
private Integer shareQuota;
Expand Down Expand Up @@ -70,7 +70,7 @@ public FileShareInner withMetadata(Map<String, String> metadata) {
}

/**
* Get the maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large File Shares, the maximum size is 100000.
* Get the maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large File Shares, the maximum size is 102400.
*
* @return the shareQuota value
*/
Expand All @@ -79,7 +79,7 @@ public Integer shareQuota() {
}

/**
* Set the maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large File Shares, the maximum size is 100000.
* Set the maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large File Shares, the maximum size is 102400.
*
* @param shareQuota the shareQuota value to set
* @return the FileShareInner object itself.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public class FileShareItemInner extends AzureEntityResource {
/**
* The maximum size of the share, in gigabytes. Must be greater than 0, and
* less than or equal to 5TB (5120). For Large File Shares, the maximum
* size is 100000.
* size is 102400.
*/
@JsonProperty(value = "properties.shareQuota")
private Integer shareQuota;
Expand Down Expand Up @@ -69,7 +69,7 @@ public FileShareItemInner withMetadata(Map<String, String> metadata) {
}

/**
* Get the maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large File Shares, the maximum size is 100000.
* Get the maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large File Shares, the maximum size is 102400.
*
* @return the shareQuota value
*/
Expand All @@ -78,7 +78,7 @@ public Integer shareQuota() {
}

/**
* Set the maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large File Shares, the maximum size is 100000.
* Set the maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large File Shares, the maximum size is 102400.
*
* @param shareQuota the shareQuota value to set
* @return the FileShareItemInner object itself.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ public Observable<ServiceResponse<FileShareInner>> call(Response<ResponseBody> r
* @param accountName The name of the storage account within the specified resource group. Storage account names must be between 3 and 24 characters in length and use numbers and lower-case letters only.
* @param shareName The name of the file share within the specified storage account. File share names must be between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every dash (-) character must be immediately preceded and followed by a letter or number.
* @param metadata A name-value pair to associate with the share as metadata.
* @param shareQuota The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large File Shares, the maximum size is 100000.
* @param shareQuota The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large File Shares, the maximum size is 102400.
* @throws IllegalArgumentException thrown if parameters fail the validation
* @throws CloudException thrown if the request is rejected by server
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
Expand All @@ -455,7 +455,7 @@ public FileShareInner create(String resourceGroupName, String accountName, Strin
* @param accountName The name of the storage account within the specified resource group. Storage account names must be between 3 and 24 characters in length and use numbers and lower-case letters only.
* @param shareName The name of the file share within the specified storage account. File share names must be between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every dash (-) character must be immediately preceded and followed by a letter or number.
* @param metadata A name-value pair to associate with the share as metadata.
* @param shareQuota The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large File Shares, the maximum size is 100000.
* @param shareQuota The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large File Shares, the maximum size is 102400.
* @param serviceCallback the async ServiceCallback to handle successful and failed responses.
* @throws IllegalArgumentException thrown if parameters fail the validation
* @return the {@link ServiceFuture} object
Expand All @@ -471,7 +471,7 @@ public ServiceFuture<FileShareInner> createAsync(String resourceGroupName, Strin
* @param accountName The name of the storage account within the specified resource group. Storage account names must be between 3 and 24 characters in length and use numbers and lower-case letters only.
* @param shareName The name of the file share within the specified storage account. File share names must be between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every dash (-) character must be immediately preceded and followed by a letter or number.
* @param metadata A name-value pair to associate with the share as metadata.
* @param shareQuota The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large File Shares, the maximum size is 100000.
* @param shareQuota The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large File Shares, the maximum size is 102400.
* @throws IllegalArgumentException thrown if parameters fail the validation
* @return the observable to the FileShareInner object
*/
Expand All @@ -491,7 +491,7 @@ public FileShareInner call(ServiceResponse<FileShareInner> response) {
* @param accountName The name of the storage account within the specified resource group. Storage account names must be between 3 and 24 characters in length and use numbers and lower-case letters only.
* @param shareName The name of the file share within the specified storage account. File share names must be between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every dash (-) character must be immediately preceded and followed by a letter or number.
* @param metadata A name-value pair to associate with the share as metadata.
* @param shareQuota The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large File Shares, the maximum size is 100000.
* @param shareQuota The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large File Shares, the maximum size is 102400.
* @throws IllegalArgumentException thrown if parameters fail the validation
* @return the observable to the FileShareInner object
*/
Expand Down Expand Up @@ -635,7 +635,7 @@ public Observable<ServiceResponse<FileShareInner>> call(Response<ResponseBody> r
* @param accountName The name of the storage account within the specified resource group. Storage account names must be between 3 and 24 characters in length and use numbers and lower-case letters only.
* @param shareName The name of the file share within the specified storage account. File share names must be between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every dash (-) character must be immediately preceded and followed by a letter or number.
* @param metadata A name-value pair to associate with the share as metadata.
* @param shareQuota The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large File Shares, the maximum size is 100000.
* @param shareQuota The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large File Shares, the maximum size is 102400.
* @throws IllegalArgumentException thrown if parameters fail the validation
* @throws CloudException thrown if the request is rejected by server
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
Expand All @@ -652,7 +652,7 @@ public FileShareInner update(String resourceGroupName, String accountName, Strin
* @param accountName The name of the storage account within the specified resource group. Storage account names must be between 3 and 24 characters in length and use numbers and lower-case letters only.
* @param shareName The name of the file share within the specified storage account. File share names must be between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every dash (-) character must be immediately preceded and followed by a letter or number.
* @param metadata A name-value pair to associate with the share as metadata.
* @param shareQuota The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large File Shares, the maximum size is 100000.
* @param shareQuota The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large File Shares, the maximum size is 102400.
* @param serviceCallback the async ServiceCallback to handle successful and failed responses.
* @throws IllegalArgumentException thrown if parameters fail the validation
* @return the {@link ServiceFuture} object
Expand All @@ -668,7 +668,7 @@ public ServiceFuture<FileShareInner> updateAsync(String resourceGroupName, Strin
* @param accountName The name of the storage account within the specified resource group. Storage account names must be between 3 and 24 characters in length and use numbers and lower-case letters only.
* @param shareName The name of the file share within the specified storage account. File share names must be between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every dash (-) character must be immediately preceded and followed by a letter or number.
* @param metadata A name-value pair to associate with the share as metadata.
* @param shareQuota The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large File Shares, the maximum size is 100000.
* @param shareQuota The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large File Shares, the maximum size is 102400.
* @throws IllegalArgumentException thrown if parameters fail the validation
* @return the observable to the FileShareInner object
*/
Expand All @@ -688,7 +688,7 @@ public FileShareInner call(ServiceResponse<FileShareInner> response) {
* @param accountName The name of the storage account within the specified resource group. Storage account names must be between 3 and 24 characters in length and use numbers and lower-case letters only.
* @param shareName The name of the file share within the specified storage account. File share names must be between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every dash (-) character must be immediately preceded and followed by a letter or number.
* @param metadata A name-value pair to associate with the share as metadata.
* @param shareQuota The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large File Shares, the maximum size is 100000.
* @param shareQuota The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large File Shares, the maximum size is 102400.
* @throws IllegalArgumentException thrown if parameters fail the validation
* @return the observable to the FileShareInner object
*/
Expand Down