MB-66726 Rename setting-columnar to setting-enterprise-analytics

Change-Id: Ia9d2ffe1b844a280d19c7a381e0664048b733bb9
Reviewed-on: https://review.couchbase.org/c/couchbase-cli/+/227832
Tested-by: Build Bot <build@couchbase.com>
Reviewed-by: Matt Hall <matt.hall@couchbase.com>

Author: lubomarinski

cbmgr.py

@@ -3280,19 +3280,19 @@ def get_description():
         return "Modify cluster settings"
 
 
-class SettingColumnar(Subcommand):
-    """The settings columnar subcommand"""
+class SettingEnterpriseAnalytics(Subcommand):
+    """The settings enterprise analytics subcommand"""
 
     def __init__(self):
-        super(SettingColumnar, self).__init__()
-        self.parser.prog = "couchbase-cli setting-columnar"
-        group = self.parser.add_argument_group("Columnar settings")
+        super(SettingEnterpriseAnalytics, self).__init__()
+        self.parser.prog = "couchbase-cli setting-enterprise-analytics"
+        group = self.parser.add_argument_group("Enterprise analytics settings")
 
         group_me = group.add_mutually_exclusive_group(required=True)
         group_me.add_argument("--get", dest="get", action="store_true",
-                              help="Get the columnar settings")
+                              help="Get the enterprise analytics settings")
         group_me.add_argument("--set", dest="set", action="store_true",
-                              help="Set the columnar settings")
+                              help="Set the enterprise analytics settings")
 
         group.add_argument("--partitions", dest="num_storage_partitions", type=(int), metavar="<num_partitions>",
                            help="The number of storage partitions (positive integer, lower than the configured " +
@@ -3324,22 +3324,22 @@ def execute(self, opts):
             if opts.blob_storage_anonymous_auth == "1":
                 opts.blob_storage_anonymous_auth = "true"
 
-            _, errors = self.rest.set_columnar_settings(opts)
+            _, errors = self.rest.set_enterprise_analytics_settings(opts)
             _exit_if_errors(errors)
 
-            _success("Columnar settings modified")
+            _success("Enterprise analytics settings modified")
 
         if opts.get:
-            columnar_settings, errors = self.rest.get_columnar_settings()
-            print(json.dumps(columnar_settings, indent=2))
+            enterprise_analytics_settings, errors = self.rest.get_enterprise_analytics_settings()
+            print(json.dumps(enterprise_analytics_settings, indent=2))
 
     @staticmethod
     def get_man_page_name():
-        return get_doc_page_name("couchbase-cli-setting-columnar")
+        return get_doc_page_name("couchbase-cli-setting-enterprise-analytics")
 
     @staticmethod
     def get_description():
-        return "Modify columnar settings"
+        return "Modify enterprise analytics settings"
 
 
 class SettingEncryption(Subcommand):

cluster_manager.py

@@ -2914,9 +2914,9 @@ def set_analytics_settings(self, replicas=None):
         params = dict(filter(lambda x: x[1], params.items()))
         return self._post_form_encoded(url, params)
 
-    def set_columnar_settings(self, opts):
-        """Sets the columnar settings"""
-        url = f'{self.hostname}/settings/columnar'
+    def set_enterprise_analytics_settings(self, opts):
+        """Sets the enterprise analytics settings"""
+        url = f'{self.hostname}/settings/analytics'
         params = {}
 
         if opts.num_storage_partitions:
@@ -2936,9 +2936,9 @@ def set_columnar_settings(self, opts):
 
         return self._post_form_encoded(url, params)
 
-    def get_columnar_settings(self):
-        """Gets the columnar settings"""
-        url = f'{self.hostname}/settings/columnar'
+    def get_enterprise_analytics_settings(self):
+        """Gets the enterprise analytics settings"""
+        url = f'{self.hostname}/settings/analytics'
 
         return self._get(url)
 

docs/modules/cli/pages/_partials/cbcli/nav.adoc

@@ -46,9 +46,9 @@
  ** xref:cli:cbcli/couchbase-cli-setting-autofailover.adoc[setting-autofailover]
  ** xref:cli:cbcli/couchbase-cli-setting-autoreprovision.adoc[setting-autoreprovision]
  ** xref:cli:cbcli/couchbase-cli-setting-cluster.adoc[setting-cluster]
- ** xref:cli:cbcli/couchbase-cli-setting-columnar.adoc[setting-columnar]
  ** xref:cli:cbcli/couchbase-cli-setting-compaction.adoc[setting-compaction]
  ** xref:cli:cbcli/couchbase-cli-setting-encryption.adoc[setting-encryption]
+ ** xref:cli:cbcli/couchbase-cli-setting-enterprise-analytics.adoc[setting-enterprise-analytics]
  ** xref:cli:cbcli/couchbase-cli-setting-index.adoc[setting-index]
  ** xref:cli:cbcli/couchbase-cli-setting-ldap.adoc[setting-ldap]
  ** xref:cli:cbcli/couchbase-cli-setting-master-password.adoc[setting-master-password]

…bcli/couchbase-cli-setting-columnar.adoc …se-cli-setting-enterprise-analytics.adocdocs/modules/cli/pages/cbcli/couchbase-cli-setting-columnar.adoc renamed to docs/modules/cli/pages/cbcli/couchbase-cli-setting-enterprise-analytics.adoc docs/modules/cli/pages/cbcli/couchbase-cli-setting-columnar.adoc renamed to docs/modules/cli/pages/cbcli/couchbase-cli-setting-enterprise-analytics.adoc

@@ -1,32 +1,32 @@
-= couchbase-cli-setting-columnar(1)
-:description: Manage Columnar service settings
-ifndef::doctype-manpage[:doctitle: setting-columnar]
+= couchbase-cli-setting-enterprise-analytics(1)
+:description: Manage Enterprise Analytics service settings
+ifndef::doctype-manpage[:doctitle: setting-enterprise-analytics]
 
 ifdef::doctype-manpage[]
 == NAME
 
-couchbase-cli-setting-columnar -
+couchbase-cli-setting-enterprise-analytics -
 endif::[]
-Manage Columnar service settings
+Manage Enterprise Analytics service settings
 
 == SYNOPSIS
 
 [verse]
-_couchbase-cli setting-columnar_ [--get] [--set] [--replicas <num>] 
+_couchbase-cli setting-enterprise-analytics_ [--get] [--set] [--replicas <num>]
 
 == DESCRIPTION
 
-Manage Columnar service settings
+Manage Enterprise Analytics service settings
 
 == OPTIONS
 
 include::{partialsdir}/cbcli/part-common-options.adoc[]
 
 --get::
-  Retrieve current Columnar service settings.
+  Retrieve current Enterprise Analytics service settings.
 
 --set::
-  Set Columnar settings.
+  Set Enterprise Analytics settings.
 
 --partitions <num>::
   The number of storage partitions (positive integer, lower than the configured maximum)
@@ -55,14 +55,14 @@ include::{partialsdir}/cbcli/part-certificate-authentication.adoc[]
 
 == EXAMPLES
 
-To retrieve the Columnar service settings:
+To retrieve the Enterprise Analytics service settings:
 
-  $ couchbase-cli setting-columnar -c 127.0.01:8091 -u Administrator \
+  $ couchbase-cli setting-enterprise-analytics -c 127.0.01:8091 -u Administrator \
    -p password --get
 
 To set the BLOB storage scheme to s3:
 
-  $ couchbase-cli setting-columnar -c 127.0.01:8091 -u Administrator \
+  $ couchbase-cli setting-enterprise-analytics -c 127.0.01:8091 -u Administrator \
    -p password --set --scheme s3
 
 == ENVIRONMENT AND CONFIGURATION VARIABLES

test/mock_server.py

@@ -568,7 +568,7 @@ def export_eventing_functions(rest_params=None, server_args=None, path="", endpo
     (r'/settings/rebalance$', {'GET': get_by_path, 'POST': do_nothing}),
     (r'/settings/retryRebalance$', {'GET': get_by_path, 'POST': do_nothing}),
     (r'/settings/replications/(\d|\w)+$', {'POST': do_nothing, 'GET': get_by_path}),
-    (r'/settings/columnar', {'POST': do_nothing, 'GET': get_by_path}),
+    (r'/settings/analytics', {'POST': do_nothing, 'GET': get_by_path}),
     (r'/nodes/self/controller/settings$', {'POST': do_nothing}),
     (r'/nodes/self$', {'GET': get_node_info}),
     (r'/nodeInit', {'POST': do_nothing}),

test/test_cli.py

@@ -5212,9 +5212,9 @@ def test_setting_replicas(self):
         self.rest_parameter_match(['numReplicas=3'])
 
 
-class TestSettingColumnar(CommandTest):
+class TestSettingEnterpriseAnalytics(CommandTest):
     def setUp(self):
-        self.command = ['couchbase-cli', 'setting-columnar'] + cluster_connect_args
+        self.command = ['couchbase-cli', 'setting-enterprise-analytics'] + cluster_connect_args
         self.server_args = {'enterprise': True, 'init': True, 'is_admin': True}
         super().setUp()
 
@@ -5223,51 +5223,51 @@ def test_get_and_set(self):
         self.assertIn('ERROR: argument --set: not allowed with argument --get', self.str_error)
 
     def test_get(self):
-        self.server_args['/settings/columnar'] = {'numStoragePartitions': 7}
+        self.server_args['/settings/analytics'] = {'numStoragePartitions': 7}
         self.no_error_run(self.command + ['--get'], self.server_args)
-        self.assertIn('GET:/settings/columnar', self.server.trace)
+        self.assertIn('GET:/settings/analytics', self.server.trace)
         self.assertIn(json.dumps({'numStoragePartitions': 7}, indent=2), self.str_output)
 
     def test_partitions(self):
         self.no_error_run(self.command + ['--set', '--partitions', '7'], self.server_args)
-        self.assertIn('POST:/settings/columnar', self.server.trace)
+        self.assertIn('POST:/settings/analytics', self.server.trace)
         self.rest_parameter_match(['numStoragePartitions=7'])
 
     def test_scheme(self):
         self.no_error_run(self.command + ['--set', '--scheme', 's3'], self.server_args)
-        self.assertIn('POST:/settings/columnar', self.server.trace)
+        self.assertIn('POST:/settings/analytics', self.server.trace)
         self.rest_parameter_match(['blobStorageScheme=s3'])
 
     def test_bucket(self):
         self.no_error_run(self.command + ['--set', '--bucket', 'aaa'], self.server_args)
-        self.assertIn('POST:/settings/columnar', self.server.trace)
+        self.assertIn('POST:/settings/analytics', self.server.trace)
         self.rest_parameter_match(['blobStorageBucket=aaa'])
 
     def test_prefix(self):
         self.no_error_run(self.command + ['--set', '--prefix', 'aaa'], self.server_args)
-        self.assertIn('POST:/settings/columnar', self.server.trace)
+        self.assertIn('POST:/settings/analytics', self.server.trace)
         self.rest_parameter_match(['blobStoragePrefix=aaa'])
 
     def test_region(self):
         self.no_error_run(self.command + ['--set', '--region', 'aaa'], self.server_args)
-        self.assertIn('POST:/settings/columnar', self.server.trace)
+        self.assertIn('POST:/settings/analytics', self.server.trace)
         self.rest_parameter_match(['blobStorageRegion=aaa'])
 
     def test_endpoint(self):
         self.no_error_run(self.command + ['--set', '--endpoint', 'aaa'], self.server_args)
-        self.assertIn('POST:/settings/columnar', self.server.trace)
+        self.assertIn('POST:/settings/analytics', self.server.trace)
         self.rest_parameter_match(['blobStorageEndpoint=aaa'])
 
     def test_anonymous_auth(self):
         self.no_error_run(self.command + ['--set', '--anonymous-auth', '1'], self.server_args)
-        self.assertIn('POST:/settings/columnar', self.server.trace)
+        self.assertIn('POST:/settings/analytics', self.server.trace)
         self.rest_parameter_match(['blobStorageAnonymousAuth=true'])
 
     def test_all_flags(self):
         self.no_error_run(self.command + ['--set', '--partitions', '7', '--scheme', 's3', '--bucket', 'aaa',
                                           '--prefix', 'aaa', '--region', 'aaa', '--endpoint', 'aaa',
                                           '--anonymous-auth', '1',], self.server_args)
-        self.assertIn('POST:/settings/columnar', self.server.trace)
+        self.assertIn('POST:/settings/analytics', self.server.trace)
         self.rest_parameter_match(['numStoragePartitions=7', 'blobStorageScheme=s3', 'blobStorageBucket=aaa',
                                    'blobStoragePrefix=aaa', 'blobStorageRegion=aaa', 'blobStorageEndpoint=aaa',
                                    'blobStorageAnonymousAuth=true'])