Make Includes a list of strings

Author: Kate Osborn

internal/mode/static/nginx/config/http/config.go

@@ -5,7 +5,7 @@ type Server struct {
 	SSL           *SSL
 	ServerName    string
 	Locations     []Location
-	Includes      []Include
+	Includes      []string
 	Port          int32
 	IsDefaultHTTP bool
 	IsDefaultSSL  bool
@@ -23,7 +23,7 @@ type Location struct {
 	Return          *Return
 	ResponseHeaders ResponseHeaders
 	Rewrites        []string
-	Includes        []Include
+	Includes        []string
 	GRPC            bool
 }
 
@@ -106,8 +106,3 @@ type ProxySSLVerify struct {
 	TrustedCertificate string
 	Name               string
 }
-
-// Include holds all the files to include using the include directive.
-type Include struct {
-	Filename string
-}

internal/mode/static/nginx/config/servers.go

@@ -131,17 +131,15 @@ func createAdditionFileName(addition *dataplane.Addition) string {
 	return fmt.Sprintf("%s/%s.conf", includesFolder, addition.Identifier)
 }
 
-func createIncludes(additions []*dataplane.Addition) []http.Include {
+func createIncludes(additions []*dataplane.Addition) []string {
 	if len(additions) == 0 {
 		return nil
 	}
 
-	includes := make([]http.Include, 0, len(additions))
+	includes := make([]string, 0, len(additions))
 
 	for _, addition := range additions {
-		includes = append(includes, http.Include{
-			Filename: createAdditionFileName(addition),
-		})
+		includes = append(includes, createAdditionFileName(addition))
 	}
 
 	return includes
@@ -281,7 +279,7 @@ func createLocations(server *dataplane.VirtualServer, serverID int) ([]http.Loca
 	return locs, matchPairs, grpc
 }
 
-func updateLocationsForIncludes(locations []http.Location, includes []http.Include) []http.Location {
+func updateLocationsForIncludes(locations []http.Location, includes []string) []http.Location {
 	for i := range locations {
 		locations[i].Includes = includes
 	}

internal/mode/static/nginx/config/servers_template.go

@@ -33,13 +33,13 @@ server {
     server_name {{ $s.ServerName }};
 
     {{- range $i := $s.Includes }}
-    include {{ $i.Filename }};
+    include {{ $i }};
     {{ end -}}
 
         {{ range $l := $s.Locations }}
     location {{ $l.Path }} {
         {{- range $i := $l.Includes }}
-        include {{ $i.Filename }};
+        include {{ $i }};
         {{- end -}}
 
         {{ range $r := $l.Rewrites }}

internal/mode/static/nginx/config/servers_test.go

@@ -1000,20 +1000,16 @@ func TestCreateServers(t *testing.T) {
 				Path:            "= /addition-path-only-match",
 				ProxyPass:       "http://test_foo_80$request_uri",
 				ProxySetHeaders: httpBaseHeaders,
-				Includes: []http.Include{
-					{
-						Filename: includesFolder + "/path-only-match-addition.conf",
-					},
+				Includes: []string{
+					includesFolder + "/path-only-match-addition.conf",
 				},
 			},
 			{
 				Path:            "@rule17-route0",
 				ProxyPass:       "http://test_foo_80$request_uri",
 				ProxySetHeaders: httpBaseHeaders,
-				Includes: []http.Include{
-					{
-						Filename: includesFolder + "/match-addition.conf",
-					},
+				Includes: []string{
+					includesFolder + "/match-addition.conf",
 				},
 			},
 			{
@@ -1035,13 +1031,9 @@ func TestCreateServers(t *testing.T) {
 			Locations:  getExpectedLocations(false),
 			Port:       8080,
 			GRPC:       true,
-			Includes: []http.Include{
-				{
-					Filename: includesFolder + "/server-addition-1.conf",
-				},
-				{
-					Filename: includesFolder + "/server-addition-2.conf",
-				},
+			Includes: []string{
+				includesFolder + "/server-addition-1.conf",
+				includesFolder + "/server-addition-2.conf",
 			},
 		},
 		{
@@ -1057,13 +1049,9 @@ func TestCreateServers(t *testing.T) {
 			Locations: getExpectedLocations(true),
 			Port:      8443,
 			GRPC:      true,
-			Includes: []http.Include{
-				{
-					Filename: includesFolder + "/server-addition-1.conf",
-				},
-				{
-					Filename: includesFolder + "/server-addition-3.conf",
-				},
+			Includes: []string{
+				includesFolder + "/server-addition-1.conf",
+				includesFolder + "/server-addition-3.conf",
 			},
 		},
 	}
@@ -2362,7 +2350,7 @@ func TestCreateIncludes(t *testing.T) {
 	tests := []struct {
 		name      string
 		additions []*dataplane.Addition
-		includes  []http.Include
+		includes  []string
 	}{
 		{
 			name:      "no additions",
@@ -2385,16 +2373,10 @@ func TestCreateIncludes(t *testing.T) {
 					Identifier: "three",
 				},
 			},
-			includes: []http.Include{
-				{
-					Filename: includesFolder + "/one.conf",
-				},
-				{
-					Filename: includesFolder + "/two.conf",
-				},
-				{
-					Filename: includesFolder + "/three.conf",
-				},
+			includes: []string{
+				includesFolder + "/one.conf",
+				includesFolder + "/two.conf",
+				includesFolder + "/three.conf",
 			},
 		},
 	}