[ReleasePR sdk/sql/mgmt-v2017_03_01_preview] revert V2020-02-02-Preview ShortTermRetentionPolicy

sdk/sql/mgmt-v2017_03_01_preview/pom.xml

@@ -11,8 +11,8 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.2.0</version>
-        <relativePath>../../parents/azure-arm-parent</relativePath>
+        <version>1.1.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-sql</artifactId>
     <version>1.0.0-beta</version>

sdk/sql/mgmt-v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/DatabaseBlobAuditingPolicy.java

@@ -54,6 +54,11 @@ public interface DatabaseBlobAuditingPolicy extends HasInner<DatabaseBlobAuditin
      */
     String name();
 
+    /**
+     * @return the queueDelayMs value.
+     */
+    Integer queueDelayMs();
+
     /**
      * @return the retentionDays value.
      */
@@ -213,6 +218,19 @@ interface WithIsStorageSecondaryKeyInUse {
             WithCreate withIsStorageSecondaryKeyInUse(Boolean isStorageSecondaryKeyInUse);
         }
 
+        /**
+         * The stage of the databaseblobauditingpolicy definition allowing to specify QueueDelayMs.
+         */
+        interface WithQueueDelayMs {
+            /**
+             * Specifies queueDelayMs.
+             * @param queueDelayMs Specifies the amount of time in milliseconds that can elapse before audit actions are forced to be processed.
+ The default minimum value is 1000 (1 second). The maximum is 2,147,483,647
+             * @return the next definition stage
+             */
+            WithCreate withQueueDelayMs(Integer queueDelayMs);
+        }
+
         /**
          * The stage of the databaseblobauditingpolicy definition allowing to specify RetentionDays.
          */
