Merge pull request #520 from tam7t/tam7t/atomic

feat: use the atomic file writer

Author: k8s-ci-robot

pkg/secrets-store/nodeserver_test.go

@@ -363,7 +363,7 @@ func TestNodeUnpublishVolume(t *testing.T) {
 			name: "Success for a mounted volume with a retry",
 			nodeUnpublishVolReq: csi.NodeUnpublishVolumeRequest{
 				VolumeId:   "testvolid1",
-				TargetPath: tmpdir.New(t, "", `*\\pods\\fakePod\\volumes\\kubernetes.io~csi\\myvol\\mount`),
+				TargetPath: tmpdir.New(t, "", `*mount`),
 			},
 			mountPoints:        []mount.MountPoint{},
 			shouldRetryUnmount: true,

pkg/secrets-store/provider_client_test.go

@@ -21,8 +21,8 @@ import (
 	"errors"
 	"fmt"
 	"os"
-	"path/filepath"
 	"reflect"
+	"runtime"
 	"sync"
 	"testing"
 	"time"
@@ -33,6 +33,7 @@ import (
 	"google.golang.org/grpc/status"
 
 	"sigs.k8s.io/secrets-store-csi-driver/pkg/test_utils/tmpdir"
+	"sigs.k8s.io/secrets-store-csi-driver/pkg/util/fileutil"
 	"sigs.k8s.io/secrets-store-csi-driver/provider/fake"
 	"sigs.k8s.io/secrets-store-csi-driver/provider/v1alpha1"
 )
@@ -64,6 +65,7 @@ func TestMountContent(t *testing.T) {
 		files          []*v1alpha1.File
 		// expectations
 		expectedFiles map[string]os.FileMode
+		skipon        string
 	}{
 		{
 			name:           "provider successful response (no files)",
@@ -77,13 +79,13 @@ func TestMountContent(t *testing.T) {
 			files: []*v1alpha1.File{
 				{
 					Path:     "foo",
-					Mode:     0644,
+					Mode:     0666,
 					Contents: []byte("foo"),
 				},
 			},
 			objectVersions: map[string]string{"foo": "v1"},
 			expectedFiles: map[string]os.FileMode{
-				"foo": 0644,
+				"foo": 0666,
 			},
 		},
 		{
@@ -92,25 +94,87 @@ func TestMountContent(t *testing.T) {
 			files: []*v1alpha1.File{
 				{
 					Path:     "foo",
-					Mode:     0644,
+					Mode:     0666,
 					Contents: []byte("foo"),
 				},
 				{
 					Path:     "bar",
+					Mode:     0444,
+					Contents: []byte("bar"),
+				},
+			},
+			objectVersions: map[string]string{"foo": "v1"},
+			expectedFiles: map[string]os.FileMode{
+				"foo": 0666,
+				"bar": 0444,
+			},
+		},
+		{
+			name:       "provider response with nested files (linux)",
+			permission: "777",
+			files: []*v1alpha1.File{
+				{
+					Path:     "foo",
+					Mode:     0644,
+					Contents: []byte("foo"),
+				},
+				{
+					Path:     "baz/bar",
 					Mode:     0777,
 					Contents: []byte("bar"),
 				},
+				{
+					Path:     "baz/qux",
+					Mode:     0777,
+					Contents: []byte("qux"),
+				},
 			},
 			objectVersions: map[string]string{"foo": "v1"},
 			expectedFiles: map[string]os.FileMode{
-				"foo": 0644,
-				"bar": 0777,
+				"foo":     0644,
+				"baz/bar": 0777,
+				"baz/qux": 0777,
+			},
+			skipon: "windows",
+		},
+		{
+			// note: this is a bit weird because the path `baz\bar` on windows
+			// should be a file `bar` nested in a folder `baz`. it _actually_
+			// works on linux though because the `\` character is just treated
+			// as part of the filename.
+			name:       "provider response with nested files (windows)",
+			permission: "777",
+			files: []*v1alpha1.File{
+				{
+					Path:     "foo",
+					Mode:     0444,
+					Contents: []byte("foo"),
+				},
+				{
+					Path:     "baz\\bar",
+					Mode:     0444,
+					Contents: []byte("bar"),
+				},
+				{
+					Path:     "baz\\qux",
+					Mode:     0666,
+					Contents: []byte("qux"),
+				},
+			},
+			objectVersions: map[string]string{"foo": "v1"},
+			expectedFiles: map[string]os.FileMode{
+				"foo":      0444,
+				"baz\\bar": 0444,
+				"baz\\qux": 0666,
 			},
 		},
 	}
 
 	for _, test := range cases {
 		t.Run(test.name, func(t *testing.T) {
+			if test.skipon == runtime.GOOS {
+				t.SkipNow()
+			}
 			socketPath := tmpdir.New(t, "", "ut")
 			targetPath := tmpdir.New(t, "", "ut")
 
@@ -140,18 +204,17 @@ func TestMountContent(t *testing.T) {
 
 			// check that file was written
 			gotFiles := make(map[string]os.FileMode)
-			filepath.Walk(targetPath, func(path string, info os.FileInfo, err error) error {
-				// skip mount folder
-				if path == targetPath {
-					return nil
-				}
-				rel, err := filepath.Rel(targetPath, path)
+			paths, err := fileutil.GetMountedFiles(targetPath)
+			if err != nil {
+				t.Fatalf("unable to read mounted files: %s", err)
+			}
+			for rel, abs := range paths {
+				info, err := os.Lstat(abs)
 				if err != nil {
-					return err
+					t.Fatalf("unable to read mounted files: %s", err)
 				}
 				gotFiles[rel] = info.Mode()
-				return nil
-			})
+			}
 
 			if diff := cmp.Diff(test.expectedFiles, gotFiles); diff != "" {
 				t.Errorf("MountContent() file mismatch (-want +got):\n%s", diff)