From 65c395c0cfa52620498f8c779f72b4b77d04d2e8 Mon Sep 17 00:00:00 2001
From: Kay Yan <kay.yan@daocloud.io>
Date: Thu, 9 Oct 2025 06:45:19 +0000
Subject: [PATCH] Fix namestore directory regression: restore names
 subdirectory in path

Signed-off-by: Kay Yan <kay.yan@daocloud.io>
---
 pkg/namestore/namestore.go      |  2 +-
 pkg/namestore/namestore_test.go | 70 +++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 pkg/namestore/namestore_test.go

diff --git a/pkg/namestore/namestore.go b/pkg/namestore/namestore.go
index 6ded12d6c95..6b65269ef36 100644
--- a/pkg/namestore/namestore.go
+++ b/pkg/namestore/namestore.go
@@ -40,7 +40,7 @@ func New(stateDir, namespace string) (NameStore, error) {
 		return nil, errors.Join(ErrNameStore, store.ErrInvalidArgument)
 	}
 
-	st, err := store.New(filepath.Join(stateDir, namespace), 0, 0)
+	st, err := store.New(filepath.Join(stateDir, "names", namespace), 0, 0)
 	if err != nil {
 		return nil, errors.Join(ErrNameStore, err)
 	}
diff --git a/pkg/namestore/namestore_test.go b/pkg/namestore/namestore_test.go
new file mode 100644
index 00000000000..b426d8d63e3
--- /dev/null
+++ b/pkg/namestore/namestore_test.go
@@ -0,0 +1,70 @@
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package namestore
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+
+	"gotest.tools/v3/assert"
+
+	"github.com/containerd/nerdctl/v2/pkg/store"
+)
+
+func TestNamestoreNew(t *testing.T) {
+	tempDir := t.TempDir()
+
+	tests := []struct {
+		name      string
+		namespace string
+		wantErr   bool
+		errChecks []error
+	}{
+		{
+			name:      "empty namespace",
+			namespace: "",
+			wantErr:   true,
+			errChecks: []error{ErrNameStore, store.ErrInvalidArgument},
+		},
+		{
+			name:      "valid namespace",
+			namespace: "testnamespace",
+			wantErr:   false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			ns, err := New(tempDir, tt.namespace)
+			if tt.wantErr {
+				assert.Assert(t, err != nil, "New should return an error for %s", tt.name)
+				for _, errCheck := range tt.errChecks {
+					assert.ErrorIs(t, err, errCheck, "Error should contain %v for %s", errCheck, tt.name)
+				}
+			} else {
+				assert.NilError(t, err, "New should succeed for %s", tt.name)
+				assert.Assert(t, ns != nil, "New should return a non-nil NameStore for %s", tt.name)
+
+				// Check that the directory is created in the correct path
+				expectedDir := filepath.Join(tempDir, "names", tt.namespace)
+				_, err = os.Stat(expectedDir)
+				assert.NilError(t, err, "Directory should be created at the correct path for %s", tt.name)
+			}
+		})
+	}
+}