[ARVADOS] updated: 2.1.0-1628-gfb96637bf
Git user
git at public.arvados.org
Tue Nov 16 20:43:10 UTC 2021
Summary of changes:
.gitignore | 1 +
apps/workbench/Gemfile.lock | 8 +-
cmd/arvados-package/cmd.go | 32 +-
cmd/arvados-package/install.go | 8 +-
doc/Rakefile | 3 +-
doc/_config.yml | 2 +-
....liquid => _metadata_vocabulary_example.liquid} | 6 +-
doc/_includes/_tutorial_expectations.liquid | 2 +-
...uid => metadata-vocabulary.html.textile.liquid} | 20 +-
doc/admin/upgrading.html.textile.liquid | 16 +-
doc/admin/user-activity.html.textile.liquid | 4 +-
doc/api/permission-model.html.textile.liquid | 4 +-
doc/api/projects.html.textile.liquid | 2 +-
.../keep-components-overview.html.textile.liquid | 10 +-
.../arvados-on-kubernetes-GKE.html.textile.liquid | 2 +-
...ados-on-kubernetes-minikube.html.textile.liquid | 2 +-
.../arvados-on-kubernetes.html.textile.liquid | 2 +-
...install-compute-node-docker.html.textile.liquid | 2 +-
...ll-compute-node-singularity.html.textile.liquid | 2 +-
.../install-workbench2-app.html.textile.liquid | 2 +-
doc/install/salt-multi-host.html.textile.liquid | 11 +-
.../topics/arvados-sync-groups.html.textile.liquid | 2 +-
.../collection-versioning.html.textile.liquid | 2 +-
lib/config/config.default.yml | 17 +-
lib/config/export.go | 5 +-
lib/config/generated_config.go | 17 +-
lib/controller/federation.go | 2 -
lib/controller/federation/conn.go | 46 ++-
lib/controller/federation/federation_test.go | 4 +-
lib/controller/federation/generate.go | 2 +-
lib/controller/federation/generated.go | 41 ++
lib/controller/federation/login_test.go | 2 +-
lib/controller/federation/user_test.go | 6 +-
lib/controller/handler.go | 38 +-
lib/controller/handler_test.go | 100 ++++-
lib/controller/integration_test.go | 60 +++
lib/controller/localdb/collection.go | 12 +-
lib/controller/localdb/collection_test.go | 87 ++++
lib/controller/localdb/conn.go | 122 +++++-
lib/controller/localdb/container_request.go | 39 ++
lib/controller/localdb/container_request_test.go | 166 ++++++++
lib/controller/localdb/group.go | 39 ++
lib/controller/localdb/group_test.go | 138 +++++++
lib/controller/localdb/link.go | 39 ++
lib/controller/localdb/link_test.go | 142 +++++++
lib/controller/router/response.go | 4 +
lib/controller/router/router.go | 42 ++
lib/controller/router/router_test.go | 21 +
lib/controller/rpc/conn.go | 42 ++
lib/crunchrun/crunchrun.go | 7 +-
lib/crunchrun/crunchrun_test.go | 14 +-
lib/install/deps.go | 2 +-
lib/install/deps_go_version_test.go | 40 ++
sdk/go/arvados/api.go | 12 +
sdk/go/arvados/config.go | 39 +-
sdk/go/arvados/container.go | 1 +
sdk/go/arvados/link.go | 26 +-
sdk/go/arvados/vocabulary.go | 220 ++++++++++
sdk/go/arvados/vocabulary_test.go | 457 +++++++++++++++++++++
sdk/go/arvadostest/api.go | 24 ++
sdk/python/arvados/collection.py | 30 +-
sdk/python/tests/run_test_server.py | 1 +
sdk/python/tests/test_collections.py | 19 +
services/api/Gemfile.lock | 8 +-
services/api/app/models/user.rb | 27 +-
.../functional/arvados/v1/users_controller_test.rb | 1 +
services/api/test/unit/permission_test.rb | 2 +
services/api/test/unit/user_test.rb | 47 ++-
services/fuse/arvados_fuse/command.py | 4 +-
services/fuse/arvados_fuse/fusedir.py | 93 +++--
services/fuse/arvados_fuse/fusefile.py | 7 +-
services/fuse/tests/mount_test_base.py | 7 +-
services/fuse/tests/test_mount.py | 24 +-
services/keepstore/unix_volume.go | 35 +-
tools/arvbox/bin/arvbox | 5 +
tools/arvbox/lib/arvbox/docker/Dockerfile.base | 29 +-
76 files changed, 2320 insertions(+), 239 deletions(-)
rename doc/_includes/{_wb2_vocabulary_example.liquid => _metadata_vocabulary_example.liquid} (90%)
rename doc/admin/{workbench2-vocabulary.html.textile.liquid => metadata-vocabulary.html.textile.liquid} (75%)
create mode 100644 lib/controller/localdb/container_request.go
create mode 100644 lib/controller/localdb/container_request_test.go
create mode 100644 lib/controller/localdb/group.go
create mode 100644 lib/controller/localdb/group_test.go
create mode 100644 lib/controller/localdb/link.go
create mode 100644 lib/controller/localdb/link_test.go
create mode 100644 lib/install/deps_go_version_test.go
create mode 100644 sdk/go/arvados/vocabulary.go
create mode 100644 sdk/go/arvados/vocabulary_test.go
via fb96637bf76fe8779e7a7e58f052b8f55ed76f4f (commit)
via fce3aab6c0dce1b3a940ec2f276b39837f5d4724 (commit)
via 3849ee94bbe65ef79df8f50c87b5445a5b1d4877 (commit)
via 528b929e84319067df7bc49162307ee82a9d852c (commit)
via b1a88ceac8f65aaf90076827120e233cb52976d6 (commit)
via a02b821d78d93bd814d8bf2b8b532b8940e93ecf (commit)
via 365b9ca0ea4291d9864297593d185aeef66457ba (commit)
via a4d47d01dbbca45545353cee14f6a0aa2424c149 (commit)
via d3ffe252f9d7cbbad9a7bf61ccf5d26129720f43 (commit)
via 9f4fd542a9fc94e9f48387e90fd70b614458c1f2 (commit)
via a969c0d3e97c2aeff0b64f9f0c8052f71eefa576 (commit)
via ee0b90f8e2e9fc75ea810336dc398d8365752e79 (commit)
via 1c36c7a9d4cb3829e57aab9ac84a6b85ec35459c (commit)
via d0a50cd1fafca2a931f35f7997bd40f01a295ee0 (commit)
via 2437c9eb78db1fbeb5365bd403dc791096a03a2b (commit)
via 615722f1097cb80e085f959fa2e6cad94a02cf07 (commit)
via d35c1a7499cabedf0e2b6e592e0abf039fb8450f (commit)
via 9df4cad4500d092bb07909b6f49e4eaaa6d31984 (commit)
via a78762353971ea3707bcf92960a12557d66fb9af (commit)
via f1b121ccb36483304fc6debdab62e680f84dc98f (commit)
via e60cae2f887a433b2bae0921bfdfed4096c9cbd6 (commit)
via 54d36a634def086f5c3b16e897489ee84cbd27f4 (commit)
via a4886639d07503f3101800feb7deaf7aae025312 (commit)
via 617d783980943ac7cda84d94a5a43e06adeb838e (commit)
via 613b22c08b3fb2fb24a15b17ce7de04e3f7ebc35 (commit)
via 69a9857a37007723c17007b0c2f960b87e95bc02 (commit)
via c51e85a536ec9520ce9c8784bf26b639f7e4ce0a (commit)
via e7aec8c18af9ae99d0a43c1d172d8598ee8bf577 (commit)
via f827088cc812a217bfb46aca66be62b79b7ed973 (commit)
via d1af1ede3314ec5ae9b7dbbe51f8a8a7314ba651 (commit)
via d75bcd1e8bb8c5b312ccd6c86136d0c1e1d7b904 (commit)
via 79870ba994f0606c8ed13806f00cb8b23d9b2c83 (commit)
via 1f7f3f7f49d3e2d44b77472bfc1f204ae0496a70 (commit)
via 7b7de0ba345c02103bbaa9fb981424c59d440d55 (commit)
via 36b4a526be01a76eeb2ef2db645598f45f1de992 (commit)
via 733d05ba984089553428a40a74478fa6700b4e9f (commit)
via 29f32bb5c13c5a9667d12455013ba24b7a8725b1 (commit)
via d60aa7ad3fec08ffd158ab88c2e0758627e4928b (commit)
via 8b042997093ad9aa96c159ca952746449bd5b315 (commit)
via 3f32ceb98c74d4c1ad056615c3dac359ad0c0bce (commit)
via 13dea78ff8ad72bd8a406843bb702aef0d0f569a (commit)
via 1cd689f0355b29be7d0e4b316369eed5c228f92a (commit)
via 88a28473710c28f36cf8fab178697dd5e0d7a6ac (commit)
via 7e85063ebffe3a6d990fb0b2eac62b1906660a21 (commit)
via d98a3ad49469f33e01e35776afff55e1452a2321 (commit)
via 7dcbe06182de70d158835e400d61fa026eac6384 (commit)
via 5fc1dcfcb58c70b8347cc74dab2a9e0501f26cca (commit)
via 3b6a4a8e1dc7614216bae1177e6a646f366a048d (commit)
via 5e864400e2f82db117c15eaac4c7c5c3ad913bd6 (commit)
via c3f165fd3fa7a39643af96e6c7b5095ee8c43f9d (commit)
via 3a822f9f2f0907fd1bdb530390772b7e0f46c9cb (commit)
via a357f5f197dbe54314608d4c5acbdd9e1959afba (commit)
via 9ff58642c2c1eaae8d6dd7c01e8fb85a030c2dfc (commit)
via 3ce7895505f99de703ec750e4b0bf10334522b2d (commit)
via 5e4b8ac7997c68ffa45471b9879789c96068885d (commit)
from 47c3faf1e26be21190eeee7f266d44eb33a0aeb6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit fb96637bf76fe8779e7a7e58f052b8f55ed76f4f
Merge: fce3aab6c 3849ee94b
Author: Tom Clegg <tom at curii.com>
Date: Tue Nov 16 15:28:06 2021 -0500
17840: Merge branch 'main'
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
commit fce3aab6c0dce1b3a940ec2f276b39837f5d4724
Author: Tom Clegg <tom at curii.com>
Date: Tue Nov 16 15:27:27 2021 -0500
17840: Use cmd.ParseFlags for arvados-package command.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/cmd/arvados-package/cmd.go b/cmd/arvados-package/cmd.go
index 863bbe925..a64d44074 100644
--- a/cmd/arvados-package/cmd.go
+++ b/cmd/arvados-package/cmd.go
@@ -33,7 +33,7 @@ var (
func main() {
if len(os.Args) < 2 || strings.HasPrefix(os.Args[1], "-") {
- parseFlags([]string{"-help"})
+ parseFlags(os.Args[0], []string{"-help"}, os.Stderr)
os.Exit(2)
}
os.Exit(handler.RunCommand(os.Args[0], os.Args[1:], os.Stdin, os.Stdout, os.Stderr))
@@ -44,12 +44,11 @@ type cmdFunc func(ctx context.Context, opts opts, stdin io.Reader, stdout, stder
func (cf cmdFunc) RunCommand(prog string, args []string, stdin io.Reader, stdout, stderr io.Writer) int {
logger := ctxlog.New(stderr, "text", "info")
ctx := ctxlog.Context(context.Background(), logger)
- opts, err := parseFlags(args)
- if err != nil {
- logger.WithError(err).Error("error parsing command line flags")
- return 1
+ opts, ok, code := parseFlags(prog, args, stderr)
+ if !ok {
+ return code
}
- err = cf(ctx, opts, stdin, stdout, stderr)
+ err := cf(ctx, opts, stdin, stdout, stderr)
if err != nil {
logger.WithError(err).Error("failed")
return 1
@@ -68,7 +67,7 @@ type opts struct {
Vendor string
}
-func parseFlags(args []string) (opts, error) {
+func parseFlags(prog string, args []string, stderr io.Writer) (_ opts, ok bool, exitCode int) {
opts := opts{
SourceDir: ".",
TargetOS: "debian:10",
@@ -120,24 +119,23 @@ Options:
`)
flags.PrintDefaults()
}
- err := flags.Parse(args)
- if err != nil {
- return opts, err
- }
- if flags.NArg() != 0 {
- return opts, fmt.Errorf("unrecognized command line arguments: %v", flags.Args())
+ if ok, code := cmd.ParseFlags(flags, prog, args, "", stderr); !ok {
+ return opts, false, code
}
if opts.SourceDir == "" {
d, err := os.Getwd()
if err != nil {
- return opts, fmt.Errorf("Getwd: %w", err)
+ fmt.Fprintf(stderr, "error getting current working directory: %s\n", err)
+ return opts, false, 1
}
opts.SourceDir = d
}
opts.PackageDir = filepath.Clean(opts.PackageDir)
- opts.SourceDir, err = filepath.Abs(opts.SourceDir)
+ abs, err := filepath.Abs(opts.SourceDir)
if err != nil {
- return opts, err
+ fmt.Fprintf(stderr, "error resolving source dir %q: %s\n", opts.SourceDir, err)
+ return opts, false, 1
}
- return opts, nil
+ opts.SourceDir = abs
+ return opts, true, 0
}
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list