From 3ef815ee6d6c47e19e7d1a584a68a0acc7ff20ea Mon Sep 17 00:00:00 2001 From: Joachim Van Herwegen Date: Mon, 31 May 2021 10:19:44 +0200 Subject: [PATCH] refactor: Move pod config to identity folder --- config/default.json | 2 +- config/dynamic.json | 2 +- config/file.json | 2 +- config/identity/README.md | 6 ++++++ config/{pod/handler => identity/pod}/dynamic.json | 4 ++-- .../pod}/pod-generators/templated.json | 0 .../pod}/resource-generators/templated.json | 0 config/{pod/handler => identity/pod}/static.json | 2 +- config/memory-subdomains.json | 2 +- config/path-routing.json | 2 +- config/pod/README.md | 9 --------- config/sparql-endpoint.json | 2 +- test/integration/config/server-dynamic-unsafe.json | 2 +- test/integration/config/server-memory.json | 2 +- test/integration/config/server-subdomains-unsafe.json | 2 +- test/integration/config/server-without-auth.json | 1 - 16 files changed, 18 insertions(+), 22 deletions(-) rename config/{pod/handler => identity/pod}/dynamic.json (94%) rename config/{pod/handler => identity/pod}/pod-generators/templated.json (100%) rename config/{pod/handler => identity/pod}/resource-generators/templated.json (100%) rename config/{pod/handler => identity/pod}/static.json (88%) delete mode 100644 config/pod/README.md diff --git a/config/default.json b/config/default.json index 9a7001177..94de69f3b 100644 --- a/config/default.json +++ b/config/default.json @@ -8,6 +8,7 @@ "files-scs:config/identity/email/default.json", "files-scs:config/identity/handler/default.json", "files-scs:config/identity/ownership/token.json", + "files-scs:config/identity/pod/static.json", "files-scs:config/init/handler/default.json", "files-scs:config/ldp/authentication/dpop-bearer.json", "files-scs:config/ldp/authorization/webacl.json", @@ -15,7 +16,6 @@ "files-scs:config/ldp/metadata-parser/default.json", "files-scs:config/ldp/metadata-writer/default.json", "files-scs:config/ldp/permissions/acl.json", - "files-scs:config/pod/handler/static.json", "files-scs:config/storage/key-value/memory.json", "files-scs:config/storage/resource-store/memory.json", "files-scs:config/util/auxiliary/acl.json", diff --git a/config/dynamic.json b/config/dynamic.json index 00184da31..ea70123b2 100644 --- a/config/dynamic.json +++ b/config/dynamic.json @@ -8,6 +8,7 @@ "files-scs:config/identity/email/default.json", "files-scs:config/identity/handler/default.json", "files-scs:config/identity/ownership/token.json", + "files-scs:config/identity/pod/dynamic.json", "files-scs:config/init/handler/default.json", "files-scs:config/ldp/authentication/dpop-bearer.json", "files-scs:config/ldp/authorization/webacl.json", @@ -15,7 +16,6 @@ "files-scs:config/ldp/metadata-parser/default.json", "files-scs:config/ldp/metadata-writer/default.json", "files-scs:config/ldp/permissions/acl.json", - "files-scs:config/pod/handler/dynamic.json", "files-scs:config/storage/key-value/memory.json", "files-scs:config/storage/resource-store/dynamic.json", "files-scs:config/util/auxiliary/acl.json", diff --git a/config/file.json b/config/file.json index 3c1559084..0b1419e89 100644 --- a/config/file.json +++ b/config/file.json @@ -8,6 +8,7 @@ "files-scs:config/identity/email/default.json", "files-scs:config/identity/handler/default.json", "files-scs:config/identity/ownership/token.json", + "files-scs:config/identity/pod/static.json", "files-scs:config/init/handler/default.json", "files-scs:config/ldp/authentication/dpop-bearer.json", "files-scs:config/ldp/authorization/webacl.json", @@ -15,7 +16,6 @@ "files-scs:config/ldp/metadata-parser/default.json", "files-scs:config/ldp/metadata-writer/default.json", "files-scs:config/ldp/permissions/acl.json", - "files-scs:config/pod/handler/static.json", "files-scs:config/storage/key-value/memory.json", "files-scs:config/storage/resource-store/file.json", "files-scs:config/util/auxiliary/acl.json", diff --git a/config/identity/README.md b/config/identity/README.md index 6cdb6c1c8..12ff67e96 100644 --- a/config/identity/README.md +++ b/config/identity/README.md @@ -17,3 +17,9 @@ Contains everything needed for setting up the Identity Provider. Which technique to use to determine if a requesting agent owns a WebID. * *token*: A token needs to added to the WebID to prove ownership. * *unsafe-no-check*: No verification is done, the agent is always believed. + +## Pod +What to use for pod creation. +* *dynamic*: Every created pod has its own Components.js config for its ResourceStore, + which can differ from the others. +* *static*: All pod data is stored in separate containers in the same ResourceStore. diff --git a/config/pod/handler/dynamic.json b/config/identity/pod/dynamic.json similarity index 94% rename from config/pod/handler/dynamic.json rename to config/identity/pod/dynamic.json index fb0bdfe48..c4051e557 100644 --- a/config/pod/handler/dynamic.json +++ b/config/identity/pod/dynamic.json @@ -1,8 +1,8 @@ { "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^0.0.0/components/context.jsonld", "import": [ - "files-scs:config/pod/handler/pod-generators/templated.json", - "files-scs:config/pod/handler/resource-generators/templated.json" + "files-scs:config/identity/pod/pod-generators/templated.json", + "files-scs:config/identity/pod/resource-generators/templated.json" ], "comment": "Besides the PodManager, also exports a RouterRule that will need to be added to a RoutingStore.", "@graph": [ diff --git a/config/pod/handler/pod-generators/templated.json b/config/identity/pod/pod-generators/templated.json similarity index 100% rename from config/pod/handler/pod-generators/templated.json rename to config/identity/pod/pod-generators/templated.json diff --git a/config/pod/handler/resource-generators/templated.json b/config/identity/pod/resource-generators/templated.json similarity index 100% rename from config/pod/handler/resource-generators/templated.json rename to config/identity/pod/resource-generators/templated.json diff --git a/config/pod/handler/static.json b/config/identity/pod/static.json similarity index 88% rename from config/pod/handler/static.json rename to config/identity/pod/static.json index d9a50f4e7..356872ccd 100644 --- a/config/pod/handler/static.json +++ b/config/identity/pod/static.json @@ -1,7 +1,7 @@ { "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^0.0.0/components/context.jsonld", "import": [ - "files-scs:config/pod/handler/resource-generators/templated.json" + "files-scs:config/identity/pod/resource-generators/templated.json" ], "@graph": [ { diff --git a/config/memory-subdomains.json b/config/memory-subdomains.json index 86ef7f2c8..2b4ca9e33 100644 --- a/config/memory-subdomains.json +++ b/config/memory-subdomains.json @@ -8,6 +8,7 @@ "files-scs:config/identity/email/default.json", "files-scs:config/identity/handler/default.json", "files-scs:config/identity/ownership/token.json", + "files-scs:config/identity/pod/static.json", "files-scs:config/init/handler/default.json", "files-scs:config/ldp/authentication/dpop-bearer.json", "files-scs:config/ldp/authorization/webacl.json", @@ -15,7 +16,6 @@ "files-scs:config/ldp/metadata-parser/default.json", "files-scs:config/ldp/metadata-writer/default.json", "files-scs:config/ldp/permissions/acl.json", - "files-scs:config/pod/handler/static.json", "files-scs:config/storage/key-value/memory.json", "files-scs:config/storage/resource-store/memory.json", "files-scs:config/util/auxiliary/acl.json", diff --git a/config/path-routing.json b/config/path-routing.json index d095c973f..b94f4df9e 100644 --- a/config/path-routing.json +++ b/config/path-routing.json @@ -8,6 +8,7 @@ "files-scs:config/identity/email/default.json", "files-scs:config/identity/handler/default.json", "files-scs:config/identity/ownership/token.json", + "files-scs:config/identity/pod/static.json", "files-scs:config/init/handler/default.json", "files-scs:config/ldp/authentication/dpop-bearer.json", "files-scs:config/ldp/authorization/webacl.json", @@ -15,7 +16,6 @@ "files-scs:config/ldp/metadata-parser/default.json", "files-scs:config/ldp/metadata-writer/default.json", "files-scs:config/ldp/permissions/acl.json", - "files-scs:config/pod/handler/static.json", "files-scs:config/storage/key-value/memory.json", "files-scs:config/storage/resource-store/regex.json", "files-scs:config/util/auxiliary/acl.json", diff --git a/config/pod/README.md b/config/pod/README.md deleted file mode 100644 index 381c8e5b3..000000000 --- a/config/pod/README.md +++ /dev/null @@ -1,9 +0,0 @@ -# Pod -Options related to pod provisioning. - -## Handler -What to use for pod creation. This covers several features -and is a bit more extensive than many other options. -* *dynamic*: Every created pod has its own components.js config for its ResourceStore, - which can differ from the others. -* *static*: All pod data is stored in separate containers in the same ResourceStore. diff --git a/config/sparql-endpoint.json b/config/sparql-endpoint.json index d2e773584..8149a9351 100644 --- a/config/sparql-endpoint.json +++ b/config/sparql-endpoint.json @@ -8,6 +8,7 @@ "files-scs:config/identity/email/default.json", "files-scs:config/identity/handler/default.json", "files-scs:config/identity/ownership/token.json", + "files-scs:config/identity/pod/static.json", "files-scs:config/init/handler/default.json", "files-scs:config/ldp/authentication/dpop-bearer.json", "files-scs:config/ldp/authorization/webacl.json", @@ -15,7 +16,6 @@ "files-scs:config/ldp/metadata-parser/default.json", "files-scs:config/ldp/metadata-writer/default.json", "files-scs:config/ldp/permissions/acl.json", - "files-scs:config/pod/handler/static.json", "files-scs:config/storage/key-value/memory.json", "files-scs:config/storage/resource-store/sparql.json", "files-scs:config/util/auxiliary/acl.json", diff --git a/test/integration/config/server-dynamic-unsafe.json b/test/integration/config/server-dynamic-unsafe.json index 5c5f6eb39..f7bf4acd8 100644 --- a/test/integration/config/server-dynamic-unsafe.json +++ b/test/integration/config/server-dynamic-unsafe.json @@ -8,6 +8,7 @@ "files-scs:config/identity/email/default.json", "files-scs:config/identity/handler/default.json", "files-scs:config/identity/ownership/unsafe-no-check.json", + "files-scs:config/identity/pod/dynamic.json", "files-scs:config/init/handler/default.json", "files-scs:config/ldp/authentication/debug-auth-header.json", "files-scs:config/ldp/authorization/webacl.json", @@ -15,7 +16,6 @@ "files-scs:config/ldp/metadata-parser/default.json", "files-scs:config/ldp/metadata-writer/default.json", "files-scs:config/ldp/permissions/acl.json", - "files-scs:config/pod/handler/dynamic.json", "files-scs:config/storage/key-value/memory.json", "files-scs:config/storage/resource-store/dynamic.json", "files-scs:config/util/auxiliary/acl.json", diff --git a/test/integration/config/server-memory.json b/test/integration/config/server-memory.json index e1d2ee74e..1c4adb500 100644 --- a/test/integration/config/server-memory.json +++ b/test/integration/config/server-memory.json @@ -7,6 +7,7 @@ "files-scs:config/http/static/default.json", "files-scs:config/identity/handler/default.json", "files-scs:config/identity/ownership/token.json", + "files-scs:config/identity/pod/static.json", "files-scs:config/init/handler/default.json", "files-scs:config/ldp/authentication/dpop-bearer.json", "files-scs:config/ldp/authorization/webacl.json", @@ -14,7 +15,6 @@ "files-scs:config/ldp/metadata-parser/default.json", "files-scs:config/ldp/metadata-writer/default.json", "files-scs:config/ldp/permissions/acl.json", - "files-scs:config/pod/handler/static.json", "files-scs:config/storage/key-value/memory.json", "files-scs:config/storage/resource-store/memory.json", "files-scs:config/util/auxiliary/acl.json", diff --git a/test/integration/config/server-subdomains-unsafe.json b/test/integration/config/server-subdomains-unsafe.json index a5a744cd1..24ef6e904 100644 --- a/test/integration/config/server-subdomains-unsafe.json +++ b/test/integration/config/server-subdomains-unsafe.json @@ -8,6 +8,7 @@ "files-scs:config/identity/email/default.json", "files-scs:config/identity/handler/default.json", "files-scs:config/identity/ownership/unsafe-no-check.json", + "files-scs:config/identity/pod/static.json", "files-scs:config/init/handler/default.json", "files-scs:config/ldp/authentication/debug-auth-header.json", "files-scs:config/ldp/authorization/webacl.json", @@ -15,7 +16,6 @@ "files-scs:config/ldp/metadata-parser/default.json", "files-scs:config/ldp/metadata-writer/default.json", "files-scs:config/ldp/permissions/acl.json", - "files-scs:config/pod/handler/static.json", "files-scs:config/storage/key-value/memory.json", "files-scs:config/util/auxiliary/acl.json", "files-scs:config/util/identifiers/subdomain.json", diff --git a/test/integration/config/server-without-auth.json b/test/integration/config/server-without-auth.json index 320f43e72..959c0c4ab 100644 --- a/test/integration/config/server-without-auth.json +++ b/test/integration/config/server-without-auth.json @@ -12,7 +12,6 @@ "files-scs:config/ldp/metadata-parser/default.json", "files-scs:config/ldp/metadata-writer/default.json", "files-scs:config/ldp/permissions/acl.json", - "files-scs:config/pod/handler/static.json", "files-scs:config/storage/key-value/memory.json", "files-scs:config/storage/resource-store/memory.json", "files-scs:config/util/auxiliary/acl.json",