Merge pull request #51 from davidweterings/fix/inheritance-bug

Fix/inheritance bug

Author: demeyerthom

.changes/unreleased/Fixed-20250630-225441.yaml

@@ -0,0 +1,3 @@
+kind: Fixed
+body: Inheritance when partially bool was set
+time: 2025-06-30T22:54:41.038341+02:00

.gitignore

@@ -3,3 +3,6 @@ mach-composer-plugin-*
 
 # Coverage file
 *.out
+
+.idea/
+.claude/

internal/config.go

@@ -58,7 +58,7 @@ func (c *VercelConfig) extendConfig(o *VercelConfig) *VercelConfig {
 type ProjectConfig struct {
 	Name                          string                       `mapstructure:"name"`
 	Framework                     string                       `mapstructure:"framework"`
-	ManualProductionDeployment    bool                         `mapstructure:"manual_production_deployment"`
+	ManualProductionDeployment    *bool                        `mapstructure:"manual_production_deployment"`
 	ServerlessFunctionRegion      string                       `mapstructure:"serverless_function_region"`
 	EnvironmentVariables          []ProjectEnvironmentVariable `mapstructure:"environment_variables"`
 	GitRepository                 GitRepository                `mapstructure:"git_repository"`
@@ -113,7 +113,7 @@ func (c *ProjectConfig) extendConfig(o *ProjectConfig) *ProjectConfig {
 			cfg.RootDirectory = c.RootDirectory
 		}
 
-		if c.ManualProductionDeployment != o.ManualProductionDeployment {
+		if c.ManualProductionDeployment != nil {
 			cfg.ManualProductionDeployment = c.ManualProductionDeployment
 		}
 

internal/plugin.go

@@ -138,7 +138,6 @@ func (p *VercelPlugin) getSiteConfig(site string) (*VercelConfig, error) {
 }
 
 func (p *VercelPlugin) getConfig(site string, component string) *VercelConfig {
-
 	cfg, err := p.getComponentConfig(site, component)
 	if err != nil {
 		cfg, err = p.getSiteConfig(site)
@@ -163,6 +162,12 @@ func (p *VercelPlugin) getConfig(site string, component string) *VercelConfig {
 		}
 	}
 
+	// keep existing behavior to false when omitted
+	if cfg.ProjectConfig.ManualProductionDeployment == nil {
+		defaultFalse := false
+		cfg.ProjectConfig.ManualProductionDeployment = &defaultFalse
+	}
+
 	return cfg
 }
 

internal/plugin_test.go

@@ -585,3 +585,133 @@ func TestCompleteInheritance(t *testing.T) {
 	assert.Contains(t, component.Variables, "production_branch = \"production\"")
 	assert.Contains(t, component.Variables, "vercel_project_manual_production_deployment = true")
 }
+
+func TestManualProductionDeploymentBehavior(t *testing.T) {
+	t.Run("defaults to false when not specified", func(t *testing.T) {
+		plugin := NewVercelPlugin()
+
+		data := map[string]any{
+			"team_id":   "test-team",
+			"api_token": "test-token",
+			"project_config": map[string]any{
+				"framework": "nextjs",
+			},
+		}
+
+		err := plugin.SetSiteConfig("my-site", data)
+		require.NoError(t, err)
+
+		component, err := plugin.RenderTerraformComponent("my-site", "test-component")
+		require.NoError(t, err)
+
+		assert.Contains(t, component.Variables, "vercel_project_manual_production_deployment = false")
+	})
+
+	t.Run("explicit false is preserved", func(t *testing.T) {
+		plugin := NewVercelPlugin()
+
+		data := map[string]any{
+			"team_id":   "test-team",
+			"api_token": "test-token",
+			"project_config": map[string]any{
+				"framework":                    "nextjs",
+				"manual_production_deployment": false,
+			},
+		}
+
+		err := plugin.SetSiteConfig("my-site", data)
+		require.NoError(t, err)
+
+		component, err := plugin.RenderTerraformComponent("my-site", "test-component")
+		require.NoError(t, err)
+
+		assert.Contains(t, component.Variables, "vercel_project_manual_production_deployment = false")
+	})
+
+	t.Run("inheritance: child overrides parent", func(t *testing.T) {
+		plugin := NewVercelPlugin()
+
+		globalData := map[string]any{
+			"team_id":   "test-team",
+			"api_token": "test-token",
+			"project_config": map[string]any{
+				"manual_production_deployment": false,
+			},
+		}
+
+		siteData := map[string]any{
+			"project_config": map[string]any{
+				"manual_production_deployment": true,
+			},
+		}
+
+		err := plugin.SetGlobalConfig(globalData)
+		require.NoError(t, err)
+
+		err = plugin.SetSiteConfig("my-site", siteData)
+		require.NoError(t, err)
+
+		component, err := plugin.RenderTerraformComponent("my-site", "test-component")
+		require.NoError(t, err)
+
+		assert.Contains(t, component.Variables, "vercel_project_manual_production_deployment = true")
+	})
+
+	t.Run("inheritance: inherits false when not specified", func(t *testing.T) {
+		plugin := NewVercelPlugin()
+
+		globalData := map[string]any{
+			"team_id":   "test-team",
+			"api_token": "test-token",
+			"project_config": map[string]any{
+				"manual_production_deployment": false,
+			},
+		}
+
+		siteData := map[string]any{
+			"project_config": map[string]any{
+				"framework": "nextjs",
+			},
+		}
+
+		err := plugin.SetGlobalConfig(globalData)
+		require.NoError(t, err)
+
+		err = plugin.SetSiteConfig("my-site", siteData)
+		require.NoError(t, err)
+
+		component, err := plugin.RenderTerraformComponent("my-site", "test-component")
+		require.NoError(t, err)
+
+		assert.Contains(t, component.Variables, "vercel_project_manual_production_deployment = false")
+	})
+
+	t.Run("inheritance: inherits true when not specified", func(t *testing.T) {
+		plugin := NewVercelPlugin()
+
+		globalData := map[string]any{
+			"team_id":   "test-team",
+			"api_token": "test-token",
+			"project_config": map[string]any{
+				"manual_production_deployment": true,
+			},
+		}
+
+		siteData := map[string]any{
+			"project_config": map[string]any{
+				"framework": "nextjs",
+			},
+		}
+
+		err := plugin.SetGlobalConfig(globalData)
+		require.NoError(t, err)
+
+		err = plugin.SetSiteConfig("my-site", siteData)
+		require.NoError(t, err)
+
+		component, err := plugin.RenderTerraformComponent("my-site", "test-component")
+		require.NoError(t, err)
+
+		assert.Contains(t, component.Variables, "vercel_project_manual_production_deployment = true")
+	})
+}