feat: merge variables from required input packages into composable manifests

internal/builder/packages.go

@@ -234,7 +234,7 @@ func BuildPackage(options BuildOptions) (string, error) {
 		return "", fmt.Errorf("resolving transform manifests failed: %w", err)
 	}
 
-	err = options.RequiredInputsResolver.BundleInputPackageTemplates(buildPackageRoot)
+	err = options.RequiredInputsResolver.Bundle(buildPackageRoot)
 	if err != nil {
 		return "", fmt.Errorf("bundling input package templates failed: %w", err)
 	}

internal/packages/archetype/package_test.go

@@ -97,10 +97,13 @@ func createPackageDescriptorForTest(packageType, kibanaVersion string) PackageDe
 }
 
 type requiredInputsResolverMock struct {
-	BundleInputPackageTemplatesFunc func(buildPackageRoot string) error
+	BundleFunc func(buildPackageRoot string) error
 }
 
-func (r *requiredInputsResolverMock) BundleInputPackageTemplates(buildPackageRoot string) error {
+func (r *requiredInputsResolverMock) Bundle(buildPackageRoot string) error {
+	if r.BundleFunc != nil {
+		return r.BundleFunc(buildPackageRoot)
+	}
 	return nil
 }
 

internal/requiredinputs/requiredinputs.go

@@ -20,17 +20,18 @@ type eprClient interface {
 	DownloadPackage(packageName string, packageVersion string, tmpDir string) (string, error)
 }
 
-// Resolver bundles required input package templates into a built package tree.
+// Resolver bundles required input package templates into a built package tree and merges
+// variables from those input packages when applicable.
 type Resolver interface {
-	BundleInputPackageTemplates(buildPackageRoot string) error
+	Bundle(buildPackageRoot string) error
 }
 
 // NoopRequiredInputsResolver is a no-op implementation of Resolver.
 // TODO: Replace with a resolver that supports test overrides (e.g. local package paths)
 // when implementing local input package resolution for development and testing workflows.
 type NoopRequiredInputsResolver struct{}
 
-func (r *NoopRequiredInputsResolver) BundleInputPackageTemplates(_ string) error {
+func (r *NoopRequiredInputsResolver) Bundle(_ string) error {
 	return nil
 }
 
@@ -46,7 +47,7 @@ func NewRequiredInputsResolver(eprClient eprClient) (*RequiredInputsResolver, er
 	}, nil
 }
 
-func (r *RequiredInputsResolver) BundleInputPackageTemplates(buildPackageRoot string) error {
+func (r *RequiredInputsResolver) Bundle(buildPackageRoot string) error {
 
 	buildRoot, err := os.OpenRoot(buildPackageRoot)
 	if err != nil {
@@ -91,6 +92,10 @@ func (r *RequiredInputsResolver) BundleInputPackageTemplates(buildPackageRoot st
 		return fmt.Errorf("failed to bundle data stream input package templates: %w", err)
 	}
 
+	if err := r.mergeVariables(manifest, inputPkgPaths, buildRoot); err != nil {
+		return fmt.Errorf("merging variables from input packages: %w", err)
+	}
+
 	return nil
 }
 

internal/requiredinputs/requiredinputs_test.go

@@ -27,7 +27,7 @@ func (f *fakeEprClient) DownloadPackage(packageName string, packageVersion strin
 	return "", fmt.Errorf("download package not implemented")
 }
 
-func TestBundleInputPackageTemplates_Success(t *testing.T) {
+func TestBundle_Success(t *testing.T) {
 	fakeInputPath := createFakeInputHelper(t)
 	fakeEprClient := &fakeEprClient{
 		downloadPackageFunc: func(packageName string, packageVersion string, tmpDir string) (string, error) {
@@ -54,7 +54,7 @@ policy_templates:
 	resolver, err := NewRequiredInputsResolver(fakeEprClient)
 	require.NoError(t, err)
 
-	err = resolver.BundleInputPackageTemplates(buildPackageRoot)
+	err = resolver.Bundle(buildPackageRoot)
 	require.NoError(t, err)
 
 	_, err = os.ReadFile(path.Join(buildPackageRoot, "agent", "input", "sql-input.yml.hbs"))
@@ -74,7 +74,7 @@ policy_templates:
 
 }
 
-func TestBundleInputPackageTemplates_NoManifest(t *testing.T) {
+func TestBundle_NoManifest(t *testing.T) {
 	fakeInputPath := createFakeInputHelper(t)
 	fakeEprClient := &fakeEprClient{
 		downloadPackageFunc: func(packageName string, packageVersion string, tmpDir string) (string, error) {
@@ -86,12 +86,12 @@ func TestBundleInputPackageTemplates_NoManifest(t *testing.T) {
 	resolver, err := NewRequiredInputsResolver(fakeEprClient)
 	require.NoError(t, err)
 
-	err = resolver.BundleInputPackageTemplates(buildPackageRoot)
+	err = resolver.Bundle(buildPackageRoot)
 	require.Error(t, err)
 	assert.ErrorContains(t, err, "failed to read package manifest")
 }
 
-func TestBundleInputPackageTemplates_SkipNoIntegration(t *testing.T) {
+func TestBundle_SkipNoIntegration(t *testing.T) {
 	fakeInputPath := createFakeInputHelper(t)
 	fakeEprClient := &fakeEprClient{
 		downloadPackageFunc: func(packageName string, packageVersion string, tmpDir string) (string, error) {
@@ -110,11 +110,11 @@ type: input
 	resolver, err := NewRequiredInputsResolver(fakeEprClient)
 	require.NoError(t, err)
 
-	err = resolver.BundleInputPackageTemplates(buildPackageRoot)
+	err = resolver.Bundle(buildPackageRoot)
 	require.NoError(t, err)
 }
 
-func TestBundleInputPackageTemplates_NoRequires(t *testing.T) {
+func TestBundle_NoRequires(t *testing.T) {
 	fakeEprClient := &fakeEprClient{
 		downloadPackageFunc: func(packageName string, packageVersion string, tmpDir string) (string, error) {
 			return "", fmt.Errorf("no download without requires")
@@ -135,7 +135,7 @@ policy_templates:
 	resolver, err := NewRequiredInputsResolver(fakeEprClient)
 	require.NoError(t, err)
 
-	err = resolver.BundleInputPackageTemplates(buildPackageRoot)
+	err = resolver.Bundle(buildPackageRoot)
 	require.NoError(t, err)
 
 	updatedManifestBytes, err := os.ReadFile(path.Join(buildPackageRoot, "manifest.yml"))