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

set default codec type to auto/http1 (#2839)

Browse source
This commit is contained in:
Denis Mishin 2021-12-21 13:26:07 -05:00 • committed by GitHub
parent 70e0e866fc
commit 6b592afd3e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
config/envoyconfig/listeners_test.go
View file

@ -134,6 +134,7 @@ func Test_buildMainHTTPConnectionManagerFilter(t *testing.T) {
} }
} }
}], }],
"codecType": "HTTP1",
"commonHttpProtocolOptions": { "commonHttpProtocolOptions": {
"idleTimeout": "300s" "idleTimeout": "300s"
}, },

1
config/options.go
View file

@ -312,6 +312,7 @@ var defaultOptions = Options{
Services: "all", Services: "all",
CookieHTTPOnly: true, CookieHTTPOnly: true,
CookieSecure: true, CookieSecure: true,
CodecType: CodecTypeAuto,
CookieExpire: 14 * time.Hour, CookieExpire: 14 * time.Hour,
CookieName: "_pomerium", CookieName: "_pomerium",
DefaultUpstreamTimeout: 30 * time.Second, DefaultUpstreamTimeout: 30 * time.Second,

7
config/options_test.go
View file

@ -313,6 +313,7 @@ func TestOptionsFromViper(t *testing.T) {
EnvoyAdminAccessLogPath: os.DevNull, EnvoyAdminAccessLogPath: os.DevNull,
EnvoyAdminProfilePath: os.DevNull, EnvoyAdminProfilePath: os.DevNull,
EnvoyAdminAddress: "127.0.0.1:9901", EnvoyAdminAddress: "127.0.0.1:9901",
CodecType: CodecTypeAuto,
}, },
false, false,
}, },
@ -334,6 +335,7 @@ func TestOptionsFromViper(t *testing.T) {
EnvoyAdminAccessLogPath: os.DevNull, EnvoyAdminAccessLogPath: os.DevNull,
EnvoyAdminProfilePath: os.DevNull, EnvoyAdminProfilePath: os.DevNull,
EnvoyAdminAddress: "127.0.0.1:9901", EnvoyAdminAddress: "127.0.0.1:9901",
CodecType: CodecTypeAuto,
}, },
false, false,
}, },
@ -691,3 +693,8 @@ func mustParseWeightedURLs(t *testing.T, urls ...string) []WeightedURL {
require.NoError(t, err) require.NoError(t, err)
return wu return wu
} }
func TestDefaults(t *testing.T) {
o := NewDefaultOptions()
assert.Equal(t, CodecTypeAuto, o.CodecType)
}