luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

syncing changes back from enterprise (#12701)

This commit is contained in:
R.B. Boyer 2022-04-05 15:46:56 -05:00 committed by GitHub
parent 9d67f34614
commit 12523197f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 39 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
acl/policy_merger.go
View File

@ -19,6 +19,8 @@ type policyRulesMergeContext struct {
servicePrefixRules map[string]*ServiceRule
sessionRules map[string]*SessionRule
sessionPrefixRules map[string]*SessionRule
// namespaceRule is an enterprise-only field
namespaceRule string
}
func (p *policyRulesMergeContext) init() {

4
agent/delegate_mock_test.go
View File

@ -47,9 +47,9 @@ func (m *delegateMock) RemoveFailedNode(node string, prune bool, entMeta *struct
return m.Called(node, prune, entMeta).Error(0)
}
func (m *delegateMock) ResolveTokenAndDefaultMeta(token string, entMeta *structs.EnterpriseMeta, authzContext *acl.AuthorizerContext) (acl.Authorizer, error) {
func (m *delegateMock) ResolveTokenAndDefaultMeta(token string, entMeta *structs.EnterpriseMeta, authzContext *acl.AuthorizerContext) (consul.ACLResolveResult, error) {
ret := m.Called(token, entMeta, authzContext)
return ret.Get(0).(acl.Authorizer), ret.Error(1)
return ret.Get(0).(consul.ACLResolveResult), ret.Error(1)
}
func (m *delegateMock) RPC(method string, args interface{}, reply interface{}) error {

8
api/acl_test.go
View File

@ -237,6 +237,10 @@ func prepTokenPolicies(t *testing.T, acl *ACL) (policies []*ACLPolicy) {
}
func prepTokenPoliciesInPartition(t *testing.T, acl *ACL, partition string) (policies []*ACLPolicy) {
datacenters := []string{"dc1", "dc2"}
if partition != "" && partition != "default" {
datacenters = []string{"dc1"}
}
var wqPart *WriteOptions
if partition != "" {
wqPart = &WriteOptions{Partition: partition}
@ -245,7 +249,7 @@ func prepTokenPoliciesInPartition(t *testing.T, acl *ACL, partition string) (pol
Name: "one",
Description: "one description",
Rules: `acl = "read"`,
Datacenters: []string{"dc1", "dc2"},
Datacenters: datacenters,
}, wqPart)
require.NoError(t, err)
@ -256,7 +260,7 @@ func prepTokenPoliciesInPartition(t *testing.T, acl *ACL, partition string) (pol
Name: "two",
Description: "two description",
Rules: `node_prefix "" { policy = "read" }`,
Datacenters: []string{"dc1", "dc2"},
Datacenters: datacenters,
}, wqPart)
require.NoError(t, err)

12
command/acl/authmethod/create/authmethod_create_test.go
View File

@ -9,15 +9,16 @@ import (
"testing"
"time"
"github.com/hashicorp/go-uuid"
"github.com/mitchellh/cli"
"github.com/stretchr/testify/require"
"github.com/hashicorp/consul/agent"
"github.com/hashicorp/consul/agent/connect"
"github.com/hashicorp/consul/api"
"github.com/hashicorp/consul/command/acl"
"github.com/hashicorp/consul/sdk/testutil"
"github.com/hashicorp/consul/testrpc"
"github.com/hashicorp/go-uuid"
"github.com/mitchellh/cli"
"github.com/stretchr/testify/require"
// activate testing auth method
_ "github.com/hashicorp/consul/agent/consul/authmethod/testauth"
@ -293,6 +294,7 @@ func TestAuthMethodCreateCommand_JSON(t *testing.T) {
delete(raw, "CreateIndex")
delete(raw, "ModifyIndex")
delete(raw, "Namespace")
delete(raw, "Partition")
require.Equal(t, map[string]interface{}{
"Name": name,
@ -342,6 +344,7 @@ func TestAuthMethodCreateCommand_JSON(t *testing.T) {
delete(raw, "CreateIndex")
delete(raw, "ModifyIndex")
delete(raw, "Namespace")
delete(raw, "Partition")
require.Equal(t, map[string]interface{}{
"Name": name,
@ -613,6 +616,9 @@ func getTestMethod(t *testing.T, client *api.Client, methodName string) *api.ACL
if method.Namespace == "default" {
method.Namespace = ""
}
if method.Partition == "default" {
method.Partition = ""
}
return method
}

10
command/acl/authmethod/update/authmethod_update_test.go
View File

@ -8,15 +8,16 @@ import (
"strings"
"testing"
"github.com/hashicorp/go-uuid"
"github.com/mitchellh/cli"
"github.com/stretchr/testify/require"
"github.com/hashicorp/consul/agent"
"github.com/hashicorp/consul/agent/connect"
"github.com/hashicorp/consul/api"
"github.com/hashicorp/consul/command/acl"
"github.com/hashicorp/consul/sdk/testutil"
"github.com/hashicorp/consul/testrpc"
"github.com/hashicorp/go-uuid"
"github.com/mitchellh/cli"
"github.com/stretchr/testify/require"
// activate testing auth method
_ "github.com/hashicorp/consul/agent/consul/authmethod/testauth"
@ -941,6 +942,9 @@ func getTestMethod(t *testing.T, client *api.Client, methodName string) *api.ACL
if method.Namespace == "default" {
method.Namespace = ""
}
if method.Partition == "default" {
method.Partition = ""
}
return method
}

7
command/connect/expose/expose_test.go
View File

@ -3,11 +3,12 @@ package expose
import (
"testing"
"github.com/mitchellh/cli"
"github.com/stretchr/testify/require"
"github.com/hashicorp/consul/agent"
"github.com/hashicorp/consul/api"
"github.com/hashicorp/consul/testrpc"
"github.com/mitchellh/cli"
"github.com/stretchr/testify/require"
)
func TestConnectExpose(t *testing.T) {
@ -47,6 +48,7 @@ func TestConnectExpose(t *testing.T) {
Kind: api.IngressGateway,
Name: "ingress",
Namespace: ns,
Partition: ap,
Listeners: []api.IngressListener{
{
Port: 8888,
@ -280,6 +282,7 @@ func TestConnectExpose_existingConfig(t *testing.T) {
},
},
})
ingressConf.Partition = entryConf.Partition
ingressConf.Namespace = entryConf.Namespace
for i, listener := range ingressConf.Listeners {
listener.Services[0].Namespace = entryConf.Listeners[i].Services[0].Namespace

4
test/integration/connect/envoy/case-basic/capture.sh Normal file
View File

@ -0,0 +1,4 @@
#!/bin/bash
snapshot_envoy_admin localhost:19000 s1 primary || true
snapshot_envoy_admin localhost:19001 s2 primary || true

4
test/integration/connect/envoy/case-http/capture.sh Normal file
View File

@ -0,0 +1,4 @@
#!/bin/bash
snapshot_envoy_admin localhost:19000 s1 primary || true
snapshot_envoy_admin localhost:19001 s2 primary || true