Skip to content

Commit

Permalink
Update from master
Browse files Browse the repository at this point in the history
  • Loading branch information
SDK Automation committed Jun 16, 2020
1 parent 240939d commit f2d6def
Show file tree
Hide file tree
Showing 58 changed files with 5,046 additions and 43 deletions.
6 changes: 3 additions & 3 deletions sdk/storage/mgmt-v2019_06_01/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-arm-parent</artifactId>
<version>1.3.0</version>
<relativePath>../../parents/azure-arm-parent</relativePath>
<version>1.1.0</version>
<relativePath>../../../pom.management.xml</relativePath>
</parent>
<artifactId>azure-mgmt-storage</artifactId>
<version>1.0.0-beta-7</version>
<version>1.0.0-beta</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 @@ -28,6 +28,16 @@ public interface BlobContainer extends HasInner<BlobContainerInner>, Indexable,
*/
String defaultEncryptionScope();

/**
* @return the deleted value.
*/
Boolean deleted();

/**
* @return the deletedTime value.
*/
DateTime deletedTime();

/**
* @return the denyEncryptionScopeOverride value.
*/
Expand Down Expand Up @@ -98,11 +108,21 @@ public interface BlobContainer extends HasInner<BlobContainerInner>, Indexable,
*/
PublicAccess publicAccess();

/**
* @return the remainingRetentionDays value.
*/
Integer remainingRetentionDays();

/**
* @return the type value.
*/
String type();

/**
* @return the version value.
*/
String version();

/**
* The entirety of the BlobContainer definition.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import com.microsoft.azure.arm.model.Appliable;
import com.microsoft.azure.arm.model.Creatable;
import com.microsoft.azure.arm.resources.models.HasManager;
import com.microsoft.azure.management.storage.v2019_06_01.implementation.SkuInner;
import com.microsoft.azure.management.storage.v2019_06_01.implementation.StorageManager;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,13 @@ public class Encryption {
@JsonProperty(value = "keySource", required = true)
private KeySource keySource;

/**
* A boolean indicating whether or not the service applies a secondary
* layer of encryption with platform managed keys for data at rest.
*/
@JsonProperty(value = "requireInfrastructureEncryption")
private Boolean requireInfrastructureEncryption;

/**
* Properties provided by key vault.
*/
Expand Down Expand Up @@ -74,6 +81,26 @@ public Encryption withKeySource(KeySource keySource) {
return this;
}

/**
* Get a boolean indicating whether or not the service applies a secondary layer of encryption with platform managed keys for data at rest.
*
* @return the requireInfrastructureEncryption value
*/
public Boolean requireInfrastructureEncryption() {
return this.requireInfrastructureEncryption;
}

/**
* Set a boolean indicating whether or not the service applies a secondary layer of encryption with platform managed keys for data at rest.
*
* @param requireInfrastructureEncryption the requireInfrastructureEncryption value to set
* @return the Encryption object itself.
*/
public Encryption withRequireInfrastructureEncryption(Boolean requireInfrastructureEncryption) {
this.requireInfrastructureEncryption = requireInfrastructureEncryption;
return this;
}

/**
* Get properties provided by key vault.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import com.microsoft.azure.arm.model.Appliable;
import com.microsoft.azure.arm.model.Creatable;
import com.microsoft.azure.arm.resources.models.HasManager;
import com.microsoft.azure.management.storage.v2019_06_01.implementation.SkuInner;
import com.microsoft.azure.management.storage.v2019_06_01.implementation.StorageManager;
import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public interface FileShare extends HasInner<FileShareInner>, Indexable, Updatabl
/**
* @return the shareUsageBytes value.
*/
Integer shareUsageBytes();
Long shareUsageBytes();

/**
* @return the type value.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public interface FileShareItem extends HasInner<FileShareItemInner>, HasManager<
/**
* @return the shareUsageBytes value.
*/
Integer shareUsageBytes();
Long shareUsageBytes();

/**
* @return the type value.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,16 @@ public interface ListContainerItem extends HasInner<ListContainerItemInner>, Has
*/
String defaultEncryptionScope();

/**
* @return the deleted value.
*/
Boolean deleted();

