address oss feedback re: phrasing and tests

hashicorp · Feb 6, 2023 · 51e9ff0 · 51e9ff0
1 parent 3d68db7
commit 51e9ff0
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 15 deletions.
diff --git a/agent/agent_endpoint_test.go b/agent/agent_endpoint_test.go
@@ -4915,7 +4915,7 @@ func testAgent_RegisterServiceDeregisterService_Sidecar_UDP(t *testing.T, extraH
 			}
 			`,
 			enableACL: true,
-			policies:  ``, // No token rules means no valid token
+			policies:  ``, // No policies means no valid token
 			wantNS:    nil,
 			wantErr:   "Permission denied",
 		},

diff --git a/agent/structs/aclfilter/filter_test.go b/agent/structs/aclfilter/filter_test.go
@@ -505,13 +505,13 @@ func TestACL_filterHealthChecks(t *testing.T) {
 			service "foo" {
 			  policy = "read"
 			}
-            service_prefix "foo" {
+			service_prefix "foo" {
 			  policy = "read"
 			}
 			node "node1" {
 			  policy = "read"
 			}
-            node_prefix "node1" {
+			node_prefix "node1" {
 			  policy = "read"
 			}
 		`, nil, nil)
@@ -533,7 +533,7 @@ func TestACL_filterHealthChecks(t *testing.T) {
 			service "foo" {
 			  policy = "read"
 			}
-            service_prefix "foo" {
+			service_prefix "foo" {
 			  policy = "read"
 			}
 		`, nil, nil)
@@ -555,7 +555,7 @@ func TestACL_filterHealthChecks(t *testing.T) {
 			node "node1" {
 			  policy = "read"
 			}
-            node_prefix "node1" {
+			node_prefix "node1" {
 			  policy = "read"
 			}
 		`, nil, nil)
@@ -616,7 +616,7 @@ func TestACL_filterIntentions(t *testing.T) {
 			service "foo" {
 			  policy = "read"
 			}
-            service_prefix "foo" {
+			service_prefix "foo" {
 			  policy = "read"
 			}
 		`, nil, nil)
@@ -1623,7 +1623,7 @@ func TestACL_filterNodeDump(t *testing.T) {
 			node "" {
 			  policy = "read"
 			},
-            node_prefix "" {
+			node_prefix "" {
 			  policy = "read"
 			}
 		`, nil, nil)

diff --git a/api/api_test.go b/api/api_test.go
@@ -908,14 +908,6 @@ func TestAPI_Headers(t *testing.T) {
 	require.Error(t, err)
 	require.Equal(t, "application/octet-stream", request.Header.Get("Content-Type"))
 
-	_, err = c.ACL().RulesTranslate(strings.NewReader(`
-	agent "" {
-	  policy = "read"
-	}
-	`))
-	// Legacy ACL support is deprecated.
-	require.Error(t, err)
-
 	_, _, err = c.Event().Fire(&UserEvent{
 		Name:    "test",
 		Payload: []byte("foo"),
@@ -924,6 +916,24 @@ func TestAPI_Headers(t *testing.T) {
 	require.Equal(t, "application/octet-stream", request.Header.Get("Content-Type"))
 }
 
+func TestAPI_Deprecated(t *testing.T) {
+	t.Parallel()
+	c, s := makeClientWithConfig(t, func(c *Config) {
+		transport := http.DefaultTransport.(*http.Transport).Clone()
+		c.Transport = transport
+	}, nil)
+	defer s.Stop()
+	// Rules translation functionality was completely removed in Consul 1.15.
+	_, err := c.ACL().RulesTranslate(strings.NewReader(`
+	agent "" {
+	  policy = "read"
+	}
+	`))
+	require.Error(t, err)
+	_, err = c.ACL().RulesTranslateToken("")
+	require.Error(t, err)
+}
+
 func TestAPI_RequestToHTTP(t *testing.T) {
 	t.Parallel()
 	c, s := makeClient(t)