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

cleanup toml config, add ocmd, drop gen subcommand #2239

Merged
merged 1 commit into from
Nov 5, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 7 additions & 7 deletions .drone.star
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,7 @@ def litmusOcisOldWebdav():
"/drone/src/cmd/revad/revad -c frontend.toml &",
"/drone/src/cmd/revad/revad -c gateway.toml &",
"/drone/src/cmd/revad/revad -c storage-home-ocis.toml &",
"/drone/src/cmd/revad/revad -c storage-oc-ocis.toml &",
"/drone/src/cmd/revad/revad -c storage-users-ocis.toml &",
"/drone/src/cmd/revad/revad -c users.toml",
],
},
Expand Down Expand Up @@ -624,7 +624,7 @@ def litmusOcisNewWebdav():
"/drone/src/cmd/revad/revad -c frontend.toml &",
"/drone/src/cmd/revad/revad -c gateway.toml &",
"/drone/src/cmd/revad/revad -c storage-home-ocis.toml &",
"/drone/src/cmd/revad/revad -c storage-oc-ocis.toml &",
"/drone/src/cmd/revad/revad -c storage-users-ocis.toml &",
"/drone/src/cmd/revad/revad -c users.toml",
]
},
Expand Down Expand Up @@ -678,7 +678,7 @@ def litmusOcisSpacesDav():
"/drone/src/cmd/revad/revad -c frontend.toml &",
"/drone/src/cmd/revad/revad -c gateway.toml &",
"/drone/src/cmd/revad/revad -c storage-home-ocis.toml &",
"/drone/src/cmd/revad/revad -c storage-oc-ocis.toml &",
"/drone/src/cmd/revad/revad -c storage-users-ocis.toml &",
"/drone/src/cmd/revad/revad -c users.toml",
]
},
Expand Down Expand Up @@ -744,8 +744,8 @@ def ocisIntegrationTests(parallelRuns, skipExceptParts = []):
"/drone/src/cmd/revad/revad -c gateway.toml &",
"/drone/src/cmd/revad/revad -c shares.toml &",
"/drone/src/cmd/revad/revad -c storage-home-ocis.toml &",
"/drone/src/cmd/revad/revad -c storage-oc-ocis.toml &",
"/drone/src/cmd/revad/revad -c storage-publiclink-ocis.toml &",
"/drone/src/cmd/revad/revad -c storage-users-ocis.toml &",
"/drone/src/cmd/revad/revad -c storage-publiclink.toml &",
"/drone/src/cmd/revad/revad -c ldap-users.toml",
],
},
Expand Down Expand Up @@ -819,8 +819,8 @@ def s3ngIntegrationTests(parallelRuns, skipExceptParts = []):
"/drone/src/cmd/revad/revad -c gateway.toml &",
"/drone/src/cmd/revad/revad -c shares.toml &",
"/drone/src/cmd/revad/revad -c storage-home-s3ng.toml &",
"/drone/src/cmd/revad/revad -c storage-oc-s3ng.toml &",
"/drone/src/cmd/revad/revad -c storage-publiclink-s3ng.toml &",
"/drone/src/cmd/revad/revad -c storage-users-s3ng.toml &",
"/drone/src/cmd/revad/revad -c storage-publiclink.toml &",
"/drone/src/cmd/revad/revad -c ldap-users.toml",
],
},
Expand Down
5 changes: 5 additions & 0 deletions changelog/unreleased/toml-cleanup.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Enhancement: update toml configs

We updated the local and drone configurations, cleanad up the example configs and removed the reva gen subcommand which was generating outdated config.

https://github.com/cs3org/reva/pull/2239
8 changes: 0 additions & 8 deletions cmd/reva/completer.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,15 +79,7 @@ func (c *Completer) argumentCompleter(args ...string) []prompt.Suggest {
return []prompt.Suggest{}
}

var suggests []prompt.Suggest

switch args[0] {
case "gen":
suggests = convertCmdToSuggests([]*command{
genConfigSubCommand(),
genUsersSubCommand(),
})
return prompt.FilterHasPrefix(suggests, args[1], true)

case "login":
if len(args) == 2 {
Expand Down
79 changes: 0 additions & 79 deletions cmd/reva/gen-config.go

This file was deleted.

62 changes: 0 additions & 62 deletions cmd/reva/gen-users.go

This file was deleted.

75 changes: 0 additions & 75 deletions cmd/reva/gen.go

This file was deleted.

Loading