Generated from 597f50c00a4102c2e5c364e939cd049b6a479a81

Merge branch 'master' of https://github.com/Azure/azure-rest-api-specs
AzureSDKAutomation · Mar 16, 2020 · 832f78f · 832f78f
1 parent a41f329
commit 832f78f
Show file tree

Hide file tree

Showing 34 changed files with 601 additions and 62 deletions.
diff --git a/sdk/sql/mgmt-v2017_03_01_preview/pom.xml b/sdk/sql/mgmt-v2017_03_01_preview/pom.xml
@@ -11,7 +11,7 @@
     <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-sql</artifactId>

diff --git a/...va/com/microsoft/azure/management/sql/v2017_03_01_preview/DatabaseBlobAuditingPolicy.java b/...va/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.
          */
@@ -255,7 +273,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 +284,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 +384,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.
          */
@@ -408,7 +439,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);

diff --git a/...m/microsoft/azure/management/sql/v2017_03_01_preview/DatabasisServerSensitivityLabel.java b/...m/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.
      */

diff --git a/...rosoft/azure/management/sql/v2017_03_01_preview/DatabasisServerSensitivityLabelModel.java b/...rosoft/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.
      */

diff --git a/...icrosoft/azure/management/sql/v2017_03_01_preview/ExtendedDatabaseBlobAuditingPolicy.java b/...icrosoft/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.
          */
@@ -267,7 +285,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 +296,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 +408,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.
          */
@@ -432,7 +463,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);

diff --git a/.../microsoft/azure/management/sql/v2017_03_01_preview/ExtendedServerBlobAuditingPolicy.java b/.../microsoft/azure/management/sql/v2017_03_01_preview/ExtendedServerBlobAuditingPolicy.java
@@ -54,6 +54,11 @@ public interface ExtendedServerBlobAuditingPolicy extends HasInner<ExtendedServe
      */
     String predicateExpression();
 
+    /**
+     * @return the queueDelayMs value.
+     */
+    Integer queueDelayMs();
+
     /**
      * @return the retentionDays value.
      */
@@ -224,6 +229,19 @@ interface WithPredicateExpression {
             WithCreate withPredicateExpression(String predicateExpression);
         }
 
+        /**
+         * The stage of the extendedserverblobauditingpolicy 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 extendedserverblobauditingpolicy definition allowing to specify RetentionDays.
          */
@@ -266,7 +284,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);
@@ -277,13 +295,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<ExtendedServerBlobAuditingPolicy>, DefinitionStages.WithAuditActionsAndGroups, DefinitionStages.WithIsAzureMonitorTargetEnabled, DefinitionStages.WithIsStorageSecondaryKeyInUse, DefinitionStages.WithPredicateExpression, DefinitionStages.WithRetentionDays, DefinitionStages.WithStorageAccountAccessKey, DefinitionStages.WithStorageAccountSubscriptionId, DefinitionStages.WithStorageEndpoint {
+        interface WithCreate extends Creatable<ExtendedServerBlobAuditingPolicy>, DefinitionStages.WithAuditActionsAndGroups, DefinitionStages.WithIsAzureMonitorTargetEnabled, DefinitionStages.WithIsStorageSecondaryKeyInUse, DefinitionStages.WithPredicateExpression, DefinitionStages.WithQueueDelayMs, DefinitionStages.WithRetentionDays, DefinitionStages.WithStorageAccountAccessKey, DefinitionStages.WithStorageAccountSubscriptionId, DefinitionStages.WithStorageEndpoint {
         }
     }
     /**
      * The template for a ExtendedServerBlobAuditingPolicy update operation, containing all the settings that can be modified.
      */
-    interface Update extends Appliable<ExtendedServerBlobAuditingPolicy>, UpdateStages.WithAuditActionsAndGroups, UpdateStages.WithIsAzureMonitorTargetEnabled, UpdateStages.WithIsStorageSecondaryKeyInUse, UpdateStages.WithPredicateExpression, UpdateStages.WithRetentionDays, UpdateStages.WithStorageAccountAccessKey, UpdateStages.WithStorageAccountSubscriptionId, UpdateStages.WithStorageEndpoint {
+    interface Update extends Appliable<ExtendedServerBlobAuditingPolicy>, UpdateStages.WithAuditActionsAndGroups, UpdateStages.WithIsAzureMonitorTargetEnabled, UpdateStages.WithIsStorageSecondaryKeyInUse, UpdateStages.WithPredicateExpression, UpdateStages.WithQueueDelayMs, UpdateStages.WithRetentionDays, UpdateStages.WithStorageAccountAccessKey, UpdateStages.WithStorageAccountSubscriptionId, UpdateStages.WithStorageEndpoint {
     }
 
     /**
@@ -389,6 +407,19 @@ interface WithPredicateExpression {
             Update withPredicateExpression(String predicateExpression);
         }
 
+        /**
+         * The stage of the extendedserverblobauditingpolicy 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 extendedserverblobauditingpolicy update allowing to specify RetentionDays.
          */
@@ -431,7 +462,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);

diff --git a/...c/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/JobStepExecutions.java b/...c/main/java/com/microsoft/azure/management/sql/v2017_03_01_preview/JobStepExecutions.java
@@ -11,8 +11,6 @@
 import rx.Observable;
 import com.microsoft.azure.management.sql.v2017_03_01_preview.ExecutionJobJobAgentServerJobExecution;
 
-import java.util.UUID;
-
 /**
  * Type representing JobStepExecutions.
  */