rebase to main

Author: salonichf5

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

@@ -107,22 +107,6 @@ func (g GeneratorImpl) Generate(conf dataplane.Configuration) []file.File {
 	return files
 }
 
-func (g GeneratorImpl) getExecuteFuncs(generator policies.Generator) []executeFunc {
-	return []executeFunc{
-		executeMainConfig,
-		executeBaseHTTPConfig,
-		g.newExecuteServersFunc(generator),
-		g.executeUpstreams,
-		executeSplitClients,
-		executeMaps,
-		executeTelemetry,
-		g.executeStreamServers,
-		g.executeStreamUpstreams,
-		executeStreamMaps,
-		executeVersion,
-	}
-}
-
 func generatePEM(id dataplane.SSLKeyPairID, cert []byte, key []byte) file.File {
 	c := make([]byte, 0, len(cert)+len(key)+1)
 	c = append(c, cert...)
@@ -179,6 +163,7 @@ func (g GeneratorImpl) runExecuteFuncs(
 
 func (g GeneratorImpl) getExecuteFuncs(generator policies.Generator) []executeFunc {
 	return []executeFunc{
+		executeMainConfig,
 		executeBaseHTTPConfig,
 		g.newExecuteServersFunc(generator),
 		g.executeUpstreams,

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

@@ -175,20 +175,12 @@ func TestGenerate(t *testing.T) {
 	expString := "{}"
 	g.Expect(string(files[2].Content)).To(Equal(expString))
 
-<<<<<<< HEAD
-	g.Expect(files[3].Path).To(Equal("/etc/nginx/main-includes/main.conf"))
-
-	mainCfg := string(files[3].Content)
-	g.Expect(mainCfg).To(ContainSubstring("load_module modules/ngx_otel_module.so;"))
-	g.Expect(mainCfg).To(ContainSubstring("error_log stderr debug;"))
-=======
 	// snippet include files
 	// content is not checked in this test.
 	g.Expect(files[3].Path).To(Equal("/etc/nginx/includes/http_snippet1.conf"))
 	g.Expect(files[4].Path).To(Equal("/etc/nginx/includes/http_snippet2.conf"))
 	g.Expect(files[5].Path).To(Equal("/etc/nginx/includes/main_snippet1.conf"))
 	g.Expect(files[6].Path).To(Equal("/etc/nginx/includes/main_snippet2.conf"))
->>>>>>> 401e19f7 (Apply configuration of SnippetsFilters to NGINX (#2604))
 
 	g.Expect(files[7].Path).To(Equal("/etc/nginx/main-includes/main.conf"))
 	mainConfStr := string(files[7].Content)

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

@@ -25,7 +25,7 @@ func executeMainConfig(conf dataplane.Configuration) []executeResult {
 
 	results := make([]executeResult, 0, len(includes)+1)
 	results = append(results, executeResult{
-		dest: mainIncludeFile,
+		dest: mainIncludesConfigFile,
 		data: helpers.MustExecuteTemplate(mainConfigTemplate, mc),
 	})
 	results = append(results, createIncludeExecuteResults(includes)...)

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

@@ -46,7 +46,7 @@ func TestExecuteMainConfig_Telemetry(t *testing.T) {
 
 			res := executeMainConfig(test.conf)
 			g.Expect(res).To(HaveLen(1))
-			g.Expect(res[0].dest).To(Equal(mainIncludeFile))
+			g.Expect(res[0].dest).To(Equal(mainIncludesConfigFile))
 			if test.expLoadModuleDirective {
 				g.Expect(res[0].data).To(ContainSubstring(loadModuleDirective))
 			} else {
@@ -105,5 +105,5 @@ func TestExecuteMainConfig_Snippets(t *testing.T) {
 	g.Expect(res[2].dest).To(Equal("/etc/nginx/includes/snippet3.conf"))
 	g.Expect(string(res[2].data)).To(ContainSubstring("contents3"))
 
-	g.Expect(res[3].dest).To(Equal(mainIncludeFile))
+	g.Expect(res[3].dest).To(Equal(mainIncludesConfigFile))
 }