/**
* @return the deletedTime value.
*/
DateTime deletedTime();

/**
* @return the denyEncryptionScopeOverride value.
*/
Expand Down Expand Up @@ -94,9 +104,19 @@ public interface ListContainerItem extends HasInner<ListContainerItemInner>, Has
*/
PublicAccess publicAccess();

/**
* @return the remainingRetentionDays value.
*/
Integer remainingRetentionDays();

/**
* @return the type value.
*/
String type();

/**
* @return the version value.
*/
String version();

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
/**
* 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 ListContainersInclude.
*/
public final class ListContainersInclude extends ExpandableStringEnum<ListContainersInclude> {
/** Static value deleted for ListContainersInclude. */
public static final ListContainersInclude DELETED = fromString("deleted");

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

/**
* @return known ListContainersInclude values
*/
public static Collection<ListContainersInclude> values() {
return values(ListContainersInclude.class);
}
}
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 com.microsoft.azure.arm.model.HasInner;
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.ListQueueInner;
import java.util.Map;

/**
* Type representing ListQueue.
*/
public interface ListQueue extends HasInner<ListQueueInner>, HasManager<StorageManager> {
/**
* @return the id value.
*/
String id();

/**
* @return the metadata value.
*/
Map<String, String> metadata();

/**
* @return the name value.
*/
String name();

/**
* @return the type value.
*/
String type();

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/**
* 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 com.microsoft.azure.arm.model.HasInner;
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.ListQueueServicesInner;
import com.microsoft.azure.management.storage.v2019_06_01.implementation.QueueServicePropertiesInner;
import java.util.List;

/**
* Type representing ListQueueServices.
*/
public interface ListQueueServices extends HasInner<ListQueueServicesInner>, HasManager<StorageManager> {
/**
* @return the value value.
*/
List<QueueServicePropertiesInner> value();

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/**
* 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 com.microsoft.azure.arm.model.HasInner;
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.ListTableServicesInner;
import com.microsoft.azure.management.storage.v2019_06_01.implementation.TableServicePropertiesInner;
import java.util.List;

/**
* Type representing ListTableServices.
*/
public interface ListTableServices extends HasInner<ListTableServicesInner>, HasManager<StorageManager> {
/**
* @return the value value.
*/
List<TableServicePropertiesInner> value();

}
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ public class ManagementPolicyRule {

/**
* Creates an instance of ManagementPolicyRule class.
* @param name a rule name can contain any combination of alpha numeric characters. Rule name is case-sensitive. It must be unique within a policy.
* @param definition an object that defines the Lifecycle rule.
*/
public ManagementPolicyRule() {
type = "Lifecycle";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,28 @@ public interface PrivateEndpointConnections extends SupportsCreating<PrivateEndp
*
* @param resourceGroupName The name of the resource group within the user's subscription. The name is case insensitive.
* @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 privateEndpointConnectionName The name of the private endpoint connection associated with the Storage Account
* @param privateEndpointConnectionName The name of the private endpoint connection associated with the Azure resource
* @throws IllegalArgumentException thrown if parameters fail the validation
* @return the observable for the request
*/
Observable<PrivateEndpointConnection> getAsync(String resourceGroupName, String accountName, String privateEndpointConnectionName);

/**
* List all the private endpoint connections associated with the storage account.
*
* @param resourceGroupName The name of the resource group within the user's subscription. The name is case insensitive.
* @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.
* @throws IllegalArgumentException thrown if parameters fail the validation
* @return the observable for the request
*/
Observable<PrivateEndpointConnection> listAsync(String resourceGroupName, String accountName);

/**
* Deletes the specified private endpoint connection associated with the storage account.
*
* @param resourceGroupName The name of the resource group within the user's subscription. The name is case insensitive.
* @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 privateEndpointConnectionName The name of the private endpoint connection associated with the Storage Account
* @param privateEndpointConnectionName The name of the private endpoint connection associated with the Azure resource
* @throws IllegalArgumentException thrown if parameters fail the validation
* @return the observable for the request
*/
Expand Down
Loading

0 comments on commit f2d6def

Please sign in to comment.