Change package name to contourconfig

Signed-off-by: Sunjay Bhatia <sunjayb@vmware.com>
projectcontour · Nov 9, 2021 · 2ec96bd · 2ec96bd
1 parent 7edcf3a
commit 2ec96bd
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 31 deletions.
diff --git a/cmd/contour/serve.go b/cmd/contour/serve.go
@@ -31,7 +31,7 @@ import (
 	contour_api_v1alpha1 "github.com/projectcontour/contour/apis/projectcontour/v1alpha1"
 	"github.com/projectcontour/contour/internal/annotation"
 	"github.com/projectcontour/contour/internal/contour"
-	"github.com/projectcontour/contour/internal/contourconfiguration"
+	"github.com/projectcontour/contour/internal/contourconfig"
 	"github.com/projectcontour/contour/internal/controller"
 	"github.com/projectcontour/contour/internal/dag"
 	"github.com/projectcontour/contour/internal/debug"
@@ -281,7 +281,7 @@ func (s *Server) doServe() error {
 		cipherSuites = append(cipherSuites, string(cs))
 	}
 
-	timeouts, err := contourconfiguration.ParseTimeoutPolicy(contourConfiguration.Envoy.Timeouts)
+	timeouts, err := contourconfig.ParseTimeoutPolicy(contourConfiguration.Envoy.Timeouts)
 	if err != nil {
 		return err
 	}

diff --git a/...tourconfiguration/contourconfiguration.go → ...nal/contourconfig/contourconfiguration.go b/...tourconfiguration/contourconfiguration.go → ...nal/contourconfig/contourconfiguration.go
@@ -11,7 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package contourconfiguration
+package contourconfig
 
 import (
 	"fmt"

diff --git a/...onfiguration/contourconfiguration_test.go → ...ontourconfig/contourconfiguration_test.go b/...onfiguration/contourconfiguration_test.go → ...ontourconfig/contourconfiguration_test.go
@@ -11,14 +11,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package contourconfiguration_test
+package contourconfig_test
 
 import (
 	"testing"
 	"time"
 
 	contour_api_v1alpha1 "github.com/projectcontour/contour/apis/projectcontour/v1alpha1"
-	"github.com/projectcontour/contour/internal/contourconfiguration"
+	"github.com/projectcontour/contour/internal/contourconfig"
 	"github.com/projectcontour/contour/internal/timeout"
 	"github.com/stretchr/testify/require"
 	"k8s.io/utils/pointer"
@@ -27,12 +27,12 @@ import (
 func TestParseTimeoutPolicy(t *testing.T) {
 	testCases := map[string]struct {
 		config   *contour_api_v1alpha1.TimeoutParameters
-		expected contourconfiguration.Timeouts
+		expected contourconfig.Timeouts
 		errorMsg string
 	}{
 		"nil timeout parameters": {
 			config: nil,
-			expected: contourconfiguration.Timeouts{
+			expected: contourconfig.Timeouts{
 				Request:                       timeout.DefaultSetting(),
 				ConnectionIdle:                timeout.DefaultSetting(),
 				StreamIdle:                    timeout.DefaultSetting(),
@@ -43,7 +43,7 @@ func TestParseTimeoutPolicy(t *testing.T) {
 		},
 		"timeouts not set": {
 			config: &contour_api_v1alpha1.TimeoutParameters{},
-			expected: contourconfiguration.Timeouts{
+			expected: contourconfig.Timeouts{
 				Request:                       timeout.DefaultSetting(),
 				ConnectionIdle:                timeout.DefaultSetting(),
 				StreamIdle:                    timeout.DefaultSetting(),
@@ -61,7 +61,7 @@ func TestParseTimeoutPolicy(t *testing.T) {
 				DelayedCloseTimeout:           pointer.String("5s"),
 				ConnectionShutdownGracePeriod: pointer.String("6s"),
 			},
-			expected: contourconfiguration.Timeouts{
+			expected: contourconfig.Timeouts{
 				Request:                       timeout.DurationSetting(time.Second),
 				ConnectionIdle:                timeout.DurationSetting(time.Second * 2),
 				StreamIdle:                    timeout.DurationSetting(time.Second * 3),
@@ -110,7 +110,7 @@ func TestParseTimeoutPolicy(t *testing.T) {
 
 	for name, tc := range testCases {
 		t.Run(name, func(t *testing.T) {
-			parsed, err := contourconfiguration.ParseTimeoutPolicy(tc.config)
+			parsed, err := contourconfig.ParseTimeoutPolicy(tc.config)
 			if len(tc.errorMsg) > 0 {
 				require.Error(t, err, "expected error to be returned")
 				require.Contains(t, err.Error(), tc.errorMsg)

diff --git a/internal/featuretests/v3/timeouts_test.go b/internal/featuretests/v3/timeouts_test.go
@@ -19,7 +19,7 @@ import (
 
 	envoy_discovery_v3 "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3"
 	contour_api_v1 "github.com/projectcontour/contour/apis/projectcontour/v1"
-	"github.com/projectcontour/contour/internal/contourconfiguration"
+	"github.com/projectcontour/contour/internal/contourconfig"
 	envoy_v3 "github.com/projectcontour/contour/internal/envoy/v3"
 	"github.com/projectcontour/contour/internal/fixture"
 	"github.com/projectcontour/contour/internal/timeout"
@@ -77,7 +77,7 @@ func TestTimeoutsNotSpecified(t *testing.T) {
 
 func TestNonZeroTimeoutsSpecified(t *testing.T) {
 	withTimeouts := func(conf *xdscache_v3.ListenerConfig) {
-		conf.Timeouts = contourconfiguration.Timeouts{
+		conf.Timeouts = contourconfig.Timeouts{
 			ConnectionIdle:                timeout.DurationSetting(7 * time.Second),
 			StreamIdle:                    timeout.DurationSetting(70 * time.Second),
 			MaxConnectionDuration:         timeout.DurationSetting(700 * time.Second),

diff --git a/internal/xdscache/v3/listener.go b/internal/xdscache/v3/listener.go
@@ -26,7 +26,7 @@ import (
 	"github.com/golang/protobuf/proto"
 	contour_api_v1alpha1 "github.com/projectcontour/contour/apis/projectcontour/v1alpha1"
 	"github.com/projectcontour/contour/internal/contour"
-	"github.com/projectcontour/contour/internal/contourconfiguration"
+	"github.com/projectcontour/contour/internal/contourconfig"
 	"github.com/projectcontour/contour/internal/dag"
 	envoy_v3 "github.com/projectcontour/contour/internal/envoy/v3"
 	"github.com/projectcontour/contour/internal/protobuf"
@@ -113,7 +113,7 @@ type ListenerConfig struct {
 	AccessLogFormatterExtensions []string
 
 	// Timeouts holds Listener timeout settings.
-	Timeouts contourconfiguration.Timeouts
+	Timeouts contourconfig.Timeouts
 
 	// AllowChunkedLength enables setting allow_chunked_length on the HTTP1 options for all
 	// listeners.

diff --git a/internal/xdscache/v3/listener_test.go b/internal/xdscache/v3/listener_test.go
@@ -27,7 +27,7 @@ import (
 	"github.com/envoyproxy/go-control-plane/pkg/wellknown"
 	"github.com/golang/protobuf/proto"
 	contour_api_v1 "github.com/projectcontour/contour/apis/projectcontour/v1"
-	"github.com/projectcontour/contour/internal/contourconfiguration"
+	"github.com/projectcontour/contour/internal/contourconfig"
 	"github.com/projectcontour/contour/internal/dag"
 	envoy_v3 "github.com/projectcontour/contour/internal/envoy/v3"
 	"github.com/projectcontour/contour/internal/k8s"
@@ -1126,7 +1126,7 @@ func TestListenerVisit(t *testing.T) {
 				Namespace: "default",
 			},
 			ListenerConfig: ListenerConfig{
-				Timeouts: contourconfiguration.Timeouts{
+				Timeouts: contourconfig.Timeouts{
 					Request: timeout.DurationSetting(90 * time.Second),
 				},
 			},
@@ -1242,7 +1242,7 @@ func TestListenerVisit(t *testing.T) {
 				Namespace: "default",
 			},
 			ListenerConfig: ListenerConfig{
-				Timeouts: contourconfiguration.Timeouts{
+				Timeouts: contourconfig.Timeouts{
 					ConnectionIdle: timeout.DurationSetting(90 * time.Second),
 				},
 			},
@@ -1358,7 +1358,7 @@ func TestListenerVisit(t *testing.T) {
 				Namespace: "default",
 			},
 			ListenerConfig: ListenerConfig{
-				Timeouts: contourconfiguration.Timeouts{
+				Timeouts: contourconfig.Timeouts{
 					StreamIdle: timeout.DurationSetting(90 * time.Second),
 				},
 			},
@@ -1474,7 +1474,7 @@ func TestListenerVisit(t *testing.T) {
 				Namespace: "default",
 			},
 			ListenerConfig: ListenerConfig{
-				Timeouts: contourconfiguration.Timeouts{
+				Timeouts: contourconfig.Timeouts{
 					DelayedClose: timeout.DurationSetting(90 * time.Second),
 				},
 			},
@@ -1590,7 +1590,7 @@ func TestListenerVisit(t *testing.T) {
 				Namespace: "default",
 			},
 			ListenerConfig: ListenerConfig{
-				Timeouts: contourconfiguration.Timeouts{
+				Timeouts: contourconfig.Timeouts{
 					MaxConnectionDuration: timeout.DurationSetting(90 * time.Second),
 				},
 			},
@@ -1706,7 +1706,7 @@ func TestListenerVisit(t *testing.T) {
 				Namespace: "default",
 			},
 			ListenerConfig: ListenerConfig{
-				Timeouts: contourconfiguration.Timeouts{
+				Timeouts: contourconfig.Timeouts{
 					ConnectionShutdownGracePeriod: timeout.DurationSetting(90 * time.Second),
 				},
 			},
@@ -2159,7 +2159,7 @@ func TestListenerVisit(t *testing.T) {
 		},
 		"httpproxy with connection idle timeout set in listener config": {
 			ListenerConfig: ListenerConfig{
-				Timeouts: contourconfiguration.Timeouts{
+				Timeouts: contourconfig.Timeouts{
 					ConnectionIdle: timeout.DurationSetting(90 * time.Second),
 				},
 			},
@@ -2215,7 +2215,7 @@ func TestListenerVisit(t *testing.T) {
 		},
 		"httpproxy with stream idle timeout set in listener config": {
 			ListenerConfig: ListenerConfig{
-				Timeouts: contourconfiguration.Timeouts{
+				Timeouts: contourconfig.Timeouts{
 					StreamIdle: timeout.DurationSetting(90 * time.Second),
 				},
 			},
@@ -2271,7 +2271,7 @@ func TestListenerVisit(t *testing.T) {
 		},
 		"httpproxy with max connection duration set in listener config": {
 			ListenerConfig: ListenerConfig{
-				Timeouts: contourconfiguration.Timeouts{
+				Timeouts: contourconfig.Timeouts{
 					MaxConnectionDuration: timeout.DurationSetting(90 * time.Second),
 				},
 			},
@@ -2327,7 +2327,7 @@ func TestListenerVisit(t *testing.T) {
 		},
 		"httpproxy with delayed close timeout set in listener config": {
 			ListenerConfig: ListenerConfig{
-				Timeouts: contourconfiguration.Timeouts{
+				Timeouts: contourconfig.Timeouts{
 					DelayedClose: timeout.DurationSetting(90 * time.Second),
 				},
 			},
@@ -2383,7 +2383,7 @@ func TestListenerVisit(t *testing.T) {
 		},
 		"httpproxy with connection shutdown grace period set in listener config": {
 			ListenerConfig: ListenerConfig{
-				Timeouts: contourconfiguration.Timeouts{
+				Timeouts: contourconfig.Timeouts{
 					ConnectionShutdownGracePeriod: timeout.DurationSetting(90 * time.Second),
 				},
 			},
@@ -2439,7 +2439,7 @@ func TestListenerVisit(t *testing.T) {
 		},
 		"httpsproxy with secret with connection idle timeout set in listener config": {
 			ListenerConfig: ListenerConfig{
-				Timeouts: contourconfiguration.Timeouts{
+				Timeouts: contourconfig.Timeouts{
 					ConnectionIdle: timeout.DurationSetting(90 * time.Second),
 				},
 			},
@@ -2631,7 +2631,7 @@ func TestListenerVisit(t *testing.T) {
 		},
 		"httpsproxy with secret with stream idle timeout set in listener config": {
 			ListenerConfig: ListenerConfig{
-				Timeouts: contourconfiguration.Timeouts{
+				Timeouts: contourconfig.Timeouts{
 					StreamIdle: timeout.DurationSetting(90 * time.Second),
 				},
 			},
@@ -2715,7 +2715,7 @@ func TestListenerVisit(t *testing.T) {
 		},
 		"httpsproxy with secret with max connection duration set in listener config": {
 			ListenerConfig: ListenerConfig{
-				Timeouts: contourconfiguration.Timeouts{
+				Timeouts: contourconfig.Timeouts{
 					MaxConnectionDuration: timeout.DurationSetting(90 * time.Second),
 				},
 			},
@@ -2799,7 +2799,7 @@ func TestListenerVisit(t *testing.T) {
 		},
 		"httpsproxy with secret with delayed close timeout set in listener config": {
 			ListenerConfig: ListenerConfig{
-				Timeouts: contourconfiguration.Timeouts{
+				Timeouts: contourconfig.Timeouts{
 					DelayedClose: timeout.DurationSetting(90 * time.Second),
 				},
 			},
@@ -2883,7 +2883,7 @@ func TestListenerVisit(t *testing.T) {
 		},
 		"httpsproxy with secret with connection shutdown grace period set in listener config": {
 			ListenerConfig: ListenerConfig{
-				Timeouts: contourconfiguration.Timeouts{
+				Timeouts: contourconfig.Timeouts{
 					ConnectionShutdownGracePeriod: timeout.DurationSetting(90 * time.Second),
 				},
 			},