[AutoPR sql/resource-manager] Adding new value to VA baseline name (#…

…2640) * Generated from 03645a856ba34f572618832814b410d8e2410ba2 Adding new value to VA baseline name Adding new value to VA baseline name * Generated from c9946efbfaf9f6a9f7765878a337784756ce951c Fix typo Fix typo * Generated from c3621b01ece4897d91763a7e4ba8d1e29d4d6832 Updating VulnerabilityAssessmentPolicyBaselineName * Generated from 5c8646bff054ea42bb05bef708e3c66c7d005c2e Fixed all comments
Azure · May 31, 2018 · 6205793 · 6205793
1 parent 559aecd
commit 6205793
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 9 deletions.
diff --git a/azure-mgmt-sql/azure/mgmt/sql/models/__init__.py b/azure-mgmt-sql/azure/mgmt/sql/models/__init__.py
@@ -405,6 +405,7 @@
     VulnerabilityAssessmentScanState,
     InstanceFailoverGroupReplicationRole,
     LongTermRetentionDatabaseState,
+    VulnerabilityAssessmentPolicyBaselineName,
     CapabilityGroup,
 )
 
@@ -668,5 +669,6 @@
     'VulnerabilityAssessmentScanState',
     'InstanceFailoverGroupReplicationRole',
     'LongTermRetentionDatabaseState',
+    'VulnerabilityAssessmentPolicyBaselineName',
     'CapabilityGroup',
 ]
diff --git a/azure-mgmt-sql/azure/mgmt/sql/models/sql_management_client_enums.py b/azure-mgmt-sql/azure/mgmt/sql/models/sql_management_client_enums.py
@@ -657,6 +657,12 @@ class LongTermRetentionDatabaseState(str, Enum):
     deleted = "Deleted"
 
 
+class VulnerabilityAssessmentPolicyBaselineName(str, Enum):
+
+    master = "master"
+    default = "default"
+
+
 class CapabilityGroup(str, Enum):
 
     supported_editions = "supportedEditions"

diff --git a/.../azure/mgmt/sql/operations/database_vulnerability_assessment_rule_baselines_operations.py b/.../azure/mgmt/sql/operations/database_vulnerability_assessment_rule_baselines_operations.py
@@ -24,7 +24,6 @@ class DatabaseVulnerabilityAssessmentRuleBaselinesOperations(object):
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
     :ivar vulnerability_assessment_name: The name of the vulnerability assessment. Constant value: "default".
-    :ivar baseline_name: The name of the vulnerability assessment rule baseline. Constant value: "default".
     :ivar api_version: The API version to use for the request. Constant value: "2017-03-01-preview".
     """
 
@@ -36,13 +35,12 @@ def __init__(self, client, config, serializer, deserializer):
         self._serialize = serializer
         self._deserialize = deserializer
         self.vulnerability_assessment_name = "default"
-        self.baseline_name = "default"
         self.api_version = "2017-03-01-preview"
 
         self.config = config
 
     def get(
-            self, resource_group_name, server_name, database_name, rule_id, custom_headers=None, raw=False, **operation_config):
+            self, resource_group_name, server_name, database_name, rule_id, baseline_name, custom_headers=None, raw=False, **operation_config):
         """Gets a database's vulnerability assessment rule baseline.
 
         :param resource_group_name: The name of the resource group that
