fix(config): add support for git repository inheritance

Author: blurrah

internal/config.go

@@ -17,9 +17,6 @@ func NewVercelConfig() VercelConfig {
 	return VercelConfig{
 
 		ProjectConfig: ProjectConfig{
-			GitRepository: GitRepository{
-				ProductionBranch: "main",
-			},
 			PasswordProtection: PasswordProtection{
 				ProtectProduction: true,
 			},
@@ -113,8 +110,14 @@ func (c *ProjectConfig) extendConfig(o *ProjectConfig) *ProjectConfig {
 			cfg.ManualProductionDeployment = c.ManualProductionDeployment
 		}
 
-		if c.GitRepository.Type != "" || c.GitRepository.Repo != "" {
-			cfg.GitRepository = c.GitRepository
+		if c.GitRepository.Type != "" || c.GitRepository.Repo != "" || c.GitRepository.ProductionBranch != "" {
+			result := c.GitRepository.extendConfig(&o.GitRepository)
+			if result != nil {
+				cfg.GitRepository = *result
+			} else {
+				cfg.GitRepository = c.GitRepository
+			}
+
 		}
 
 		if c.ProtectionBypassForAutomation {
@@ -153,6 +156,32 @@ type GitRepository struct {
 	Repo             string `mapstructure:"repo"`
 }
 
+func (c *GitRepository) extendConfig(o *GitRepository) *GitRepository {
+	if o != nil && o != (&GitRepository{}) {
+		cfg := &GitRepository{
+			ProductionBranch: o.ProductionBranch,
+			Type:             o.Type,
+			Repo:             o.Repo,
+		}
+
+		if c.ProductionBranch != "" {
+			cfg.ProductionBranch = c.ProductionBranch
+		}
+
+		if c.Type != "" {
+			cfg.Type = c.Type
+		}
+
+		if c.Repo != "" {
+			cfg.Repo = c.Repo
+		}
+
+		return cfg
+	}
+
+	return c
+}
+
 type PasswordProtection struct {
 	Password          string `mapstructure:"password"`
 	ProtectProduction bool   `mapstructure:"protect_production"`

internal/plugin_test.go

@@ -1,6 +1,7 @@
 package internal
 
 import (
+	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -194,6 +195,11 @@ func TestSiteComponentInheritance(t *testing.T) {
 			"serverless_function_region":   "iad1",
 			"manual_production_deployment": false,
 			"environment_variables":        siteVariables,
+			"git_repository": map[string]any{
+				"production_branch": "main",
+				"type":              "github",
+				"repo":              "mach-composer/my-project",
+			},
 		},
 	}
 
@@ -211,6 +217,9 @@ func TestSiteComponentInheritance(t *testing.T) {
 			"serverless_function_region":   "fra1",
 			"manual_production_deployment": true,
 			"environment_variables":        componentVariables,
+			"git_repository": map[string]any{
+				"production_branch": "production",
+			},
 		},
 	}
 
@@ -229,6 +238,7 @@ func TestSiteComponentInheritance(t *testing.T) {
 	assert.Contains(t, component.Variables, "vercel_project_manual_production_deployment = true")
 	assert.Contains(t, component.Variables, "key = \"TEST_ENVIRONMENT_VARIABLE_2\"")
 	assert.Contains(t, component.Variables, "key = \"TEST_ENVIRONMENT_VARIABLE_3\"")
+	assert.Contains(t, component.Variables, "production_branch = \"production\"")
 
 }
 
@@ -321,6 +331,8 @@ func TestCompleteInheritance(t *testing.T) {
 
 	component, err := plugin.RenderTerraformComponent("my-site", "test-component")
 
+	fmt.Println(component)
+
 	assert.Contains(t, component.Variables, "vercel_project_serverless_function_region = \"fra1\"")
 	assert.Contains(t, component.Variables, "type = \"github\"")
 	assert.Contains(t, component.Variables, "production_branch = \"production\"")