Adding Credentials to allow fetching repo using https instead of ssh

odoo_tools/api/services.py

@@ -32,7 +32,8 @@ def checkout(
         service,
         target_path,
         fetch_path=None,
-        decrypt_key=None
+        decrypt_key=None,
+        credentials=None
     ):
         if not fetch_path:
             fetch_path = target_path
@@ -51,7 +52,8 @@ def checkout(
             path, info = fetch_addons(
                 addon,
                 fetch_path,
-                decrypt_key=decrypt_key
+                decrypt_key=decrypt_key,
+                credentials=credentials,
             )
 
             if fetch_path != checkout_path:

odoo_tools/cli/click/services.py

@@ -62,23 +62,44 @@ def show(ctx, service_file, env, url):
 @click.option(
     '--decrypt-key',
 )
+@click.option(
+    '--credentials'
+)
 @click.argument('service_file')
 @click.argument('environment')
 @click.argument('target')
 @click.pass_context
-def checkout(ctx, service_file, environment, target, cache, decrypt_key):
+def checkout(
+    ctx,
+    service_file,
+    environment,
+    target,
+    cache,
+    decrypt_key,
+    credentials,
+):
     env = ctx.obj['env']
 
     manifests = env.services.get_services(service_file)
 
     service = manifests.services.get(environment)
     resolved_service = service.resolved
 
+    host, username, password = credentials.split(':')
+
+    credentials = {
+        host: {
+            "username": username,
+            "password": password,
+        }
+    }
+
     env.services.checkout(
         resolved_service,
         target,
         cache or target,
-        decrypt_key
+        decrypt_key,
+        credentials
     )
 
 

odoo_tools/configuration/git.py

@@ -69,6 +69,9 @@ def fetch_addons(addon, output_directory, decrypt_key=None, credentials=None):
         password = credential['password']
 
         url = urlparse(parsed.url2https)
+
+        _logger.debug("Fetching with url: %s", url.geturl())
+
         url = url._replace(
             netloc="{}:{}@{}".format(
                 username,

odoo_tools/services/fields.py

@@ -112,6 +112,9 @@ def parse(self, owner, data):
 class Dict(List):
 
     def __init__(self, *args, **kwargs):
+        if 'default' not in kwargs:
+            kwargs['default'] = {}
+
         super().__init__(*args, **kwargs)
         self._key = kwargs['key']
 

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="odoo-tools",
-    version="0.1.6",
+    version="0.1.7",
     author="Loïc Faure-Lacroix <[email protected]>",
     author_email="[email protected]",
     description="Odoo Tools",