Add enableApexApprovalLockUnlock to login scratch --setting Options

Author: cwarden

command/login.go

@@ -81,12 +81,14 @@ const (
 	EnableEnhancedNotes ScratchSetting = iota
 	EnableQuote
 	NetworksEnabled
+	EnableApexApprovalLockUnlock
 )
 
 var ScratchSettingIds = map[ScratchSetting][]string{
-	EnableEnhancedNotes: {"enableEnhancedNotes"},
-	EnableQuote:         {"enableQuote"},
-	NetworksEnabled:     {"networksEnabled"},
+	EnableEnhancedNotes:          {"enableEnhancedNotes"},
+	EnableQuote:                  {"enableQuote"},
+	NetworksEnabled:              {"networksEnabled"},
+	EnableApexApprovalLockUnlock: {"enableApexApprovalLockUnlock"},
 }
 
 var (
@@ -174,6 +176,7 @@ Available Settings (deployed after org creation):
   enableEnhancedNotes - Enable Enhanced Notes
   enableQuote         - Enable Quotes
   networksEnabled     - Enable Experience Cloud (Communities)
+  enableApexApprovalLockUnlock - Allow Apex to lock/unlock approval processes
 
 Examples:
   force login scratch --product fsc

command/login_test.go

@@ -162,6 +162,33 @@ func TestExpandProductsToFeatures_CommunitiesProduct(t *testing.T) {
 	}
 }
 
