-
Notifications
You must be signed in to change notification settings - Fork 669
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
cmd/contour: add TimeoutConfig.RequestTimeout (#2726)
Adds a new RequestTimeout field to the TimeoutConfig struct. If specified in the config file, this field takes precedence over the now-deprecated RequestTimeout field in the root of the serveContext struct. Signed-off-by: Steve Kriss <krisss@vmware.com>
- Loading branch information
Showing
10 changed files
with
119 additions
and
57 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| // Copyright Project Contour Authors | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package main | ||
|
|
||
| import ( | ||
| "io/ioutil" | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/google/go-cmp/cmp" | ||
| "github.com/projectcontour/contour/internal/assert" | ||
| "github.com/projectcontour/contour/internal/timeout" | ||
| "github.com/sirupsen/logrus" | ||
| ) | ||
|
|
||
| func TestGetRequestTimeout(t *testing.T) { | ||
| tests := []struct { | ||
| name string | ||
| ctx *serveContext | ||
| want timeout.Setting | ||
| }{ | ||
| { | ||
| name: "neither field set", | ||
| ctx: &serveContext{}, | ||
| want: timeout.DefaultSetting(), | ||
| }, | ||
| { | ||
| name: "only deprecated field set", | ||
| ctx: &serveContext{RequestTimeoutDeprecated: 7 * time.Second}, | ||
| want: timeout.DurationSetting(7 * time.Second), | ||
| }, | ||
| { | ||
| name: "only new field set", | ||
| ctx: &serveContext{ | ||
| TimeoutConfig: TimeoutConfig{ | ||
| RequestTimeout: "70s", | ||
| }, | ||
| }, | ||
| want: timeout.DurationSetting(70 * time.Second), | ||
| }, | ||
| { | ||
| name: "both fields set, new field takes precedence", | ||
| ctx: &serveContext{ | ||
| TimeoutConfig: TimeoutConfig{ | ||
| RequestTimeout: "70s", | ||
| }, | ||
| RequestTimeoutDeprecated: 7 * time.Second, | ||
| }, | ||
| want: timeout.DurationSetting(70 * time.Second), | ||
| }, | ||
| } | ||
|
|
||
| for _, tc := range tests { | ||
| log := logrus.New() | ||
| log.Out = ioutil.Discard | ||
| opt := cmp.AllowUnexported(timeout.Setting{}) | ||
|
|
||
| assert.Equal(t, tc.want, getRequestTimeout(log, tc.ctx), opt) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.