From 3c0d5745fe768369fb4ac9f07de652ad55f0f392 Mon Sep 17 00:00:00 2001
From: Charandas <542168+charandas@users.noreply.github.com>
Date: Thu, 20 Nov 2025 02:23:36 -0800
Subject: [PATCH] chore: remove remaining references to singular namespace
 (#114208)

---
 pkg/apiserver/endpoints/filters/path_rewriter_test.go     | 8 ++++----
 .../apis/provisioning/resources/repository_test.go        | 4 ++--
 .../apiserver/endpoints/request/namespace_test.go         | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkg/apiserver/endpoints/filters/path_rewriter_test.go b/pkg/apiserver/endpoints/filters/path_rewriter_test.go
index 2340c3ff1f8..d8d8278ccf7 100644
--- a/pkg/apiserver/endpoints/filters/path_rewriter_test.go
+++ b/pkg/apiserver/endpoints/filters/path_rewriter_test.go
@@ -28,20 +28,20 @@ func Test_WithPathRewriters(t *testing.T) {
 	handler := WithPathRewriters(mockHandler, rewriters)
 
 	t.Run("should rewrite path", func(t *testing.T) {
-		req, err := http.NewRequest("GET", "/apis/scope.grafana.app/namespaces/stack-1234/query/blah", nil)
+		req, err := http.NewRequest("GET", "/apis/scope.grafana.app/namespaces/stacks-1234/query/blah", nil)
 		assert.NoError(t, err)
 		rr := httptest.NewRecorder()
 		handler.ServeHTTP(rr, req)
 		assert.Equal(t, http.StatusOK, rr.Code)
-		assert.Equal(t, "/apis/scope.grafana.app/namespaces/stack-1234/query", rr.Body.String())
+		assert.Equal(t, "/apis/scope.grafana.app/namespaces/stacks-1234/query", rr.Body.String())
 	})
 
 	t.Run("should ignore requests that don't match", func(t *testing.T) {
-		req, err := http.NewRequest("GET", "/apis/scope.grafana.app/namespaces/stack-1234/scopes/1", nil)
+		req, err := http.NewRequest("GET", "/apis/scope.grafana.app/namespaces/stacks-1234/scopes/1", nil)
 		assert.NoError(t, err)
 		rr := httptest.NewRecorder()
 		handler.ServeHTTP(rr, req)
 		assert.Equal(t, http.StatusOK, rr.Code)
-		assert.Equal(t, "/apis/scope.grafana.app/namespaces/stack-1234/scopes/1", rr.Body.String())
+		assert.Equal(t, "/apis/scope.grafana.app/namespaces/stacks-1234/scopes/1", rr.Body.String())
 	})
 }
diff --git a/pkg/registry/apis/provisioning/resources/repository_test.go b/pkg/registry/apis/provisioning/resources/repository_test.go
index 5240d9d2758..cf845ba7440 100644
--- a/pkg/registry/apis/provisioning/resources/repository_test.go
+++ b/pkg/registry/apis/provisioning/resources/repository_test.go
@@ -536,7 +536,7 @@ func TestCheckResourceOwnership(t *testing.T) {
 						"name": "test-resource",
 						"annotations": map[string]interface{}{
 							utils.AnnoKeyManagerKind:     "terraform",
-							utils.AnnoKeyManagerIdentity: "tf-stack-1",
+							utils.AnnoKeyManagerIdentity: "tf-stacks-1",
 						},
 					},
 				},
@@ -546,7 +546,7 @@ func TestCheckResourceOwnership(t *testing.T) {
 				Identity: "repo-1",
 			},
 			expectError:     true,
-			expectedMessage: "resource 'test-resource' is managed by terraform 'tf-stack-1' and cannot be modified by repo 'repo-1'",
+			expectedMessage: "resource 'test-resource' is managed by terraform 'tf-stacks-1' and cannot be modified by repo 'repo-1'",
 		},
 	}
 
diff --git a/pkg/services/apiserver/endpoints/request/namespace_test.go b/pkg/services/apiserver/endpoints/request/namespace_test.go
index 6c565d43e19..47c75fa2e77 100644
--- a/pkg/services/apiserver/endpoints/request/namespace_test.go
+++ b/pkg/services/apiserver/endpoints/request/namespace_test.go
@@ -26,7 +26,7 @@ func TestNamespaceMapper(t *testing.T) {
 			orgId:    123,
 			expected: "org-123",
 		},
-		// an invalid use-case, but just documenting that it's handled as stack-0
+		// an invalid use-case, but just documenting that it's handled as stacks-0
 		// this currently prevents the need to have the Mapper return (mapped, err) instead of just mapped.
 		// err checking is avoided for now to keep the usage fluent
 		{