Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[full-ci] Revamp Config Parsing #2708

Merged
merged 171 commits into from
Nov 23, 2021
Merged
Changes from 1 commit
Commits
Show all changes
171 commits
Select commit Hold shift + click to select a range
34253fc
remove flagset on proxy, use default config values
refs Oct 29, 2021
94aeefb
first examples of config parsing
refs Oct 29, 2021
998df71
poors man struct inheritance and perpetuity
refs Oct 29, 2021
711acbb
inherit logging config from ocis.yaml, let extensions overwrite their…
refs Oct 30, 2021
18b5536
Merge branch 'master' into try-gookikt-config
refs Oct 30, 2021
7df000d
parse config regardless of supervised / unsupervised
refs Oct 30, 2021
7fa70d7
Merge branch 'master' into try-gookikt-config
refs Nov 2, 2021
20b6d0a
add DefaultConfig on accounts
refs Nov 2, 2021
7ca9345
adjust accounts flagset, replace new with defaultconfig
refs Nov 2, 2021
a767356
provide example config + implement parse config on accounts
refs Nov 2, 2021
10731c3
general restructuring
refs Nov 2, 2021
ab1703c
refactor around config parsing
refs Nov 2, 2021
2d7a394
Merge branch 'master' into try-gookikt-config
refs Nov 2, 2021
2a14bb3
fix smells
refs Nov 2, 2021
24b3363
rename _fs -> dirFS
refs Nov 2, 2021
23d8c26
Merge branch 'master' into try-gookikt-config
refs Nov 2, 2021
598944b
Merge branch 'master' into try-gookikt-config
refs Nov 3, 2021
d54fc2f
ignoring config/ ignores changes done to extensions config packages
refs Nov 3, 2021
09195ff
use reflection to set config values from environment
refs Nov 3, 2021
850fe65
comments for mappings
refs Nov 3, 2021
ac373dd
add mode mappings to proxy config struct
refs Nov 3, 2021
90844c5
first draft of config loading exclusively using env vars
refs Nov 3, 2021
7ac71b6
backwards compatibility with urfave/cli
refs Nov 3, 2021
ebd34df
Merge branch 'master' into try-gookikt-config
refs Nov 3, 2021
572e238
infere go type from destination
refs Nov 3, 2021
418cc97
update proxy bindings
refs Nov 3, 2021
3d46e27
Merge branch 'master' into try-gookikt-config
refs Nov 4, 2021
4194da4
add ocis.yaml
refs Nov 4, 2021
e858fa0
define ocis_url as a shared option in ocis-pkg/config
refs Nov 4, 2021
b61887a
hook accounts to env variables
refs Nov 4, 2021
cfe1ac3
add graph
refs Nov 4, 2021
a76ad08
fix dead code logic
refs Nov 4, 2021
da36ca8
adjust flagsets
refs Nov 4, 2021
ba16351
migrate idp to the new config scheme
refs Nov 5, 2021
91c7662
migrate graph-explorer to the new config scheme
refs Nov 5, 2021
be9eff8
add tags to structs
refs Nov 5, 2021
ff7022a
migrate ocs to the new config scheme
refs Nov 5, 2021
28b0b8f
fix ocis root flagset
refs Nov 5, 2021
17dbc3d
migrate settings to the new config scheme
refs Nov 5, 2021
b44ebce
continue thumbnails migration
refs Nov 5, 2021
11855bc
Merge branch 'master' into try-gookikt-config
refs Nov 5, 2021
ca997e5
migrate web to the new config scheme
refs Nov 5, 2021
ad72f75
migrate webdav to the new config scheme
refs Nov 5, 2021
99f28e6
migrate store to the new config scheme
refs Nov 5, 2021
8202f7b
fix offenses
refs Nov 5, 2021
b94c0e6
fix yet more offenses
refs Nov 5, 2021
a55a039
add mapstructure to ocs
refs Nov 5, 2021
9466e01
change log level to debug
refs Nov 5, 2021
3206b98
attempt to fix flags
refs Nov 5, 2021
6f27c1a
refactor env unbinding to ocis-pkg
refs Nov 7, 2021
835928b
Merge branch 'master' into try-gookikt-config
refs Nov 7, 2021
74dae6d
add ocis-pkg/config default config + fix logging inheritance
refs Nov 8, 2021
0e9b6d8
fix log inheritance
refs Nov 8, 2021
4999d4a
fix test
refs Nov 8, 2021
d782814
fix log inheritance for accounts
refs Nov 8, 2021
e8b9186
normalize glauth
refs Nov 8, 2021
4c9e471
normalize graph
refs Nov 8, 2021
22601de
normalize graph-explorer
refs Nov 8, 2021
a515a97
normalize idp
refs Nov 8, 2021
e297142
normalize ocs
refs Nov 8, 2021
db9dc74
normalize settings
refs Nov 8, 2021
23cfb90
normalize store
refs Nov 8, 2021
f76dfc9
normalize thumbnails
refs Nov 8, 2021
b1de937
fix tests
refs Nov 8, 2021
185cee0
normalize web
refs Nov 8, 2021
8c2a681
normalize webdav
refs Nov 8, 2021
2dd9a7b
new config framework in proxy
refs Nov 8, 2021
bff4ec4
new config framework in accounts
refs Nov 8, 2021
3d90b21
new config framework in glauth
refs Nov 8, 2021
6da95d3
new config framework in graph
refs Nov 8, 2021
261a800
new config framework in idp
refs Nov 8, 2021
51dc171
new config framework in ocs
refs Nov 8, 2021
8f99fdc
new config framework in settings
refs Nov 8, 2021
ef13618
new config framework in store
refs Nov 8, 2021
96033dc
new config framework in thumbnails
refs Nov 8, 2021
c05c3db
new config framework in web
refs Nov 8, 2021
e308992
new config framework in webdav
refs Nov 8, 2021
1d5488a
Merge branch 'master' into try-gookikt-config
refs Nov 8, 2021
9d0809b
update drone star ocis debug level
refs Nov 8, 2021
e7f9fb3
refactor NewLogger away to ocis-pkg
refs Nov 8, 2021
2c49ee6
first doc draft + glauth logging small refactor
refs Nov 8, 2021
82a66b5
added shared log values to config template
refs Nov 9, 2021
7f557d3
Merge branch 'master' into try-gookikt-config
refs Nov 9, 2021
26aa37c
reword docs
refs Nov 9, 2021
c335c4d
config dump endpoint for proxy
refs Nov 9, 2021
ee03185
add support for json driver
refs Nov 9, 2021
16bb92f
fix hello deployment
wkloucek Nov 9, 2021
e4742fb
fix cs3 users example
wkloucek Nov 9, 2021
713c0bb
fix oc10 ocis parallel deployment
wkloucek Nov 9, 2021
51bee0e
sort out flags precedence
refs Nov 9, 2021
b961817
fix proxy default config
refs Nov 9, 2021
04d8ec8
Merge branch 'master' into try-gookikt-config
refs Nov 10, 2021
aa67106
sane common configurations
refs Nov 11, 2021
52d5539
fix inheritance config on accounts command
refs Nov 11, 2021
9b8c383
Merge branch 'master' into try-gookikt-config
refs Nov 11, 2021
cfc9738
format
refs Nov 11, 2021
0d1c8ac
fix deref memory location
refs Nov 11, 2021
6391d94
glauth
refs Nov 11, 2021
f118357
graph
refs Nov 11, 2021
c6191b7
fix account unit tests
refs Nov 11, 2021
7eb2c25
propagate storage common logging config
refs Nov 11, 2021
e8559d1
fix proxy integration tests
refs Nov 11, 2021
48eab0c
add idp common options
refs Nov 11, 2021
34840d6
fix individual idp command
refs Nov 11, 2021
202e63b
made ocs compliant with shared.Commons
refs Nov 11, 2021
a29f10e
adapted proxy tests to support shared.Commons
refs Nov 11, 2021
3580e16
losing my mind
refs Nov 11, 2021
582649b
fix more inheritance on storages
refs Nov 11, 2021
59f5339
fix all storages
refs Nov 11, 2021
5f19300
addded thumbnails to the new inheritance strategy
refs Nov 11, 2021
4cecd9b
addded web to the new inheritance strategy
refs Nov 11, 2021
9c21504
addded webdav to the new inheritance strategy
refs Nov 11, 2021
23836bb
Merge branch 'master' into try-gookikt-config
refs Nov 11, 2021
732e04c
debug config ... trigger CI
refs Nov 11, 2021
b6066f3
Merge branch 'master' into try-gookikt-config
refs Nov 12, 2021
4db1697
leftover env variables on thumbnails
refs Nov 12, 2021
242b3e9
Merge branch 'master' into try-gookikt-config
refs Nov 15, 2021
a22342e
fix code smells
refs Nov 15, 2021
2b0f414
Revert "fix code smells"
refs Nov 15, 2021
fde5e35
fix commons propagation
refs Nov 15, 2021
cfbe37d
WIP - replace flags in storage commands
refs Nov 15, 2021
d23ab5a
Merge branch 'master' into try-gookikt-config
refs Nov 15, 2021
097c853
populate checksum
refs Nov 15, 2021
0d7be0d
set all previously set on c.StringSlice values on the bootstrap config
refs Nov 16, 2021
9a4df2f
Merge branch 'master' into try-gookikt-config
refs Nov 16, 2021
8c926f2
Merge branch 'master' into try-gookikt-config
refs Nov 16, 2021
2ebc0b4
add missing authprovider config
refs Nov 16, 2021
2aa9c24
Merge branch 'master' into try-gookikt-config
refs Nov 16, 2021
8c307ef
add missing OCIS_INSECURE binding on PROXY_OIDC_INSECURE
refs Nov 16, 2021
658bf9a
increase logging level to see more on ci
refs Nov 16, 2021
deba643
add set of env variables used on ci to the bootstrap config env parsing
refs Nov 16, 2021
f4085f6
revert ocis log level to error (CI)
refs Nov 16, 2021
7617cca
increase log level and remove dead lines
refs Nov 16, 2021
d30e776
add more OCIS_URL missing spots in storage
refs Nov 16, 2021
e139a09
change logging level back to error
refs Nov 16, 2021
7f652ae
migrate all flags to config binding mappings
refs Nov 16, 2021
26db9af
undo const...
refs Nov 16, 2021
5fe1be8
sneaky bug
refs Nov 16, 2021
9c7c2b6
empty commit to trigger full ci
refs Nov 16, 2021
017eea8
delete storage flagsets
refs Nov 17, 2021
05825d8
removed docs-generate build target from module storage
refs Nov 17, 2021
c7a4391
disable docs pipeline
refs Nov 17, 2021
f87b5bd
removed all flagset packages
refs Nov 17, 2021
c567eb6
removed yet more flagsets
refs Nov 17, 2021
aa4112e
fixed code smells: string literal repetition + cyclomatic complexity
refs Nov 17, 2021
ff61163
Revert "fixed code smells: string literal repetition + cyclomatic com…
refs Nov 17, 2021
f535041
refactor config values to constants
refs Nov 17, 2021
a34f5b6
Revert "refactor config values to constants"
refs Nov 17, 2021
592a910
restore flags for some account commands
refs Nov 17, 2021
1d127c8
remove dead code from store regarding common propagation
refs Nov 17, 2021
872cd80
Revert "remove dead code from store regarding common propagation"
refs Nov 17, 2021
ad4fb0e
attempt to revert to the old status. Just triggering a CI run
refs Nov 17, 2021
3d80925
Merge branch 'master' into try-gookikt-config
refs Nov 17, 2021
fe61ad4
reordered env var priorities
refs Nov 17, 2021
c22d3fc
prevent gookit/config to merge proxy values with default values
refs Nov 18, 2021
c427e62
need to populate policies in the tests
refs Nov 18, 2021
2434718
use ocisConfig as struct tagname to bind config files to strucg attri…
refs Nov 19, 2021
846df22
Merge branch 'master' into try-gookikt-config
refs Nov 19, 2021
2601efb
Merge branch 'master' into try-gookikt-config
refs Nov 19, 2021
f64ca1f
introduce AlternativeID attribute, which needs some explanation
refs Nov 19, 2021
70da20a
Merge branch 'master' into try-gookikt-config
refs Nov 19, 2021
1570e40
applied review comments by @wkloucek
refs Nov 19, 2021
1708149
comment docs pipeline again
refs Nov 19, 2021
9c3fb1c
comment out .make/docs.mk config-docs-generate target
refs Nov 20, 2021
45a559f
Revert "comment out .make/docs.mk config-docs-generate target"
refs Nov 20, 2021
c700cca
removed redundant ocis config parsing
refs Nov 22, 2021
8797cf3
Revert "removed redundant ocis config parsing"
refs Nov 22, 2021
ca55576
fix doc generation and reenable docs pipeline in CI
wkloucek Nov 23, 2021
552a79c
added changelog
refs Nov 23, 2021
889f37f
reimport docs makefile in storage
wkloucek Nov 23, 2021
43af041
reword changelog
refs Nov 23, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .drone.star
Original file line number Diff line number Diff line change
@@ -146,7 +146,7 @@ def main(ctx):

