Extract Charts tarballs and v1beta2 HelmChart custom resources (#2570)

Author: sgalsaleh

api/pkg/template/engine_test.go

@@ -1079,8 +1079,8 @@ repl{{ toJson $tls }}`),
 	assert.True(t, firstCachedDuration < time.Millisecond*20, "First cached execution should be under 20ms")
 
 	// Verify caching provides significant speedup
-	assert.True(t, firstCachedDuration < firstDuration/2,
-		"Cached execution should be at least 2x faster. First: %v, Cached: %v",
+	assert.True(t, firstCachedDuration < firstDuration/5,
+		"Cached execution should be at least 5x faster. First: %v, Cached: %v",
 		firstDuration, firstCachedDuration)
 
 	// Verify cached result is identical to first execution
@@ -1104,6 +1104,11 @@ repl{{ toJson $tls }}`),
 	assert.True(t, secondDuration > time.Millisecond*100, "Second execution should take at least 100ms (cert generation)")
 	assert.True(t, secondCachedDuration < time.Millisecond*20, "Second cached execution should be under 20ms")
 
+	// Verify caching provides significant speedup
+	assert.True(t, secondCachedDuration < secondDuration/5,
+		"Cached execution should be at least 5x faster. Second: %v, Cached: %v",
+		secondDuration, secondCachedDuration)
+
 	// Verify second cached result is identical to second execution
 	assert.Equal(t, secondResult, secondCachedResult, "Second cached execution should return identical result")
 

pkg/release/release.go

@@ -7,10 +7,12 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"strings"
 
 	ecv1beta1 "github.com/replicatedhq/embedded-cluster/kinds/apis/v1beta1"
 	"github.com/replicatedhq/embedded-cluster/utils/pkg/embed"
 	kotsv1beta1 "github.com/replicatedhq/kotskinds/apis/kots/v1beta1"
+	kotsv1beta2 "github.com/replicatedhq/kotskinds/apis/kots/v1beta2"
 	troubleshootv1beta2 "github.com/replicatedhq/troubleshoot/pkg/apis/troubleshoot/v1beta2"
 	velerov1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
 	"gopkg.in/yaml.v2"
@@ -33,6 +35,8 @@ type ReleaseData struct {
 	ChannelRelease        *ChannelRelease
 	VeleroBackup          *velerov1.Backup
 	VeleroRestore         *velerov1.Restore
+	HelmChartCRs          []*kotsv1beta2.HelmChart
+	HelmChartArchives     [][]byte
 }
 
 // GetReleaseData returns the release data.
@@ -93,6 +97,24 @@ func GetChannelRelease() *ChannelRelease {
 	return _releaseData.ChannelRelease
 }
 
+// GetHelmChartCRs reads and returns the HelmChart custom resources embedded as part of the release.
+// If no HelmChart CRs are found, returns an empty slice.
+func GetHelmChartCRs() []*kotsv1beta2.HelmChart {
+	if _releaseData.HelmChartCRs == nil {
+		return []*kotsv1beta2.HelmChart{}
+	}
+	return _releaseData.HelmChartCRs
+}
+
+// GetHelmChartArchives reads and returns the Helm chart archives embedded as part of the release.
+// If no chart archives are found, returns an empty slice.
+func GetHelmChartArchives() [][]byte {
+	if _releaseData.HelmChartArchives == nil {
+		return [][]byte{}
+	}
+	return _releaseData.HelmChartArchives
+}
+
 func init() {
 	rd, err := parseReleaseDataFromBinary()
 	if err != nil {
@@ -208,6 +230,17 @@ func parseVeleroRestore(data []byte) (*velerov1.Restore, error) {
 	return &restore, nil
 }
 
+func parseHelmChartCR(data []byte) (*kotsv1beta2.HelmChart, error) {
+	if len(data) == 0 {
+		return nil, nil
+	}
+	var helmChart kotsv1beta2.HelmChart
+	if err := kyaml.Unmarshal(data, &helmChart); err != nil {
+		return nil, fmt.Errorf("unable to unmarshal helm chart CR: %w", err)
+	}
+	return &helmChart, nil
+}
+
 // ChannelRelease contains information about a specific app release inside a channel.
 type ChannelRelease struct {
 	VersionLabel   string  `yaml:"versionLabel"`
@@ -324,11 +357,32 @@ func (r *ReleaseData) parse() error {
 				}
 			}
 
+		case bytes.Contains(content.Bytes(), []byte("apiVersion: kots.io/v1beta2")):
+			if bytes.Contains(content.Bytes(), []byte("kind: HelmChart")) {
+				helmChart, err := parseHelmChartCR(content.Bytes())
+				if err != nil {
+					return fmt.Errorf("failed to parse helm chart CR: %w", err)
+				}
+				if helmChart != nil {
+					if r.HelmChartCRs == nil {
+						r.HelmChartCRs = []*kotsv1beta2.HelmChart{}
+					}
+					r.HelmChartCRs = append(r.HelmChartCRs, helmChart)
+				}
+			}
+
 		case bytes.Contains(content.Bytes(), []byte("# channel release object")):
 			r.ChannelRelease, err = parseChannelRelease(content.Bytes())
 			if err != nil {
 				return fmt.Errorf("failed to parse channel release: %w", err)
 			}
+
+		case strings.HasSuffix(header.Name, ".tgz"):
+			// This is a chart archive (.tgz file)
+			if r.HelmChartArchives == nil {
+				r.HelmChartArchives = [][]byte{}
+			}
+			r.HelmChartArchives = append(r.HelmChartArchives, content.Bytes())
 		}
 	}
 }

