Merge pull request #62 from romeech/implement-hub-token-cmd

Implement 'hub-token' command in apsconnect-cli

Author: ToxicWar

.travis.yml

@@ -13,9 +13,6 @@ matrix:
       sudo: required
       python: 3.6
       env: BUILD=LINUX
-    - os: osx
-      language: generic
-      env: BUILD=OSX
 
 before_install:
 - ./.travis/before_install.sh

README.md

@@ -162,3 +162,9 @@ Disable mode with `--disable`.
 ⇒ apsconnect aps-devel-mode --disable
 APS Development mode DISABLED.
 ```
+
+#### Get Hub token
+ ```
+ ⇒ apsconnect hub-token
+ ab8719ff-d818-4b6f-8023-0229f768e086
+ ```

VERSION

@@ -1 +1 @@
-1.11.0
+1.11.1

apsconnectcli/apsconnect.py

@@ -18,13 +18,13 @@
 import yaml
 
 from requests import get
-from requests.exceptions import Timeout, ConnectionError, SSLError
+from requests.exceptions import ConnectionError, SSLError, Timeout
 
 from kubernetes import client, config
 from kubernetes.client.rest import ApiException
 
 from apsconnectcli.action_logger import Logger
-from apsconnectcli.cluster import read_cluster_certificate, poll_deployment
+from apsconnectcli.cluster import poll_deployment, read_cluster_certificate
 from apsconnectcli.config import CFG_FILE_PATH, NULL_CFG_INFO
 from apsconnectcli.hub import Hub
 from apsconnectcli.package import Package
@@ -319,6 +319,10 @@ def info(self):
             print(item_name)
             print(_check_binding(check_config, get_info))
 
+    def hub_token(self):
+        hub = Hub()
+        print(hub.hub_id)
+
 
 def _get_k8s_api_client(config_file=None):
     if not config_file:

tests/test_hub.py

@@ -1,8 +1,17 @@
+import sys
 from unittest import TestCase
 
 from mock import MagicMock, patch
 
-from apsconnectcli.hub import osaapi_raise_for_status, Hub, APS
+from apsconnectcli.apsconnect import APSConnectUtil
+from apsconnectcli.hub import APS, Hub, osaapi_raise_for_status
+
+if sys.version_info >= (3,):
+    _BUILTINS_OPEN = 'builtins.open'
+    _BUILTINS_PRINT = 'builtins.print'
+else:
+    _BUILTINS_OPEN = 'apsconnectcli.apsconnect.open'
+    _BUILTINS_PRINT = 'apsconnectcli.apsconnect.print'
 
 
 class OsaApiRaiseForStatusTest(TestCase):
@@ -79,7 +88,7 @@ def test_get_resclass_name_without_unit(self):
 
     def test_hub_init(self):
         with patch('apsconnectcli.hub.osaapi'), \
-             patch('apsconnectcli.hub.APS') as aps_mock, \
+                patch('apsconnectcli.hub.APS') as aps_mock, \
                 patch('apsconnectcli.hub.get_config'), \
                 patch('apsconnectcli.hub.osaapi_raise_for_status'):
             resp_mock = MagicMock()
@@ -104,7 +113,7 @@ def test_get_hub_version(self):
 
     def test_hub_incorrect_id(self):
         with patch('apsconnectcli.hub.osaapi'), \
-             patch('apsconnectcli.hub.APS') as aps_mock, \
+                patch('apsconnectcli.hub.APS') as aps_mock, \
                 patch('apsconnectcli.hub.get_config'), \
                 patch('apsconnectcli.hub.osaapi_raise_for_status'), \
                 patch('apsconnectcli.hub.sys') as sys_mock:
@@ -244,3 +253,17 @@ def test_delete(self):
         self.assertEqual(requests_mock.delete.call_args[1].get('headers'), 'token')
         self.assertEqual(requests_mock.delete.call_args[1].get('verify'), False)
         self.assertEqual(requests_mock.delete.call_args[0][0], 'https://aps_host:aps_port/test')
+
+
+class TestApsConnectUtilHubCommands(TestCase):
+    @patch('apsconnectcli.apsconnect.Hub')
+    def test_hub_token(self, hub_cls):
+        with patch(_BUILTINS_PRINT) as mock_print:
+            expected_hub_token = '359b67d3-fdd7-4e90-a891-b909734fb64a'
+            hub_mock = MagicMock()
+            hub_mock.hub_id = expected_hub_token
+            hub_cls.return_value = hub_mock
+
+            util = APSConnectUtil()
+            util.hub_token()
+            mock_print.assert_called_with(expected_hub_token)