fix PR comments, resolve conflicts

Author: sashaostrikov

cmd/frontend/oneclickexport/export.go

@@ -45,10 +45,10 @@ func (e *DataExporter) Export(ctx context.Context, request ExportRequest) ([]byt
 
 	// 2) tmp dir is passed to every processor
 	if request.IncludeSiteConfig {
-		e.configProcessors["siteConfig"].Process(ctx, &ConfigRequest{}, dir)
+		e.configProcessors["siteConfig"].Process(ctx, ConfigRequest{}, dir)
 	}
 	if request.IncludeCodeHostConfig {
-		e.configProcessors["codeHostConfig"].Process(ctx, &ConfigRequest{}, dir)
+		e.configProcessors["codeHostConfig"].Process(ctx, ConfigRequest{}, dir)
 	}
 
 	// 3) after all request parts are processed, zip the tmp dir and return its bytes

cmd/frontend/oneclickexport/export_test.go

@@ -264,9 +264,9 @@ func TestExport_CumulativeTest(t *testing.T) {
 	db := database.NewMockDB()
 	db.ExternalServicesFunc.SetDefaultReturn(externalServices)
 
-	exporter := &OneClickExporter{
+	exporter := &DataExporter{
 		logger: logger,
-		cfgProcessors: map[string]Processor[ConfigRequest]{
+		configProcessors: map[string]Processor[ConfigRequest]{
 			"siteConfig": &SiteConfigProcessor{
 				logger: logger,
 				Type:   "siteConfig",
@@ -279,7 +279,7 @@ func TestExport_CumulativeTest(t *testing.T) {
 		},
 	}
 
-	archive, err := exporter.Export(ctx, &ExportRequest{IncludeSiteConfig: true, IncludeCodeHostConfig: true})
+	archive, err := exporter.Export(ctx, ExportRequest{IncludeSiteConfig: true, IncludeCodeHostConfig: true})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -290,8 +290,8 @@ func TestExport_CumulativeTest(t *testing.T) {
 	}
 
 	wantMap := map[string]string{
-		"site-config.txt":      wantSiteConfig,
-		"code-host-config.txt": wantCodeHostConfig,
+		"site-config.json":      wantSiteConfig,
+		"code-host-config.json": wantCodeHostConfig,
 	}
 
 	for _, f := range zr.File {
@@ -388,9 +388,9 @@ func TestExport_CodeHostConfigs(t *testing.T) {
 	db := database.NewMockDB()
 	db.ExternalServicesFunc.SetDefaultReturn(externalServices)
 
-	exporter := &OneClickExporter{
+	exporter := &DataExporter{
 		logger: logger,
-		cfgProcessors: map[string]Processor[ConfigRequest]{
+		configProcessors: map[string]Processor[ConfigRequest]{
 			"codeHostConfig": &CodeHostConfigProcessor{
 				db:     db,
 				logger: logger,
@@ -399,7 +399,7 @@ func TestExport_CodeHostConfigs(t *testing.T) {
 		},
 	}
 
-	archive, err := exporter.Export(ctx, &ExportRequest{IncludeCodeHostConfig: true})
+	archive, err := exporter.Export(ctx, ExportRequest{IncludeCodeHostConfig: true})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -412,7 +412,7 @@ func TestExport_CodeHostConfigs(t *testing.T) {
 	found := false
 
 	for _, f := range zr.File {
-		if f.Name != "code-host-config.txt" {
+		if f.Name != "code-host-config.json" {
 			continue
 		}
 		found = true

cmd/frontend/oneclickexport/processor.go

@@ -21,6 +21,7 @@ type Processor[T any] interface {
 }
 
 var _ Processor[ConfigRequest] = &SiteConfigProcessor{}
+var _ Processor[ConfigRequest] = &CodeHostConfigProcessor{}
 
 type ConfigRequest struct {
 }
@@ -59,10 +60,10 @@ type CodeHostConfigProcessor struct {
 
 // Process function of CodeHostConfigProcessor loads all code host configs
 // available and stores it in a provided tmp directory dir
-func (c CodeHostConfigProcessor) Process(ctx context.Context, _ *ConfigRequest, dir string) {
+func (c CodeHostConfigProcessor) Process(ctx context.Context, _ ConfigRequest, dir string) {
 	externalServices, err := c.db.ExternalServices().List(ctx, database.ExternalServicesListOptions{})
 	if err != nil {
-		c.logger.Error("Error during getting external services", log.Error(err))
+		c.logger.Error("Error getting external services", log.Error(err))
 	}
 
 	if len(externalServices) == 0 {
@@ -85,10 +86,10 @@ func (c CodeHostConfigProcessor) Process(ctx context.Context, _ *ConfigRequest,
 		c.logger.Error("Error during marshalling the code host config", log.Error(err))
 	}
 
-	err = ioutil.WriteFile(dir+"/code-host-config.txt", configBytes, 0644)
+	err = ioutil.WriteFile(dir+"/code-host-config.json", configBytes, 0644)
 
 	if err != nil {
-		c.logger.Error("Error during site config export", log.Error(err))
+		c.logger.Error("Error during code host config export", log.Error(err))
 	}
 }