From b2ac10e925a3c757a27c8d1a07745a4b798dc6a6 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Fri, 25 Mar 2022 14:26:24 +0100 Subject: [PATCH 01/13] update lico to get libregraph/lico#32 --- go.mod | 5 ++--- go.sum | 24 ++++-------------------- 2 files changed, 6 insertions(+), 23 deletions(-) diff --git a/go.mod b/go.mod index 3191b4b510..2d97f79a0d 100644 --- a/go.mod +++ b/go.mod @@ -42,7 +42,7 @@ require ( github.com/iancoleman/strcase v0.2.0 github.com/justinas/alice v1.2.0 github.com/libregraph/idm v0.3.1-0.20220315094434-e9a5cff3dd05 - github.com/libregraph/lico v0.54.0 + github.com/libregraph/lico v0.54.1-0.20220325072321-31efc3995d63 github.com/mennanov/fieldmask-utils v0.5.0 github.com/mitchellh/mapstructure v1.4.3 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 @@ -231,7 +231,6 @@ require ( github.com/rs/xid v1.3.0 // indirect github.com/russellhaering/goxmldsig v1.1.1 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect - github.com/satori/go.uuid v1.2.0 // indirect github.com/sciencemesh/meshdirectory-web v1.0.4 // indirect github.com/sergi/go-diff v1.2.0 // indirect github.com/sethvargo/go-password v0.2.0 // indirect @@ -257,7 +256,7 @@ require ( golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 // indirect golang.org/x/text v0.3.7 // indirect - golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect + golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 // indirect golang.org/x/tools v0.1.8 // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect google.golang.org/appengine v1.6.7 // indirect diff --git a/go.sum b/go.sum index af6cdc79d0..04cdeb0a58 100644 --- a/go.sum +++ b/go.sum @@ -216,7 +216,6 @@ github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edY github.com/bits-and-blooms/bitset v1.2.1 h1:M+/hrU9xlMp7t4TyTDQW97d3tRPVuKFC6zBEK16QnXY= github.com/bits-and-blooms/bitset v1.2.1/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= -github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= github.com/blevesearch/bleve/v2 v2.3.2 h1:BJUnMhi2nrkl+vboHmKfW+9l+tJSj39HeWa5c3BN3/Y= github.com/blevesearch/bleve/v2 v2.3.2/go.mod h1:96+xE5pZUOsr3Y4vHzV1cBC837xZCpwLlX0hrrxnvIg= github.com/blevesearch/bleve_index_api v1.0.1 h1:nx9++0hnyiGOHJwQQYfsUGzpRdEVE5LsylmmngQvaFk= @@ -347,7 +346,6 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dchest/uniuri v0.0.0-20200228104902-7aecb25e1fe5/go.mod h1:GgB8SF9nRG+GqaDtLcwJZsQFhcogVCJ79j4EdT0c2V4= -github.com/deckarep/golang-set v1.7.1/go.mod h1:93vsz/8Wt4joVM7c2AVqh+YRMiUSc14yDtF28KmMOgQ= github.com/deckarep/golang-set v1.8.0 h1:sk9/l/KqpunDwP7pSjUg0keiOOLEnOBHzykLrsPppp4= github.com/deckarep/golang-set v1.8.0/go.mod h1:5nI87KwE7wgsBU1F4GKAw2Qod7p5kyS383rP6+o6qqo= github.com/deepmap/oapi-codegen v1.3.11/go.mod h1:suMvK7+rKlx3+tpa8ByptmvoXbAV70wERKTOGH3hLp0= @@ -923,8 +921,8 @@ github.com/leodido/go-urn v1.1.0/go.mod h1:+cyI34gQWZcE1eQU7NVgKkkzdXDQHr1dBMtdA github.com/lib/pq v1.10.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/libregraph/idm v0.3.1-0.20220315094434-e9a5cff3dd05 h1:/I4f6c7ZGw16oTBAyhCD9Tf+arBHGvmxL9Drs/KRkRc= github.com/libregraph/idm v0.3.1-0.20220315094434-e9a5cff3dd05/go.mod h1:YQ21AOfZPcCZWX1uJYULZ8hNdrmxStg6egvXaS+ZvOM= -github.com/libregraph/lico v0.54.0 h1:mb8qz/mq0yqLn2Wueq24mDQI4FrIeuHx/R/61NeS8t4= -github.com/libregraph/lico v0.54.0/go.mod h1:za0xPSxnQDEB2XsFxmSsDmr/0H89p8fgPp32DoX0VMQ= +github.com/libregraph/lico v0.54.1-0.20220325072321-31efc3995d63 h1:oPqyRePmq+59YF1tAur7WXuM/z/epRd+HGGyPPx2Vv8= +github.com/libregraph/lico v0.54.1-0.20220325072321-31efc3995d63/go.mod h1:KZ4X+bEbOQMSV6iPysZEqVO/Pa5Mvo7xhhcLwUNPjmw= github.com/linode/linodego v0.25.3/go.mod h1:GSBKPpjoQfxEfryoCRcgkuUOCuVtGHWhzI8OMdycNTE= github.com/liquidweb/go-lwApi v0.0.0-20190605172801-52a4864d2738/go.mod h1:0sYF9rMXb0vlG+4SzdiGMXHheCZxjguMq+Zb4S2BfBs= github.com/liquidweb/go-lwApi v0.0.5/go.mod h1:0sYF9rMXb0vlG+4SzdiGMXHheCZxjguMq+Zb4S2BfBs= @@ -937,7 +935,6 @@ github.com/m3o/m3o-go/client v0.0.0-20210421144725-8bfd7992ada3/go.mod h1:vmeaYr github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.4/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= -github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= @@ -1129,7 +1126,6 @@ github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFSt github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= github.com/oracle/oci-go-sdk v24.3.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888= -github.com/orcaman/concurrent-map v0.0.0-20210501183033-44dafcb38ecc/go.mod h1:Lu3tH6HLW3feq74c2GC+jIMS/K2CFcDWnWD9XkenwhI= github.com/orcaman/concurrent-map v1.0.0 h1:I/2A2XPCb4IuQWcQhBhSwGfiuybl/J0ev9HDbW65HOY= github.com/orcaman/concurrent-map v1.0.0/go.mod h1:Lu3tH6HLW3feq74c2GC+jIMS/K2CFcDWnWD9XkenwhI= github.com/ovh/go-ovh v1.1.0/go.mod h1:AxitLZ5HBRPyUd+Zl60Ajaag+rNTdVXWIkzfrVuTXWA= @@ -1147,7 +1143,6 @@ github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/9 github.com/pelletier/go-toml v1.4.0/go.mod h1:PN7xzY2wHTK0K9p34ErDQMlFxa51Fk0OUruD3k1mMwo= github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE= github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc= -github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -1254,8 +1249,6 @@ github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/sacloud/libsacloud v1.36.2/go.mod h1:P7YAOVmnIn3DKHqCZcUKYUXmSwGBm3yS7IBEjKVSrjg= -github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww= -github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20210127161313-bd30bebeac4f/go.mod h1:CJJ5VAbozOl0yEw7nHB9+7BXTJbIn6h7W+f6Gau5IP8= github.com/sciencemesh/meshdirectory-web v1.0.4 h1:1YSctF6PAXhoHUYCaeRTj7rHaF7b3rYrZf2R0VXBIbo= github.com/sciencemesh/meshdirectory-web v1.0.4/go.mod h1:fJSThTS3xf+sTdL0iXQoaQJssLI7tn7DetHMHUl4SRk= @@ -1298,7 +1291,6 @@ github.com/spacewander/go-suffix-tree v0.0.0-20191010040751-0865e368c784/go.mod github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/afero v1.4.1/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= -github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v0.0.1/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= @@ -1306,7 +1298,6 @@ github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKv github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI= -github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk= github.com/spf13/cobra v1.4.0 h1:y+wJpx64xcgO1V+RcnwW0LEHxTKRi2ZDPSBjWnrg88Q= github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= @@ -1320,7 +1311,6 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= -github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= @@ -1427,7 +1417,6 @@ go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQc go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/pkg/v3 v3.5.1 h1:XIQcHCFSG53bJETYeRJtIxdLv2EWRGxcfzR8lSnTH4E= go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= -go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= go.etcd.io/etcd/client/v3 v3.5.0/go.mod h1:AIKXXVX/DQXtfTEqBryiLTUXwON+GuvO6Z7lLS/oTh0= go.etcd.io/etcd/client/v3 v3.5.1 h1:oImGuV5LGKjCqXdjkMHCyWa5OO1gYKCnC/1sgdfj1Uk= go.etcd.io/etcd/client/v3 v3.5.1/go.mod h1:OnjH4M8OnAotwaB2l9bVgZzRFKru7/ZMoS46OtKyd3Q= @@ -1522,7 +1511,6 @@ golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= @@ -1641,7 +1629,6 @@ golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211020060615-d418f374d309/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211111083644-e5c967477495/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= @@ -1659,7 +1646,6 @@ golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210323180902-22b0adad7558/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= @@ -1789,7 +1775,6 @@ golang.org/x/sys v0.0.0-20210917161153-d61c044b1678/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211110154304-99a53858aa08/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1819,10 +1804,10 @@ golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 h1:vVKdlvoWBphwdxWKrFZEuM0kGgGLxUOYcY4U/2Vjg44= golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 h1:M73Iuj3xbbb9Uk1DYhzydthsj6oOd6l9bpuFcNoUvTs= +golang.org/x/time v0.0.0-20220224211638-0e9765cccd65/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -1935,7 +1920,6 @@ google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34q google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= -google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8= google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo= google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4= google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw= From 981bd81fdc2a29c1e329b15a29beff13a1897aa4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Mar 2022 06:18:10 +0000 Subject: [PATCH 02/13] Bump github.com/onsi/gomega from 1.18.1 to 1.19.0 Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.18.1 to 1.19.0. - [Release notes](https://github.com/onsi/gomega/releases) - [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md) - [Commits](https://github.com/onsi/gomega/compare/v1.18.1...v1.19.0) --- updated-dependencies: - dependency-name: github.com/onsi/gomega dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 3191b4b510..b710f74e30 100644 --- a/go.mod +++ b/go.mod @@ -52,7 +52,7 @@ require ( github.com/oklog/run v1.1.0 github.com/olekukonko/tablewriter v0.0.5 github.com/onsi/ginkgo v1.16.5 - github.com/onsi/gomega v1.18.1 + github.com/onsi/gomega v1.19.0 github.com/owncloud/libre-graph-api-go v0.13.1 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.12.1 diff --git a/go.sum b/go.sum index af6cdc79d0..2edcff545e 100644 --- a/go.sum +++ b/go.sum @@ -1110,14 +1110,16 @@ github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108 github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= -github.com/onsi/ginkgo/v2 v2.0.0 h1:CcuG/HvWNkkaqCUpJifQY8z7qEMBJya6aLPx6ftGyjQ= github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= +github.com/onsi/ginkgo/v2 v2.1.3 h1:e/3Cwtogj0HA+25nMP1jCMDIf8RtRYbGwGGuBIFztkc= +github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= -github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE= github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs= +github.com/onsi/gomega v1.19.0 h1:4ieX6qQjPP/BfC3mpsAtIGGlxTWPeA3Inl/7DtXw1tw= +github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= From 5a8ea0331235fcb7e38293fecd1d1f31b983bdea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Mar 2022 06:18:24 +0000 Subject: [PATCH 03/13] Bump github.com/golang-jwt/jwt/v4 from 4.3.0 to 4.4.1 Bumps [github.com/golang-jwt/jwt/v4](https://github.com/golang-jwt/jwt) from 4.3.0 to 4.4.1. - [Release notes](https://github.com/golang-jwt/jwt/releases) - [Changelog](https://github.com/golang-jwt/jwt/blob/main/VERSION_HISTORY.md) - [Commits](https://github.com/golang-jwt/jwt/compare/v4.3.0...v4.4.1) --- updated-dependencies: - dependency-name: github.com/golang-jwt/jwt/v4 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 3191b4b510..fcaca22381 100644 --- a/go.mod +++ b/go.mod @@ -33,7 +33,7 @@ require ( github.com/go-logr/logr v1.2.3 github.com/go-ozzo/ozzo-validation/v4 v4.3.0 github.com/gofrs/uuid v4.2.0+incompatible - github.com/golang-jwt/jwt/v4 v4.3.0 + github.com/golang-jwt/jwt/v4 v4.4.1 github.com/golang/protobuf v1.5.2 github.com/google/uuid v1.3.0 github.com/gookit/config/v2 v2.0.27 diff --git a/go.sum b/go.sum index af6cdc79d0..b0206a5480 100644 --- a/go.sum +++ b/go.sum @@ -617,8 +617,8 @@ github.com/goji/httpauth v0.0.0-20160601135302-2da839ab0f4d/go.mod h1:nnjvkQ9ptG github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= github.com/golang-jwt/jwt/v4 v4.1.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= -github.com/golang-jwt/jwt/v4 v4.3.0 h1:kHL1vqdqWNfATmA0FNMdmZNMyZI1U6O31X4rlIPoBog= -github.com/golang-jwt/jwt/v4 v4.3.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= +github.com/golang-jwt/jwt/v4 v4.4.1 h1:pC5DB52sCeK48Wlb9oPcdhnjkz1TKt1D/P7WKJ0kUcQ= +github.com/golang-jwt/jwt/v4 v4.4.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/glog v1.0.0 h1:nfP3RFugxnNRyKgeWd4oI1nYvXpxrx8ck8ZrcizshdQ= From 3f64fb0cf9f98fb5cf2f07c9f8a4acaf4515fc02 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Mar 2022 10:49:28 +0000 Subject: [PATCH 04/13] Bump github.com/owncloud/libre-graph-api-go from 0.13.1 to 0.13.2 Bumps [github.com/owncloud/libre-graph-api-go](https://github.com/owncloud/libre-graph-api-go) from 0.13.1 to 0.13.2. - [Release notes](https://github.com/owncloud/libre-graph-api-go/releases) - [Commits](https://github.com/owncloud/libre-graph-api-go/compare/v0.13.1...v0.13.2) --- updated-dependencies: - dependency-name: github.com/owncloud/libre-graph-api-go dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 8e3b3869f3..fa4d9cfdda 100644 --- a/go.mod +++ b/go.mod @@ -53,7 +53,7 @@ require ( github.com/olekukonko/tablewriter v0.0.5 github.com/onsi/ginkgo v1.16.5 github.com/onsi/gomega v1.19.0 - github.com/owncloud/libre-graph-api-go v0.13.1 + github.com/owncloud/libre-graph-api-go v0.13.2 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.12.1 github.com/rs/zerolog v1.26.1 diff --git a/go.sum b/go.sum index 8cdeb38c46..7e80b3972f 100644 --- a/go.sum +++ b/go.sum @@ -615,6 +615,7 @@ github.com/goji/httpauth v0.0.0-20160601135302-2da839ab0f4d/go.mod h1:nnjvkQ9ptG github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= github.com/golang-jwt/jwt/v4 v4.1.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= +github.com/golang-jwt/jwt/v4 v4.3.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang-jwt/jwt/v4 v4.4.1 h1:pC5DB52sCeK48Wlb9oPcdhnjkz1TKt1D/P7WKJ0kUcQ= github.com/golang-jwt/jwt/v4 v4.4.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= @@ -1131,8 +1132,8 @@ github.com/oracle/oci-go-sdk v24.3.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35uk github.com/orcaman/concurrent-map v1.0.0 h1:I/2A2XPCb4IuQWcQhBhSwGfiuybl/J0ev9HDbW65HOY= github.com/orcaman/concurrent-map v1.0.0/go.mod h1:Lu3tH6HLW3feq74c2GC+jIMS/K2CFcDWnWD9XkenwhI= github.com/ovh/go-ovh v1.1.0/go.mod h1:AxitLZ5HBRPyUd+Zl60Ajaag+rNTdVXWIkzfrVuTXWA= -github.com/owncloud/libre-graph-api-go v0.13.1 h1:Pdg+3mmYOeKb5Gr+eUHM6L1CpHcEkaNjcBnxTZfm80s= -github.com/owncloud/libre-graph-api-go v0.13.1/go.mod h1:579sFrPP7aP24LZXGPopLfvE+hAka/2DYHk0+Ij+w+U= +github.com/owncloud/libre-graph-api-go v0.13.2 h1:Qv79QuGP6GHGMuA8kwpdGOamSgrauoZGWKwF8vn2GgA= +github.com/owncloud/libre-graph-api-go v0.13.2/go.mod h1:579sFrPP7aP24LZXGPopLfvE+hAka/2DYHk0+Ij+w+U= github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c h1:rp5dCmg/yLR3mgFuSOe4oEnDDmGLROTvMragMUXpTQw= github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c/go.mod h1:X07ZCGwUbLaax7L0S3Tw4hpejzu63ZrrQiUe6W0hcy0= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= From 551e38e21f09a4b48f8de3a3268e684c55cd5866 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Wed, 23 Mar 2022 08:17:44 +0100 Subject: [PATCH 05/13] drop json config support --- ocis-pkg/config/helpers.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/ocis-pkg/config/helpers.go b/ocis-pkg/config/helpers.go index 7da572a35f..eac108963b 100644 --- a/ocis-pkg/config/helpers.go +++ b/ocis-pkg/config/helpers.go @@ -7,7 +7,6 @@ import ( "strings" gofig "github.com/gookit/config/v2" - goojson "github.com/gookit/config/v2/json" gooyaml "github.com/gookit/config/v2/yaml" ) @@ -22,7 +21,6 @@ var ( supportedExtensions = []string{ "yaml", "yml", - "json", } ) @@ -73,7 +71,6 @@ func BindSourcesToStructs(extension string, dst interface{}) (*gofig.Config, err options.DecoderConfig.TagName = "ocisConfig" }) cnf.AddDriver(gooyaml.Driver) - cnf.AddDriver(goojson.Driver) _ = cnf.LoadFiles(sources...) err := cnf.BindStruct("", &dst) From a81ba03d558bdd9ac1fa95cf2dc5413f5bb73065 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Wed, 23 Mar 2022 08:18:03 +0100 Subject: [PATCH 06/13] switch deployment examples to yaml config --- .../oc10_ocis_parallel/config/ocis/proxy.json | 109 ----------------- .../oc10_ocis_parallel/config/ocis/proxy.yaml | 54 +++++++++ .../oc10_ocis_parallel/docker-compose.yml | 3 +- .../ocis_hello/config/ocis/proxy.json | 111 ------------------ .../ocis_hello/config/ocis/proxy.yaml | 55 +++++++++ .../examples/ocis_hello/docker-compose.yml | 2 +- .../config/proxy/proxy.json | 103 ---------------- .../config/proxy/proxy.yaml | 51 ++++++++ .../docker-compose.yml | 2 +- .../examples/ocis_ldap/config/ocis/proxy.json | 95 --------------- .../examples/ocis_ldap/config/ocis/proxy.yaml | 47 ++++++++ .../examples/ocis_ldap/docker-compose.yml | 2 +- 12 files changed, 211 insertions(+), 423 deletions(-) delete mode 100644 deployments/examples/oc10_ocis_parallel/config/ocis/proxy.json create mode 100644 deployments/examples/oc10_ocis_parallel/config/ocis/proxy.yaml delete mode 100644 deployments/examples/ocis_hello/config/ocis/proxy.json create mode 100644 deployments/examples/ocis_hello/config/ocis/proxy.yaml delete mode 100644 deployments/examples/ocis_individual_services/config/proxy/proxy.json create mode 100644 deployments/examples/ocis_individual_services/config/proxy/proxy.yaml delete mode 100644 deployments/examples/ocis_ldap/config/ocis/proxy.json create mode 100644 deployments/examples/ocis_ldap/config/ocis/proxy.yaml diff --git a/deployments/examples/oc10_ocis_parallel/config/ocis/proxy.json b/deployments/examples/oc10_ocis_parallel/config/ocis/proxy.json deleted file mode 100644 index 6333545dac..0000000000 --- a/deployments/examples/oc10_ocis_parallel/config/ocis/proxy.json +++ /dev/null @@ -1,109 +0,0 @@ -{ - "log": { - "level": "PROXY_LOG_LEVEL" - }, - "policy_selector": { - "claims": { - "default_policy": "oc10", - "unauthenticated_policy": "oc10" - } - }, - "policies": [ - { - "name": "ocis", - "routes": [ - { - "endpoint": "/", - "backend": "http://localhost:9100" - }, - { - "endpoint": "/.well-known/", - "backend": "http://localhost:9130" - }, - { - "type": "regex", - "endpoint": "/ocs/v[12].php/cloud/user/signing-key", - "backend": "http://localhost:9110" - }, - { - "endpoint": "/ocs/", - "backend": "http://localhost:9140" - }, - { - "type": "query", - "endpoint": "/remote.php/?preview=1", - "backend": "http://localhost:9115" - }, - { - "endpoint": "/remote.php/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/dav/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/webdav/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/status.php", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/index.php/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/index.php/login", - "backend": "http://localhost:9100" - }, - { - "endpoint": "/login", - "backend": "http://localhost:9100" - }, - { - "endpoint": "/data", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/graph/", - "backend": "http://localhost:9120" - }, - { - "endpoint": "/app/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/archiver", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/graph-explorer/", - "backend": "http://localhost:9135" - }, - { - "endpoint": "/api/v0/settings", - "backend": "http://localhost:9190" - }, - { - "endpoint": "/settings.js", - "backend": "http://localhost:9190" - } - ] - }, - { - "name": "oc10", - "routes": [ - { - "endpoint": "/", - "backend": "http://oc10:8080" - }, - { - "endpoint": "/data", - "backend": "http://localhost:9140" - } - ] - } - ] -} diff --git a/deployments/examples/oc10_ocis_parallel/config/ocis/proxy.yaml b/deployments/examples/oc10_ocis_parallel/config/ocis/proxy.yaml new file mode 100644 index 0000000000..a472adcf12 --- /dev/null +++ b/deployments/examples/oc10_ocis_parallel/config/ocis/proxy.yaml @@ -0,0 +1,54 @@ +--- +policy_selector: + claims: + default_policy: oc10 + unauthenticated_policy: oc10 +policies: + - name: ocis + routes: + - endpoint: "/" + backend: http://localhost:9100 + - endpoint: "/.well-known/" + backend: http://localhost:9130 + - type: regex + endpoint: "/ocs/v[12].php/cloud/user/signing-key" + backend: http://localhost:9110 + - endpoint: "/ocs/" + backend: http://localhost:9140 + - type: query + endpoint: "/remote.php/?preview=1" + backend: http://localhost:9115 + - endpoint: "/remote.php/" + backend: http://localhost:9140 + - endpoint: "/dav/" + backend: http://localhost:9140 + - endpoint: "/webdav/" + backend: http://localhost:9140 + - endpoint: "/status.php" + backend: http://localhost:9140 + - endpoint: "/index.php/" + backend: http://localhost:9140 + - endpoint: "/index.php/login" + backend: http://localhost:9100 + - endpoint: "/login" + backend: http://localhost:9100 + - endpoint: "/data" + backend: http://localhost:9140 + - endpoint: "/graph/" + backend: http://localhost:9120 + - endpoint: "/app/" + backend: http://localhost:9140 + - endpoint: "/archiver" + backend: http://localhost:9140 + - endpoint: "/graph-explorer/" + backend: http://localhost:9135 + - endpoint: "/api/v0/settings" + backend: http://localhost:9190 + - endpoint: "/settings.js" + backend: http://localhost:9190 + - name: oc10 + routes: + - endpoint: "/" + backend: http://oc10:8080 + - endpoint: "/data" + backend: http://localhost:9140 diff --git a/deployments/examples/oc10_ocis_parallel/docker-compose.yml b/deployments/examples/oc10_ocis_parallel/docker-compose.yml index fce87848ea..677877f5b2 100644 --- a/deployments/examples/oc10_ocis_parallel/docker-compose.yml +++ b/deployments/examples/oc10_ocis_parallel/docker-compose.yml @@ -116,7 +116,6 @@ services: OCIS_LOG_LEVEL: ${OCIS_LOG_LEVEL:-error} # make oCIS less verbose OCIS_URL: https://${CLOUD_DOMAIN:-cloud.owncloud.test} PROXY_TLS: "false" # do not use SSL between Traefik and oCIS - PROXY_CONFIG_FILE: "/var/tmp/ocis/.config/proxy-config.json" # change default secrets OCIS_JWT_SECRET: ${OCIS_JWT_SECRET:-Pive-Fumkiu4} STORAGE_TRANSFER_SECRET: ${STORAGE_TRANSFER_SECRET:-replace-me-with-a-transfer-secret} @@ -126,7 +125,7 @@ services: # basic auth (not recommended, but needed for eg. WebDav clients that do not support OpenID Connect) PROXY_ENABLE_BASIC_AUTH: "${PROXY_ENABLE_BASIC_AUTH:-false}" volumes: - - ./config/ocis/proxy.json:/etc/ocis/proxy.json + - ./config/ocis/proxy.yaml:/etc/ocis/proxy.yaml - ocis-data:/var/lib/ocis # shared volume with oC10 - oc10-data:/mnt/data diff --git a/deployments/examples/ocis_hello/config/ocis/proxy.json b/deployments/examples/ocis_hello/config/ocis/proxy.json deleted file mode 100644 index fd1ea36315..0000000000 --- a/deployments/examples/ocis_hello/config/ocis/proxy.json +++ /dev/null @@ -1,111 +0,0 @@ -{ - "HTTP": { - "Namespace": "com.owncloud" - }, - "policy_selector": { - "static": { - "policy": "ocis" - } - }, - "policies": [ - { - "name": "ocis", - "routes": [ - { - "endpoint": "/", - "backend": "http://localhost:9100" - }, - { - "endpoint": "/.well-known/", - "backend": "http://localhost:9130" - }, - { - "endpoint": "/konnect/", - "backend": "http://localhost:9130" - }, - { - "endpoint": "/signin/", - "backend": "http://localhost:9130" - }, - { - "type": "regex", - "endpoint": "/ocs/v[12].php/cloud/(users?|groups)", - "backend": "http://localhost:9110" - }, - { - "endpoint": "/ocs/", - "backend": "http://localhost:9140" - }, - { - "type": "query", - "endpoint": "/remote.php/?preview=1", - "backend": "http://localhost:9115" - }, - { - "endpoint": "/remote.php/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/dav/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/webdav/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/status.php", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/index.php/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/data", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/app/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/archiver", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/graph/", - "backend": "http://localhost:9120" - }, - { - "endpoint": "/graph-explorer/", - "backend": "http://localhost:9135" - }, - { - "endpoint": "/api/v0/accounts", - "backend": "http://localhost:9181" - }, - { - "endpoint": "/accounts.js", - "backend": "http://localhost:9181" - }, - { - "endpoint": "/api/v0/settings", - "backend": "http://localhost:9190" - }, - { - "endpoint": "/settings.js", - "backend": "http://localhost:9190" - }, - { - "endpoint": "/api/v0/greet", - "backend": "http://ocis-hello:9105" - }, - { - "endpoint": "/hello.js", - "backend": "http://ocis-hello:9105" - } - ] - } - ] -} \ No newline at end of file diff --git a/deployments/examples/ocis_hello/config/ocis/proxy.yaml b/deployments/examples/ocis_hello/config/ocis/proxy.yaml new file mode 100644 index 0000000000..432398165f --- /dev/null +++ b/deployments/examples/ocis_hello/config/ocis/proxy.yaml @@ -0,0 +1,55 @@ +--- +policy_selector: + static: + policy: ocis +policies: + - name: ocis + routes: + - endpoint: "/" + backend: http://localhost:9100 + - endpoint: "/.well-known/" + backend: http://localhost:9130 + - endpoint: "/konnect/" + backend: http://localhost:9130 + - endpoint: "/signin/" + backend: http://localhost:9130 + - type: regex + endpoint: "/ocs/v[12].php/cloud/(users?|groups)" + backend: http://localhost:9110 + - endpoint: "/ocs/" + backend: http://localhost:9140 + - type: query + endpoint: "/remote.php/?preview=1" + backend: http://localhost:9115 + - endpoint: "/remote.php/" + backend: http://localhost:9140 + - endpoint: "/dav/" + backend: http://localhost:9140 + - endpoint: "/webdav/" + backend: http://localhost:9140 + - endpoint: "/status.php" + backend: http://localhost:9140 + - endpoint: "/index.php/" + backend: http://localhost:9140 + - endpoint: "/data" + backend: http://localhost:9140 + - endpoint: "/app/" + backend: http://localhost:9140 + - endpoint: "/archiver" + backend: http://localhost:9140 + - endpoint: "/graph/" + backend: http://localhost:9120 + - endpoint: "/graph-explorer/" + backend: http://localhost:9135 + - endpoint: "/api/v0/accounts" + backend: http://localhost:9181 + - endpoint: "/accounts.js" + backend: http://localhost:9181 + - endpoint: "/api/v0/settings" + backend: http://localhost:9190 + - endpoint: "/settings.js" + backend: http://localhost:9190 + - endpoint: "/api/v0/greet" + backend: http://ocis-hello:9105 + - endpoint: "/hello.js" + backend: http://ocis-hello:9105 diff --git a/deployments/examples/ocis_hello/docker-compose.yml b/deployments/examples/ocis_hello/docker-compose.yml index 3a6d0c8325..9b72e1f59f 100644 --- a/deployments/examples/ocis_hello/docker-compose.yml +++ b/deployments/examples/ocis_hello/docker-compose.yml @@ -71,7 +71,7 @@ services: volumes: - ./config/ocis/entrypoint-override.sh:/entrypoint-override.sh - ./config/ocis/web-config.dist.json:/config/web-config.dist.json - - ./config/ocis/proxy.json:/etc/ocis/proxy.json + - ./config/ocis/proxy.yaml:/etc/ocis/proxy.yaml - ocis-data:/var/lib/ocis labels: - "traefik.enable=true" diff --git a/deployments/examples/ocis_individual_services/config/proxy/proxy.json b/deployments/examples/ocis_individual_services/config/proxy/proxy.json deleted file mode 100644 index 3874ceff19..0000000000 --- a/deployments/examples/ocis_individual_services/config/proxy/proxy.json +++ /dev/null @@ -1,103 +0,0 @@ -{ - "HTTP": { - "Namespace": "com.owncloud" - }, - "policy_selector": { - "static": { - "policy": "ocis" - } - }, - "policies": [ - { - "name": "ocis", - "routes": [ - { - "endpoint": "/", - "backend": "http://web:9100" - }, - { - "endpoint": "/.well-known/", - "backend": "http://idp:9130" - }, - { - "endpoint": "/konnect/", - "backend": "http://idp:9130" - }, - { - "endpoint": "/signin/", - "backend": "http://idp:9130" - }, - { - "type": "regex", - "endpoint": "/ocs/v[12].php/cloud/(users?|groups)", - "backend": "http://ocs:9110" - }, - { - "endpoint": "/ocs/", - "backend": "http://storage-frontend:9140" - }, - { - "type": "query", - "endpoint": "/remote.php/?preview=1", - "backend": "http://webdav:9115" - }, - { - "endpoint": "/remote.php/", - "backend": "http://storage-frontend:9140" - }, - { - "endpoint": "/dav/", - "backend": "http://storage-frontend:9140" - }, - { - "endpoint": "/webdav/", - "backend": "http://storage-frontend:9140" - }, - { - "endpoint": "/status.php", - "backend": "http://storage-frontend:9140" - }, - { - "endpoint": "/index.php/", - "backend": "http://storage-frontend:9140" - }, - { - "endpoint": "/data", - "backend": "http://storage-frontend:9140" - }, - { - "endpoint": "/app/", - "backend": "http://storage-frontend:9140" - }, - { - "endpoint": "/archiver", - "backend": "http://storage-frontend:9140" - }, - { - "endpoint": "/graph/", - "backend": "http://graph:9120" - }, - { - "endpoint": "/graph-explorer/", - "backend": "http://graph-explorer:9135" - }, - { - "endpoint": "/api/v0/accounts", - "backend": "http://accounts:9181" - }, - { - "endpoint": "/accounts.js", - "backend": "http://accounts:9181" - }, - { - "endpoint": "/api/v0/settings", - "backend": "http://settings:9190" - }, - { - "endpoint": "/settings.js", - "backend": "http://settings:9190" - } - ] - } - ] -} \ No newline at end of file diff --git a/deployments/examples/ocis_individual_services/config/proxy/proxy.yaml b/deployments/examples/ocis_individual_services/config/proxy/proxy.yaml new file mode 100644 index 0000000000..c239588980 --- /dev/null +++ b/deployments/examples/ocis_individual_services/config/proxy/proxy.yaml @@ -0,0 +1,51 @@ +--- +policy_selector: + static: + policy: ocis +policies: + - name: ocis + routes: + - endpoint: "/" + backend: http://web:9100 + - endpoint: "/.well-known/" + backend: http://idp:9130 + - endpoint: "/konnect/" + backend: http://idp:9130 + - endpoint: "/signin/" + backend: http://idp:9130 + - type: regex + endpoint: "/ocs/v[12].php/cloud/(users?|groups)" + backend: http://ocs:9110 + - endpoint: "/ocs/" + backend: http://storage-frontend:9140 + - type: query + endpoint: "/remote.php/?preview=1" + backend: http://webdav:9115 + - endpoint: "/remote.php/" + backend: http://storage-frontend:9140 + - endpoint: "/dav/" + backend: http://storage-frontend:9140 + - endpoint: "/webdav/" + backend: http://storage-frontend:9140 + - endpoint: "/status.php" + backend: http://storage-frontend:9140 + - endpoint: "/index.php/" + backend: http://storage-frontend:9140 + - endpoint: "/data" + backend: http://storage-frontend:9140 + - endpoint: "/app/" + backend: http://storage-frontend:9140 + - endpoint: "/archiver" + backend: http://storage-frontend:9140 + - endpoint: "/graph/" + backend: http://graph:9120 + - endpoint: "/graph-explorer/" + backend: http://graph-explorer:9135 + - endpoint: "/api/v0/accounts" + backend: http://accounts:9181 + - endpoint: "/accounts.js" + backend: http://accounts:9181 + - endpoint: "/api/v0/settings" + backend: http://settings:9190 + - endpoint: "/settings.js" + backend: http://settings:9190 diff --git a/deployments/examples/ocis_individual_services/docker-compose.yml b/deployments/examples/ocis_individual_services/docker-compose.yml index dda52fb635..8c30ac2b2d 100644 --- a/deployments/examples/ocis_individual_services/docker-compose.yml +++ b/deployments/examples/ocis_individual_services/docker-compose.yml @@ -72,7 +72,7 @@ services: PROXY_HTTP_ADDR: 0.0.0.0:9200 volumes: - - "./config/proxy/proxy.json:/etc/ocis/proxy.json" + - "./config/proxy/proxy.yaml:/etc/ocis/proxy.yaml" labels: - "traefik.enable=true" - "traefik.http.routers.ocis.entrypoints=https" diff --git a/deployments/examples/ocis_ldap/config/ocis/proxy.json b/deployments/examples/ocis_ldap/config/ocis/proxy.json deleted file mode 100644 index 76285d79b4..0000000000 --- a/deployments/examples/ocis_ldap/config/ocis/proxy.json +++ /dev/null @@ -1,95 +0,0 @@ -{ - "HTTP": { - "Namespace": "com.owncloud" - }, - "policy_selector": { - "static": { - "policy": "ocis" - } - }, - "policies": [ - { - "name": "ocis", - "routes": [ - { - "endpoint": "/", - "backend": "http://localhost:9100" - }, - { - "endpoint": "/.well-known/", - "backend": "http://localhost:9130" - }, - { - "endpoint": "/konnect/", - "backend": "http://localhost:9130" - }, - { - "endpoint": "/signin/", - "backend": "http://localhost:9130" - }, - { - "type": "regex", - "endpoint": "/ocs/v[12].php/cloud/user/signing-key", - "backend": "http://localhost:9110" - }, - { - "endpoint": "/ocs/", - "backend": "http://localhost:9140" - }, - { - "type": "query", - "endpoint": "/remote.php/?preview=1", - "backend": "http://localhost:9115" - }, - { - "endpoint": "/remote.php/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/dav/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/webdav/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/status.php", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/index.php/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/app/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/archiver", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/data", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/graph/", - "backend": "http://localhost:9120" - }, - { - "endpoint": "/graph-explorer/", - "backend": "http://localhost:9135" - }, - { - "endpoint": "/api/v0/settings", - "backend": "http://localhost:9190" - }, - { - "endpoint": "/settings.js", - "backend": "http://localhost:9190" - } - ] - } - ] -} \ No newline at end of file diff --git a/deployments/examples/ocis_ldap/config/ocis/proxy.yaml b/deployments/examples/ocis_ldap/config/ocis/proxy.yaml new file mode 100644 index 0000000000..b303cd63d9 --- /dev/null +++ b/deployments/examples/ocis_ldap/config/ocis/proxy.yaml @@ -0,0 +1,47 @@ +--- +policy_selector: + static: + policy: ocis +policies: + - name: ocis + routes: + - endpoint: "/" + backend: http://localhost:9100 + - endpoint: "/.well-known/" + backend: http://localhost:9130 + - endpoint: "/konnect/" + backend: http://localhost:9130 + - endpoint: "/signin/" + backend: http://localhost:9130 + - type: regex + endpoint: "/ocs/v[12].php/cloud/user/signing-key" + backend: http://localhost:9110 + - endpoint: "/ocs/" + backend: http://localhost:9140 + - type: query + endpoint: "/remote.php/?preview=1" + backend: http://localhost:9115 + - endpoint: "/remote.php/" + backend: http://localhost:9140 + - endpoint: "/dav/" + backend: http://localhost:9140 + - endpoint: "/webdav/" + backend: http://localhost:9140 + - endpoint: "/status.php" + backend: http://localhost:9140 + - endpoint: "/index.php/" + backend: http://localhost:9140 + - endpoint: "/app/" + backend: http://localhost:9140 + - endpoint: "/archiver" + backend: http://localhost:9140 + - endpoint: "/data" + backend: http://localhost:9140 + - endpoint: "/graph/" + backend: http://localhost:9120 + - endpoint: "/graph-explorer/" + backend: http://localhost:9135 + - endpoint: "/api/v0/settings" + backend: http://localhost:9190 + - endpoint: "/settings.js" + backend: http://localhost:9190 diff --git a/deployments/examples/ocis_ldap/docker-compose.yml b/deployments/examples/ocis_ldap/docker-compose.yml index fb702d4537..60c22c280e 100644 --- a/deployments/examples/ocis_ldap/docker-compose.yml +++ b/deployments/examples/ocis_ldap/docker-compose.yml @@ -91,7 +91,7 @@ services: volumes: - ./config/ocis/entrypoint-override.sh:/entrypoint-override.sh - ./config/ocis/web-config.dist.json:/config/web-config.dist.json - - ./config/ocis/proxy.json:/etc/ocis/proxy.json + - ./config/ocis/proxy.yaml:/etc/ocis/proxy.yaml - ocis-data:/var/lib/ocis labels: - "traefik.enable=true" From 5d190620751781c1945f36086939d3eb8492fe46 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Wed, 23 Mar 2022 08:18:30 +0100 Subject: [PATCH 07/13] switch tests to yaml config --- .drone.star | 2 +- .../drone/ocis/proxy.json | 109 ------------------ .../drone/ocis/proxy.yaml | 54 +++++++++ 3 files changed, 55 insertions(+), 110 deletions(-) delete mode 100644 tests/parallelDeployAcceptance/drone/ocis/proxy.json create mode 100644 tests/parallelDeployAcceptance/drone/ocis/proxy.yaml diff --git a/.drone.star b/.drone.star index e5e702c351..faf0739e85 100644 --- a/.drone.star +++ b/.drone.star @@ -2272,7 +2272,7 @@ def copyConfigs(): "commands": [ # ocis proxy config "mkdir -p /etc/ocis", - "cp %s/ocis/proxy.json /etc/ocis/proxy.json" % (PARALLEL_DEPLOY_CONFIG_PATH), + "cp %s/ocis/proxy.yaml /etc/ocis/proxy.yaml" % (PARALLEL_DEPLOY_CONFIG_PATH), # oc10 configs "mkdir -p /etc/templates", "mkdir -p /etc/pre_server.d", diff --git a/tests/parallelDeployAcceptance/drone/ocis/proxy.json b/tests/parallelDeployAcceptance/drone/ocis/proxy.json deleted file mode 100644 index 6333545dac..0000000000 --- a/tests/parallelDeployAcceptance/drone/ocis/proxy.json +++ /dev/null @@ -1,109 +0,0 @@ -{ - "log": { - "level": "PROXY_LOG_LEVEL" - }, - "policy_selector": { - "claims": { - "default_policy": "oc10", - "unauthenticated_policy": "oc10" - } - }, - "policies": [ - { - "name": "ocis", - "routes": [ - { - "endpoint": "/", - "backend": "http://localhost:9100" - }, - { - "endpoint": "/.well-known/", - "backend": "http://localhost:9130" - }, - { - "type": "regex", - "endpoint": "/ocs/v[12].php/cloud/user/signing-key", - "backend": "http://localhost:9110" - }, - { - "endpoint": "/ocs/", - "backend": "http://localhost:9140" - }, - { - "type": "query", - "endpoint": "/remote.php/?preview=1", - "backend": "http://localhost:9115" - }, - { - "endpoint": "/remote.php/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/dav/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/webdav/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/status.php", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/index.php/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/index.php/login", - "backend": "http://localhost:9100" - }, - { - "endpoint": "/login", - "backend": "http://localhost:9100" - }, - { - "endpoint": "/data", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/graph/", - "backend": "http://localhost:9120" - }, - { - "endpoint": "/app/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/archiver", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/graph-explorer/", - "backend": "http://localhost:9135" - }, - { - "endpoint": "/api/v0/settings", - "backend": "http://localhost:9190" - }, - { - "endpoint": "/settings.js", - "backend": "http://localhost:9190" - } - ] - }, - { - "name": "oc10", - "routes": [ - { - "endpoint": "/", - "backend": "http://oc10:8080" - }, - { - "endpoint": "/data", - "backend": "http://localhost:9140" - } - ] - } - ] -} diff --git a/tests/parallelDeployAcceptance/drone/ocis/proxy.yaml b/tests/parallelDeployAcceptance/drone/ocis/proxy.yaml new file mode 100644 index 0000000000..2d1a6aced4 --- /dev/null +++ b/tests/parallelDeployAcceptance/drone/ocis/proxy.yaml @@ -0,0 +1,54 @@ +--- +policy_selector: + claims: + default_policy: oc10 + unauthenticated_policy: oc10 +policies: +- name: ocis + routes: + - endpoint: "/" + backend: http: //localhost:9100 + - endpoint: "/.well-known/" + backend: http: //localhost:9130 + - type: regex + endpoint: "/ocs/v[12].php/cloud/user/signing-key" + backend: http: //localhost:9110 + - endpoint: "/ocs/" + backend: http: //localhost:9140 + - type: query + endpoint: "/remote.php/?preview=1" + backend: http: //localhost:9115 + - endpoint: "/remote.php/" + backend: http: //localhost:9140 + - endpoint: "/dav/" + backend: http: //localhost:9140 + - endpoint: "/webdav/" + backend: http: //localhost:9140 + - endpoint: "/status.php" + backend: http: //localhost:9140 + - endpoint: "/index.php/" + backend: http: //localhost:9140 + - endpoint: "/index.php/login" + backend: http: //localhost:9100 + - endpoint: "/login" + backend: http: //localhost:9100 + - endpoint: "/data" + backend: http: //localhost:9140 + - endpoint: "/graph/" + backend: http: //localhost:9120 + - endpoint: "/app/" + backend: http: //localhost:9140 + - endpoint: "/archiver" + backend: http: //localhost:9140 + - endpoint: "/graph-explorer/" + backend: http: //localhost:9135 + - endpoint: "/api/v0/settings" + backend: http: //localhost:9190 + - endpoint: "/settings.js" + backend: http: //localhost:9190 +- name: oc10 + routes: + - endpoint: "/" + backend: http: //oc10:8080 + - endpoint: "/data" + backend: http: //localhost:9140 From f67e6242ee14e88a6df208e0078922a10bf3ef79 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Wed, 23 Mar 2022 08:18:50 +0100 Subject: [PATCH 08/13] fix config edit path --- docs/ocis/config.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/ocis/config.md b/docs/ocis/config.md index 02df18b9f1..a07e127257 100644 --- a/docs/ocis/config.md +++ b/docs/ocis/config.md @@ -3,7 +3,7 @@ title: "Configuration" date: "2021-11-09T00:03:16+0100" weight: 2 geekdocRepo: https://github.com/owncloud/ocis -geekdocEditPath: edit/master/ocis/templates +geekdocEditPath: edit/master/docs/ocis geekdocFilePath: config.md --- From 7f65dfba34a02be35c7c9e0dda48aadccb22c825 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Wed, 23 Mar 2022 08:19:10 +0100 Subject: [PATCH 09/13] remove example config files --- glauth/config/example.json | 18 -- glauth/config/example.yml | 18 -- graph-explorer/config/example.json | 24 --- graph-explorer/config/example.yml | 24 --- graph/config/example.json | 18 -- graph/config/example.yml | 18 -- idp/config/example.json | 20 --- idp/config/example.yml | 19 -- idp/config/identifier-registration.yaml | 1 - ocis/config/eos-docker.env | 12 -- ocis/config/example.json | 1 - ocis/config/example.yml | 3 - ocs/config/example.json | 18 -- ocs/config/example.yml | 18 -- proxy/config/proxy-example-migration.json | 164 ------------------ proxy/config/proxy-example-regex.json | 202 ---------------------- proxy/config/proxy-example.json | 104 ----------- settings/config/example.json | 18 -- settings/config/example.yml | 18 -- storage/config/example.json | 24 --- storage/config/example.yml | 24 --- storage/config/mimetypes.json | 92 ---------- store/config/example.json | 15 -- store/config/example.yml | 15 -- thumbnails/config/example.json | 18 -- thumbnails/config/example.yml | 18 -- web/config/example.json | 24 --- web/config/example.yml | 24 --- webdav/config/example.json | 18 -- webdav/config/example.yml | 18 -- 30 files changed, 1008 deletions(-) delete mode 100644 glauth/config/example.json delete mode 100644 glauth/config/example.yml delete mode 100644 graph-explorer/config/example.json delete mode 100644 graph-explorer/config/example.yml delete mode 100644 graph/config/example.json delete mode 100644 graph/config/example.yml delete mode 100644 idp/config/example.json delete mode 100644 idp/config/example.yml delete mode 100644 idp/config/identifier-registration.yaml delete mode 100644 ocis/config/eos-docker.env delete mode 100644 ocis/config/example.json delete mode 100644 ocis/config/example.yml delete mode 100644 ocs/config/example.json delete mode 100644 ocs/config/example.yml delete mode 100644 proxy/config/proxy-example-migration.json delete mode 100644 proxy/config/proxy-example-regex.json delete mode 100644 proxy/config/proxy-example.json delete mode 100644 settings/config/example.json delete mode 100644 settings/config/example.yml delete mode 100644 storage/config/example.json delete mode 100644 storage/config/example.yml delete mode 100644 storage/config/mimetypes.json delete mode 100644 store/config/example.json delete mode 100644 store/config/example.yml delete mode 100644 thumbnails/config/example.json delete mode 100644 thumbnails/config/example.yml delete mode 100644 web/config/example.json delete mode 100644 web/config/example.yml delete mode 100644 webdav/config/example.json delete mode 100644 webdav/config/example.yml diff --git a/glauth/config/example.json b/glauth/config/example.json deleted file mode 100644 index 3685032dd3..0000000000 --- a/glauth/config/example.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "debug": { - "addr": "0.0.0.0:9129", - "token": "", - "pprof": false, - "zpages": false - }, - "http": { - "addr": "0.0.0.0:9120" - }, - "tracing": { - "enabled": false, - "type": "jaeger", - "endpoint": "localhost:6831", - "collector": "http://localhost:14268/api/traces", - "service": "glauth" - } -} diff --git a/glauth/config/example.yml b/glauth/config/example.yml deleted file mode 100644 index 0ca0053f26..0000000000 --- a/glauth/config/example.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -debug: - addr: 0.0.0.0:9129 - token: - pprof: false - zpages: false - -http: - addr: 0.0.0.0:9120 - -tracing: - enabled: false - type: jaeger - endpoint: localhost:6831 - collector: http://localhost:14268/api/traces - service: glauth - -... diff --git a/graph-explorer/config/example.json b/graph-explorer/config/example.json deleted file mode 100644 index 8ef2b3443e..0000000000 --- a/graph-explorer/config/example.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "debug": { - "addr": "0.0.0.0:9136", - "token": "", - "pprof": false, - "zpages": false - }, - "http": { - "addr": "0.0.0.0:9100" - }, - "tracing": { - "enabled": false, - "type": "jaeger", - "endpoint": "localhost:6831", - "collector": "http://localhost:14268/api/traces", - "service": "graph-explorer" - }, - "asset": { - "path": "" - }, - "config": { - "file": "" - } -} diff --git a/graph-explorer/config/example.yml b/graph-explorer/config/example.yml deleted file mode 100644 index cf09175d94..0000000000 --- a/graph-explorer/config/example.yml +++ /dev/null @@ -1,24 +0,0 @@ ---- -debug: - addr: 0.0.0.0:9136 - token: - pprof: false - zpages: false - -http: - addr: 0.0.0.0:9100 - -tracing: - enabled: false - type: jaeger - endpoint: localhost:6831 - collector: http://localhost:14268/api/traces - service: graph-explorer - -asset: - path: - -config: - file: - -... diff --git a/graph/config/example.json b/graph/config/example.json deleted file mode 100644 index 4fce8de672..0000000000 --- a/graph/config/example.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "debug": { - "addr": "0.0.0.0:9124", - "token": "", - "pprof": false, - "zpages": false - }, - "http": { - "addr": "0.0.0.0:9120" - }, - "tracing": { - "enabled": false, - "type": "jaeger", - "endpoint": "localhost:6831", - "collector": "http://localhost:14268/api/traces", - "service": "graph" - } -} diff --git a/graph/config/example.yml b/graph/config/example.yml deleted file mode 100644 index 3d90580ae6..0000000000 --- a/graph/config/example.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -debug: - addr: 0.0.0.0:9124 - token: - pprof: false - zpages: false - -http: - addr: 0.0.0.0:9120 - -tracing: - enabled: false - type: jaeger - endpoint: localhost:6831 - collector: http://localhost:14268/api/traces - service: graph - -... diff --git a/idp/config/example.json b/idp/config/example.json deleted file mode 100644 index e70627df46..0000000000 --- a/idp/config/example.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "debug": { - "addr": "0.0.0.0:9134", - "token": "", - "pprof": false, - "zpages": false - }, - "http": { - "addr": "0.0.0.0:9130", - "root": "/", - "tls": true - }, - "tracing": { - "enabled": false, - "type": "jaeger", - "endpoint": "localhost:6831", - "collector": "http://localhost:14268/api/traces", - "service": "idp" - } -} diff --git a/idp/config/example.yml b/idp/config/example.yml deleted file mode 100644 index c1a0c74a9f..0000000000 --- a/idp/config/example.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- -debug: - addr: 0.0.0.0:9134 - token: - pprof: false - zpages: false - -http: - addr: 0.0.0.0:9130 - root: / - -tracing: - enabled: false - type: jaeger - endpoint: localhost:6831 - collector: http://localhost:14268/api/traces - service: idp - -... diff --git a/idp/config/identifier-registration.yaml b/idp/config/identifier-registration.yaml deleted file mode 100644 index 713d267567..0000000000 --- a/idp/config/identifier-registration.yaml +++ /dev/null @@ -1 +0,0 @@ -# see ../assets/identifier-registration.yaml \ No newline at end of file diff --git a/ocis/config/eos-docker.env b/ocis/config/eos-docker.env deleted file mode 100644 index 62d810c9fb..0000000000 --- a/ocis/config/eos-docker.env +++ /dev/null @@ -1,12 +0,0 @@ -EOS_MQ_URL=mq-master.testnet -EOS_MGM_ALIAS=mgm-master.testnet -EOS_QDB_NODES=quark-1.testnet:7777 quark-2.testnet:7777 quark-3.testnet:7777 -EOS_LDAP_HOST=ocis.testnet:9125 -EOS_GEOTAG=test -EOS_INSTANCE_NAME=eostest -EOS_MAIL_CC=eos@localhost -EOS_USE_QDB=1 -EOS_USE_QDB_MASTER=1 -EOS_NS_ACCOUNTING=1 -EOS_SYNCTIME_ACCOUNTING=1 -EOS_UTF8=1 diff --git a/ocis/config/example.json b/ocis/config/example.json deleted file mode 100644 index 0967ef424b..0000000000 --- a/ocis/config/example.json +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/ocis/config/example.yml b/ocis/config/example.yml deleted file mode 100644 index c81cf5b7c4..0000000000 --- a/ocis/config/example.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -... diff --git a/ocs/config/example.json b/ocs/config/example.json deleted file mode 100644 index 72b62d09d6..0000000000 --- a/ocs/config/example.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "debug": { - "addr": "0.0.0.0:9114", - "token": "", - "pprof": false, - "zpages": false - }, - "http": { - "addr": "0.0.0.0:9110" - }, - "tracing": { - "enabled": false, - "type": "jaeger", - "endpoint": "localhost:6831", - "collector": "http://localhost:14268/api/traces", - "service": "ocs" - } -} diff --git a/ocs/config/example.yml b/ocs/config/example.yml deleted file mode 100644 index b6bfd3b04d..0000000000 --- a/ocs/config/example.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -debug: - addr: 0.0.0.0:9114 - token: - pprof: false - zpages: false - -http: - addr: 0.0.0.0:9110 - -tracing: - enabled: false - type: jaeger - endpoint: localhost:6831 - collector: http://localhost:14268/api/traces - service: ocs - -... diff --git a/proxy/config/proxy-example-migration.json b/proxy/config/proxy-example-migration.json deleted file mode 100644 index 54e0583262..0000000000 --- a/proxy/config/proxy-example-migration.json +++ /dev/null @@ -1,164 +0,0 @@ -{ - "http": { - "addr": "0.0.0.0:9200", - "root": "/" - }, - "oidc": { - "issuer": "https://localhost:9200", - "insecure": true - }, - "policy_selector": { - "migration": { - "acc_found_policy": "ocis", - "acc_not_found_policy": "oc10", - "unauthenticated_policy": "oc10" - } - }, - "policies": [ - { - "name": "ocis", - "routes": [ - { - "endpoint": "/", - "backend": "http://localhost:9100" - }, - { - "endpoint": "/.well-known/", - "backend": "http://localhost:9130" - }, - { - "endpoint": "/konnect/", - "backend": "http://localhost:9130" - }, - { - "endpoint": "/signin/", - "backend": "http://localhost:9130" - }, - { - "type": "regex", - "endpoint": "/ocs/v[12].php/cloud/(users?|groups)", - "backend": "http://localhost:9110" - }, - { - "endpoint": "/ocs/", - "backend": "http://localhost:9140" - }, - { - "type": "query", - "endpoint": "/remote.php/?preview=1", - "backend": "http://localhost:9115" - }, - { - "endpoint": "/remote.php/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/dav/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/webdav/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/status.php", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/index.php/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/data", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/graph/", - "backend": "http://localhost:9120" - }, - { - "endpoint": "/app/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/archiver", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/graph-explorer/", - "backend": "http://localhost:9135" - }, - { - "endpoint": "/api/v0/accounts", - "backend": "http://localhost:9181" - }, - { - "endpoint": "/accounts.js", - "backend": "http://localhost:9181" - }, - { - "endpoint": "/api/v0/settings", - "backend": "http://localhost:9190" - }, - { - "endpoint": "/settings.js", - "backend": "http://localhost:9190" - } - ] - }, - { - "name": "oc10", - "routes": [ - { - "endpoint": "/", - "backend": "http://localhost:9100" - }, - { - "endpoint": "/.well-known/", - "backend": "http://localhost:9130" - }, - { - "endpoint": "/konnect/", - "backend": "http://localhost:9130" - }, - { - "endpoint": "/signin/", - "backend": "http://localhost:9130" - }, - { - "endpoint": "/ocs/", - "backend": "https://demo.owncloud.com", - "apache-vhost": true - }, - { - "endpoint": "/remote.php/", - "backend": "https://demo.owncloud.com", - "apache-vhost": true - }, - { - "endpoint": "/dav/", - "backend": "https://demo.owncloud.com", - "apache-vhost": true - }, - { - "endpoint": "/webdav/", - "backend": "https://demo.owncloud.com", - "apache-vhost": true - }, - { - "endpoint": "/status.php", - "backend": "https://demo.owncloud.com" - }, - { - "endpoint": "/index.php/", - "backend": "https://demo.owncloud.com" - }, - { - "endpoint": "/data", - "backend": "https://demo.owncloud.com", - "apache-vhost": true - } - ] - } - ] -} \ No newline at end of file diff --git a/proxy/config/proxy-example-regex.json b/proxy/config/proxy-example-regex.json deleted file mode 100644 index 49f5d66744..0000000000 --- a/proxy/config/proxy-example-regex.json +++ /dev/null @@ -1,202 +0,0 @@ -{ - "http": { - "addr": "0.0.0.0:9200", - "root": "/" - }, - "oidc": { - "issuer": "https://localhost:9200", - "insecure": true - }, - "policy_selector": { - "regex": { - "selector_cookie_name": "owncloud-selector", - "default_policy": "oc10", - "matches_policies": [ - { - "priority": 10, - "property": "mail", - "match": "marie@example.org", - "policy": "ocis" - }, - { - "priority": 20, - "property": "mail", - "match": "[^@]+@example.org", - "policy": "oc10" - }, - { - "priority": 30, - "property": "username", - "match": "(einstein|feynman)", - "policy": "ocis" - }, - { - "priority": 40, - "property": "username", - "match": ".+", - "policy": "oc10" - }, - { - "priority": 50, - "property": "id", - "match": "4c510ada-c86b-4815-8820-42cdf82c3d51", - "policy": "ocis" - }, - { - "priority": 60, - "property": "id", - "match": "f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c", - "policy": "oc10" - } - ], - "unauthenticated_policy": "oc10" - } - }, - "policies": [ - { - "name": "ocis", - "routes": [ - { - "endpoint": "/", - "backend": "http://localhost:9100" - }, - { - "endpoint": "/.well-known/", - "backend": "http://localhost:9130" - }, - { - "endpoint": "/konnect/", - "backend": "http://localhost:9130" - }, - { - "endpoint": "/signin/", - "backend": "http://localhost:9130" - }, - { - "type": "regex", - "endpoint": "/ocs/v[12].php/cloud/(users?|groups)", - "backend": "http://localhost:9110" - }, - { - "endpoint": "/ocs/", - "backend": "http://localhost:9140" - }, - { - "type": "query", - "endpoint": "/remote.php/?preview=1", - "backend": "http://localhost:9115" - }, - { - "endpoint": "/remote.php/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/dav/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/webdav/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/status.php", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/index.php/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/data", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/app/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/archiver", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/graph/", - "backend": "http://localhost:9120" - }, - { - "endpoint": "/graph-explorer/", - "backend": "http://localhost:9135" - }, - { - "endpoint": "/api/v0/accounts", - "backend": "http://localhost:9181" - }, - { - "endpoint": "/accounts.js", - "backend": "http://localhost:9181" - }, - { - "endpoint": "/api/v0/settings", - "backend": "http://localhost:9190" - }, - { - "endpoint": "/settings.js", - "backend": "http://localhost:9190" - } - ] - }, - { - "name": "oc10", - "routes": [ - { - "endpoint": "/", - "backend": "http://localhost:9100" - }, - { - "endpoint": "/.well-known/", - "backend": "http://localhost:9130" - }, - { - "endpoint": "/konnect/", - "backend": "http://localhost:9130" - }, - { - "endpoint": "/signin/", - "backend": "http://localhost:9130" - }, - { - "endpoint": "/ocs/", - "backend": "https://demo.owncloud.com", - "apache-vhost": true - }, - { - "endpoint": "/remote.php/", - "backend": "https://demo.owncloud.com", - "apache-vhost": true - }, - { - "endpoint": "/dav/", - "backend": "https://demo.owncloud.com", - "apache-vhost": true - }, - { - "endpoint": "/webdav/", - "backend": "https://demo.owncloud.com", - "apache-vhost": true - }, - { - "endpoint": "/status.php", - "backend": "https://demo.owncloud.com" - }, - { - "endpoint": "/index.php/", - "backend": "https://demo.owncloud.com" - }, - { - "endpoint": "/data", - "backend": "https://demo.owncloud.com", - "apache-vhost": true - } - ] - } - ] -} \ No newline at end of file diff --git a/proxy/config/proxy-example.json b/proxy/config/proxy-example.json deleted file mode 100644 index 75f50065ee..0000000000 --- a/proxy/config/proxy-example.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "http": { - "addr": "0.0.0.0:9200", - "root": "/" - }, - "policy_selector": { - "static": { - "policy": "ocis" - } - }, - "policies": [ - { - "name": "ocis", - "routes": [ - { - "endpoint": "/", - "backend": "http://localhost:9100" - }, - { - "endpoint": "/.well-known/", - "backend": "http://localhost:9130" - }, - { - "endpoint": "/konnect/", - "backend": "http://localhost:9130" - }, - { - "endpoint": "/signin/", - "backend": "http://localhost:9130" - }, - { - "type": "regex", - "endpoint": "/ocs/v[12].php/cloud/(users?|groups)", - "backend": "http://localhost:9110" - }, - { - "endpoint": "/ocs/", - "backend": "http://localhost:9140" - }, - { - "type": "query", - "endpoint": "/remote.php/?preview=1", - "backend": "http://localhost:9115" - }, - { - "endpoint": "/remote.php/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/dav/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/webdav/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/status.php", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/index.php/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/data", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/app/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/archiver", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/graph/", - "backend": "http://localhost:9120" - }, - { - "endpoint": "/graph-explorer/", - "backend": "http://localhost:9135" - }, - { - "endpoint": "/api/v0/accounts", - "backend": "http://localhost:9181" - }, - { - "endpoint": "/accounts.js", - "backend": "http://localhost:9181" - }, - { - "endpoint": "/api/v0/settings", - "backend": "http://localhost:9190" - }, - { - "endpoint": "/settings.js", - "backend": "http://localhost:9190" - } - ] - } - ] -} \ No newline at end of file diff --git a/settings/config/example.json b/settings/config/example.json deleted file mode 100644 index 5591fda44f..0000000000 --- a/settings/config/example.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "debug": { - "addr": "0.0.0.0:9194", - "token": "", - "pprof": false, - "zpages": false - }, - "http": { - "addr": "0.0.0.0:9190" - }, - "tracing": { - "enabled": false, - "type": "jaeger", - "endpoint": "localhost:6831", - "collector": "http://localhost:14268/api/traces", - "service": "settings" - } -} diff --git a/settings/config/example.yml b/settings/config/example.yml deleted file mode 100644 index d7986c8006..0000000000 --- a/settings/config/example.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -debug: - addr: 0.0.0.0:9194 - token: - pprof: false - zpages: false - -http: - addr: 0.0.0.0:9190 - -tracing: - enabled: false - type: jaeger - endpoint: localhost:6831 - collector: http://localhost:14268/api/traces - service: settings - -... diff --git a/storage/config/example.json b/storage/config/example.json deleted file mode 100644 index 8076deb52c..0000000000 --- a/storage/config/example.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "debug": { - "addr": "0.0.0.0:9109", - "token": "", - "pprof": false, - "zpages": false - }, - "http": { - "addr": "0.0.0.0:9105" - }, - "grpc": { - "addr": "0.0.0.0:9106" - }, - "tracing": { - "enabled": false, - "type": "jaeger", - "endpoint": "localhost:6831", - "collector": "http://localhost:14268/api/traces", - "service": "reva" - }, - "asset": { - "path": "" - } -} diff --git a/storage/config/example.yml b/storage/config/example.yml deleted file mode 100644 index 41c533d41d..0000000000 --- a/storage/config/example.yml +++ /dev/null @@ -1,24 +0,0 @@ ---- -debug: - addr: 0.0.0.0:9109 - token: - pprof: false - zpages: false - -http: - addr: 0.0.0.0:9105 - -grpc: - addr: 0.0.0.0:9106 - -tracing: - enabled: false - type: jaeger - endpoint: localhost:6831 - collector: http://localhost:14268/api/traces - service: reva - -asset: - path: - -... diff --git a/storage/config/mimetypes.json b/storage/config/mimetypes.json deleted file mode 100644 index 866ae9c51a..0000000000 --- a/storage/config/mimetypes.json +++ /dev/null @@ -1,92 +0,0 @@ -[ - { - "mime_type": "application/pdf", - "extension": "pdf", - "name": "PDF", - "description": "PDF document", - "icon": "", - "default_app": "", - "allow_creation": false - }, - { - "mime_type": "application/vnd.oasis.opendocument.text", - "extension": "odt", - "name": "OpenDocument", - "description": "OpenDocument text document", - "icon": "", - "default_app": "", - "allow_creation": true - }, - { - "mime_type": "application/vnd.oasis.opendocument.spreadsheet", - "extension": "ods", - "name": "OpenSpreadsheet", - "description": "OpenDocument spreadsheet document", - "icon": "", - "default_app": "", - "allow_creation": true - }, - { - "mime_type": "application/vnd.oasis.opendocument.presentation", - "extension": "odp", - "name": "OpenPresentation", - "description": "OpenDocument presentation document", - "icon": "", - "default_app": "", - "allow_creation": true - }, - { - "mime_type": "application/vnd.openxmlformats-officedocument.wordprocessingml.document", - "extension": "docx", - "name": "Microsoft Word", - "description": "Microsoft Word document", - "icon": "", - "default_app": "", - "allow_creation": true - }, - { - "mime_type": "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", - "extension": "xlsx", - "name": "Microsoft Excel", - "description": "Microsoft Excel document", - "icon": "", - "default_app": "", - "allow_creation": true - }, - { - "mime_type": "application/vnd.openxmlformats-officedocument.presentationml.presentation", - "extension": "pptx", - "name": "Microsoft PowerPoint", - "description": "Microsoft PowerPoint document", - "icon": "", - "default_app": "", - "allow_creation": true - }, - { - "mime_type": "application/vnd.jupyter", - "extension": "ipynb", - "name": "Jupyter Notebook", - "description": "Jupyter Notebook", - "icon": "", - "default_app": "", - "allow_creation": true - }, - { - "mime_type": "text/markdown", - "extension": "md", - "name": "Markdown file", - "description": "Markdown file", - "icon": "", - "default_app": "", - "allow_creation": true - }, - { - "mime_type": "application/compressed-markdown", - "extension": "zmd", - "name": "Compressed markdown file", - "description": "Compressed markdown file", - "icon": "", - "default_app": "", - "allow_creation": false - } -] diff --git a/store/config/example.json b/store/config/example.json deleted file mode 100644 index 3781d6bbc3..0000000000 --- a/store/config/example.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "debug": { - "addr": "0.0.0.0:9460", - "token": "", - "pprof": false, - "zpages": false - }, - "tracing": { - "enabled": false, - "type": "jaeger", - "endpoint": "localhost:6831", - "collector": "http://localhost:14268/api/traces", - "service": "store" - } -} diff --git a/store/config/example.yml b/store/config/example.yml deleted file mode 100644 index bfd01811b8..0000000000 --- a/store/config/example.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -debug: - addr: 0.0.0.0:9460 - token: - pprof: false - zpages: false - -tracing: - enabled: false - type: jaeger - endpoint: localhost:6831 - collector: http://localhost:14268/api/traces - service: store - -... diff --git a/thumbnails/config/example.json b/thumbnails/config/example.json deleted file mode 100644 index c2a6ebf922..0000000000 --- a/thumbnails/config/example.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "debug": { - "addr": "0.0.0.0:9189", - "token": "", - "pprof": false, - "zpages": false - }, - "http": { - "addr": "0.0.0.0:9110" - }, - "tracing": { - "enabled": false, - "type": "jaeger", - "endpoint": "localhost:6831", - "collector": "http://localhost:14268/api/traces", - "service": "thumbnails" - } -} diff --git a/thumbnails/config/example.yml b/thumbnails/config/example.yml deleted file mode 100644 index 7e1b1491a2..0000000000 --- a/thumbnails/config/example.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -debug: - addr: 0.0.0.0:9189 - token: - pprof: false - zpages: false - -http: - addr: 0.0.0.0:9110 - -tracing: - enabled: false - type: jaeger - endpoint: localhost:6831 - collector: http://localhost:14268/api/traces - service: thumbnails - -... diff --git a/web/config/example.json b/web/config/example.json deleted file mode 100644 index 90bdc6fb01..0000000000 --- a/web/config/example.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "debug": { - "addr": "0.0.0.0:9104", - "token": "", - "pprof": false, - "zpages": false - }, - "http": { - "addr": "0.0.0.0:9100" - }, - "tracing": { - "enabled": false, - "type": "jaeger", - "endpoint": "localhost:6831", - "collector": "http://localhost:14268/api/traces", - "service": "web" - }, - "asset": { - "path": "" - }, - "config": { - "file": "" - } -} diff --git a/web/config/example.yml b/web/config/example.yml deleted file mode 100644 index 986d9e9d73..0000000000 --- a/web/config/example.yml +++ /dev/null @@ -1,24 +0,0 @@ ---- -debug: - addr: 0.0.0.0:9104 - token: - pprof: false - zpages: false - -http: - addr: 0.0.0.0:9100 - -tracing: - enabled: false - type: jaeger - endpoint: localhost:6831 - collector: http://localhost:14268/api/traces - service: web - -asset: - path: - -config: - file: - -... diff --git a/webdav/config/example.json b/webdav/config/example.json deleted file mode 100644 index cb9038bf28..0000000000 --- a/webdav/config/example.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "debug": { - "addr": "0.0.0.0:9119", - "token": "", - "pprof": false, - "zpages": false - }, - "http": { - "addr": "0.0.0.0:9115" - }, - "tracing": { - "enabled": false, - "type": "jaeger", - "endpoint": "localhost:6831", - "collector": "http://localhost:14268/api/traces", - "service": "webdav" - } -} diff --git a/webdav/config/example.yml b/webdav/config/example.yml deleted file mode 100644 index a02834860a..0000000000 --- a/webdav/config/example.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -debug: - addr: 0.0.0.0:9119 - token: - pprof: false - zpages: false - -http: - addr: 0.0.0.0:9115 - -tracing: - enabled: false - type: jaeger - endpoint: localhost:6831 - collector: http://localhost:14268/api/traces - service: webdav - -... From 3d4293c7a0e2c31d2898f2a9ed3caf54ac5e5bda Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Wed, 23 Mar 2022 08:23:39 +0100 Subject: [PATCH 10/13] add changelog --- changelog/unreleased/drop-json-config-file-support.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 changelog/unreleased/drop-json-config-file-support.md diff --git a/changelog/unreleased/drop-json-config-file-support.md b/changelog/unreleased/drop-json-config-file-support.md new file mode 100644 index 0000000000..b17612a863 --- /dev/null +++ b/changelog/unreleased/drop-json-config-file-support.md @@ -0,0 +1,7 @@ +Change: Drop json config file support + +We've remove the support to configure oCIS and it's service with a json file. +From now on we only support yaml configuration files, since they have the possibility +to add comments. + +https://github.com/owncloud/ocis/pull/3366 From 0f410479de2371a72121143ec21608624ed57518 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Mon, 28 Mar 2022 13:09:13 +0200 Subject: [PATCH 11/13] fix PROXY_OIDC_ISSUER --- .drone.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index faf0739e85..dcbd0a80e6 100644 --- a/.drone.star +++ b/.drone.star @@ -1454,7 +1454,7 @@ def ocisServer(storage, accounts_hash_difficulty = 4, volumes = [], depends_on = user = "33:33" environment = { # Keycloak IDP specific configuration - "PROXY_OIDC_ISSUER": "https://keycloak/auth/realmsowncloud", + "PROXY_OIDC_ISSUER": "https://keycloak/auth/realms/owncloud", "WEB_OIDC_AUTHORITY": "https://keycloak/auth/realms/owncloud", "WEB_OIDC_CLIENT_ID": "ocis-web", "WEB_OIDC_METADATA_URL": "https://keycloak/auth/realms/owncloud/.well-known/openid-configuration", From cc7144d9d13dfd21dcc50847cdd26ef825e692f6 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Mon, 28 Mar 2022 13:13:16 +0200 Subject: [PATCH 12/13] fix config for CI parallel deployment --- .../drone/ocis/proxy.yaml | 96 +++++++++---------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/tests/parallelDeployAcceptance/drone/ocis/proxy.yaml b/tests/parallelDeployAcceptance/drone/ocis/proxy.yaml index 2d1a6aced4..a472adcf12 100644 --- a/tests/parallelDeployAcceptance/drone/ocis/proxy.yaml +++ b/tests/parallelDeployAcceptance/drone/ocis/proxy.yaml @@ -4,51 +4,51 @@ policy_selector: default_policy: oc10 unauthenticated_policy: oc10 policies: -- name: ocis - routes: - - endpoint: "/" - backend: http: //localhost:9100 - - endpoint: "/.well-known/" - backend: http: //localhost:9130 - - type: regex - endpoint: "/ocs/v[12].php/cloud/user/signing-key" - backend: http: //localhost:9110 - - endpoint: "/ocs/" - backend: http: //localhost:9140 - - type: query - endpoint: "/remote.php/?preview=1" - backend: http: //localhost:9115 - - endpoint: "/remote.php/" - backend: http: //localhost:9140 - - endpoint: "/dav/" - backend: http: //localhost:9140 - - endpoint: "/webdav/" - backend: http: //localhost:9140 - - endpoint: "/status.php" - backend: http: //localhost:9140 - - endpoint: "/index.php/" - backend: http: //localhost:9140 - - endpoint: "/index.php/login" - backend: http: //localhost:9100 - - endpoint: "/login" - backend: http: //localhost:9100 - - endpoint: "/data" - backend: http: //localhost:9140 - - endpoint: "/graph/" - backend: http: //localhost:9120 - - endpoint: "/app/" - backend: http: //localhost:9140 - - endpoint: "/archiver" - backend: http: //localhost:9140 - - endpoint: "/graph-explorer/" - backend: http: //localhost:9135 - - endpoint: "/api/v0/settings" - backend: http: //localhost:9190 - - endpoint: "/settings.js" - backend: http: //localhost:9190 -- name: oc10 - routes: - - endpoint: "/" - backend: http: //oc10:8080 - - endpoint: "/data" - backend: http: //localhost:9140 + - name: ocis + routes: + - endpoint: "/" + backend: http://localhost:9100 + - endpoint: "/.well-known/" + backend: http://localhost:9130 + - type: regex + endpoint: "/ocs/v[12].php/cloud/user/signing-key" + backend: http://localhost:9110 + - endpoint: "/ocs/" + backend: http://localhost:9140 + - type: query + endpoint: "/remote.php/?preview=1" + backend: http://localhost:9115 + - endpoint: "/remote.php/" + backend: http://localhost:9140 + - endpoint: "/dav/" + backend: http://localhost:9140 + - endpoint: "/webdav/" + backend: http://localhost:9140 + - endpoint: "/status.php" + backend: http://localhost:9140 + - endpoint: "/index.php/" + backend: http://localhost:9140 + - endpoint: "/index.php/login" + backend: http://localhost:9100 + - endpoint: "/login" + backend: http://localhost:9100 + - endpoint: "/data" + backend: http://localhost:9140 + - endpoint: "/graph/" + backend: http://localhost:9120 + - endpoint: "/app/" + backend: http://localhost:9140 + - endpoint: "/archiver" + backend: http://localhost:9140 + - endpoint: "/graph-explorer/" + backend: http://localhost:9135 + - endpoint: "/api/v0/settings" + backend: http://localhost:9190 + - endpoint: "/settings.js" + backend: http://localhost:9190 + - name: oc10 + routes: + - endpoint: "/" + backend: http://oc10:8080 + - endpoint: "/data" + backend: http://localhost:9140 From bc15db125f35949bf262543d71e4543acc0e213c Mon Sep 17 00:00:00 2001 From: Willy Kloucek <34452982+wkloucek@users.noreply.github.com> Date: Mon, 28 Mar 2022 13:29:18 +0000 Subject: [PATCH 13/13] Automated changelog update [skip ci] --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ee4120aa8..5af2ec379a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ The following sections list the changes for unreleased. * Bugfix - Fix error handling in GraphAPI GetUsers call: [#3357](https://github.com/owncloud/ocis/pull/3357) * Bugfix - Replace public mountpoint fileid with grant fileid: [#3349](https://github.com/owncloud/ocis/pull/3349) * Change - Switch NATS backend: [#3192](https://github.com/owncloud/ocis/pull/3192) +* Change - Drop json config file support: [#3366](https://github.com/owncloud/ocis/pull/3366) * Change - Settings service now stores its data via metadata service: [#3232](https://github.com/owncloud/ocis/pull/3232) * Enhancement - Audit logger will now log file events: [#3332](https://github.com/owncloud/ocis/pull/3332) * Enhancement - Add password reset link to login page: [#3329](https://github.com/owncloud/ocis/pull/3329) @@ -59,6 +60,13 @@ The following sections list the changes for unreleased. https://github.com/owncloud/ocis/pull/3192 https://github.com/cs3org/reva/pull/2574 +* Change - Drop json config file support: [#3366](https://github.com/owncloud/ocis/pull/3366) + + We've remove the support to configure oCIS and it's service with a json file. From now on we only + support yaml configuration files, since they have the possibility to add comments. + + https://github.com/owncloud/ocis/pull/3366 + * Change - Settings service now stores its data via metadata service: [#3232](https://github.com/owncloud/ocis/pull/3232) Instead of writing files to disk it will use metadata service to do so