Make storage-registry rules in toml more readable (#1648)

cs3org · Apr 20, 2021 · 0cb297c · 0cb297c
1 parent 3de7ce4
commit 0cb297c
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 36 deletions.
diff --git a/examples/oc-phoenix/gateway.toml b/examples/oc-phoenix/gateway.toml
@@ -48,16 +48,15 @@ driver = "static"
 [grpc.services.storageregistry.drivers.static]
 home_provider = "/home"
 
+[grpc.services.storageregistry.drivers.static.rules]
+
 # mount a home storage provider that uses a context based path wrapper
 # to jail users into their home dir
-[grpc.services.storageregistry.drivers.static.rules."/home"]
-address = "localhost:12000"
+"/home" = {"address" = "localhost:12000"}
 
 # mount a storage provider without a path wrapper for direct access to users.
-[grpc.services.storageregistry.drivers.static.rules."/oc"]
-address = "localhost:11000"
-[grpc.services.storageregistry.drivers.static.rules."123e4567-e89b-12d3-a456-426655440000"]
-address = "localhost:11000"
+"/oc" = {"address" = "localhost:11000"}
+"123e4567-e89b-12d3-a456-426655440000" = {"address" = "localhost:11000"}
 # another mount point might be "/projects/"
 
 [http]

diff --git a/examples/ocmd/ocmd-server-1.toml b/examples/ocmd/ocmd-server-1.toml
@@ -33,10 +33,9 @@ driver = "static"
 [grpc.services.storageregistry.drivers.static]
 home_provider = "/home"
 
-[grpc.services.storageregistry.drivers.static.rules."/home"]
-address = "localhost:19000"
-[grpc.services.storageregistry.drivers.static.rules."123e4567-e89b-12d3-a456-426655440000"]
-address = "localhost:19000"
+[grpc.services.storageregistry.drivers.static.rules]
+"/home" = {"address" = "localhost:19000"}
+"123e4567-e89b-12d3-a456-426655440000" = {"address" = "localhost:19000"}
 
 [grpc.services.usershareprovider]
 driver = "memory"

diff --git a/examples/ocmd/ocmd-server-2.toml b/examples/ocmd/ocmd-server-2.toml
@@ -31,10 +31,9 @@ driver = "static"
 [grpc.services.storageregistry.drivers.static]
 home_provider = "/home"
 
-[grpc.services.storageregistry.drivers.static.rules."/home"]
-address = "localhost:17000"
-[grpc.services.storageregistry.drivers.static.rules."123e4567-e89b-12d3-a456-426655440000"]
-address = "localhost:17000"
+[grpc.services.storageregistry.drivers.static.rules]
+"/home" = {"address" = "localhost:17000"}
+"123e4567-e89b-12d3-a456-426655440000" = {"address" = "localhost:17000"}
 
 [grpc.services.usershareprovider]
 driver = "memory"

diff --git a/examples/storage-references/gateway.toml b/examples/storage-references/gateway.toml
@@ -6,12 +6,10 @@ commit_share_to_storage_ref = true
 [grpc.services.storageregistry]
 [grpc.services.storageregistry.drivers.static]
 home_provider = "/home"
-[grpc.services.storageregistry.drivers.static.rules."/home"]
-address = "localhost:17000"
-[grpc.services.storageregistry.drivers.static.rules."/reva"]
-address = "localhost:18000"
-[grpc.services.storageregistry.drivers.static.rules."123e4567-e89b-12d3-a456-426655440000"]
-address = "localhost:18000"
+[grpc.services.storageregistry.drivers.static.rules]
+"/home" = {"address" = "localhost:17000"}
+"/reva" = {"address" = "localhost:18000"}
+"123e4567-e89b-12d3-a456-426655440000" = {"address" = "localhost:18000"}
 
 [grpc.services.authprovider]
 [grpc.services.authregistry]

diff --git a/tests/oc-integration-tests/drone/gateway.toml b/tests/oc-integration-tests/drone/gateway.toml
@@ -53,20 +53,18 @@ driver = "static"
 [grpc.services.storageregistry.drivers.static]
 home_provider = "/home"
 
+[grpc.services.storageregistry.drivers.static.rules]
+
 # mount a home storage provider that uses a context based path wrapper
 # to jail users into their home dir
-[grpc.services.storageregistry.drivers.static.rules."/home"]
-address = "localhost:12000"
+"/home" = {"address" = "localhost:12000"}
 
 # mount a storage provider without a path wrapper for direct access to users.
-[grpc.services.storageregistry.drivers.static.rules."/oc"]
-address = "localhost:11000"
-[grpc.services.storageregistry.drivers.static.rules."123e4567-e89b-12d3-a456-426655440000"]
-address = "localhost:11000"
+"/oc" = {"address" = "localhost:11000"}
+"123e4567-e89b-12d3-a456-426655440000" = {"address" = "localhost:11000"}
 # another mount point might be "/projects/"
 
-[grpc.services.storageregistry.drivers.static.rules."/public"]
-address = "localhost:13000"
+"/public" = {"address" = "localhost:13000"}
 
 [http]
 address = "0.0.0.0:19001"

diff --git a/tests/oc-integration-tests/local/gateway.toml b/tests/oc-integration-tests/local/gateway.toml
@@ -53,20 +53,18 @@ driver = "static"
 [grpc.services.storageregistry.drivers.static]
 home_provider = "/home"
 
+[grpc.services.storageregistry.drivers.static.rules]
+
 # mount a home storage provider that uses a context based path wrapper
 # to jail users into their home dir
-[grpc.services.storageregistry.drivers.static.rules."/home"]
-address = "localhost:12000"
+"/home" = {"address" = "localhost:12000"}
 
 # mount a storage provider without a path wrapper for direct access to users.
-[grpc.services.storageregistry.drivers.static.rules."/oc"]
-address = "localhost:11000"
-[grpc.services.storageregistry.drivers.static.rules."123e4567-e89b-12d3-a456-426655440000"]
-address = "localhost:11000"
+"/oc" = {"address" = "localhost:11000"}
+"123e4567-e89b-12d3-a456-426655440000" = {"address" = "localhost:11000"}
 # another mount point might be "/projects/"
 
-[grpc.services.storageregistry.drivers.static.rules."/public"]
-address = "localhost:13000"
+"/public" = {"address" = "localhost:13000"}
 
 [http]
 address = "0.0.0.0:19001"