Clean up, and test added

Author: bacelarfc

internal/bootstrap/viper.go

@@ -26,11 +26,7 @@ type ImportConfigSection struct {
 		Enabled                   bool    `yaml:"enabled"`
 		Architecture              *string `yaml:"architecture"`
 		ReplaceRegistryReferences bool    `yaml:"replaceRegistryReferences"`
-		Artifacts                 struct {
-			Enabled bool   `yaml:"enabled"`
-			Folder  string `yaml:"folder"`
-		} `yaml:"artifacts"`
-		Copacetic struct {
+		Copacetic                 struct {
 			Enabled      bool `yaml:"enabled"`
 			IgnoreErrors bool `yaml:"ignoreErrors"`
 			Buildkitd    struct {
@@ -65,6 +61,12 @@ type ImportConfigSection struct {
 			AllowInsecure     bool    `yaml:"allowInsecure"`
 		} `yaml:"cosign"`
 	} `yaml:"import"`
+	Export struct {
+		Artifacts struct {
+			Enabled bool   `yaml:"enabled"`
+			Folder  string `yaml:"folder"`
+		} `yaml:"artifacts"`
+	} `yaml:"export"`
 }
 
 type imageConfigSection struct {
@@ -143,7 +145,7 @@ func LoadViperConfiguration() (*viper.Viper, error) {
 	viper.SetDefault("verbose", false)
 	viper.SetDefault("update", false)
 	viper.SetDefault("k8s_version", "1.31.1")
-	viper.SetDefault("import.artifacts.enabled", false)
+	viper.SetDefault("export.artifacts.enabled", false)
 
 	// Unmarshal registries config section
 	conf := config{}
@@ -279,9 +281,9 @@ copacetic:
 `
 			return nil, xerrors.Errorf("You have enabled copacetic patching but did not specify the path to the tars output folder'. Please add the value and try again\nExample:\n%s", s)
 		}
-		if importConf.Import.Artifacts.Enabled && importConf.Import.Artifacts.Folder == "" {
+		if importConf.Export.Artifacts.Enabled && importConf.Export.Artifacts.Folder == "" {
 			s := `
-import:
+export:
 	artifacts:
 		enabled: true
 		folder: /workspace/.out/artifacts  <---

internal/program.go

@@ -271,12 +271,11 @@ func program(ctx context.Context, _ []string, viper *viper.Viper, settings *cli.
 			return err
 		}
 	}
-	// Step 7: Export and output artifacts
-
-	if importConfig.Import.Artifacts.Enabled {
+	// Step 7: Export artifacts to json
+	if importConfig.Export.Artifacts.Enabled {
 		eo := exportArtifacts.ExportOption{
-			Data:  mImgs,
-			Data2: mCharts,
+			Image:  mImgs,
+			Chart: mCharts,
 		}
 		_, _, err = eo.Run(context.WithoutCancel(ctx))
 		if err != nil {

pkg/exportArtifacts/main.go

@@ -14,69 +14,51 @@ import (
 )
 
 type ExportOption struct {
-	Data          helm.RegistryImageStatus                    // image data
-	Data2         map[*registry.Registry]map[*helm.Chart]bool // chart data
-	ChartData     helm.ChartData
-	//RegistryImage map[*registry.Registry]map[*image.Image]bool
-	RegistryImage    map[*helm.Chart]map[*image.Image][]bool
+	Image helm.RegistryImageStatus   
+	Chart helm.RegistryChartStatus                 // image data
+	Data2     map[*registry.Registry]map[*helm.Chart]bool // chart data
+	ChartData helm.ChartData
+	RegistryImage map[*helm.Chart]map[*image.Image][]bool
+	Registries    []*registry.Registry
 }
 
 type ChartArtifact struct {
 	ChartOverview string `json:"chart_overview"`
 	ChartName     string `json:"chart_name"`
 	Repository    string `json:"repository"`
-	Registry      string `json:"registry"`
 	ChartVersion  string `json:"chart_version"`
-	Import        bool   `json:"import"`
+	ChartPath 	  string `json:"chart_artifact_path"`
 }
 
 type ImageArtifact struct {
 	ImageOverview string `json:"image_overview"`
 	ImageName     string `json:"image_name"`
 	ImageTag      string `json:"image_tag"`
 	Repository    string `json:"repository"`
-	Import        bool   `json:"import"`
 }
 
 func (eo *ExportOption) Run(ctx context.Context) ([]string, []string, error) {
 	imgOverview := []string{}
 	chartOverview := []string{}
-	chartDataOverview := []string{}
 
 	// Collect image data
-	for reg, imgs := range eo.Data {
-		for img := range imgs {
+	for r, i := range eo.Image {
+		for img := range i {
 			overview := fmt.Sprintf("Registry: %s, Image: %s, Repository: %s, Tag: %s",
-				reg.GetName(),
+				r.GetName(),
 				img.String(), img.Repository, img.Tag)
-			fmt.Println("Registry - data 1:", reg)
-			fmt.Println("Image - data 1:", imgs)
 			imgOverview = append(imgOverview, overview)
 		}
 	}
 	// Collect chart data
-	for reg, charts := range eo.Data2 {
-		for chart := range charts {
-			overview := fmt.Sprintf("Registry: %s, Chart: %s, Version: %s",
-				reg.Name, chart.Name, chart.Version)
-				fmt.Println("Registry - data 2:", reg)
-				fmt.Println("Chart - data 2:", chart)
-				chartPath := fmt.Sprintf("charts/%s", chart.Name)
-				fmt.Println(chartPath) 
+	for r, c := range eo.Chart {
+		for chart := range c {
+			overview := fmt.Sprintf("Registry: %s, Chart: %s, Version: %s, ChartPath: %s",
+				r.Name, chart.Name, chart.Version, fmt.Sprintf("charts/%s", chart.Name))
 			chartOverview = append(chartOverview, overview)
 		}
 	}
-
-	// Collect chart data (2)
-	for reg, charts := range eo.RegistryImage {
-		// for chart := range charts {
-			overview := fmt.Sprintf("Reg: %s, Charts: %s",
-				reg, charts)
-			chartDataOverview = append(chartDataOverview, overview)
-		// }
-	}
-
-	// Convert to JSON (IMAGES) ("Registry: %s, Image: %s, Repository: %s, Tag: %s"
+    // Convert to JSON
 	artifacts := []ImageArtifact{}
 	for _, overview := range imgOverview {
 		ia := ImageArtifact{
@@ -87,48 +69,36 @@ func (eo *ExportOption) Run(ctx context.Context) ([]string, []string, error) {
 		}
 		artifacts = append(artifacts, ia)
 	}
+
 	chartArtifacts := []ChartArtifact{}
-	// Convert to JSON (CHARTS) ("Registry: %s, Chart: %s, Version: %s"
 	for _, overview := range chartOverview {
 		ca := ChartArtifact{
 			ChartOverview: overview,
-			Registry:      strings.Split(overview, ", ")[0],
 			ChartName:     strings.Split(overview, ", ")[1],
 			ChartVersion:  strings.Split(overview, ", ")[2],
+			ChartPath:     strings.Split(overview, ", ")[3],
 		}
 		chartArtifacts = append(chartArtifacts, ca)
 	}
 
-	chartData := []ChartArtifact{}
-	// Convert to JSON (CHARTS) ("Registry: %s, Chart: %s, Version: %s"
-	for _, overview := range chartDataOverview {
-		cd := ChartArtifact{
-			ChartOverview: overview,
-		}
-		chartData = append(chartData, cd)
-	}
-
 	exportData := struct {
 		Images []ImageArtifact `json:"images"`
 		Charts []ChartArtifact `json:"charts"`
-		Data   []ChartArtifact `json:"chart_data"`
 	}{
 		Images: artifacts,
 		Charts: chartArtifacts,
-		Data:   chartData,
 	}
 
 	jsonData, err := json.MarshalIndent(exportData, "", "  ")
 	if err != nil {
 		return nil, nil, err
 	}
 
-	// Write JSON to file
 	err = os.WriteFile("artifacts.json", jsonData, 0644)
 	if err != nil {
 		return nil, nil, err
 	}
 
 	slog.Info("Exported artifacts to artifacts.json")
 	return imgOverview, chartOverview, nil
-}
+}

pkg/exportArtifacts/main_test.go

@@ -1,2 +1,49 @@
 package exportArtifacts
 
+import (
+	"context"
+	"os"
+	"testing"
+
+	"github.com/ChristofferNissen/helmper/pkg/helm"
+	"github.com/ChristofferNissen/helmper/pkg/image"
+	"github.com/ChristofferNissen/helmper/pkg/registry"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestExportOptionRun(t *testing.T) {
+    // Arrange
+    mockRegistry := &registry.Registry{Name: "azure.registry.io"}
+    mockImage := &image.Image{Repository: "argocd", Tag: "v2.0.5"}
+    mockChart := &helm.Chart{Name: "prometheus", Version: "1.0.0"}
+
+    mockData := helm.RegistryImageStatus{
+        mockRegistry: {
+            mockImage: true,
+
+        },
+    }
+
+    mockData2 := map[*registry.Registry]map[*helm.Chart]bool{
+        mockRegistry: {
+            mockChart: true,
+        },
+    }
+
+    eo := &ExportOption{
+        Image:  mockData,
+        Chart: mockData2,
+    }
+
+    // Act
+    imgOverview, chartOverview, err := eo.Run(context.Background())
+
+    // Assert
+    assert.NoError(t, err, "expected no error during execution")
+    assert.FileExists(t, "artifacts.json", "expected file to be created")
+    assert.NotEmpty(t, imgOverview, "expected image overview to be populated")
+    assert.NotEmpty(t, chartOverview, "expected chart overview to be populated")
+
+    // Cleanup
+    os.Remove("artifacts.json")
+}