@@ -231,7 +249,12 @@ interface WithRetentionDays {
         interface WithStorageAccountAccessKey {
             /**
              * Specifies storageAccountAccessKey.
-             * @param storageAccountAccessKey Specifies the identifier key of the auditing storage account. If state is Enabled and storageEndpoint is specified, storageAccountAccessKey is required
+             * @param storageAccountAccessKey Specifies the identifier key of the auditing storage account.
+ If state is Enabled and storageEndpoint is specified, not specifying the storageAccountAccessKey will use SQL server system-assigned managed identity to access the storage.
+ Prerequisites for using managed identity authentication:
+ 1. Assign SQL Server a system-assigned managed identity in Azure Active Directory (AAD).
+ 2. Grant SQL Server identity access to the storage account by adding 'Storage Blob Data Contributor' RBAC role to the server identity.
+ For more information, see [Auditing to storage using Managed Identity authentication](https://go.microsoft.com/fwlink/?linkid=2114355)
              * @return the next definition stage
              */
             WithCreate withStorageAccountAccessKey(String storageAccountAccessKey);
@@ -255,7 +278,7 @@ interface WithStorageAccountSubscriptionId {
         interface WithStorageEndpoint {
             /**
              * Specifies storageEndpoint.
-             * @param storageEndpoint Specifies the blob storage endpoint (e.g. https://MyAccount.blob.core.windows.net). If state is Enabled, storageEndpoint is required
+             * @param storageEndpoint Specifies the blob storage endpoint (e.g. https://MyAccount.blob.core.windows.net). If state is Enabled, storageEndpoint or isAzureMonitorTargetEnabled is required
              * @return the next definition stage
              */
             WithCreate withStorageEndpoint(String storageEndpoint);
@@ -266,13 +289,13 @@ interface WithStorageEndpoint {
          * the resource to be created (via {@link WithCreate#create()}), but also allows
          * for any other optional settings to be specified.
          */
-        interface WithCreate extends Creatable<DatabaseBlobAuditingPolicy>, DefinitionStages.WithAuditActionsAndGroups, DefinitionStages.WithIsAzureMonitorTargetEnabled, DefinitionStages.WithIsStorageSecondaryKeyInUse, DefinitionStages.WithRetentionDays, DefinitionStages.WithStorageAccountAccessKey, DefinitionStages.WithStorageAccountSubscriptionId, DefinitionStages.WithStorageEndpoint {
+        interface WithCreate extends Creatable<DatabaseBlobAuditingPolicy>, DefinitionStages.WithAuditActionsAndGroups, DefinitionStages.WithIsAzureMonitorTargetEnabled, DefinitionStages.WithIsStorageSecondaryKeyInUse, DefinitionStages.WithQueueDelayMs, DefinitionStages.WithRetentionDays, DefinitionStages.WithStorageAccountAccessKey, DefinitionStages.WithStorageAccountSubscriptionId, DefinitionStages.WithStorageEndpoint {
         }
     }
     /**
      * The template for a DatabaseBlobAuditingPolicy update operation, containing all the settings that can be modified.
      */
-    interface Update extends Appliable<DatabaseBlobAuditingPolicy>, UpdateStages.WithAuditActionsAndGroups, UpdateStages.WithIsAzureMonitorTargetEnabled, UpdateStages.WithIsStorageSecondaryKeyInUse, UpdateStages.WithRetentionDays, UpdateStages.WithStorageAccountAccessKey, UpdateStages.WithStorageAccountSubscriptionId, UpdateStages.WithStorageEndpoint {
+    interface Update extends Appliable<DatabaseBlobAuditingPolicy>, UpdateStages.WithAuditActionsAndGroups, UpdateStages.WithIsAzureMonitorTargetEnabled, UpdateStages.WithIsStorageSecondaryKeyInUse, UpdateStages.WithQueueDelayMs, UpdateStages.WithRetentionDays, UpdateStages.WithStorageAccountAccessKey, UpdateStages.WithStorageAccountSubscriptionId, UpdateStages.WithStorageEndpoint {
     }
 
     /**
@@ -366,6 +389,19 @@ interface WithIsStorageSecondaryKeyInUse {
             Update withIsStorageSecondaryKeyInUse(Boolean isStorageSecondaryKeyInUse);
         }
 
+        /**
+         * The stage of the databaseblobauditingpolicy update allowing to specify QueueDelayMs.
+         */
+        interface WithQueueDelayMs {
+            /**
+             * Specifies queueDelayMs.
+             * @param queueDelayMs Specifies the amount of time in milliseconds that can elapse before audit actions are forced to be processed.
+ The default minimum value is 1000 (1 second). The maximum is 2,147,483,647
+             * @return the next update stage
+             */
+            Update withQueueDelayMs(Integer queueDelayMs);
+        }
+
         /**
          * The stage of the databaseblobauditingpolicy update allowing to specify RetentionDays.
          */
@@ -384,7 +420,12 @@ interface WithRetentionDays {
         interface WithStorageAccountAccessKey {
             /**
              * Specifies storageAccountAccessKey.
-             * @param storageAccountAccessKey Specifies the identifier key of the auditing storage account. If state is Enabled and storageEndpoint is specified, storageAccountAccessKey is required
+             * @param storageAccountAccessKey Specifies the identifier key of the auditing storage account.
+ If state is Enabled and storageEndpoint is specified, not specifying the storageAccountAccessKey will use SQL server system-assigned managed identity to access the storage.
+ Prerequisites for using managed identity authentication:
+ 1. Assign SQL Server a system-assigned managed identity in Azure Active Directory (AAD).
+ 2. Grant SQL Server identity access to the storage account by adding 'Storage Blob Data Contributor' RBAC role to the server identity.
+ For more information, see [Auditing to storage using Managed Identity authentication](https://go.microsoft.com/fwlink/?linkid=2114355)
              * @return the next update stage
              */
             Update withStorageAccountAccessKey(String storageAccountAccessKey);
@@ -408,7 +449,7 @@ interface WithStorageAccountSubscriptionId {
         interface WithStorageEndpoint {
             /**
              * Specifies storageEndpoint.
-             * @param storageEndpoint Specifies the blob storage endpoint (e.g. https://MyAccount.blob.core.windows.net). If state is Enabled, storageEndpoint is required
+             * @param storageEndpoint Specifies the blob storage endpoint (e.g. https://MyAccount.blob.core.windows.net). If state is Enabled, storageEndpoint or isAzureMonitorTargetEnabled is required
              * @return the next update stage
              */
             Update withStorageEndpoint(String storageEndpoint);

sdk/sql/mgmt-v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/DatabasisServerSensitivityLabel.java

@@ -52,6 +52,11 @@ public interface DatabasisServerSensitivityLabel extends HasInner<SensitivityLab
      */
     String name();
 
+    /**
+     * @return the rank value.
+     */
+    SensitivityLabelRank rank();
+
     /**
      * @return the type value.
      */

sdk/sql/mgmt-v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/DatabasisServerSensitivityLabelModel.java

@@ -52,6 +52,11 @@ public interface DatabasisServerSensitivityLabelModel extends HasInner<Sensitivi
      */
     String name();
 
+    /**
+     * @return the rank value.
+     */
+    SensitivityLabelRank rank();
+
     /**
      * @return the type value.
      */

sdk/sql/mgmt-v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ExtendedDatabaseBlobAuditingPolicies.java

@@ -28,4 +28,15 @@ public interface ExtendedDatabaseBlobAuditingPolicies extends SupportsCreating<E
      */
     Observable<ExtendedDatabaseBlobAuditingPolicy> getAsync(String resourceGroupName, String serverName, String databaseName);
 
+    /**
+     * Lists extended auditing settings of a database.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @param databaseName The name of the database.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ExtendedDatabaseBlobAuditingPolicy> listByDatabaseAsync(final String resourceGroupName, final String serverName, final String databaseName);
+
 }

sdk/sql/mgmt-v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ExtendedDatabaseBlobAuditingPolicy.java

@@ -54,6 +54,11 @@ public interface ExtendedDatabaseBlobAuditingPolicy extends HasInner<ExtendedDat
      */
     String predicateExpression();
 
+    /**
+     * @return the queueDelayMs value.
+     */
+    Integer queueDelayMs();
+
     /**
      * @return the retentionDays value.
      */
@@ -225,6 +230,19 @@ interface WithPredicateExpression {
             WithCreate withPredicateExpression(String predicateExpression);
         }
 
+        /**
+         * The stage of the extendeddatabaseblobauditingpolicy definition allowing to specify QueueDelayMs.
+         */
+        interface WithQueueDelayMs {
+            /**
+             * Specifies queueDelayMs.
+             * @param queueDelayMs Specifies the amount of time in milliseconds that can elapse before audit actions are forced to be processed.
+ The default minimum value is 1000 (1 second). The maximum is 2,147,483,647
+             * @return the next definition stage
+             */
+            WithCreate withQueueDelayMs(Integer queueDelayMs);
+        }
+
         /**
          * The stage of the extendeddatabaseblobauditingpolicy definition allowing to specify RetentionDays.
          */
@@ -243,7 +261,12 @@ interface WithRetentionDays {
         interface WithStorageAccountAccessKey {
             /**
              * Specifies storageAccountAccessKey.
-             * @param storageAccountAccessKey Specifies the identifier key of the auditing storage account. If state is Enabled and storageEndpoint is specified, storageAccountAccessKey is required
+             * @param storageAccountAccessKey Specifies the identifier key of the auditing storage account.
+ If state is Enabled and storageEndpoint is specified, not specifying the storageAccountAccessKey will use SQL server system-assigned managed identity to access the storage.
+ Prerequisites for using managed identity authentication:
+ 1. Assign SQL Server a system-assigned managed identity in Azure Active Directory (AAD).
+ 2. Grant SQL Server identity access to the storage account by adding 'Storage Blob Data Contributor' RBAC role to the server identity.
+ For more information, see [Auditing to storage using Managed Identity authentication](https://go.microsoft.com/fwlink/?linkid=2114355)
              * @return the next definition stage
              */
             WithCreate withStorageAccountAccessKey(String storageAccountAccessKey);
@@ -267,7 +290,7 @@ interface WithStorageAccountSubscriptionId {
         interface WithStorageEndpoint {
             /**
              * Specifies storageEndpoint.
-             * @param storageEndpoint Specifies the blob storage endpoint (e.g. https://MyAccount.blob.core.windows.net). If state is Enabled, storageEndpoint is required
+             * @param storageEndpoint Specifies the blob storage endpoint (e.g. https://MyAccount.blob.core.windows.net). If state is Enabled, storageEndpoint or isAzureMonitorTargetEnabled is required
              * @return the next definition stage
              */
             WithCreate withStorageEndpoint(String storageEndpoint);
@@ -278,13 +301,13 @@ interface WithStorageEndpoint {
          * the resource to be created (via {@link WithCreate#create()}), but also allows
          * for any other optional settings to be specified.
          */
-        interface WithCreate extends Creatable<ExtendedDatabaseBlobAuditingPolicy>, DefinitionStages.WithAuditActionsAndGroups, DefinitionStages.WithIsAzureMonitorTargetEnabled, DefinitionStages.WithIsStorageSecondaryKeyInUse, DefinitionStages.WithPredicateExpression, DefinitionStages.WithRetentionDays, DefinitionStages.WithStorageAccountAccessKey, DefinitionStages.WithStorageAccountSubscriptionId, DefinitionStages.WithStorageEndpoint {
+        interface WithCreate extends Creatable<ExtendedDatabaseBlobAuditingPolicy>, DefinitionStages.WithAuditActionsAndGroups, DefinitionStages.WithIsAzureMonitorTargetEnabled, DefinitionStages.WithIsStorageSecondaryKeyInUse, DefinitionStages.WithPredicateExpression, DefinitionStages.WithQueueDelayMs, DefinitionStages.WithRetentionDays, DefinitionStages.WithStorageAccountAccessKey, DefinitionStages.WithStorageAccountSubscriptionId, DefinitionStages.WithStorageEndpoint {
         }
     }
     /**
      * The template for a ExtendedDatabaseBlobAuditingPolicy update operation, containing all the settings that can be modified.
      */
-    interface Update extends Appliable<ExtendedDatabaseBlobAuditingPolicy>, UpdateStages.WithAuditActionsAndGroups, UpdateStages.WithIsAzureMonitorTargetEnabled, UpdateStages.WithIsStorageSecondaryKeyInUse, UpdateStages.WithPredicateExpression, UpdateStages.WithRetentionDays, UpdateStages.WithStorageAccountAccessKey, UpdateStages.WithStorageAccountSubscriptionId, UpdateStages.WithStorageEndpoint {
+    interface Update extends Appliable<ExtendedDatabaseBlobAuditingPolicy>, UpdateStages.WithAuditActionsAndGroups, UpdateStages.WithIsAzureMonitorTargetEnabled, UpdateStages.WithIsStorageSecondaryKeyInUse, UpdateStages.WithPredicateExpression, UpdateStages.WithQueueDelayMs, UpdateStages.WithRetentionDays, UpdateStages.WithStorageAccountAccessKey, UpdateStages.WithStorageAccountSubscriptionId, UpdateStages.WithStorageEndpoint {
     }
 
     /**
@@ -390,6 +413,19 @@ interface WithPredicateExpression {
             Update withPredicateExpression(String predicateExpression);
         }
 
+        /**
+         * The stage of the extendeddatabaseblobauditingpolicy update allowing to specify QueueDelayMs.
+         */
+        interface WithQueueDelayMs {
+            /**
+             * Specifies queueDelayMs.
+             * @param queueDelayMs Specifies the amount of time in milliseconds that can elapse before audit actions are forced to be processed.
+ The default minimum value is 1000 (1 second). The maximum is 2,147,483,647
+             * @return the next update stage
+             */
+            Update withQueueDelayMs(Integer queueDelayMs);
+        }
+
         /**
          * The stage of the extendeddatabaseblobauditingpolicy update allowing to specify RetentionDays.
          */
@@ -408,7 +444,12 @@ interface WithRetentionDays {
         interface WithStorageAccountAccessKey {
             /**
              * Specifies storageAccountAccessKey.
-             * @param storageAccountAccessKey Specifies the identifier key of the auditing storage account. If state is Enabled and storageEndpoint is specified, storageAccountAccessKey is required
+             * @param storageAccountAccessKey Specifies the identifier key of the auditing storage account.
+ If state is Enabled and storageEndpoint is specified, not specifying the storageAccountAccessKey will use SQL server system-assigned managed identity to access the storage.
+ Prerequisites for using managed identity authentication:
+ 1. Assign SQL Server a system-assigned managed identity in Azure Active Directory (AAD).
+ 2. Grant SQL Server identity access to the storage account by adding 'Storage Blob Data Contributor' RBAC role to the server identity.
+ For more information, see [Auditing to storage using Managed Identity authentication](https://go.microsoft.com/fwlink/?linkid=2114355)
              * @return the next update stage
              */
             Update withStorageAccountAccessKey(String storageAccountAccessKey);
@@ -432,7 +473,7 @@ interface WithStorageAccountSubscriptionId {
         interface WithStorageEndpoint {
             /**
              * Specifies storageEndpoint.
-             * @param storageEndpoint Specifies the blob storage endpoint (e.g. https://MyAccount.blob.core.windows.net). If state is Enabled, storageEndpoint is required
+             * @param storageEndpoint Specifies the blob storage endpoint (e.g. https://MyAccount.blob.core.windows.net). If state is Enabled, storageEndpoint or isAzureMonitorTargetEnabled is required
              * @return the next update stage
              */
             Update withStorageEndpoint(String storageEndpoint);

sdk/sql/mgmt-v2017_03_01_preview/src/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/ExtendedServerBlobAuditingPolicies.java

@@ -27,4 +27,14 @@ public interface ExtendedServerBlobAuditingPolicies extends SupportsCreating<Ext
      */
     Observable<ExtendedServerBlobAuditingPolicy> getAsync(String resourceGroupName, String serverName);
 
+    /**
+     * Lists extended auditing settings of a server.
+     *
+     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param serverName The name of the server.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<ExtendedServerBlobAuditingPolicy> listByServerAsync(final String resourceGroupName, final String serverName);
+
 }