Specify when to use tls on Context constructor

Signed-off-by: Ulysses Souza <[email protected]>

Author: ulyssessouza

docker/context/config.py

@@ -73,8 +73,8 @@ def get_tls_dir(name=None, endpoint=""):
     return os.path.join(context_dir, "tls")
 
 
-def get_context_host(path=None):
-    host = utils.parse_host(path, IS_WINDOWS_PLATFORM)
+def get_context_host(path=None, tls=False):
+    host = utils.parse_host(path, IS_WINDOWS_PLATFORM, tls)
     if host == DEFAULT_UNIX_SOCKET:
         # remove http+ from default docker socket url
         return host.strip("http+")

docker/context/context.py

@@ -11,7 +11,8 @@
 
 class Context:
     """A context."""
-    def __init__(self, name, orchestrator="swarm", host=None, endpoints=None):
+    def __init__(self, name, orchestrator="swarm", host=None, endpoints=None,
+                 tls=False):
         if not name:
             raise Exception("Name not provided")
         self.name = name
@@ -22,8 +23,8 @@ def __init__(self, name, orchestrator="swarm", host=None, endpoints=None):
                 ) else orchestrator
             self.endpoints = {
                 default_endpoint: {
-                    "Host": get_context_host(host),
-                    "SkipTLSVerify": False
+                    "Host": get_context_host(host, tls),
+                    "SkipTLSVerify": not tls
                 }
             }
         else:
@@ -44,7 +45,7 @@ def set_endpoint(
             self, name="docker", host=None, tls_cfg=None,
             skip_tls_verify=False, def_namespace=None):
         self.endpoints[name] = {
-            "Host": get_context_host(host),
+            "Host": get_context_host(host, not skip_tls_verify),
             "SkipTLSVerify": skip_tls_verify
         }
         if def_namespace:

tests/unit/context_test.py

@@ -37,6 +37,10 @@ def test_default_in_context_list(self):
     def test_get_current_context(self):
         assert ContextAPI.get_current_context().Name == "default"
 
+    def test_https_host(self):
+        c = Context("test", host="tcp://testdomain:8080", tls=True)
+        assert c.Host == "https://testdomain:8080"
+
     def test_context_inspect_without_params(self):
         ctx = ContextAPI.inspect_context()
         assert ctx["Name"] == "default"