Minor fixes

airenas · Feb 19, 2021 · a3a9caa · a3a9caa
1 parent 7bf48a8
commit a3a9caa
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/cmd/doorman-admin/main.go b/cmd/doorman-admin/main.go
@@ -41,6 +41,8 @@ func main() {
 		log.Fatal(errors.Wrap(err, "Can't init project validator"))
 	}
 
+	printBanner()
+
 	err = admin.StartWebServer(&data)
 	if err != nil {
 		log.Fatal(errors.Wrap(err, "Can't start the service"))

diff --git a/examples/docker-compose/.env b/examples/docker-compose/.env
@@ -2,10 +2,10 @@ MONGO_USER=list
 MONGO_PASS=EiviejaFai5ohsheir6O
 MONGO_URL=mongodb://list:EiviejaFai5ohsheir6O@mongo:27017
 
-DOORMAN_VERSION=0.3.138
+DOORMAN_VERSION=0.4.144
 DOORMAN_PORT=8000
 
-ADMIN_VERSION=0.2.135
+ADMIN_VERSION=0.2.144
 ADMIN_PORT=8001
 
 TEST_API_VERSION=0.9.85

diff --git a/examples/docker-compose/docker-compose.yml b/examples/docker-compose/docker-compose.yml
@@ -7,7 +7,7 @@ services:
       - "${DOORMAN_PORT}:8000"
     environment:
       MONGO_URL: "${MONGO_URL}"  
-      PROXY_HANDLERS: "test,default"
+      PROXY_HANDLERS: "test,test2,default"
       PROXY_DEFAULT_BACKEND: "http://test-api:8000/"
       PROXY_TEST_TYPE: quota
       PROXY_TEST_DB: test
@@ -16,6 +16,12 @@ services:
       PROXY_TEST_QUOTA_TYPE: "json"
       PROXY_TEST_QUOTA_FIELD: "text"
       PROXY_TEST_QUOTA_DEFAULT: 100
+      PROXY_TEST2_TYPE: simple
+      PROXY_TEST2_DB: test
+      PROXY_TEST2_BACKEND: "http://test-api:8000/"
+      PROXY_TEST2_PREFIXURL: "/simple/public"
+      PROXY_TEST2_STRIPPREFIX: "/simple"
+      PROXY_TEST2_QUOTA_DEFAULT: 100
     # restart: unless-stopped
 
   doorman-admin:

diff --git a/internal/pkg/service/handlers.go b/internal/pkg/service/handlers.go
@@ -160,7 +160,7 @@ func newQuotaHandler(name string, cfg *viper.Viper, ms *mongodb.SessionProvider)
 		}
 	} else {
 		if qt != "" {
-			return nil, errors.Errorf("Quat not expected for type simple")
+			return nil, errors.Errorf("Quota is not expected for type simple")
 		}
 		goapp.Log.Infof("No quota validation")
 	}