MB-66725 Rename columnar-link-setup to enterprise-analytics-link-setup

Change-Id: I47299423d9e1855cd9e8931777abf0648e6c5cb6
Reviewed-on: https://review.couchbase.org/c/couchbase-cli/+/227833
Reviewed-by: Matt Hall <[email protected]>
Tested-by: Build Bot <[email protected]>

Author: lubomarinski

cbmgr.py

@@ -5641,14 +5641,14 @@ def get_description():
         return "Manage Analytics Links"
 
 
-class ColumnarLinkSetup(Subcommand):
-    """The columnar link setup subcommand"""
+class EnterpriseAnalyticsLinkSetup(Subcommand):
+    """The Enterprise Analytics link setup subcommand"""
 
     def __init__(self):
-        super(ColumnarLinkSetup, self).__init__()
-        self.parser.prog = "couchbase-cli columnar-link-setup"
+        super(EnterpriseAnalyticsLinkSetup, self).__init__()
+        self.parser.prog = "couchbase-cli enterprise-analytics-link-setup"
 
-        group = self.parser.add_argument_group("Columnar link setup options")
+        group = self.parser.add_argument_group("Enterprise Analytics link setup options")
         action_group = group.add_mutually_exclusive_group(required=True)
         action_group.add_argument("--create", dest="create", action="store_true",
                                   default=False, help="Create a link")
@@ -5696,7 +5696,7 @@ def _set(self, opts):
         except ValueError as err:
             _exit_if_errors(['Failed to parse link-details JSON', err])
 
-        _, errors = self.rest.set_columnar_link(opts)
+        _, errors = self.rest.set_enterprise_analytics_link(opts)
         _exit_if_errors(errors)
 
         _success("Link created" if opts.create else "Link edited")
@@ -5705,25 +5705,25 @@ def _delete(self, opts):
         if opts.name is None:
             _exit_if_errors(['--name is required to delete a link'])
 
-        _, errors = self.rest.delete_columnar_link(opts)
+        _, errors = self.rest.delete_enterprise_analytics_link(opts)
         _exit_if_errors(errors)
         _success("Link deleted")
 
     def _get(self, opts):
         if opts.get and opts.name is None:
             _exit_if_errors(['--name is required to get a link'])
 
-        clusters, errors = self.rest.get_columnar_links(opts)
+        clusters, errors = self.rest.get_enterprise_analytics_links(opts)
         _exit_if_errors(errors)
         print(json.dumps(clusters, sort_keys=True, indent=2))
 
     @staticmethod
     def get_man_page_name():
-        return get_doc_page_name("couchbase-cli-columnar-link-setup")
+        return get_doc_page_name("couchbase-cli-enterprise-analytics-link-setup")
 
     @staticmethod
     def get_description():
-        return "Manage Columnar Links"
+        return "Manage Enterprise Analytics Links"
 
 
 class UserChangePassword(Subcommand):

cluster_manager.py

@@ -2942,7 +2942,7 @@ def get_enterprise_analytics_settings(self):
 
         return self._get(url)
 
-    def _columnar_link_url(self, name):
+    def _enterprise_analytics_link_url(self, name):
         hosts, errors = self.get_hostnames_for_service(CBAS_SERVICE)
         if errors:
             return None, errors
@@ -2952,23 +2952,23 @@ def _columnar_link_url(self, name):
 
         return f'{hosts[0]}/api/v1/link{("/" + urllib.parse.quote_plus(name)) if name else ""}', None
 
-    def set_columnar_link(self, opts):
-        url, errors = self._columnar_link_url(opts.name)
+    def set_enterprise_analytics_link(self, opts):
+        url, errors = self._enterprise_analytics_link_url(opts.name)
         if errors:
             return None, errors
 
         send_json = self._put_json if opts.edit else self._post_json
         return send_json(url, opts.parsed_link_details)
 
-    def delete_columnar_link(self, opts):
-        url, errors = self._columnar_link_url(opts.name)
+    def delete_enterprise_analytics_link(self, opts):
+        url, errors = self._enterprise_analytics_link_url(opts.name)
         if errors:
             return None, errors
 
         return self._delete(url, None)
 
-    def get_columnar_links(self, opts):
-        url, errors = self._columnar_link_url(opts.name)
+    def get_enterprise_analytics_links(self, opts):
+        url, errors = self._enterprise_analytics_link_url(opts.name)
         if errors:
             return None, errors
 

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

@@ -18,8 +18,8 @@
  ** xref:cli:cbcli/couchbase-cli-collect-logs-status.adoc[collect-logs-status]
  ** xref:cli:cbcli/couchbase-cli-collect-logs-stop.adoc[collect-logs-stop]
  ** xref:cli:cbcli/couchbase-cli-collection-manage.adoc[collection-manage]
- ** xref:cli:cbcli/couchbase-cli-columnar-link-setup.adoc[columnar-link-setup]
  ** xref:cli:cbcli/couchbase-cli-enable-developer-preview.adoc[enable-developer-preview]