+func TestExpandProductsToFeatures_HealthCloudProduct(t *testing.T) {
+	result := expandProductsToFeatures([]ScratchProduct{HealthCloudProduct}, []ScratchFeature{}, map[string]string{})
+	if len(result) != 2 {
+		t.Errorf("Expected 2 features from health cloud product, got %d", len(result))
+	}
+	featureMap := make(map[string]bool)
+	for _, f := range result {
+		featureMap[f] = true
+	}
+	if !featureMap["HealthCloudAddOn"] {
+		t.Error("Expected HealthCloudAddOn in health cloud product")
+	}
+	if !featureMap["HealthCloudUser"] {
+		t.Error("Expected HealthCloudUser in health cloud product")
+	}
+}
+
+func TestExpandProductsToFeatures_ApexUserModeWithPermset(t *testing.T) {
+	result := expandProductsToFeatures([]ScratchProduct{}, []ScratchFeature{ApexUserModeWithPermset}, map[string]string{})
+	if len(result) != 1 {
+		t.Fatalf("Expected 1 feature, got %d", len(result))
+	}
+	if result[0] != "ApexUserModeWithPermset" {
+		t.Errorf("Expected ApexUserModeWithPermset, got %s", result[0])
+	}
+}
+
 func TestExpandProductsToSettings_NoProductsOrSettings(t *testing.T) {
 	result := expandProductsToSettings([]ScratchProduct{}, []ScratchSetting{})
 	if len(result) != 0 {
@@ -281,11 +308,22 @@ func TestConvertSettingsToStrings_NetworksEnabled(t *testing.T) {
 	}
 }
 
+func TestConvertSettingsToStrings_EnableApexApprovalLockUnlock(t *testing.T) {
+	result := convertSettingsToStrings([]ScratchSetting{EnableApexApprovalLockUnlock})
+	if len(result) != 1 {
+		t.Errorf("Expected 1 setting, got %d", len(result))
+	}
+	if result[0] != "enableApexApprovalLockUnlock" {
+		t.Errorf("Expected enableApexApprovalLockUnlock, got %s", result[0])
+	}
+}
+
 func TestScratchSettingIds_AllSettingsDefined(t *testing.T) {
 	expectedSettings := map[string]bool{
-		"enableEnhancedNotes": true,
-		"enableQuote":         true,
-		"networksEnabled":     true,
+		"enableEnhancedNotes":          true,
+		"enableQuote":                  true,
+		"networksEnabled":              true,
+		"enableApexApprovalLockUnlock": true,
 	}
 
 	if len(ScratchSettingIds) != len(expectedSettings) {

lib/scratch.go

@@ -104,6 +104,34 @@ func (s *ScratchOrg) getSession() (session ForceSession, err error) {
 
 // DeploySettings deploys settings metadata to a scratch org
 func (f *Force) DeploySettings(settings []string) error {
+	files := buildSettingsMetadata(settings)
+
+	// Deploy the metadata
+	options := ForceDeployOptions{}
+	result, err := f.Metadata.Deploy(files, options)
+	if err != nil {
+		return fmt.Errorf("settings deployment failed: %w", err)
+	}
+
+	// Check if deployment succeeded
+	if !result.Success {
+		errorMsg := fmt.Sprintf("Settings deployment failed with status: %s", result.Status)
+		if result.ErrorMessage != "" {
+			errorMsg += fmt.Sprintf(": %s", result.ErrorMessage)
+		}
+		if len(result.Details.ComponentFailures) > 0 {
+			errorMsg += "\nComponent failures:"
+			for _, failure := range result.Details.ComponentFailures {
+				errorMsg += fmt.Sprintf("\n  - %s: %s", failure.FileName, failure.Problem)
+			}
+		}
+		return errors.New(errorMsg)
+	}
+
+	return nil
+}
+
+func buildSettingsMetadata(settings []string) ForceMetadataFiles {
 	files := make(ForceMetadataFiles)
 
 	// Create package.xml at root of zip
@@ -118,6 +146,8 @@ func (f *Force) DeploySettings(settings []string) error {
 	files["unpackaged/package.xml"] = []byte(packageXml)
 
 	// Create settings file for each requested setting
+	apexSettings := false
+
 	for _, setting := range settings {
 		switch setting {
 		case "enableEnhancedNotes":
@@ -139,32 +169,21 @@ func (f *Force) DeploySettings(settings []string) error {
     <enableNetworksEnabled>true</enableNetworksEnabled>
 </CommunitiesSettings>`
 			files["unpackaged/settings/Communities.settings"] = []byte(communitiesSettings)
+		case "enableApexApprovalLockUnlock":
+			apexSettings = true
 		}
 	}
 
-	// Deploy the metadata
-	options := ForceDeployOptions{}
-	result, err := f.Metadata.Deploy(files, options)
-	if err != nil {
-		return err
+	if apexSettings {
+		var apexBuffer bytes.Buffer
+		apexBuffer.WriteString(`<?xml version="1.0" encoding="UTF-8"?>
+<ApexSettings xmlns="http://soap.sforce.com/2006/04/metadata">
+    <enableApexApprovalLockUnlock>true</enableApexApprovalLockUnlock>
+</ApexSettings>`)
+		files["unpackaged/settings/Apex.settings"] = apexBuffer.Bytes()
 	}
 
-	// Check if deployment succeeded
-	if !result.Success {
-		errorMsg := fmt.Sprintf("Settings deployment failed with status: %s", result.Status)
-		if result.ErrorMessage != "" {
-			errorMsg += fmt.Sprintf(": %s", result.ErrorMessage)
-		}
-		if len(result.Details.ComponentFailures) > 0 {
-			errorMsg += "\nComponent failures:"
-			for _, failure := range result.Details.ComponentFailures {
-				errorMsg += fmt.Sprintf("\n  - %s: %s", failure.FileName, failure.Problem)
-			}
-		}
-		return errors.New(errorMsg)
-	}
-
-	return nil
+	return files
 }
 
 // Create a new Scratch Org from a Dev Hub Org

lib/scratch_test.go

@@ -0,0 +1,26 @@
+package lib
+
+import (
+	"strings"
+	"testing"
+)
+
+func TestBuildSettingsMetadata_AddsOrgPreferenceSettings(t *testing.T) {
+	files := buildSettingsMetadata([]string{"enableApexApprovalLockUnlock"})
+
+	content, ok := files["unpackaged/settings/Apex.settings"]
+	if !ok {
+		t.Fatalf("Apex.settings not generated")
+	}
+	if !strings.Contains(string(content), "<enableApexApprovalLockUnlock>true</enableApexApprovalLockUnlock>") {
+		t.Errorf("Apex.settings missing enableApexApprovalLockUnlock preference:\n%s", content)
+	}
+}
+
+func TestBuildSettingsMetadata_ExcludesApexSettingsWhenUnused(t *testing.T) {
+	files := buildSettingsMetadata([]string{"enableEnhancedNotes"})
+
+	if _, ok := files["unpackaged/settings/Apex.settings"]; ok {
+		t.Fatalf("Apex.settings should not be generated when no Apex settings requested")
+	}
+}