Change --context flag to --environment

- Replace --context CLI flag with --environment for better user experience
- Update variable names from contextName to environmentName
- Preserve internal config system using 'context' terminology
- Update all test cases to use new --environment flag
- Update example documentation and usage comments

Breaking change: Users must now use --environment instead of --context

Author: orien

cmd/deploy.go

@@ -15,7 +15,7 @@ import (
 )
 
 var (
-	contextName string
+	environmentName string
 	// deployer can be injected for testing
 	deployer Deployer
 )
@@ -34,12 +34,12 @@ var deployCmd = &cobra.Command{
 		stackName := args[0]
 		ctx := context.Background()
 
-		// Context must be provided
-		if contextName == "" {
-			return fmt.Errorf("--context must be specified")
+		// Environment must be provided
+		if environmentName == "" {
+			return fmt.Errorf("--environment must be specified")
 		}
 
-		return deployWithConfig(ctx, stackName, contextName)
+		return deployWithConfig(ctx, stackName, environmentName)
 	},
 }
 
@@ -67,13 +67,13 @@ func SetDeployer(d Deployer) {
 }
 
 // deployWithConfig handles deployment using configuration file
-func deployWithConfig(ctx context.Context, stackName, contextName string) error {
+func deployWithConfig(ctx context.Context, stackName, environmentName string) error {
 	// Create configuration provider and resolver
 	provider := file.NewDefaultProvider()
 	resolver := resolve.NewStackResolver(provider)
 
 	// Resolve stack and all its dependencies
-	resolved, err := resolver.Resolve(ctx, contextName, []string{stackName})
+	resolved, err := resolver.Resolve(ctx, environmentName, []string{stackName})
 	if err != nil {
 		return fmt.Errorf("failed to resolve stack dependencies: %w", err)
 	}
@@ -102,16 +102,16 @@ func deployWithConfig(ctx context.Context, stackName, contextName string) error
 			return fmt.Errorf("error deploying stack %s: %w", stackName, err)
 		}
 
-		fmt.Printf("Successfully deployed stack %s in context %s\n", stackName, contextName)
+		fmt.Printf("Successfully deployed stack %s in environment %s\n", stackName, environmentName)
 	}
 
 	return nil
 }
 
 func init() {
 	rootCmd.AddCommand(deployCmd)
-	deployCmd.Flags().StringVar(&contextName, "context", "", "deployment context (environment)")
-	if err := deployCmd.MarkFlagRequired("context"); err != nil {
-		panic(fmt.Sprintf("failed to mark context flag as required: %v", err))
+	deployCmd.Flags().StringVar(&environmentName, "environment", "", "deployment environment")
+	if err := deployCmd.MarkFlagRequired("environment"); err != nil {
+		panic(fmt.Sprintf("failed to mark environment flag as required: %v", err))
 	}
 }

cmd/deploy_test.go

@@ -47,19 +47,19 @@ func TestDeployCommand_AcceptsStackName(t *testing.T) {
 	assert.NotNil(t, deployCmd.Args, "deploy command should have Args validation set")
 }
 
-func TestDeployCommand_HasContextFlag(t *testing.T) {
-	// Test that deploy command has a --context flag
+func TestDeployCommand_HasEnvironmentFlag(t *testing.T) {
+	// Test that deploy command has a --environment flag
 	deployCmd := findCommand(rootCmd, "deploy")
 	assert.NotNil(t, deployCmd)
 
-	// Check that --context flag exists
-	contextFlag := deployCmd.Flags().Lookup("context")
-	assert.NotNil(t, contextFlag, "deploy command should have --context flag")
-	assert.Equal(t, "context", contextFlag.Name)
+	// Check that --environment flag exists
+	environmentFlag := deployCmd.Flags().Lookup("environment")
+	assert.NotNil(t, environmentFlag, "deploy command should have --environment flag")
+	assert.Equal(t, "environment", environmentFlag.Name)
 }
 
-func TestDeployCommand_RequiresContext(t *testing.T) {
-	// Test that deploy command requires --context flag
+func TestDeployCommand_RequiresEnvironment(t *testing.T) {
+	// Test that deploy command requires --environment flag
 
 	// Mock deployer that shouldn't be called
 	mockDeployer := &MockDeployer{}
@@ -68,12 +68,12 @@ func TestDeployCommand_RequiresContext(t *testing.T) {
 	SetDeployer(mockDeployer)
 	defer SetDeployer(oldDeployer)
 
-	// Execute without context flag - should fail
+	// Execute without environment flag - should fail
 	rootCmd.SetArgs([]string{"deploy", "test-stack"})
 
 	err := rootCmd.Execute()
-	assert.Error(t, err, "deploy command should require --context flag")
-	assert.Contains(t, err.Error(), "required flag(s) \"context\" not set")
+	assert.Error(t, err, "deploy command should require --environment flag")
+	assert.Contains(t, err.Error(), "required flag(s) \"environment\" not set")
 
 	// Verify no deployer calls were made
 	mockDeployer.AssertExpectations(t)
@@ -123,7 +123,7 @@ stacks:
 	}()
 
 	// Execute the root command with deploy subcommand and arguments
-	rootCmd.SetArgs([]string{"deploy", "test-stack", "--context", "test"})
+	rootCmd.SetArgs([]string{"deploy", "test-stack", "--environment", "test"})
 
 	// Execute the command - should return error
 	err = rootCmd.Execute()
@@ -218,12 +218,12 @@ stacks:
 	}()
 
 	// First deployment should succeed
-	rootCmd.SetArgs([]string{"deploy", "stack-1", "--context", "test"})
+	rootCmd.SetArgs([]string{"deploy", "stack-1", "--environment", "test"})
 	err = rootCmd.Execute()
 	assert.NoError(t, err, "first deployment should succeed")
 
 	// Second deployment should fail
-	rootCmd.SetArgs([]string{"deploy", "stack-2", "--context", "test"})
+	rootCmd.SetArgs([]string{"deploy", "stack-2", "--environment", "test"})
 	err = rootCmd.Execute()
 	assert.Error(t, err, "second deployment should fail")
 	assert.Contains(t, err.Error(), "second deployment failed", "error should contain expected message")
@@ -288,7 +288,7 @@ stacks:
 
 	// Set up mock deployer that expects config-resolved values
 	mockDeployer := &MockDeployer{}
-	// Expect ResolvedStack with resolved parameters from dev context
+	// Expect ResolvedStack with resolved parameters from dev environment
 	mockDeployer.On("DeployStack", mock.Anything, mock.MatchedBy(func(resolvedStack *resolve.ResolvedStack) bool {
 		return resolvedStack.Name == "vpc" &&
 			resolvedStack.Parameters["VpcCidr"] == "10.1.0.0/16" &&
@@ -310,8 +310,8 @@ stacks:
 		require.NoError(t, err)
 	}()
 
-	// Execute deploy command with context flag
-	rootCmd.SetArgs([]string{"deploy", "vpc", "--context", "dev"})
+	// Execute deploy command with environment flag
+	rootCmd.SetArgs([]string{"deploy", "vpc", "--environment", "dev"})
 
 	err = rootCmd.Execute()
 	assert.NoError(t, err, "deploy command should execute successfully with config")
@@ -396,7 +396,7 @@ stacks:
 
 	// This should resolve dependencies and deploy: vpc → database → app
 	// But current implementation will only deploy app
-	rootCmd.SetArgs([]string{"deploy", "app", "--context", "test"})
+	rootCmd.SetArgs([]string{"deploy", "app", "--environment", "test"})
 
 	err = rootCmd.Execute()
 	assert.NoError(t, err, "deploy should succeed")
@@ -472,7 +472,7 @@ stacks:
 	}()
 
 	// Deploy app - should trigger resolver to deploy vpc → database → app
-	rootCmd.SetArgs([]string{"deploy", "app", "--context", "test"})
+	rootCmd.SetArgs([]string{"deploy", "app", "--environment", "test"})
 
 	err = rootCmd.Execute()
 	assert.NoError(t, err, "deploy should succeed")

examples/simple-vpc/README.md

@@ -52,17 +52,17 @@ The `stackaroo.yaml` file defines:
 
 3. **Deploy to development**:
    ```bash
-   ../../stackaroo deploy vpc --context dev
+   ../../stackaroo deploy vpc --environment dev
    ```
 
 4. **Deploy to staging**:
    ```bash
-   ../../stackaroo deploy vpc --context staging
+   ../../stackaroo deploy vpc --environment staging
    ```
 
 5. **Deploy to production** (requires production account access):
    ```bash
-   ../../stackaroo deploy vpc --context prod
+   ../../stackaroo deploy vpc --environment prod
    ```
 
 ## What Gets Deployed
@@ -87,16 +87,16 @@ Each deployment creates:
 
 Check the status of your deployments:
 ```bash
-../../stackaroo status vpc --context dev
+../../stackaroo status vpc --environment dev
 ```
 
 ## Cleanup
 
 To remove the infrastructure:
 ```bash
-../../stackaroo delete vpc --context dev
-../../stackaroo delete vpc --context staging
-../../stackaroo delete vpc --context prod
+../../stackaroo delete vpc --environment dev
+../../stackaroo delete vpc --environment staging
+../../stackaroo delete vpc --environment prod
 ```
 
 ## Learning Points

examples/simple-vpc/stackaroo.yaml

@@ -62,6 +62,6 @@ stacks:
           Monitoring: enabled
 
 # Usage examples:
-#   stackaroo deploy vpc --context dev     # Deploy to dev environment
-#   stackaroo deploy vpc --context prod    # Deploy to production
-#   stackaroo list --context staging       # List stacks in staging
+#   stackaroo deploy vpc --environment dev     # Deploy to dev environment
+#   stackaroo deploy vpc --environment prod    # Deploy to production
+#   stackaroo list --environment staging       # List stacks in staging