[AutoPR sdk/storage/mgmt-v2019_06_01] [SRP] Add blob service property for container soft delete

sdk/storage/mgmt-v2019_06_01/pom.xml

@@ -11,11 +11,11 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.2.0</version>
+        <version>1.1.0</version>
         <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-storage</artifactId>
-    <version>1.0.0-beta-3</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>

sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/BlobContainers.java

@@ -139,10 +139,9 @@ public interface BlobContainers {
      * @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 containerName The name of the blob container within the specified storage account. Blob container 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 ifMatch The entity state (ETag) version of the immutability policy to update. A value of "*" can be used to apply the operation only if the immutability policy already exists. If omitted, this operation will always be applied.
-     * @param immutabilityPeriodSinceCreationInDays The immutability period for the blobs in the container since the policy creation, in days.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Observable<ImmutabilityPolicy> extendImmutabilityPolicyAsync(String resourceGroupName, String accountName, String containerName, String ifMatch, int immutabilityPeriodSinceCreationInDays);
+    Observable<ImmutabilityPolicy> extendImmutabilityPolicyAsync(String resourceGroupName, String accountName, String containerName, String ifMatch);
 
 }

sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/BlobServiceProperties.java

@@ -17,7 +17,6 @@
 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.StorageManager;
-import com.microsoft.azure.management.storage.v2019_06_01.implementation.SkuInner;
 
 /**
  * Type representing BlobServiceProperties.
@@ -33,6 +32,11 @@ public interface BlobServiceProperties extends HasInner<BlobServicePropertiesInn
      */
     ChangeFeed changeFeed();
 
+    /**
+     * @return the containerDeleteRetentionPolicy value.
+     */
+    DeleteRetentionPolicy containerDeleteRetentionPolicy();
+
     /**
      * @return the cors value.
      */
@@ -53,6 +57,11 @@ public interface BlobServiceProperties extends HasInner<BlobServicePropertiesInn
      */
     String id();
 
+    /**
+     * @return the isVersioningEnabled value.
+     */
+    Boolean isVersioningEnabled();
+
     /**
      * @return the name value.
      */