build_release_helpers = [
changelog(ctx),
#docs(ctx),
docs(ctx),
]

test_pipelines.append(
6 changes: 4 additions & 2 deletions .make/docs.mk
Original file line number Diff line number Diff line change
@@ -2,8 +2,10 @@
SKIP_CONFIG_DOCS_GENERATE ?= 0
CONFIG_DOCS_BASE_PATH ?= ../docs/extensions

#.PHONY: config-docs-generate
#config-docs-generate: $(FLAEX)
.PHONY: config-docs-generate
config-docs-generate: #$(FLAEX)
# since https://github.com/owncloud/ocis/pull/2708 flaex can no longer be used
# TODO: how to document configuration
# @if [ $(SKIP_CONFIG_DOCS_GENERATE) -ne 1 ]; then \
# $(FLAEX) >| $(CONFIG_DOCS_BASE_PATH)/$(NAME)/configuration.md \
# ; fi;
2 changes: 1 addition & 1 deletion docs/ocis/deployment/basic-remote-setup.md
Original file line number Diff line number Diff line change
@@ -53,7 +53,7 @@ PROXY_TRANSPORT_TLS_CERT=./certs/your-host.crt \

If you generated these certificates on your own, you might need to set `OCIS_INSECURE` to `true`.

For more configuration options check the configuration section in [oCIS]({{< ref "../configuration" >}}) and the oCIS extensions.
For more configuration options check the configuration section in [oCIS]({{< ref "../config" >}}) and the oCIS extensions.

## Start the oCIS fullstack server with Docker Compose

2 changes: 1 addition & 1 deletion docs/ocis/getting-started/_index.md
Original file line number Diff line number Diff line change
@@ -71,7 +71,7 @@ Open [https://localhost:9200](https://localhost:9200) and [login using one of th

### Basic Management Commands

The oCIS single binary contains multiple extensions and the `ocis` command helps you to manage them. You already used `ocis server` to run all available extensions in the [Run oCIS]({{< ref "#run-ocis" >}}) section. We now will show you some more management commands, which you may also explore by typing `ocis --help` or going to the [docs]({{< ref "../configuration" >}}).
The oCIS single binary contains multiple extensions and the `ocis` command helps you to manage them. You already used `ocis server` to run all available extensions in the [Run oCIS]({{< ref "#run-ocis" >}}) section. We now will show you some more management commands, which you may also explore by typing `ocis --help` or going to the [docs]({{< ref "../config" >}}).

To start oCIS server: