From 9dbfc9bb8775db2284ea9905cc68d0badc03b1f5 Mon Sep 17 00:00:00 2001 From: Antoon P Date: Mon, 8 May 2023 14:43:21 +0200 Subject: [PATCH 1/4] Rename 'transfer' to 'datatx' --- changelog/unreleased/rename-transfer-to-datatx.md | 4 ++++ cmd/reva/ocm-share-create.go | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 changelog/unreleased/rename-transfer-to-datatx.md diff --git a/changelog/unreleased/rename-transfer-to-datatx.md b/changelog/unreleased/rename-transfer-to-datatx.md new file mode 100644 index 0000000000..1ed6d04493 --- /dev/null +++ b/changelog/unreleased/rename-transfer-to-datatx.md @@ -0,0 +1,4 @@ +Bugfix: Fix inconsistency between data transfer protocol naming. + +https://github.com/cs3org/reva/issues/3858 +https://github.com/cs3org/reva/ \ No newline at end of file diff --git a/cmd/reva/ocm-share-create.go b/cmd/reva/ocm-share-create.go index b9861823fc..b151156a4b 100644 --- a/cmd/reva/ocm-share-create.go +++ b/cmd/reva/ocm-share-create.go @@ -48,12 +48,12 @@ func ocmShareCreateCommand() *command { webdav := cmd.Bool("webdav", false, "create a share with webdav access") webapp := cmd.Bool("webapp", false, "create a share for app access") - transfer := cmd.Bool("transfer", false, "create a share for a data transfer") + datatx := cmd.Bool("datatx", false, "create a share for a data transfer") rol := cmd.String("rol", "viewer", "the permission for the share (viewer or editor) / applies to webdav and webapp") cmd.ResetFlags = func() { - *grantType, *grantee, *idp, *rol, *userType, *webdav, *webapp, *transfer = "user", "", "", "viewer", "primary", false, false, false + *grantType, *grantee, *idp, *rol, *userType, *webdav, *webapp, *datatx = "user", "", "", "viewer", "primary", false, false, false } cmd.Action = func(w ...io.Writer) error { @@ -70,7 +70,7 @@ func ocmShareCreateCommand() *command { return errors.New("IdP cannot be empty: use -idp flag\n" + cmd.Usage()) } - if !*webdav && !*webapp && !*transfer { + if !*webdav && !*webapp && !*datatx { *webdav = true } @@ -111,7 +111,7 @@ func ocmShareCreateCommand() *command { } gt := getGrantType(*grantType) - am, err := getAccessMethods(*webdav, *webapp, *transfer, *rol) + am, err := getAccessMethods(*webdav, *webapp, *datatx, *rol) if err != nil { return err } @@ -155,7 +155,7 @@ func ocmShareCreateCommand() *command { return cmd } -func getAccessMethods(webdav, webapp, transfer bool, rol string) ([]*ocm.AccessMethod, error) { +func getAccessMethods(webdav, webapp, datatx bool, rol string) ([]*ocm.AccessMethod, error) { var m []*ocm.AccessMethod if webdav { perm, err := getOCMSharePerm(rol) @@ -171,7 +171,7 @@ func getAccessMethods(webdav, webapp, transfer bool, rol string) ([]*ocm.AccessM } m = append(m, ocmshare.NewWebappAccessMethod(v)) } - if transfer { + if datatx { m = append(m, ocmshare.NewTransferAccessMethod()) } return m, nil From f39c2f07ab42094fa88a222031e506ca10bea60d Mon Sep 17 00:00:00 2001 From: Antoon P Date: Mon, 8 May 2023 15:35:32 +0200 Subject: [PATCH 2/4] Add #PR --- changelog/unreleased/rename-transfer-to-datatx.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog/unreleased/rename-transfer-to-datatx.md b/changelog/unreleased/rename-transfer-to-datatx.md index 1ed6d04493..f75bd7d631 100644 --- a/changelog/unreleased/rename-transfer-to-datatx.md +++ b/changelog/unreleased/rename-transfer-to-datatx.md @@ -1,4 +1,4 @@ Bugfix: Fix inconsistency between data transfer protocol naming. https://github.com/cs3org/reva/issues/3858 -https://github.com/cs3org/reva/ \ No newline at end of file +https://github.com/cs3org/reva/pull/3859 \ No newline at end of file From c3e16b4f7ca398c46f70f245f0a7333f56ad9836 Mon Sep 17 00:00:00 2001 From: Antoon P Date: Mon, 8 May 2023 15:40:22 +0200 Subject: [PATCH 3/4] Add PR --- changelog/unreleased/rename-transfer-to-datatx.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog/unreleased/rename-transfer-to-datatx.md b/changelog/unreleased/rename-transfer-to-datatx.md index f75bd7d631..72d615277d 100644 --- a/changelog/unreleased/rename-transfer-to-datatx.md +++ b/changelog/unreleased/rename-transfer-to-datatx.md @@ -1,4 +1,4 @@ -Bugfix: Fix inconsistency between data transfer protocol naming. +Bugfix: Fix inconsistency between data transfer protocol naming https://github.com/cs3org/reva/issues/3858 https://github.com/cs3org/reva/pull/3859 \ No newline at end of file From 81270168092f35c6e706c06fe8fa57d2739325a6 Mon Sep 17 00:00:00 2001 From: Antoon P Date: Mon, 8 May 2023 15:50:12 +0200 Subject: [PATCH 4/4] Corrected --- changelog/unreleased/rename-transfer-to-datatx.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/changelog/unreleased/rename-transfer-to-datatx.md b/changelog/unreleased/rename-transfer-to-datatx.md index 72d615277d..b0256ac73e 100644 --- a/changelog/unreleased/rename-transfer-to-datatx.md +++ b/changelog/unreleased/rename-transfer-to-datatx.md @@ -1,4 +1,4 @@ Bugfix: Fix inconsistency between data transfer protocol naming -https://github.com/cs3org/reva/issues/3858 -https://github.com/cs3org/reva/pull/3859 \ No newline at end of file +https://github.com/cs3org/reva/pull/3859 +https://github.com/cs3org/reva/issues/3858 \ No newline at end of file