[Legal] Add the Preview Terms agreement requirement

- Add the Preview Terms agreement requirement
- Remove location, custom_header, and raw parameters for account operations.

src/command_modules/azure-cli-locationbasedservices/azure/cli/command_modules/locationbasedservices/_params.py

@@ -39,6 +39,10 @@ def load_arguments(self, _):
                    required=False)
         c.argument('tags',
                    arg_type=tags_type)
+        c.argument('agree',
+                   options_list=['--agree-to-the-preview-terms'],
+                   help='You agree to the Preview Terms. Ignore prompt for confirmation.',
+                   action='store_true')
 
     with self.argument_context('locationbasedservices account key regenerate') as c:
         c.argument('key_type',

src/command_modules/azure-cli-locationbasedservices/azure/cli/command_modules/locationbasedservices/custom.py

@@ -3,12 +3,17 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
 
+from knack.log import get_logger
+from knack.prompting import prompt_y_n
+from knack.util import CLIError
+
 from azure.mgmt.locationbasedservices.models import LocationBasedServicesAccountCreateParameters, Sku
 
+logger = get_logger(__name__)
+
 
 # pylint: disable=line-too-long
-def create(client, resource_group_name, account_name, sku_name='S0', tags=None, custom_headers=None,
-           raw=False):
+def create(client, resource_group_name, account_name, sku_name='S0', tags=None, agree=None):
     """Create a Location Based Services Account. A Location Based
     Services Account holds the keys which allow access to the Location
     Based Services REST APIs.
@@ -25,23 +30,33 @@ def create(client, resource_group_name, account_name, sku_name='S0', tags=None,
      resource. Each tag must have a key no greater than 128 characters and
      value no greater than 256 characters.
     :type tags: dict[str, str]
-    :param dict custom_headers: headers that will be added to the request
-    :param bool raw: returns the direct response alongside the
-     deserialized response
+    :param agree: If true, user agrees to the Preview Terms. Ignore prompt
+     for confirmation. False otherwise.
+    :type agree: bool
     :return: LocationBasedServicesAccount or ClientRawResponse if raw=true
     :rtype:
      ~azure.mgmt.locationbasedservices.models.LocationBasedServicesAccount
      or ~msrest.pipeline.ClientRawResponse
     :raises:
      :class:`ErrorException<azure.mgmt.locationbasedservices.models.ErrorException>`
     """
+    # Prompt for the Preview Terms agreement.
+    logger.warning(
+        'By creating a Location Based Services account, you agree to the Microsoft Azure Preview Terms.' +
+        '\nThe Preview Terms can be found at: ' +
+        '\nhttps://azure.microsoft.com/en-us/support/legal/preview-supplemental-terms/')
+    if not agree:  # ... in order to pass tests
+        response = prompt_y_n('I confirm that I have read and agree to the Microsoft Azure Preview Terms.')
+        if not response:
+            raise CLIError('You must agree to the Microsoft Azure Preview Terms to create an account.')
 
+    # Proceed if user has agreed to the Preview Terms.
     sku = Sku(sku_name)
     lbs_account_create_params = LocationBasedServicesAccountCreateParameters('global', sku, tags)
-    return client.create_or_update(resource_group_name, account_name, lbs_account_create_params, custom_headers, raw)
+    return client.create_or_update(resource_group_name, account_name, lbs_account_create_params)
 
 
-def list_accounts(client, resource_group_name=None, custom_headers=None, raw=False):
+def list_accounts(client, resource_group_name=None):
     """Get all Location Based Services Accounts in a Resource Group OR in a Subscription.
 
     :param resource_group_name: The name of the Azure Resource Group.
@@ -58,5 +73,5 @@ def list_accounts(client, resource_group_name=None, custom_headers=None, raw=Fal
      :class:`ErrorException<azure.mgmt.locationbasedservices.models.ErrorException>`
     """
     if resource_group_name is None:
-        return client.list_by_subscription(custom_headers, raw)
-    return client.list_by_resource_group(resource_group_name, custom_headers, raw)
+        return client.list_by_subscription()
+    return client.list_by_resource_group(resource_group_name)

src/command_modules/azure-cli-locationbasedservices/azure/cli/command_modules/locationbasedservices/tests/latest/test_lbs_commands.py

@@ -12,34 +12,34 @@ class LocationBasedServicesScenarioTests(ScenarioTest):
     @ResourceGroupPreparer()
     def test_create_locationbasedservices_account(self, resource_group):
         self.kwargs.update({
-            'name': self.create_random_name(prefix='cli-locationbasedservices', length=20),
-            'name1': self.create_random_name(prefix='cli-locationbasedservices', length=20),
-            'name2': self.create_random_name(prefix='cli-locationbasedservices', length=20),
+            'name': self.create_random_name(prefix='cli-', length=20),
+            'name1': self.create_random_name(prefix='cli-', length=20),
+            'name2': self.create_random_name(prefix='cli-', length=20),
             'sku': 'S0',
-            'loc': 'global',
             'key_type_primary': KeyType.primary.value,
             'key_type_secondary': KeyType.secondary.value
         })
 
         # Test 'az locationbasedservices account create'
         # Test to create an LocationBasedServices account
-        account = self.cmd('az locationbasedservices account create -n {name} -g {rg} --sku {sku} -l {loc}', checks=[
-            self.check('location', '{loc}'),
-            self.check('name', '{name}'),
-            self.check('resourceGroup', '{rg}'),
-            self.check('sku.name', '{sku}')
-        ]).get_output_in_json()
+        account = self.cmd('az locationbasedservices account create -n {name} -g {rg} --sku {sku} ' +
+                           '--agree-to-the-preview-terms',
+                           checks=[
+                               self.check('name', '{name}'),
+                               self.check('resourceGroup', '{rg}'),
+                               self.check('sku.name', '{sku}')
+                           ]).get_output_in_json()
 
         # Call create again, expect to get the same account
         account_duplicated = self.cmd(
-            'az locationbasedservices account create -n {name} -g {rg} --sku {sku} -l {loc}').get_output_in_json()
+            'az locationbasedservices account create -n {name} -g {rg} --sku {sku} ' +
+            '--agree-to-the-preview-terms').get_output_in_json()
         self.assertEqual(account, account_duplicated)
 
         # Test 'az locationbasedservices account show'
         # Test to get information on LocationBasedServices account
         self.cmd('az locationbasedservices account show -n {name} -g {rg}', checks=[
             self.check('id', account['id']),
-            self.check('location', '{loc}'),
             self.check('name', '{name}'),
             self.check('resourceGroup', '{rg}'),
             self.check('sku.name', '{sku}')
@@ -51,16 +51,17 @@ def test_create_locationbasedservices_account(self, resource_group):
             self.check('length(@)', 1),
             self.check('type(@)', 'array'),
             self.check('[0].id', account['id']),
-            self.check('[0].location', '{loc}'),
             self.check('[0].name', '{name}'),
             self.check('[0].resourceGroup', '{rg}'),
             self.check('[0].sku.name', '{sku}'),
             self.check('[0].tags', None)
         ])
 
         # Create two new accounts
