Merge pull request #3 from containerum/develop

Develop

Author: MargoTuleninova

charts/api-gateway/env/routes/bill.toml

@@ -97,3 +97,13 @@ upstream = "http://billing-manager.web.svc:5005"
 listen = "/isp/coupon/apply"
 strip = false
 group = "billing-manager"
+
+[routes.paypal_payment]
+active = true
+name = "Paypal payment"
+method = "POST"
+roles = ["*"]
+upstream = "http://billing-manager.web.svc:5005"
+listen = "/isp/paypal"
+strip = false
+group = "billing-manager"

charts/api-gateway/env/routes/nodemetrics.toml

@@ -0,0 +1,19 @@
+[routes.current_memory]
+active = true
+name = "Get current memory"
+method = "GET"
+roles = ["*"]
+upstream = "http://nodemetrics:7777"
+listen = "/memory/current"
+strip = false
+group = "nodemetrics"
+
+[routes.current_cpu]
+active = true
+name = "Get current cpu"
+method = "GET"
+roles = ["*"]
+upstream = "http://nodemetrics:7777"
+listen = "/cpu/current"
+strip = false
+group = "nodemetrics"

charts/api-gateway/env/routes/permissions.toml

@@ -116,4 +116,34 @@ roles = ["*"]
 upstream = "http://permissions:4242"
 listen = "/namespaces/:namespace"
 strip = false
+group = "permissions"
+
+[routes.project_group_add]
+active = true
+name = "Add group to namespace"
+method = "POST"
+roles = ["admin"]
+upstream = "http://permissions:4242"
+listen = "/namespaces/:namespace/groups"
+strip = false
+group = "permissions"
+
+[routes.project_groups_get]
+active = true
+name = "Get project groups"
+method = "GET"
+roles = ["admin"]
+upstream = "http://permissions:4242"
+listen = "/namespaces/:namespace/groups"
+strip = false
+group = "permissions"
+
+[routes.project_group_delete]
+active = true
+name = "Delete group from project"
+method = "GET"
+roles = ["admin"]
+upstream = "http://permissions:4242"
+listen = "/namespaces/:namespace/groups/:group"
+strip = false
 group = "permissions"

charts/api-gateway/env/routes/resource.toml

@@ -187,3 +187,33 @@ upstream = "http://resource:1213"
 listen = "/namespaces/:namespace/services/:service"
 strip = false
 group = "resource-service"
+
+[routes.domain_create]
+active = true
+name = "Create Domain"
+method = "POST"
+roles = ["*"]
+upstream = "http://resource:1213"
+listen = "/domains"
+strip = false
+group = "resource-service"
+
+[routes.domain_list_get]
+active = true
+name = "Get Domain list"
+method = "GET"
+roles = ["*"]
+upstream = "http://resource:1213"
+listen = "/domains"
+strip = false
+group = "resource-service"
+
+[routes.domain_delete]
+active = true
+name = "Delete Domain"
+method = "DELETE"
+roles = ["*"]
+upstream = "http://resource:1213"
+listen = "/domains/:domain"
+strip = false
+group = "resource-service"

charts/api-gateway/env/routes/routes.toml

@@ -18,3 +18,4 @@
 
 #include "routes/mail.toml"
 
+#include "routes/nodemetrics.toml"

charts/api-gateway/env/routes/user.toml

@@ -61,7 +61,7 @@ name = "Admin Reset Password"
 method = "POST"
 roles = ["admin"]
 upstream = "http://user-manager:8111"
-listen = "/admin/password/reset"
+listen = "/admin/user/password/reset"
 strip = false
 group = "user"
 
@@ -75,6 +75,16 @@ listen = "/admin/user"
 strip = false
 group = "user"
 
+[routes.admin_unset]
+active = true
+name = "Admin Unset admin"
+method = "DELETE"
+roles = ["admin"]
+upstream = "http://user-manager:8111"
+listen = "/admin/user"
+strip = false
+group = "user"
+
 [routes.activate]
 active = true
 name = "Activate"
@@ -122,6 +132,16 @@ listen = "/user/info"
 strip = false
 group = "user"
 
+[routes.profile_get_by_login]
+active = true
+name = "Get Profile by login"
+method = "GET"
+roles = ["admin"]
+upstream = "http://user-manager:8111"
+listen = "/user/info/login/:login"
+strip = false
+group = "user"
+
 [routes.password_change]
 active = true
 name = "Password Change"
@@ -142,6 +162,16 @@ listen = "/user/delete/partial"
 strip = false
 group = "user"
 
+[routes.user_delete_admin]
+active = true
+name = "Admin delete user"
+method = "POST"
+roles = ["admin"]
+upstream = "http://user-manager:8111"
+listen = "/user/delete/complete"
+strip = false
+group = "user"
+
 [routes.user_list_get]
 active = true
 name = "Get user list"
@@ -220,4 +250,4 @@ roles = ["*"]
 upstream = "http://user-manager:8111"
 listen = "/groups/:group"
 strip = false
-group = "user"
+group = "user"

charts/api-gateway/values.yaml

@@ -32,6 +32,8 @@ routes:
   path: env/routes/solutions.toml
 - name: mail.toml
   path: env/routes/mail.toml
+- name: nodemetrics.toml
+  path: env/routes/nodemetrics.toml
 
 config: env/config.toml