@@ -11,7 +11,7 @@ import (
1111
1212var _ = Describe("Upstreams", func() {
1313 type validateUpstreamTableInput struct {
14− upstreams options.Upstreams
14+ upstreams options.UpstreamConfig
1515 errStrings []string
1616 }
1717
@@ -54,12 +54,12 @@ var _ = Describe("Upstreams", func() {
5454 Expect(validateUpstreams(o.upstreams)).To(ConsistOf(o.errStrings))
5555 },
5656 Entry("with no upstreams", &validateUpstreamTableInput{
57− upstreams: options.Upstreams{},
57+ upstreams: options.UpstreamConfig{},
5858 errStrings: []string{},
5959 }),
6060 Entry("with valid upstreams", &validateUpstreamTableInput{
61− upstreams: options.Upstreams{
62− Configs: []options.Upstream{
61+ upstreams: options.UpstreamConfig{
62+ Upstreams: []options.Upstream{
6363 validHTTPUpstream,
6464 validStaticUpstream,
6565 validFileUpstream,
@@ -68,8 +68,8 @@ var _ = Describe("Upstreams", func() {
6868 errStrings: []string{},
6969 }),
7070 Entry("with an empty ID", &validateUpstreamTableInput{
71− upstreams: options.Upstreams{
72− Configs: []options.Upstream{
71+ upstreams: options.UpstreamConfig{
72+ Upstreams: []options.Upstream{
7373 {
7474 ID: "",
7575 Path: "/foo",
@@ -80,8 +80,8 @@ var _ = Describe("Upstreams", func() {
8080 errStrings: []string{emptyIDMsg},
8181 }),
8282 Entry("with an empty Path", &validateUpstreamTableInput{
83− upstreams: options.Upstreams{
84− Configs: []options.Upstream{
83+ upstreams: options.UpstreamConfig{
84+ Upstreams: []options.Upstream{
8585 {
8686 ID: "foo",
8787 Path: "",
@@ -92,8 +92,8 @@ var _ = Describe("Upstreams", func() {
9292 errStrings: []string{emptyPathMsg},
9393 }),
9494 Entry("with an empty Path", &validateUpstreamTableInput{
95− upstreams: options.Upstreams{
96− Configs: []options.Upstream{
95+ upstreams: options.UpstreamConfig{
96+ Upstreams: []options.Upstream{
9797 {
9898 ID: "foo",
9999 Path: "",
@@ -104,8 +104,8 @@ var _ = Describe("Upstreams", func() {
104104 errStrings: []string{emptyPathMsg},
105105 }),
106106 Entry("with an empty URI", &validateUpstreamTableInput{
107− upstreams: options.Upstreams{
108− Configs: []options.Upstream{
107+ upstreams: options.UpstreamConfig{
108+ Upstreams: []options.Upstream{
109109 {
110110 ID: "foo",
111111 Path: "/foo",
@@ -116,8 +116,8 @@ var _ = Describe("Upstreams", func() {
116116 errStrings: []string{emptyURIMsg},
117117 }),
118118 Entry("with an invalid URI", &validateUpstreamTableInput{
119− upstreams: options.Upstreams{
120− Configs: []options.Upstream{
119+ upstreams: options.UpstreamConfig{
120+ Upstreams: []options.Upstream{
121121 {
122122 ID: "foo",
123123 Path: "/foo",
@@ -128,8 +128,8 @@ var _ = Describe("Upstreams", func() {
128128 errStrings: []string{invalidURIMsg},
129129 }),
130130 Entry("with an invalid URI scheme", &validateUpstreamTableInput{
131− upstreams: options.Upstreams{
132− Configs: []options.Upstream{
131+ upstreams: options.UpstreamConfig{
132+ Upstreams: []options.Upstream{
133133 {
134134 ID: "foo",
135135 Path: "/foo",
@@ -140,8 +140,8 @@ var _ = Describe("Upstreams", func() {
140140 errStrings: []string{invalidURISchemeMsg},
141141 }),
142142 Entry("with a static upstream and invalid optons", &validateUpstreamTableInput{
143− upstreams: options.Upstreams{
144− Configs: []options.Upstream{
143+ upstreams: options.UpstreamConfig{
144+ Upstreams: []options.Upstream{
145145 {
146146 ID: "foo",
147147 Path: "/foo",
@@ -163,8 +163,8 @@ var _ = Describe("Upstreams", func() {
163163 },
164164 }),
165165 Entry("with duplicate IDs", &validateUpstreamTableInput{
166− upstreams: options.Upstreams{
167− Configs: []options.Upstream{
166+ upstreams: options.UpstreamConfig{
167+ Upstreams: []options.Upstream{
168168 {
169169 ID: "foo",
170170 Path: "/foo1",
@@ -180,8 +180,8 @@ var _ = Describe("Upstreams", func() {
180180 errStrings: []string{multipleIDsMsg},
181181 }),
182182 Entry("with duplicate Paths", &validateUpstreamTableInput{
183− upstreams: options.Upstreams{
184− Configs: []options.Upstream{
183+ upstreams: options.UpstreamConfig{
184+ Upstreams: []options.Upstream{
185185 {
186186 ID: "foo1",
187187 Path: "/foo",
@@ -197,8 +197,8 @@ var _ = Describe("Upstreams", func() {
197197 errStrings: []string{multiplePathsMsg},
198198 }),
199199 Entry("when a static code is supplied without static", &validateUpstreamTableInput{
200− upstreams: options.Upstreams{
201− Configs: []options.Upstream{
200+ upstreams: options.UpstreamConfig{
201+ Upstreams: []options.Upstream{
202202 {
203203 ID: "foo",
204204 Path: "/foo",