-        self.cmd('az locationbasedservices account create -n {name1} -g {rg} --sku {sku} -l {loc}')
-        self.cmd('az locationbasedservices account create -n {name2} -g {rg} --sku {sku} -l {loc}')
+        self.cmd('az locationbasedservices account create -n {name1} -g {rg} --sku {sku} ' +
+                 '--agree-to-the-preview-terms')
+        self.cmd('az locationbasedservices account create -n {name2} -g {rg} --sku {sku} ' +
+                 '--agree-to-the-preview-terms')
         # Check that list command now shows three accounts.
         self.cmd('az locationbasedservices account list -g {rg}', checks=[
             self.check('length(@)', 3),
@@ -99,7 +100,8 @@ def test_create_locationbasedservices_account(self, resource_group):
         # Save the new primary key, and regenerate the secondary key.
         primary_key_old = key_regenerated['primaryKey']
         key_regenerated = self.cmd(
-            'az locationbasedservices account key regenerate -n {name} -g {rg} -t {key_type_secondary}').get_output_in_json()
+            'az locationbasedservices account key regenerate -n {name} -g {rg} -t {key_type_secondary}') \
+            .get_output_in_json()
         self.assertEqual(primary_key_old, key_regenerated['primaryKey'])
         self.assertNotEqual(secondary_key_old, key_regenerated['secondaryKey'])