@@ -108,7 +117,7 @@ interface WithStorageAccount {
         interface WithAutomaticSnapshotPolicyEnabled {
             /**
              * Specifies automaticSnapshotPolicyEnabled.
-             * @param automaticSnapshotPolicyEnabled Automatic Snapshot is enabled if set to true
+             * @param automaticSnapshotPolicyEnabled Deprecated in favor of isVersioningEnabled property
              * @return the next definition stage
              */
             WithCreate withAutomaticSnapshotPolicyEnabled(Boolean automaticSnapshotPolicyEnabled);
@@ -126,6 +135,18 @@ interface WithChangeFeed {
             WithCreate withChangeFeed(ChangeFeed changeFeed);
         }
 
+        /**
+         * The stage of the blobserviceproperties definition allowing to specify ContainerDeleteRetentionPolicy.
+         */
+        interface WithContainerDeleteRetentionPolicy {
+            /**
+             * Specifies containerDeleteRetentionPolicy.
+             * @param containerDeleteRetentionPolicy The blob service properties for container soft delete
+             * @return the next definition stage
+             */
+            WithCreate withContainerDeleteRetentionPolicy(DeleteRetentionPolicy containerDeleteRetentionPolicy);
+        }
+
         /**
          * The stage of the blobserviceproperties definition allowing to specify Cors.
          */
@@ -162,6 +183,18 @@ interface WithDeleteRetentionPolicy {
             WithCreate withDeleteRetentionPolicy(DeleteRetentionPolicy deleteRetentionPolicy);
         }
 
+        /**
+         * The stage of the blobserviceproperties definition allowing to specify IsVersioningEnabled.
+         */
+        interface WithIsVersioningEnabled {
+            /**
+             * Specifies isVersioningEnabled.
+             * @param isVersioningEnabled Versioning is enabled if set to true
+             * @return the next definition stage
+             */
+            WithCreate withIsVersioningEnabled(Boolean isVersioningEnabled);
+        }
+
         /**
          * The stage of the blobserviceproperties definition allowing to specify RestorePolicy.
          */
@@ -179,13 +212,13 @@ interface WithRestorePolicy {
          * the resource to be created (via {@link WithCreate#create()}), but also allows
          * for any other optional settings to be specified.
          */
-        interface WithCreate extends Creatable<BlobServiceProperties>, DefinitionStages.WithAutomaticSnapshotPolicyEnabled, DefinitionStages.WithChangeFeed, DefinitionStages.WithCors, DefinitionStages.WithDefaultServiceVersion, DefinitionStages.WithDeleteRetentionPolicy, DefinitionStages.WithRestorePolicy {
+        interface WithCreate extends Creatable<BlobServiceProperties>, DefinitionStages.WithAutomaticSnapshotPolicyEnabled, DefinitionStages.WithChangeFeed, DefinitionStages.WithContainerDeleteRetentionPolicy, DefinitionStages.WithCors, DefinitionStages.WithDefaultServiceVersion, DefinitionStages.WithDeleteRetentionPolicy, DefinitionStages.WithIsVersioningEnabled, DefinitionStages.WithRestorePolicy {
         }
     }
     /**
      * The template for a BlobServiceProperties update operation, containing all the settings that can be modified.
      */
-    interface Update extends Appliable<BlobServiceProperties>, UpdateStages.WithAutomaticSnapshotPolicyEnabled, UpdateStages.WithChangeFeed, UpdateStages.WithCors, UpdateStages.WithDefaultServiceVersion, UpdateStages.WithDeleteRetentionPolicy, UpdateStages.WithRestorePolicy {
+    interface Update extends Appliable<BlobServiceProperties>, UpdateStages.WithAutomaticSnapshotPolicyEnabled, UpdateStages.WithChangeFeed, UpdateStages.WithContainerDeleteRetentionPolicy, UpdateStages.WithCors, UpdateStages.WithDefaultServiceVersion, UpdateStages.WithDeleteRetentionPolicy, UpdateStages.WithIsVersioningEnabled, UpdateStages.WithRestorePolicy {
     }
 
     /**
@@ -198,7 +231,7 @@ interface UpdateStages {
         interface WithAutomaticSnapshotPolicyEnabled {
             /**
              * Specifies automaticSnapshotPolicyEnabled.
-             * @param automaticSnapshotPolicyEnabled Automatic Snapshot is enabled if set to true
+             * @param automaticSnapshotPolicyEnabled Deprecated in favor of isVersioningEnabled property
              * @return the next update stage
              */
             Update withAutomaticSnapshotPolicyEnabled(Boolean automaticSnapshotPolicyEnabled);
@@ -216,6 +249,18 @@ interface WithChangeFeed {
             Update withChangeFeed(ChangeFeed changeFeed);
         }
 
+        /**
+         * The stage of the blobserviceproperties update allowing to specify ContainerDeleteRetentionPolicy.
+         */
+        interface WithContainerDeleteRetentionPolicy {
+            /**
+             * Specifies containerDeleteRetentionPolicy.
+             * @param containerDeleteRetentionPolicy The blob service properties for container soft delete
+             * @return the next update stage
+             */
+            Update withContainerDeleteRetentionPolicy(DeleteRetentionPolicy containerDeleteRetentionPolicy);
+        }
+
         /**
          * The stage of the blobserviceproperties update allowing to specify Cors.
          */
@@ -252,6 +297,18 @@ interface WithDeleteRetentionPolicy {
             Update withDeleteRetentionPolicy(DeleteRetentionPolicy deleteRetentionPolicy);
         }
 
+        /**
+         * The stage of the blobserviceproperties update allowing to specify IsVersioningEnabled.
+         */
+        interface WithIsVersioningEnabled {
+            /**
+             * Specifies isVersioningEnabled.
+             * @param isVersioningEnabled Versioning is enabled if set to true
+             * @return the next update stage
+             */
+            Update withIsVersioningEnabled(Boolean isVersioningEnabled);
+        }
+
         /**
          * The stage of the blobserviceproperties update allowing to specify RestorePolicy.
          */

sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/EncryptionScope.java

@@ -0,0 +1,186 @@
+/**
+ * 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.management.storage.v2019_06_01.implementation.EncryptionScopeInner;
+import com.microsoft.azure.arm.model.Indexable;
+import com.microsoft.azure.arm.model.Refreshable;
+import com.microsoft.azure.arm.model.Updatable;
+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.StorageManager;
+import org.joda.time.DateTime;
+
+/**
+ * Type representing EncryptionScope.
+ */
+public interface EncryptionScope extends HasInner<EncryptionScopeInner>, Indexable, Refreshable<EncryptionScope>, Updatable<EncryptionScope.Update>, HasManager<StorageManager> {
+    /**
+     * @return the creationTime value.
+     */
+    DateTime creationTime();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the keyVaultProperties value.
+     */
+    EncryptionScopeKeyVaultProperties keyVaultProperties();
+
+    /**
+     * @return the lastModifiedTime value.
+     */
+    DateTime lastModifiedTime();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the source value.
+     */
+    EncryptionScopeSource source();
+
+    /**
+     * @return the state value.
+     */
+    EncryptionScopeState state();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * The entirety of the EncryptionScope definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithStorageAccount, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * Grouping of EncryptionScope definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of a EncryptionScope definition.
+         */
+        interface Blank extends WithStorageAccount {
+        }
+
+        /**
+         * The stage of the encryptionscope definition allowing to specify StorageAccount.
+         */
+        interface WithStorageAccount {
+           /**
+            * Specifies resourceGroupName, accountName.
+            * @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
+            * @return the next definition stage
+            */
+            WithCreate withExistingStorageAccount(String resourceGroupName, String accountName);
+        }
+
+        /**
+         * The stage of the encryptionscope definition allowing to specify KeyVaultProperties.
+         */
+        interface WithKeyVaultProperties {
+            /**
+             * Specifies keyVaultProperties.
+             * @param keyVaultProperties The key vault properties for the encryption scope. This is a required field if encryption scope 'source' attribute is set to 'Microsoft.KeyVault'
+             * @return the next definition stage
+             */
+            WithCreate withKeyVaultProperties(EncryptionScopeKeyVaultProperties keyVaultProperties);
+        }
+
+        /**
+         * The stage of the encryptionscope definition allowing to specify Source.
+         */
+        interface WithSource {
+            /**
+             * Specifies source.
+             * @param source The provider for the encryption scope. Possible values (case-insensitive):  Microsoft.Storage, Microsoft.KeyVault. Possible values include: 'Microsoft.Storage', 'Microsoft.KeyVault'
+             * @return the next definition stage
+             */
+            WithCreate withSource(EncryptionScopeSource source);
+        }
+
+        /**
+         * The stage of the encryptionscope definition allowing to specify State.
+         */
+        interface WithState {
+            /**
+             * Specifies state.
+             * @param state The state of the encryption scope. Possible values (case-insensitive):  Enabled, Disabled. Possible values include: 'Enabled', 'Disabled'
+             * @return the next definition stage
+             */
+            WithCreate withState(EncryptionScopeState state);
+        }
+
+        /**
+         * The stage of the definition which contains all the minimum required inputs for
+         * the resource to be created (via {@link WithCreate#create()}), but also allows
+         * for any other optional settings to be specified.
+         */
+        interface WithCreate extends Creatable<EncryptionScope>, DefinitionStages.WithKeyVaultProperties, DefinitionStages.WithSource, DefinitionStages.WithState {
+        }
+    }
+    /**
+     * The template for a EncryptionScope update operation, containing all the settings that can be modified.
+     */
+    interface Update extends Appliable<EncryptionScope>, UpdateStages.WithKeyVaultProperties, UpdateStages.WithSource, UpdateStages.WithState {
+    }
+
+    /**
+     * Grouping of EncryptionScope update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the encryptionscope update allowing to specify KeyVaultProperties.
+         */
+        interface WithKeyVaultProperties {
+            /**
+             * Specifies keyVaultProperties.
+             * @param keyVaultProperties The key vault properties for the encryption scope. This is a required field if encryption scope 'source' attribute is set to 'Microsoft.KeyVault'
+             * @return the next update stage
+             */
+            Update withKeyVaultProperties(EncryptionScopeKeyVaultProperties keyVaultProperties);
+        }
+
+        /**
+         * The stage of the encryptionscope update allowing to specify Source.
+         */
+        interface WithSource {
+            /**
+             * Specifies source.
+             * @param source The provider for the encryption scope. Possible values (case-insensitive):  Microsoft.Storage, Microsoft.KeyVault. Possible values include: 'Microsoft.Storage', 'Microsoft.KeyVault'
+             * @return the next update stage
+             */
+            Update withSource(EncryptionScopeSource source);
+        }
+
+        /**
+         * The stage of the encryptionscope update allowing to specify State.
+         */
+        interface WithState {
+            /**
+             * Specifies state.
+             * @param state The state of the encryption scope. Possible values (case-insensitive):  Enabled, Disabled. Possible values include: 'Enabled', 'Disabled'
+             * @return the next update stage
+             */
+            Update withState(EncryptionScopeState state);
+        }
+
+    }
+}