Ianco

.gitignore

@@ -112,7 +112,7 @@ venv.bak/
 ### Visual Studio Code
 ###
 
-.vscode/
+.vscode/*
 
 ###
 ### MacOS
@@ -138,6 +138,7 @@ Icon
 .Trashes
 .VolumeIcon.icns
 .com.apple.timemachine.donotpresent
+.settings
 
 # Directories potentially created on remote AFP share
 .AppleDB
@@ -178,4 +179,35 @@ $RECYCLE.BIN/
 *.msp
 
 # Windows shortcuts
-*.lnk
+*.lnk
+
+# Indy Agent - genesis transaction file(s)
+genesis
+
+# Visual Studio Code
+.vscode
+.idea/*
+.vs
+
+out
+
+.gradle
+/build/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# Cache of project
+.gradletasknamecache
+
+# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
+# gradle/wrapper/gradle-wrapper.properties
+
+*.crt
+*.key
+/tob-api/Pipfile
+/tob-api/Pipfile.lock
+

.gitlab-ci.yml

@@ -0,0 +1,60 @@
+image: bcgovimages/von-image:py36-1.8-0
+
+Agent Tests:
+  stage: test
+  script:
+    - mkdir test-reports
+    - mkdir test-reports/pytest
+    - cd agent
+    - python3 -m venv venv
+    - . venv/bin/activate
+    - pip install -r requirements.txt -r requirements.dev.txt pytest
+    - pytest
+    - ls -last
+    - pwd
+  coverage: '/^TOTAL\s+\d+\s+\d+\s+(\d+\%)$/'
+  artifacts:
+    name: "$CI_JOB_NAME"
+    paths:
+      - test-reports/
+    reports:
+      junit: test-reports/pytest/junit.xml
+    expire_in: 1 week
+
+# Dependency Scanning
+include:
+  template: Dependency-Scanning.gitlab-ci.yml
+
+# Code Quality Scanning
+code_quality:
+  image: docker:stable
+  variables:
+    DOCKER_DRIVER: overlay2
+  allow_failure: true
+  services:
+    - docker:stable-dind
+  script:
+    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
+    - docker run
+        --env SOURCE_CODE="$PWD"
+        --volume "$PWD":/code
+        --volume /var/run/docker.sock:/var/run/docker.sock
+        "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
+  artifacts:
+    reports:
+      codequality: gl-code-quality-report.json
+    expire_in: 1 week
+
+pages:
+  stage: deploy
+  dependencies:
+    - Agent Tests
+  script:
+    - mkdir -p public/coverage
+    - cp -r test-reports/cov_html/* public/coverage
+  artifacts:
+    paths:
+      - public
+    expire_in: 1 week
+  only:
+    - master

agent/docker/Dockerfile.test

@@ -1,12 +1,12 @@
 FROM ubuntu:18.04
 
 RUN apt-get update -y && \
-	apt-get install -y --no-install-recommends \
-	python3 \
-	python3-pip \
-	python3-setuptools \
-	libsodium23 && \
-	rm -rf /var/lib/apt/lists/*
+    apt-get install -y --no-install-recommends \
+    	python3 \
+    	python3-pip \
+    	python3-setuptools \
+    	libsodium23 && \
+    rm -rf /var/lib/apt/lists/*
 
 WORKDIR /usr/src/app
 

agent/indy_catalyst_agent/__init__.py

@@ -1,17 +1,19 @@
-"""Entrypoint."""
-
 import argparse
 import asyncio
 import os
+import signal
 
 from .conductor import Conductor
 from .defaults import default_message_factory
 from .logging import LoggingConfigurator
 from .transport.inbound import InboundTransportConfiguration
 
-PARSER = argparse.ArgumentParser(description="Runs an Indy Agent.")
+from .version import __version__
+
+
+parser = argparse.ArgumentParser(description="Runs an Indy Agent.")
 
-PARSER.add_argument(
+parser.add_argument(
     "-it",
     "--inbound-transport",
     dest="inbound_transports",
@@ -23,7 +25,7 @@
     help="Choose which interface(s) to listen on",
 )
 
-PARSER.add_argument(
+parser.add_argument(
     "-ot",
     "--outbound-transport",
     dest="outbound_transports",
@@ -34,7 +36,7 @@
     help="Choose which outbound transport handlers to register",
 )
 
-PARSER.add_argument(
+parser.add_argument(
     "--logging-config",
     dest="logging_config",
     type=str,
@@ -43,90 +45,81 @@
     help="Specifies a custom logging configuration file",
 )
 
-PARSER.add_argument(
+parser.add_argument(
     "--log-level",
     dest="log_level",
     type=str,
     metavar="<log-level>",
     default=None,
-    help="Specifies a custom logging level "
-    + "(debug, info, warning, error, critical)",
+    help="Specifies a custom logging level (debug, info, warning, error, critical)",
 )
 
-PARSER.add_argument(
+parser.add_argument(
     "-e",
     "--endpoint",
     type=str,
     metavar="<endpoint>",
-    help="Specify the default endpoint to use when "
-    + "creating connection invitations and requests",
+    help="Specify the default endpoint to use when creating connection invitations and requests",
 )
 
-PARSER.add_argument(
+parser.add_argument(
     "-l",
     "--label",
     type=str,
     metavar="<label>",
-    help="Specify the default label to use when creating"
-    + " connection invitations and requests",
+    help="Specify the default label to use when creating connection invitations and requests",
 )
 
-PARSER.add_argument(
+parser.add_argument(
     "--wallet-key",
     type=str,
     metavar="<wallet-key>",
     help="Specify the master key value to use when opening the wallet",
 )
 
-PARSER.add_argument(
-    "--wallet-name", type=str, metavar="<wallet-name>", help="Specify the wallet name"
+parser.add_argument(
+    "--wallet-name",
+    type=str,
+    metavar="<wallet-name>",
+    help="Specify the wallet name",
 )
 
-PARSER.add_argument(
+parser.add_argument(
     "--wallet-type",
     type=str,
     metavar="<wallet-type>",
     help="Specify the wallet implementation to use",
 )
 
-PARSER.add_argument("--debug", action="store_true", help="Enable debugging features")
-
-PARSER.add_argument(
-    "--seed", type=str, metavar="<did-seed>", help="Specify the default seed to use"
+parser.add_argument(
+    "--debug",
+    action="store_true",
+    help="Enable debugging features",
 )
 
-PARSER.add_argument(
-    "--invite",
-    action="store_true",
-    help="Generate and print a new connection invitation URL",
+parser.add_argument(
+    "--seed",
+    type=str,
+    metavar="<did-seed>",
+    help="Specify the default seed to use",
 )
 
-PARSER.add_argument(
-    "--send-invite",
+parser.add_argument(
+    "--invite",
     type=str,
     metavar="<agent-endpoint>",
     help="Specify an endpoint to send an invitation to",
 )
 
 
-async def start(
-    inbound_transport_configs: list, outbound_transports: list, settings: dict
-):
-    """
-    Start.
-
-    :inbound_transport_configs: list:
-    """
+async def start(inbound_transport_configs, outbound_transports, settings: dict):
     factory = default_message_factory()
-    conductor = Conductor(
-        inbound_transport_configs, outbound_transports, factory, settings
-    )
+    conductor = Conductor(inbound_transport_configs, outbound_transports, factory, settings)
     await conductor.start()
 
 
 def main():
-    """Entrypoint."""
-    args = PARSER.parse_args()
+    args = parser.parse_args()
     settings = {}
 
     inbound_transport_configs = []
@@ -163,15 +156,13 @@ def main():
     if args.seed:
         settings["debug.seed"] = args.seed
     if args.invite:
-        settings["debug.print_invitation"] = True
-    if args.send_invite:
-        settings["debug.send_invitation_to"] = args.send_invite
+        settings["debug.send_invitation_to"] = args.invite
 
     loop = asyncio.get_event_loop()
     try:
         asyncio.ensure_future(
-            start(inbound_transport_configs, outbound_transports, settings), loop=loop
-        )
+            start(inbound_transport_configs, outbound_transports, settings),
+            loop=loop)
         loop.run_forever()
     except KeyboardInterrupt:
         print("\nShutting down")

agent/indy_catalyst_agent/classloader.py

@@ -5,35 +5,21 @@
 
 from .error import BaseError
 
-
 class ModuleLoadError(BaseError):
-    """Module load error."""
-
     pass
 
 
 class ClassNotFoundError(BaseError):
-    """Class not found error."""
-
     pass
 
 
 class ClassLoader:
-    """Class used to load classes from modules dynamically."""
-
     def __init__(self, base_path, super_class):
         self.logger = logging.getLogger(__name__)
         self.base_path = base_path
         self.super_class = super_class
 
     def load(self, module_path, load_relative=False):
-        """
-        Load module by module path.
-
-        :param module_path: Dotted path to module
-        :param load_relative:  (Default value = False) Should the method check in the
-            configured base path for relative import
-        """
         # We can try to load the module relative to a given base path
         if load_relative:
             relative_module_path = ".".join([self.base_path, module_path])
@@ -67,10 +53,8 @@ def load(self, module_path, load_relative=False):
 
     @classmethod
     def load_class(cls, class_name: str, default_module: str = None):
-        """Resolve a complete class path (ie. typing.Dict) to the class itself
-
-        :param class_name: str: Class name
-        :param default_module: str:  (Default value = None)
+        """
+        Resolve a complete class path (ie. typing.Dict) to the class itself
         """
         if "." in class_name:
             # import module and find class
@@ -79,12 +63,12 @@ def load_class(cls, class_name: str, default_module: str = None):
             mod_path = default_module
         else:
             raise ClassNotFoundError(f"Cannot resolve class name: {class_name}")
-
+        
         try:
             mod = import_module(mod_path)
         except ModuleNotFoundError:
             error_message = f"Unable to import module {mod_path}"
             raise ModuleLoadError(error_message)
 
-        resolved = getattr(mod, class_name, None)
+        resolved = getattr(mod, class_name, None)        
         return resolved