+ ** xref:cli:cbcli/couchbase-cli-enterprise-analytics-link-setup.adoc[enterprise-analytics-link-setup]
  ** xref:cli:cbcli/couchbase-cli-eventing-function-setup.adoc[eventing-function-setup]
  ** xref:cli:cbcli/couchbase-cli-failover.adoc[failover]
  ** xref:cli:cbcli/couchbase-cli-group-manage.adoc[group-manage]

…i/couchbase-cli-columnar-link-setup.adoc …cli-enterprise-analytics-link-setup.adocdocs/modules/cli/pages/cbcli/couchbase-cli-columnar-link-setup.adoc renamed to docs/modules/cli/pages/cbcli/couchbase-cli-enterprise-analytics-link-setup.adoc docs/modules/cli/pages/cbcli/couchbase-cli-columnar-link-setup.adoc renamed to docs/modules/cli/pages/cbcli/couchbase-cli-enterprise-analytics-link-setup.adoc

@@ -1,18 +1,18 @@
-= couchbase-cli-columnar-link-setup(1)
-:description: Manage Columnar links
-ifndef::doctype-manpage[:doctitle: columnar-link-setup]
+= couchbase-cli-enterprise-analytics-link-setup(1)
+:description: Manage Enterprise Analytics links
+ifndef::doctype-manpage[:doctitle: enterprise-analytics-link-setup]
 
 ifdef::doctype-manpage[]
 == NAME
 
-couchbase-cli-columnar-link-setup -
+couchbase-cli-enterprise-analytics-link-setup -
 endif::[]
-Manage Columnar links
+Manage Enterprise Analytics links
 
 == SYNOPSIS
 
 [verse]
-_couchbase-cli columnar-link-setup_ [--cluster <cluster>] [--username <username>]
+_couchbase-cli enterprise-analytics-link-setup_ [--cluster <cluster>] [--username <username>]
     [--password <password>] [--client-cert <path>] [--client-cert-password <password>]
     [--client-key <path>] [--client-key-password <password>] [--create] [--delete]
     [--edit] [--list] [--dataverse <name>] [--scope <name>] [--name <name>] [--type <type>]
@@ -29,7 +29,7 @@ _couchbase-cli columnar-link-setup_ [--cluster <cluster>] [--username <username>
 == DESCRIPTION
 
 This command is used to manage links used by the external dataset and remote
-cluster capabilities of the Columnar Service.
+cluster capabilities of the Enterprise Analytics Service.
 
 == OPTIONS
 
@@ -69,22 +69,22 @@ include::{partialsdir}/cbcli/part-certificate-authentication.adoc[]
 
 To create a new link named "l1", run the following command:
 
-$ couchbase-cli columnar-link-setup -c 192.168.1.5 -u Administrator \
+$ couchbase-cli enterprise-analytics-link-setup -c 192.168.1.5 -u Administrator \
  -p password --create --name l1 --link-details-path <path>
 
 To delete the new link named "l1", run the following command:
 
-$ couchbase-cli columnar-link-setup -c 192.168.1.5 -u Administrator \
+$ couchbase-cli enterprise-analytics-link-setup -c 192.168.1.5 -u Administrator \
  -p password --delete --name l1
 
 To list the defined links run the following command:
 
-$ couchbase-cli columnar-link-setup -c 192.168.1.5 -u Administrator \
+$ couchbase-cli enterprise-analytics-link-setup -c 192.168.1.5 -u Administrator \
  -p password --list
 
 To retrieve the link details for a link named "l1", run the following command:
 
-$ couchbase-cli columnar-link-setup -c 192.168.1.5 -u Administrator \
+$ couchbase-cli enterprise-analytics-link-setup -c 192.168.1.5 -u Administrator \
  -p password --get --name l1
 
 == ENVIRONMENT AND CONFIGURATION VARIABLES

test/mock_server.py

@@ -610,7 +610,7 @@ def export_eventing_functions(rest_params=None, server_args=None, path="", endpo
       'PUT': set_analytics_link,
       'DELETE': do_nothing}),
 
-    # columnar link
+    # enterprise analytics link
     (r'api/v1/link', {'GET': do_nothing}),
     (r'api/v1/link/[^/]+',
      {'GET': do_nothing,

test/test_cli.py

@@ -4360,7 +4360,7 @@ def test_delete(self):
         self.assertIn('DELETE:/analytics/link/Default/me', self.server.trace)
 
 
-class TestColumnarLinkSetup(CommandTest):
+class TestEnterpriseAnalyticsLinkSetup(CommandTest):
     def setUp(self):
         self.server_args = {'enterprise': True, 'init': True, 'is_admin': True, 'columnar': True,
                             'version': '1.2.0-0000-columnar',
@@ -4370,8 +4370,8 @@ def setUp(self):
                                     'cbas': port,
                                 }
                             }]}}
-        self.command = ['couchbase-cli', 'columnar-link-setup'] + cluster_connect_args
-        super(TestColumnarLinkSetup, self).setUp()
+        self.command = ['couchbase-cli', 'enterprise-analytics-link-setup'] + cluster_connect_args
+        super(TestEnterpriseAnalyticsLinkSetup, self).setUp()
 
     def test_no_flags(self):
         self.system_exit_run(self.command, self.server_args)