3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-08-03 08:50:42 +02:00
Code Issues Projects Releases Packages Wiki Activity

internal/controlplane: mocking policy name in test

Browse source 
We don't have to test for exact policy name, as it does not make sense
and force us to change test every new go release.
This commit is contained in:
Cuong Manh Le 2020-08-12 10:58:06 +07:00
parent ddcfe7a5e9
commit 4b3e07c5f5
3 changed files with 34 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
internal/controlplane/xds.go
View file

@ -171,10 +171,6 @@ func inlineFilename(name string) *envoy_config_core_v3.DataSource {
}
}
func getPolicyName(policy *config.Policy) string {
return fmt.Sprintf("policy-%x", policy.RouteID())
}
func envoyTLSCertificateFromGoTLSCertificate(cert *tls.Certificate) *envoy_extensions_transport_sockets_tls_v3.TlsCertificate {
envoyCert := &envoy_extensions_transport_sockets_tls_v3.TlsCertificate{}
var chain bytes.Buffer

4
internal/controlplane/xds_routes.go
View file

@ -98,6 +98,10 @@ func buildControlPlanePrefixRoute(prefix string) *envoy_config_route_v3.Route {
}
}
var getPolicyName = func(policy *config.Policy) string {
return fmt.Sprintf("policy-%x", policy.RouteID())
}
func buildPolicyRoutes(options *config.Options, domain string) []*envoy_config_route_v3.Route {
var routes []*envoy_config_route_v3.Route
responseHeadersToAdd := toEnvoyHeaders(options.Headers)

39
internal/controlplane/xds_routes_test.go
View file

@ -1,6 +1,7 @@
package controlplane
import (
"fmt"
"net/url"
"testing"
"time"
@ -9,6 +10,14 @@ import (
"github.com/pomerium/pomerium/internal/testutil"
)
func policyNameFunc() func(*config.Policy) string {
i := 0
return func(*config.Policy) string {
i++
return fmt.Sprintf("policy-%d", i)
}
}
func Test_buildGRPCRoutes(t *testing.T) {
routes := buildGRPCRoutes()
testutil.AssertProtoJSONEqual(t, `
@ -210,6 +219,10 @@ func Test_buildControlPlanePrefixRoute(t *testing.T) {
}
func Test_buildPolicyRoutes(t *testing.T) {
defer func(f func(*config.Policy) string) {
getPolicyName = f
}(getPolicyName)
getPolicyName = policyNameFunc()
routes := buildPolicyRoutes(&config.Options{
CookieName: "pomerium",
DefaultUpstreamTimeout: time.Second * 3,
@ -283,7 +296,7 @@ func Test_buildPolicyRoutes(t *testing.T) {
},
"route": {
"autoHostRewrite": true,
"cluster": "policy-701142725541ce1f",
"cluster": "policy-1",
"timeout": "3s",
"upgradeConfigs": [
{ "enabled": false, "upgradeType": "websocket"},
@ -306,7 +319,7 @@ func Test_buildPolicyRoutes(t *testing.T) {
},
"route": {
"autoHostRewrite": false,
"cluster": "policy-35b6cce9d52d36ed",
"cluster": "policy-2",
"timeout": "0s",
"upgradeConfigs": [
{ "enabled": true, "upgradeType": "websocket"},
@ -329,7 +342,7 @@ func Test_buildPolicyRoutes(t *testing.T) {
},
"route": {
"autoHostRewrite": true,
"cluster": "policy-8935ca8067709cf7",
"cluster": "policy-3",
"timeout": "60s",
"upgradeConfigs": [
{ "enabled": false, "upgradeType": "websocket"},
@ -362,7 +375,7 @@ func Test_buildPolicyRoutes(t *testing.T) {
},
"route": {
"autoHostRewrite": true,
"cluster": "policy-45c2908c3d6f0e52",
"cluster": "policy-4",
"timeout": "3s",
"upgradeConfigs": [
{ "enabled": false, "upgradeType": "websocket"},
@ -385,7 +398,7 @@ func Test_buildPolicyRoutes(t *testing.T) {
},
"route": {
"autoHostRewrite": true,
"cluster": "policy-8935ca8067709cf7",
"cluster": "policy-5",
"timeout": "60s",
"upgradeConfigs": [
{ "enabled": false, "upgradeType": "websocket"},
@ -409,7 +422,7 @@ func Test_buildPolicyRoutes(t *testing.T) {
},
"route": {
"autoHostRewrite": false,
"cluster": "policy-35b6cce9d52d36ed",
"cluster": "policy-6",
"timeout": "3s",
"upgradeConfigs": [
{ "enabled": false, "upgradeType": "websocket"},
@ -432,7 +445,7 @@ func Test_buildPolicyRoutes(t *testing.T) {
},
"route": {
"autoHostRewrite": false,
"cluster": "policy-35b6cce9d52d36ed",
"cluster": "policy-7",
"timeout": "0s",
"upgradeConfigs": [
{ "enabled": true, "upgradeType": "websocket"},
@ -447,6 +460,10 @@ func Test_buildPolicyRoutes(t *testing.T) {
// Make sure default Headers are set for response.
// See also https://github.com/pomerium/pomerium/issues/901
func TestAddOptionsHeadersToResponse(t *testing.T) {
defer func(f func(*config.Policy) string) {
getPolicyName = f
}(getPolicyName)
getPolicyName = policyNameFunc()
routes := buildPolicyRoutes(&config.Options{
CookieName: "pomerium",
DefaultUpstreamTimeout: time.Second * 3,
@ -476,7 +493,7 @@ func TestAddOptionsHeadersToResponse(t *testing.T) {
},
"route": {
"autoHostRewrite": true,
"cluster": "policy-701142725541ce1f",
"cluster": "policy-1",
"timeout": "3s",
"upgradeConfigs": [
{ "enabled": false, "upgradeType": "websocket"},
@ -496,6 +513,10 @@ func TestAddOptionsHeadersToResponse(t *testing.T) {
}
func Test_buildPolicyRoutesWithDestinationPath(t *testing.T) {
defer func(f func(*config.Policy) string) {
getPolicyName = f
}(getPolicyName)
getPolicyName = policyNameFunc()
routes := buildPolicyRoutes(&config.Options{
CookieName: "pomerium",
DefaultUpstreamTimeout: time.Second * 3,
@ -526,7 +547,7 @@ func Test_buildPolicyRoutesWithDestinationPath(t *testing.T) {
"route": {
"autoHostRewrite": true,
"prefixRewrite": "/bar",
"cluster": "policy-605b7be39724cb4f",
"cluster": "policy-1",
"timeout": "3s",
"upgradeConfigs": [
{ "enabled": false, "upgradeType": "websocket"},