pkg/release/release_test.go

@@ -63,6 +63,127 @@ func TestGetAppTitle(t *testing.T) {
 	assert.Equal(t, "Embedded Cluster Smoke Test App", title)
 }
 
+func TestGetHelmChartCRs(t *testing.T) {
+	release, err := newReleaseDataFrom(testReleaseData)
+	assert.NoError(t, err)
+	helmCharts := release.HelmChartCRs
+	assert.NoError(t, err)
+	assert.NotNil(t, helmCharts)
+	assert.Len(t, helmCharts, 1) // One HelmChart CR in test data
+}
+
+func TestGetHelmChartArchives(t *testing.T) {
+	release, err := newReleaseDataFrom(testReleaseData)
+	assert.NoError(t, err)
+	archives := release.HelmChartArchives
+	assert.NoError(t, err)
+	assert.NotNil(t, archives)
+	assert.Len(t, archives, 1) // One .tgz file in test data
+}
+
+func TestParseHelmChartCR(t *testing.T) {
+	tests := []struct {
+		name    string
+		data    []byte
+		wantErr bool
+		wantNil bool
+	}{
+		{
+			name:    "empty data",
+			data:    []byte{},
+			wantErr: false,
+			wantNil: true,
+		},
+		{
+			name: "valid helm chart CR",
+			data: []byte(`apiVersion: kots.io/v1beta2
+kind: HelmChart
+metadata:
+  name: test-chart
+spec:
+  chart:
+    chartVersion: "1.0.0"
+    name: test-chart`),
+			wantErr: false,
+			wantNil: false,
+		},
+		{
+			name:    "invalid yaml",
+			data:    []byte(`invalid: yaml: content`),
+			wantErr: true,
+			wantNil: true,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result, err := parseHelmChartCR(tt.data)
+			if tt.wantErr {
+				assert.Error(t, err)
+			} else {
+				assert.NoError(t, err)
+			}
+			if tt.wantNil {
+				assert.Nil(t, result)
+			} else {
+				assert.NotNil(t, result)
+			}
+		})
+	}
+}
+
+func TestParseWithHelmChartData(t *testing.T) {
+	// Create test data with HelmChart CR and .tgz file
+	helmChartYAML := `apiVersion: kots.io/v1beta2
+kind: HelmChart
+metadata:
+  name: test-chart
+spec:
+  chart:
+    chartVersion: "1.0.0"
+    name: test-chart`
+
+	chartArchive := []byte("fake-chart-archive-content")
+
+	testData := map[string][]byte{
+		"helmchart.yaml":       []byte(helmChartYAML),
+		"test-chart-1.0.0.tgz": chartArchive,
+	}
+
+	// Create tar.gz from test data
+	buf := bytes.NewBuffer([]byte{})
+	gw := gzip.NewWriter(buf)
+	tw := tar.NewWriter(gw)
+
+	for name, content := range testData {
+		err := tw.WriteHeader(&tar.Header{
+			Name: name,
+			Size: int64(len(content)),
+		})
+		assert.NoError(t, err)
+		_, err = tw.Write(content)
+		assert.NoError(t, err)
+	}
+
+	err := tw.Close()
+	assert.NoError(t, err)
+	err = gw.Close()
+	assert.NoError(t, err)
+
+	// Parse the test data
+	release, err := newReleaseDataFrom(buf.Bytes())
+	assert.NoError(t, err)
+	assert.NotNil(t, release)
+
+	// Verify HelmChart CRs
+	assert.Len(t, release.HelmChartCRs, 1)
+	assert.NotNil(t, release.HelmChartCRs[0])
+
+	// Verify chart archives
+	assert.Len(t, release.HelmChartArchives, 1)
+	assert.Equal(t, chartArchive, release.HelmChartArchives[0])
+}
+
 func generateReleaseTGZ() ([]byte, error) {
 	content, err := os.ReadFile("testdata/release.yaml")
 	if err != nil {

pkg/release/testdata/release.yaml

@@ -64,3 +64,22 @@ host-preflights.yaml: |-
               message: The filesystem at {{ .DataDir }} is more than 80% full. Ensure sufficient space is available, or use --data-dir to specify an alternative data directory.
           - pass:
               message: The filesystem at {{ .DataDir }} has sufficient space
+
+helmchart.yaml: |-
+  apiVersion: kots.io/v1beta2
+  kind: HelmChart
+  metadata:
+    name: test-chart
+  spec:
+    chart:
+      name: test-chart
+      chartVersion: "1.0.0"
+    namespace: test-namespace
+    values:
+      replicaCount: 1
+      image:
+        repository: nginx
+        tag: "1.21"
+
+test-chart-1.0.0.tgz: |-
+  fake-chart-archive-content-for-testing