Merge pull request #14 from Jeffrey-Zutt/feat/introduce_production_branch_for_git_repository

feat: introduce production_branch for git_repository

Author: demeyerthom

internal/config.go

@@ -144,8 +144,9 @@ func (c *ProjectConfig) extendConfig(o *ProjectConfig) *ProjectConfig {
 }
 
 type GitRepository struct {
-	Type string `mapstructure:"type"`
-	Repo string `mapstructure:"repo"`
+	ProductionBranch string `mapstructure:"production_branch"`
+	Type             string `mapstructure:"type"`
+	Repo             string `mapstructure:"repo"`
 }
 
 type PasswordProtection struct {

internal/plugin.go

@@ -194,6 +194,7 @@ func (p *VercelPlugin) RenderTerraformComponent(site string, component string) (
 			{{ renderProperty "protect_production" .ProjectConfig.PasswordProtection.ProtectProduction }}
 		}
 		vercel_project_git_repository = {
+			{{ renderProperty "production_branch" .ProjectConfig.GitRepository.ProductionBranch }}
 			{{ renderProperty "type" .ProjectConfig.GitRepository.Type }}
 			{{ renderProperty "repo" .ProjectConfig.GitRepository.Repo }}
 		}

internal/plugin_test.go

@@ -42,8 +42,9 @@ func TestSetVercelConfig(t *testing.T) {
 			"root_directory":               "./my-project",
 			"manual_production_deployment": true,
 			"git_repository": map[string]any{
-				"type": "github",
-				"repo": "mach-composer/my-project",
+				"production_branch": "main",
+				"type":              "github",
+				"repo":              "mach-composer/my-project",
 			},
 			"environment_variables":            variables,
 			"domains":                          domains,
@@ -81,6 +82,7 @@ func TestSetVercelConfig(t *testing.T) {
 	assert.Contains(t, component.Variables, "root_directory = \"./my-project\"")
 	assert.Contains(t, component.Variables, "vercel_team_id = \"test-team\"")
 	assert.Contains(t, component.Variables, "manual_production_deployment = true")
+	assert.Contains(t, component.Variables, "production_branch = \"main\"")
 	assert.Contains(t, component.Variables, "type = \"github\"")
 	assert.Contains(t, component.Variables, "repo = \"mach-composer/my-project\"")
 	assert.Contains(t, component.Variables, "protection_bypass_for_automation = true")
@@ -298,8 +300,9 @@ func TestCompleteInheritance(t *testing.T) {
 	siteConfig := map[string]any{
 		"project_config": map[string]any{
 			"git_repository": map[string]any{
-				"type": "github",
-				"repo": "owner/test-repo",
+				"production_branch": "main",
+				"type":              "github",
+				"repo":              "owner/test-repo",
 			},
 		},
 	}
@@ -320,5 +323,6 @@ func TestCompleteInheritance(t *testing.T) {
 
 	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 = \"main\"")
 	assert.Contains(t, component.Variables, "vercel_project_manual_production_deployment = true")
 }

internal/schemas/component-config.json

@@ -47,6 +47,9 @@
         "git_repository": {
           "type": "object",
           "properties": {
+            "production_branch": {
+              "type": "string"
+            },
             "type": {
               "type": "string"
             },

internal/schemas/global-config.json

@@ -47,6 +47,9 @@
         "git_repository": {
           "type": "object",
           "properties": {
+            "production_branch": {
+              "type": "string"
+            },
             "type": {
               "type": "string"
             },

internal/schemas/site-config.json

@@ -46,6 +46,9 @@
         "git_repository": {
           "type": "object",
           "properties": {
+            "production_branch": {
+              "type": "string"
+            },
             "type": {
               "type": "string"
             },