feat(nas): support access point rrsa authentication

cmd/mount-proxy-client/main.go

@@ -7,8 +7,8 @@ import (
 
 	flag "github.com/spf13/pflag"
 
-	"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/mounter/proxy"
 	"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/mounter/proxy/client"
+	mounterutils "github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/mounter/utils"
 	"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/utils"
 )
 
@@ -21,7 +21,7 @@ func main() {
 	utils.AddGoFlags(flag.CommandLine)
 	flag.Parse()
 
-	var req proxy.MountRequest
+	var req mounterutils.MountRequest
 	err := json.NewDecoder(os.Stdin).Decode(&req)
 	if err != nil {
 		fmt.Println(err.Error())

pkg/cloud/stsinterface.go

@@ -4,4 +4,5 @@ import sts20150401 "github.com/alibabacloud-go/sts-20150401/v2/client"
 
 type STSInterface interface {
 	GetCallerIdentity() (response *sts20150401.GetCallerIdentityResponse, err error)
+	AssumeRoleWithOIDC(request *sts20150401.AssumeRoleWithOIDCRequest) (response *sts20150401.AssumeRoleWithOIDCResponse, err error)
 }

pkg/mounter/adaptor_mounter.go

@@ -3,6 +3,7 @@ package mounter
 import (
 	"context"
 
+	"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/mounter/utils"
 	mountutils "k8s.io/mount-utils"
 )
 
@@ -18,9 +19,9 @@ func NewAdaptorMounter(inner mountutils.Interface) Mounter {
 	}
 }
 
-func (m *AdaptorMounter) ExtendedMount(_ context.Context, op *MountOperation) error {
-	if op == nil {
+func (m *AdaptorMounter) ExtendedMount(_ context.Context, req *utils.MountRequest) error {
+	if req == nil {
 		return nil
 	}
-	return m.Mount(op.Source, op.Target, op.FsType, op.Options)
+	return m.Mount(req.Source, req.Target, req.Fstype, req.Options)
 }

pkg/mounter/cmd_mounter.go

@@ -7,7 +7,7 @@ import (
 	"os/exec"
 	"time"
 
-	mounterutils "github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/mounter/utils"
+	"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/mounter/utils"
 	"k8s.io/mount-utils"
 )
 
@@ -29,12 +29,12 @@ func NewOssCmdMounter(execPath, volumeID string, inner mount.Interface) Mounter
 	}
 }
 
-func (m *OssCmdMounter) ExtendedMount(ctx context.Context, op *MountOperation) error {
-	if op == nil {
+func (m *OssCmdMounter) ExtendedMount(ctx context.Context, req *utils.MountRequest) error {
+	if req == nil {
 		return nil
 	}
 
-	cmd := exec.CommandContext(ctx, m.execPath, getArgs(op)...)
+	cmd := exec.CommandContext(ctx, m.execPath, getArgs(req)...)
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 
@@ -44,17 +44,17 @@ func (m *OssCmdMounter) ExtendedMount(ctx context.Context, op *MountOperation) e
 	return nil
 }
 
-func getArgs(op *MountOperation) []string {
-	if op == nil {
+func getArgs(req *utils.MountRequest) []string {
+	if req == nil {
 		return nil
 	}
-	switch op.FsType {
-	case mounterutils.OssFsType:
-		return mount.MakeMountArgs(op.Source, op.Target, "", op.Options)
-	case mounterutils.OssFs2Type:
-		args := []string{"mount", op.Target}
-		args = append(args, op.Args...)
-		for _, o := range op.Options {
+	switch req.Fstype {
+	case utils.OssFsType:
+		return mount.MakeMountArgs(req.Source, req.Target, "", req.Options)
+	case utils.OssFs2Type:
+		args := []string{"mount", req.Target}
+		args = append(args, req.Args...)
+		for _, o := range req.Options {
 			args = append(args, fmt.Sprintf("--%s", o))
 		}
 		return args

pkg/mounter/connector_mounter.go

@@ -3,23 +3,24 @@ package mounter
 import (
 	"context"
 
+	mounterutils "github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/mounter/utils"
 	"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/utils"
 	"k8s.io/klog/v2"
-	mountutils "k8s.io/mount-utils"
+	"k8s.io/mount-utils"
 )
 
 type ConnectorMounter struct {
 	mounterPath string
-	mountutils.Interface
+	mount.Interface
 }
 
 var _ Mounter = &ConnectorMounter{}
 
-func (m *ConnectorMounter) ExtendedMount(_ context.Context, op *MountOperation) error {
-	if op == nil {
+func (m *ConnectorMounter) ExtendedMount(_ context.Context, req *mounterutils.MountRequest) error {
+	if req == nil {
 		return nil
 	}
-	args := mountutils.MakeMountArgs(op.Source, op.Target, op.FsType, op.Options)
+	args := mount.MakeMountArgs(req.Source, req.Target, req.Fstype, req.Options)
 	mntCmd := []string{"systemd-run", "--scope", "--"}
 	if m.mounterPath == "" {
 		mntCmd = append(mntCmd, "mount")
@@ -35,15 +36,15 @@ func (m *ConnectorMounter) ExtendedMount(_ context.Context, op *MountOperation)
 }
 
 func (m *ConnectorMounter) Mount(source string, target string, fstype string, options []string) error {
-	return m.ExtendedMount(context.Background(), &MountOperation{
+	return m.ExtendedMount(context.Background(), &mounterutils.MountRequest{
 		Source:  source,
 		Target:  target,
-		FsType:  fstype,
+		Fstype:  fstype,
 		Options: options,
 	})
 }
 
-func NewConnectorMounter(inner mountutils.Interface, mounterPath string) Mounter {
+func NewConnectorMounter(inner mount.Interface, mounterPath string) Mounter {
 	return &ConnectorMounter{
 		mounterPath: mounterPath,
 		Interface:   inner,