@@ -56,6 +54,12 @@ def get(
         :type database_name: str
         :param rule_id: The vulnerability assessment rule ID.
         :type rule_id: str
+        :param baseline_name: The name of the vulnerability assessment rule
+         baseline (default implies a baseline on a database level rule and
+         master for server level rule). Possible values include: 'master',
+         'default'
+        :type baseline_name: str or
+         ~azure.mgmt.sql.models.VulnerabilityAssessmentPolicyBaselineName
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
          deserialized response
@@ -76,7 +80,7 @@ def get(
             'databaseName': self._serialize.url("database_name", database_name, 'str'),
             'vulnerabilityAssessmentName': self._serialize.url("self.vulnerability_assessment_name", self.vulnerability_assessment_name, 'str'),
             'ruleId': self._serialize.url("rule_id", rule_id, 'str'),
-            'baselineName': self._serialize.url("self.baseline_name", self.baseline_name, 'str'),
+            'baselineName': self._serialize.url("baseline_name", baseline_name, 'VulnerabilityAssessmentPolicyBaselineName'),
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
         }
         url = self._client.format_url(url, **path_format_arguments)
@@ -117,7 +121,7 @@ def get(
     get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/databases/{databaseName}/vulnerabilityAssessments/{vulnerabilityAssessmentName}/rules/{ruleId}/baselines/{baselineName}'}
 
     def create_or_update(
-            self, resource_group_name, server_name, database_name, rule_id, baseline_results, custom_headers=None, raw=False, **operation_config):
+            self, resource_group_name, server_name, database_name, rule_id, baseline_name, baseline_results, custom_headers=None, raw=False, **operation_config):
         """Creates or updates a database's vulnerability assessment rule baseline.
 
         :param resource_group_name: The name of the resource group that
@@ -131,6 +135,12 @@ def create_or_update(
         :type database_name: str
         :param rule_id: The vulnerability assessment rule ID.
         :type rule_id: str
+        :param baseline_name: The name of the vulnerability assessment rule
+         baseline (default implies a baseline on a database level rule and
+         master for server level rule). Possible values include: 'master',
+         'default'
+        :type baseline_name: str or
+         ~azure.mgmt.sql.models.VulnerabilityAssessmentPolicyBaselineName
         :param baseline_results: The rule baseline result
         :type baseline_results:
          list[~azure.mgmt.sql.models.DatabaseVulnerabilityAssessmentRuleBaselineItem]
@@ -156,7 +166,7 @@ def create_or_update(
             'databaseName': self._serialize.url("database_name", database_name, 'str'),
             'vulnerabilityAssessmentName': self._serialize.url("self.vulnerability_assessment_name", self.vulnerability_assessment_name, 'str'),
             'ruleId': self._serialize.url("rule_id", rule_id, 'str'),
-            'baselineName': self._serialize.url("self.baseline_name", self.baseline_name, 'str'),
+            'baselineName': self._serialize.url("baseline_name", baseline_name, 'VulnerabilityAssessmentPolicyBaselineName'),
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
         }
         url = self._client.format_url(url, **path_format_arguments)
@@ -201,7 +211,7 @@ def create_or_update(
     create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/databases/{databaseName}/vulnerabilityAssessments/{vulnerabilityAssessmentName}/rules/{ruleId}/baselines/{baselineName}'}
 
     def delete(
-            self, resource_group_name, server_name, database_name, rule_id, custom_headers=None, raw=False, **operation_config):
+            self, resource_group_name, server_name, database_name, rule_id, baseline_name, custom_headers=None, raw=False, **operation_config):
         """Removes the database's vulnerability assessment rule baseline.
 
         :param resource_group_name: The name of the resource group that
@@ -215,6 +225,12 @@ def delete(
         :type database_name: str
         :param rule_id: The vulnerability assessment rule ID.
         :type rule_id: str
+        :param baseline_name: The name of the vulnerability assessment rule
+         baseline (default implies a baseline on a database level rule and
+         master for server level rule). Possible values include: 'master',
+         'default'
+        :type baseline_name: str or
+         ~azure.mgmt.sql.models.VulnerabilityAssessmentPolicyBaselineName
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
          deserialized response
@@ -232,7 +248,7 @@ def delete(
             'databaseName': self._serialize.url("database_name", database_name, 'str'),
             'vulnerabilityAssessmentName': self._serialize.url("self.vulnerability_assessment_name", self.vulnerability_assessment_name, 'str'),
             'ruleId': self._serialize.url("rule_id", rule_id, 'str'),
-            'baselineName': self._serialize.url("self.baseline_name", self.baseline_name, 'str'),
+            'baselineName': self._serialize.url("baseline_name", baseline_name, 'VulnerabilityAssessmentPolicyBaselineName'),
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
         }
         url = self._client.format_url(url, **path_format_arguments)

diff --git a/azure-mgmt-sql/azure/mgmt/sql/version.py b/azure-mgmt-sql/azure/mgmt/sql/version.py
@@ -9,5 +9,5 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "0.9.1"
+VERSION = "0.9.0"