[#591] cli: fix SDK PrmContainerDelete usage for DeleteContainerPrm

Signed-off-by: Airat Arifullin <a.arifullin@yadro.com>

cmd/frostfs-cli/internal/client/client.go

@@ -148,8 +148,8 @@ func IsACLExtendable(ctx context.Context, c *client.Client, cnr cid.ID) (bool, e
 
 // DeleteContainerPrm groups parameters of DeleteContainerPrm operation.
 type DeleteContainerPrm struct {
-	commonPrm
+	Client       *client.Client
-	client.PrmContainerDelete
+	ClientParams client.PrmContainerDelete
 }
 
 // DeleteContainerRes groups the resulting values of DeleteContainer operation.
@@ -164,7 +164,7 @@ type DeleteContainerRes struct{}
 //
 // Returns any error which prevented the operation from completing correctly in error return.
 func DeleteContainer(ctx context.Context, prm DeleteContainerPrm) (res DeleteContainerRes, err error) {
-	_, err = prm.cli.ContainerDelete(ctx, prm.PrmContainerDelete)
+	_, err = prm.Client.ContainerDelete(ctx, prm.ClientParams)
 
 	return
 }

cmd/frostfs-cli/modules/container/delete.go

@@ -9,6 +9,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"
 	objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
 	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user"
 	"github.com/spf13/cobra"
@@ -83,12 +84,12 @@ Only owner of the container has a permission to remove container.`,
 			}
 		}
 
-		var delPrm internalclient.DeleteContainerPrm
+		delPrm := internalclient.DeleteContainerPrm{
-		delPrm.SetClient(cli)
+			Client: cli,
-		delPrm.SetContainer(id)
+			ClientParams: client.PrmContainerDelete{
-
+				ContainerID: &id,
-		if tok != nil {
+				Session:     tok,
-			delPrm.WithinSession(*tok)
+			},
 		}
 
 		_, err := internalclient.DeleteContainer(cmd.Context(), delPrm)

go.mod

@@ -6,7 +6,7 @@ require (
 	git.frostfs.info/TrueCloudLab/frostfs-api-go/v2 v2.15.1-0.20230802075510-964c3edb3f44
 	git.frostfs.info/TrueCloudLab/frostfs-contract v0.0.0-20230627134746-36f3d39c406a
 	git.frostfs.info/TrueCloudLab/frostfs-observability v0.0.0-20230531082742-c97d21411eb6
-	git.frostfs.info/TrueCloudLab/frostfs-sdk-go v0.0.0-20230804083501-3dc8129ed794
+	git.frostfs.info/TrueCloudLab/frostfs-sdk-go v0.0.0-20230809065235-d48788c7a946
 	git.frostfs.info/TrueCloudLab/hrw v1.2.1
 	git.frostfs.info/TrueCloudLab/tzhash v1.8.0
 	github.com/cheggaaa/pb v1.0.29