TrueCloudLab/frostfs-node
20
1
Fork 28
Code Issues 107 Pull requests 4 Projects Releases 2 Packages 4 Activity Actions

[#625] cli: Fix SDK EACLPrm usage for PrmContainerEACL
Some checks failed
DCO action / DCO (pull_request) Successful in 1m53s
Details
Vulncheck / Vulncheck (pull_request) Successful in 2m35s
Details
Tests and linters / Staticcheck (pull_request) Successful in 3m33s
Details
Build / Build Components (1.20) (pull_request) Successful in 3m38s
Details
Build / Build Components (1.21) (pull_request) Successful in 3m32s
Details
Tests and linters / Tests with -race (pull_request) Failing after 4m7s
Details
Tests and linters / Tests (1.20) (pull_request) Successful in 5m13s
Details
Tests and linters / Tests (1.21) (pull_request) Successful in 5m29s
Details
Tests and linters / Lint (pull_request) Successful in 20m17s
Details

Browse source 
Signed-off-by: Airat Arifullin <a.arifullin@yadro.com>
This commit is contained in:
Airat Arifullin 2023-08-18 17:44:17 +03:00
parent 354a92ea2c
commit 84ea075587
5 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cmd/frostfs-cli/modules/container/get_eacl.go
View file

@ -8,6 +8,7 @@ import (
"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags"
"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key"
commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common"
"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client"
"github.com/spf13/cobra"
)
@ -20,9 +21,12 @@ var getExtendedACLCmd = &cobra.Command{
pk := key.GetOrGenerate(cmd)
cli := internalclient.GetSDKClientByFlag(cmd, pk, commonflags.RPC)
var eaclPrm internalclient.EACLPrm
eaclPrm.SetClient(cli)
eaclPrm.SetContainer(id)
eaclPrm := internalclient.EACLPrm{
Client: cli,
ClientParams: client.PrmContainerEACL{
ContainerID: &id,
},
}
res, err := internalclient.EACL(cmd.Context(), eaclPrm)
commonCmd.ExitOnErr(cmd, "rpc error: %w", err)

10
cmd/frostfs-cli/modules/container/set_eacl.go
View file

@ -10,6 +10,7 @@ import (
"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags"
"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key"
commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common"
"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client"
"github.com/spf13/cobra"
)
@ -65,9 +66,12 @@ Container ID in EACL table will be substituted with ID from the CLI.`,
cmd.Println("awaiting...")
var getEACLPrm internalclient.EACLPrm
getEACLPrm.SetClient(cli)
getEACLPrm.SetContainer(id)
getEACLPrm := internalclient.EACLPrm{
Client: cli,
ClientParams: client.PrmContainerEACL{
ContainerID: &id,
},
}
for i := 0; i < awaitTimeout; i++ {
time.Sleep(1 * time.Second)