add datadog terms commands (Azure#2875)

fengzhou-msft · web-flow · commit 1b89a454b8d6 · 2021-01-12T13:02:07.000+08:00
diff --git a/src/datadog/azext_datadog/azext_metadata.json b/src/datadog/azext_datadog/azext_metadata.json
@@ -1,4 +1,4 @@
 {
     "azext.isExperimental": true,
-    "azext.minCliCoreVersion": "2.11.0"
+    "azext.minCliCoreVersion": "2.17.0"
 }
diff --git a/src/datadog/azext_datadog/generated/_client_factory.py b/src/datadog/azext_datadog/generated/_client_factory.py
@@ -46,3 +46,7 @@ def cf_tag_rule(cli_ctx, *_):
 
 def cf_single_sign_on_configuration(cli_ctx, *_):
     return cf_datadog_cl(cli_ctx).single_sign_on_configuration
+
+
+def cf_marketplace_agreement(cli_ctx, *_):
+    return cf_datadog_cl(cli_ctx).marketplace_agreements
diff --git a/src/datadog/azext_datadog/generated/_help.py b/src/datadog/azext_datadog/generated/_help.py
@@ -12,6 +12,20 @@
 from knack.help_files import helps
 
 
+helps['datadog terms'] = """
+    type: group
+    short-summary: Manage marketplace agreements with datadog
+"""
+
+helps['datadog terms list'] = """
+    type: command
+    short-summary: "List datadog marketplace agreements"
+    examples:
+      - name: List marketplace agreements
+        text: |-
+               az datadog terms list
+"""
+
 helps['datadog api-key'] = """
     type: group
     short-summary: datadog api-key
diff --git a/src/datadog/azext_datadog/generated/commands.py b/src/datadog/azext_datadog/generated/commands.py
@@ -15,6 +15,15 @@
 
 def load_command_table(self, _):
 
+    from azext_datadog.generated._client_factory import cf_marketplace_agreement
+    datadog_marketplace_agreement = CliCommandType(
+        operations_tmpl='azext_datadog.vendored_sdks.datadog.operations._marketplace_agreements_operations#MarketplaceA'
+        'greementsOperations.{}',
+        client_factory=cf_marketplace_agreement)
+    with self.command_group('datadog terms', datadog_marketplace_agreement,
+                            client_factory=cf_marketplace_agreement, is_experimental=True) as g:
+        g.custom_command('list', 'datadog_terms_list')
+
     from azext_datadog.generated._client_factory import cf_api_key
     datadog_api_key = CliCommandType(
         operations_tmpl='azext_datadog.vendored_sdks.datadog.operations._api_key_operations#ApiKeyOperations.{}',
diff --git a/src/datadog/azext_datadog/generated/custom.py b/src/datadog/azext_datadog/generated/custom.py
@@ -13,6 +13,10 @@
 from azure.cli.core.util import sdk_no_wait
 
 
+def datadog_terms_list(client):
+    return client.list()
+
+
 def datadog_api_key_list(client,
                          resource_group_name,
                          monitor_name):
diff --git a/src/datadog/azext_datadog/manual/commands.py b/src/datadog/azext_datadog/manual/commands.py
@@ -3,8 +3,6 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
 
-from azure.cli.core.commands import CliCommandType
-
 
 def load_command_table(self, _):
 
diff --git a/src/datadog/azext_datadog/tests/latest/recordings/test_datadog.yaml b/src/datadog/azext_datadog/tests/latest/recordings/test_datadog.yaml
@@ -1483,4 +1483,48 @@ interactions:
     status:
       code: 200
       message: OK
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json
+      Accept-Encoding:
+      - gzip, deflate
+      CommandName:
+      - datadog terms list
+      Connection:
+      - keep-alive
+      User-Agent:
+      - AZURECLI/2.17.1 azsdk-python-microsoftdatadogclient/unknown Python/3.6.8 (Windows-10-10.0.19041-SP0)
+    method: GET
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Datadog/agreements?api-version=2020-02-01-preview
+  response:
+    body:
+      string: '{"value":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Datadog/agreements/marketplace","name":"marketplace","type":"Microsoft.Datadog/agreements","properties":{"publisher":"Microsoft","product":"Marketplace","plan":"Marketplace","licenseTextLink":"https://azure.microsoft.com/en-us/support/legal/marketplace-terms/","privacyPolicyLink":"http://www.microsoft.com/privacy","retrieveDatetime":null,"signature":"","accepted":true}},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Datadog/agreements/datadog","name":"datadog","type":"Microsoft.Datadog/agreements","properties":{"publisher":"Datadog","product":"Datadog","plan":"Datadog","licenseTextLink":"https://www.datadoghq.com/pdf/Datadog_AzureMarketplace.pdf","privacyPolicyLink":"https://www.datadoghq.com/legal/privacy/","retrieveDatetime":null,"signature":"","accepted":true}}]}'
+    headers:
+      cache-control:
+      - no-cache
+      content-length:
+      - '897'
+      content-type:
+      - application/json; charset=utf-8
+      date:
+      - Fri, 08 Jan 2021 07:41:52 GMT
+      expires:
+      - '-1'
+      pragma:
+      - no-cache
+      server:
+      - Kestrel
+      strict-transport-security:
+      - max-age=31536000; includeSubDomains
+      transfer-encoding:
+      - chunked
+      vary:
+      - Accept-Encoding
+      x-content-type-options:
+      - nosniff
+    status:
+      code: 200
+      message: OK
 version: 1
diff --git a/src/datadog/azext_datadog/tests/latest/test_datadog_scenario.py b/src/datadog/azext_datadog/tests/latest/test_datadog_scenario.py
@@ -263,6 +263,14 @@ def step__monitors_delete_monitors_delete(test, rg):
              checks=[])
 
 
+@try_manual
+def step__terms_list(test, rg):
+    test.cmd('az datadog terms list',
+             checks=[
+                 test.check('length(@)', 2)
+             ])
+
+
 @try_manual
 def cleanup(test, rg):
     pass
@@ -290,6 +298,7 @@ def call_scenario(test, rg):
     step__apikeys_post_apikeys_setdefaultkey(test, rg)
     step__apikeys_post_apikeys_getdefaultkey(test, rg)
     step__monitors_delete_monitors_delete(test, rg)
+    step__terms_list(test, rg)
     cleanup(test, rg)
 
 
diff --git a/src/datadog/azext_datadog/vendored_sdks/datadog/_microsoft_datadog_client.py b/src/datadog/azext_datadog/vendored_sdks/datadog/_microsoft_datadog_client.py
@@ -18,6 +18,7 @@
     from azure.core.credentials import TokenCredential
 
 from ._configuration import MicrosoftDatadogClientConfiguration
+from .operations import MarketplaceAgreementsOperations
 from .operations import ApiKeyOperations
 from .operations import HostOperations
 from .operations import LinkedResourceOperations
@@ -33,6 +34,8 @@
 class MicrosoftDatadogClient(object):
     """MicrosoftDatadogClient.
 
+    :ivar marketplace_agreements: MarketplaceAgreementsOperations operations
+    :vartype marketplace_agreements: microsoft_datadog_client.operations.MarketplaceAgreementsOperations
     :ivar api_key: ApiKeyOperations operations
     :vartype api_key: microsoft_datadog_client.operations.ApiKeyOperations
     :ivar host: HostOperations operations
@@ -76,6 +79,8 @@ def __init__(
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
 
+        self.marketplace_agreements = MarketplaceAgreementsOperations(
+            self._client, self._config, self._serialize, self._deserialize)
         self.api_key = ApiKeyOperations(
             self._client, self._config, self._serialize, self._deserialize)
         self.host = HostOperations(
diff --git a/src/datadog/azext_datadog/vendored_sdks/datadog/models/__init__.py b/src/datadog/azext_datadog/vendored_sdks/datadog/models/__init__.py
@@ -7,6 +7,9 @@
 # --------------------------------------------------------------------------
 
 try:
+    from ._models_py3 import DatadogAgreementProperties
+    from ._models_py3 import DatadogAgreementResource
+    from ._models_py3 import DatadogAgreementResourceListResponse
     from ._models_py3 import DatadogApiKey
     from ._models_py3 import DatadogApiKeyListResponse
     from ._models_py3 import DatadogHost
@@ -36,6 +39,9 @@
     from ._models_py3 import ResourceProviderDefaultErrorResponse
     from ._models_py3 import UserInfo
 except (SyntaxError, ImportError):
+    from ._models import DatadogAgreementProperties  # type: ignore
+    from ._models import DatadogAgreementResource  # type: ignore
+    from ._models import DatadogAgreementResourceListResponse  # type: ignore
     from ._models import DatadogApiKey  # type: ignore
     from ._models import DatadogApiKeyListResponse  # type: ignore
     from ._models import DatadogHost  # type: ignore
diff --git a/src/datadog/azext_datadog/vendored_sdks/datadog/models/_models.py b/src/datadog/azext_datadog/vendored_sdks/datadog/models/_models.py
@@ -10,6 +10,116 @@
 import msrest.serialization
 
 
+class DatadogAgreementProperties(msrest.serialization.Model):
+    """Terms properties.
+
+    :param publisher: Publisher identifier string.
+    :type publisher: str
+    :param product: Product identifier string.
+    :type product: str
+    :param plan: Plan identifier string.
+    :type plan: str
+    :param license_text_link: Link to HTML with Microsoft and Publisher terms.
+    :type license_text_link: str
+    :param privacy_policy_link: Link to the privacy policy of the publisher.
+    :type privacy_policy_link: str
+    :param retrieve_datetime: Date and time in UTC of when the terms were accepted. This is empty
+     if Accepted is false.
+    :type retrieve_datetime: ~datetime.datetime
+    :param signature: Terms signature.
+    :type signature: str
+    :param accepted: If any version of the terms have been accepted, otherwise false.
+    :type accepted: bool
+    """
+
+    _attribute_map = {
+        'publisher': {'key': 'publisher', 'type': 'str'},
+        'product': {'key': 'product', 'type': 'str'},
+        'plan': {'key': 'plan', 'type': 'str'},
+        'license_text_link': {'key': 'licenseTextLink', 'type': 'str'},
+        'privacy_policy_link': {'key': 'privacyPolicyLink', 'type': 'str'},
+        'retrieve_datetime': {'key': 'retrieveDatetime', 'type': 'iso-8601'},
+        'signature': {'key': 'signature', 'type': 'str'},
+        'accepted': {'key': 'accepted', 'type': 'bool'},
+    }
+
+    def __init__(
+        self,
+        **kwargs
+    ):
+        super(DatadogAgreementProperties, self).__init__(**kwargs)
+        self.publisher = kwargs.get('publisher', None)
+        self.product = kwargs.get('product', None)
+        self.plan = kwargs.get('plan', None)
+        self.license_text_link = kwargs.get('license_text_link', None)
+        self.privacy_policy_link = kwargs.get('privacy_policy_link', None)
+        self.retrieve_datetime = kwargs.get('retrieve_datetime', None)
+        self.signature = kwargs.get('signature', None)
+        self.accepted = kwargs.get('accepted', None)
+
+
+class DatadogAgreementResource(msrest.serialization.Model):
+    """DatadogAgreementResource.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :ivar id: ARM id of the resource.
+    :vartype id: str
+    :ivar name: Name of the agreement.
+    :vartype name: str
+    :ivar type: The type of the resource.
+    :vartype type: str
+    :param properties: Represents the properties of the resource.
+    :type properties: ~microsoft_datadog_client.models.DatadogAgreementProperties
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
+        'properties': {'key': 'properties', 'type': 'DatadogAgreementProperties'},
+    }
+
+    def __init__(
+        self,
+        **kwargs
+    ):
+        super(DatadogAgreementResource, self).__init__(**kwargs)
+        self.id = None
+        self.name = None
+        self.type = None
+        self.properties = kwargs.get('properties', None)
+
+
+class DatadogAgreementResourceListResponse(msrest.serialization.Model):
+    """Response of a list operation.
+
+    :param value: Results of a list operation.
+    :type value: list[~microsoft_datadog_client.models.DatadogAgreementResource]
+    :param next_link: Link to the next set of results, if any.
+    :type next_link: str
+    """
+
+    _attribute_map = {
+        'value': {'key': 'value', 'type': '[DatadogAgreementResource]'},
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+    }
+
+    def __init__(
+        self,
+        **kwargs
+    ):
+        super(DatadogAgreementResourceListResponse, self).__init__(**kwargs)
+        self.value = kwargs.get('value', None)
+        self.next_link = kwargs.get('next_link', None)
+
+
 class DatadogApiKey(msrest.serialization.Model):
     """DatadogApiKey.
 
diff --git a/src/datadog/azext_datadog/vendored_sdks/datadog/models/_models_py3.py b/src/datadog/azext_datadog/vendored_sdks/datadog/models/_models_py3.py
diff --git a/src/datadog/azext_datadog/vendored_sdks/datadog/operations/__init__.py b/src/datadog/azext_datadog/vendored_sdks/datadog/operations/__init__.py
diff --git a/src/datadog/azext_datadog/vendored_sdks/datadog/operations/_marketplace_agreements_operations.py b/src/datadog/azext_datadog/vendored_sdks/datadog/operations/_marketplace_agreements_operations.py

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`{`
`2`	`2`	`"azext.isExperimental": true,`
`3`		`- "azext.minCliCoreVersion": "2.11.0"`
	`3`	`+ "azext.minCliCoreVersion": "2.17.0"`
`4`	`4`	`}`