Merge branch 'main' into chore_fmt

.gitignore

@@ -25,4 +25,7 @@ vendor/
 *.db
 
 # Log files
-log/*.log
+log/*.log
+
+# VSCode
+.vscode

README.md

@@ -31,6 +31,13 @@ sets of configuration values for the server (e.g. which port to listen on), the
 and each service. Each service may define specific configuration, such as which DID methods are enabled for the DID
 service.
 
+Here is the sequence of events on how the SSI-Service consumes it's configuration
+* On startup, the SSI-Service loads default values into the SSIServiceConfig
+* It then checks for a toml config file
+  * If one exists, it loads the toml file
+  * If one does not exist, it uses a default config defined in the code inline
+* Finally, it loads the config/.env file and adds the env variables defined in this file to the final SSIServiceConfig
+
 ## Build & Test
 
 This project uses [mage](https://magefile.org/), please

build/docker-compose.yml

@@ -1,4 +1,5 @@
 version: "3.98"
+
 services:
   web:
     build:
@@ -10,8 +11,11 @@ services:
       - JAEGER_HTTP_URL=http://jaeger:14268/api/traces
     depends_on:
       - jaeger
+      - redis
     volumes:
       - ../config/compose.toml:/app/config/config.toml
+    networks:
+      - ssi_network
   swagger-ui:
     build:
       context: ../
@@ -29,9 +33,22 @@ services:
       - "8081:8501"
     depends_on:
       - web
+    networks:
+      - ssi_network
   jaeger:
     image: jaegertracing/all-in-one:latest
     ports:
       - "6831:6831/udp"
       - "16686:16686"
-      - "14268:14268"
+      - "14268:14268"
+  redis:
+    image: redis:alpine
+    environment:
+      - ALLOW_EMPTY_PASSWORD=yes
+    # This allows for data to not be persisted on new runs
+    command: [sh, -c, "rm -f /data/dump.rdb && redis-server --save ''"]
+    networks:
+      - ssi_network
+
+networks:
+  ssi_network:

cmd/main.go

@@ -9,6 +9,7 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/TBD54566975/ssi-sdk/schema"
 	"github.com/ardanlabs/conf"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
@@ -80,6 +81,20 @@ func run() error {
 		defer file.Close()
 	}
 
+	// set up schema caching based on config
+	if cfg.Server.EnableSchemaCaching {
+		localSchemas, err := schema.GetAllLocalSchemas()
+		if err != nil {
+			logrus.WithError(err).Error("could not load local schemas")
+		} else {
+			cl, err := schema.NewCachingLoader(localSchemas)
+			if err != nil {
+				logrus.WithError(err).Error("could not create caching loader")
+			}
+			cl.EnableHTTPCache()
+		}
+	}
+
 	expvar.NewString("build").Set(cfg.Version.SVN)
 
 	logrus.Infof("main: Started : Service initializing : version %q", cfg.Version.SVN)
@@ -125,7 +140,7 @@ func run() error {
 	}()
 
 	select {
-	case err := <-serverErrors:
+	case err = <-serverErrors:
 		return errors.Wrap(err, "server error")
 	case sig := <-shutdown:
 		logrus.Infof("main: shutdown signal received -> %v", sig)
@@ -138,8 +153,10 @@ func run() error {
 			logrus.Errorf("main: failed to shutdown tracer: %s", err)
 		}
 
-		if err := api.Shutdown(ctx); err != nil {
-			api.Close()
+		if err = api.Shutdown(ctx); err != nil {
+			if err = api.Close(); err != nil {
+				return err
+			}
 			return errors.Wrap(err, "main: failed to stop server gracefully")
 		}
 	}

config/.env.example

@@ -0,0 +1,2 @@
+KEYSTORE_PASSWORD=default-keystore-password
+DB_PASSWORD=default-db-password

config/compose.toml

@@ -19,9 +19,12 @@ log_location = "logs"
 # options: trace, debug, info, warning, error, fatal, panic
 log_level = "info"
 
+enable_schema_caching = true
+
+# Bolt Configuration
 [services]
-storage = "bolt"
 service_endpoint = "http://localhost:8080"
+storage = "bolt"
 
 # per-service configuration
 [services.keystore]