rebase to feature branch

Author: salonichf5

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))
 }

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

@@ -11,7 +11,7 @@ var mainIncludesTemplate = gotemplate.Must(gotemplate.New("mainIncludes").Parse(
 
 func executeMainIncludesConfig(conf dataplane.Configuration) []executeResult {
 	result := executeResult{
-		dest: mainIncludeFile,
+		dest: mainIncludesConfigFile,
 		data: helpers.MustExecuteTemplate(mainIncludesTemplate, conf),
 	}