Remove region from stack_master.yml

features/apply.feature

@@ -4,11 +4,10 @@ Feature: Apply command
     Given a file named "stack_master.yml" with:
       """
       stacks:
-        us_east_1:
-          myapp_vpc:
-            template: myapp_vpc.rb
-          myapp_web:
-            template: myapp_web.rb
+        myapp_vpc:
+          template: myapp_vpc.rb
+        myapp_web:
+          template: myapp_web.rb
       """
     And a directory named "parameters"
     And a file named "parameters/myapp_vpc.yml" with:
@@ -332,12 +331,11 @@ Feature: Apply command
     Given a file named "stack_master.yml" with:
       """
       stacks:
-        us_east_1:
-          myapp_vpc:
-            template: myapp_vpc.rb
-            notification_arns:
-              - test_arn
-            stack_policy_file: no_rds_replacement.json
+        myapp_vpc:
+          template: myapp_vpc.rb
+          notification_arns:
+            - test_arn
+          stack_policy_file: no_rds_replacement.json
       """
     And a file named "policies/no_rds_replacement.json" with:
       """

features/apply_with_compile_time_parameters.feature

@@ -4,9 +4,8 @@ Feature: Apply command with compile time parameters
     Given a file named "stack_master.yml" with:
     """
           stacks:
-            us-east-1:
-              vpc:
-                template: vpc.rb
+            vpc:
+              template: vpc.rb
           """
     And a directory named "parameters"
     And a file named "parameters/vpc.yml" with:
@@ -90,4 +89,4 @@ Feature: Apply command with compile time parameters
       | +      }                                          |
       | +    }                                            |
     And the output should match /2020-10-29 00:00:00 (\+|\-)[0-9]{4} vpc AWS::CloudFormation::Stack CREATE_COMPLETE/
-    Then the exit status should be 0
+    Then the exit status should be 0

features/apply_with_env_parameters.feature

@@ -4,9 +4,8 @@ Feature: Apply command with environment parameter
     Given a file named "stack_master.yml" with:
       """
       stacks:
-        us-east-2:
-          vpc:
-            template: vpc.rb
+        vpc:
+          template: vpc.rb
       """
     And a directory named "parameters"
     And a file named "parameters/vpc.yml" with:
@@ -46,4 +45,4 @@ Feature: Apply command with environment parameter
       | +---                  |
       | +VpcCidr: 10.0.0.0/16 |
     And the output should match /2020-10-29 00:00:00 (\+|\-)[0-9]{4} vpc AWS::CloudFormation::Stack CREATE_COMPLETE/
-    Then the exit status should be 0
+    Then the exit status should be 0

features/apply_with_parameter_store_parameters.feature

@@ -4,9 +4,8 @@ Feature: Apply command with parameter_store parameter
     Given a file named "stack_master.yml" with:
       """
       stacks:
-        us-east-2:
-          vpc:
-            template: vpc.rb
+        vpc:
+          template: vpc.rb
       """
     And a directory named "parameters"
     And a file named "parameters/vpc.yml" with:

features/apply_with_s3.feature

@@ -9,11 +9,10 @@ Feature: Apply command
           region: us-east-1
           prefix: cfn_templates/my-app
       stacks:
-        us_east_1:
-          myapp_vpc:
-            template: myapp_vpc.rb
-            files:
-              - user_data.sh
+        myapp_vpc:
+          template: myapp_vpc.rb
+          files:
+            - user_data.sh
       """
     And a directory named "parameters"
     And a file named "parameters/myapp_vpc.yml" with:

features/diff.feature

@@ -4,9 +4,8 @@ Feature: Diff command
     Given a file named "stack_master.yml" with:
       """
       stacks:
-        us_east_1:
-          myapp_vpc:
-            template: myapp_vpc.json
+        myapp_vpc:
+          template: myapp_vpc.json
       """
     And a directory named "parameters"
     And a file named "parameters/myapp_vpc.yml" with:

features/events.feature

@@ -4,9 +4,8 @@ Feature: Events command
     Given a file named "stack_master.yml" with:
       """
       stacks:
-        us_east_1:
-          myapp_vpc:
-            template: myapp_vpc.rb
+        myapp_vpc:
+          template: myapp_vpc.rb
       """
     And a directory named "templates"
     And a file named "templates/myapp_vpc.rb" with:

features/init.feature

@@ -2,5 +2,4 @@ Feature: init project
 
   Scenario: Run init
     When I run `stack_master init us-east-1 my-app`
-    # TODO flesh this out
     Then the exit status should be 0

features/outputs.feature

@@ -4,9 +4,8 @@ Feature: Outputs command
     Given a file named "stack_master.yml" with:
       """
       stacks:
-        us_east_1:
-          myapp_vpc:
-            template: myapp_vpc.rb
+        myapp_vpc:
+          template: myapp_vpc.rb
       """
     And a directory named "templates"
     And a file named "templates/myapp_vpc.rb" with:

features/region_aliases.feature

@@ -7,12 +7,8 @@ Feature: Region aliases
         staging: ap-southeast-2
         production: us_east_1
       stacks:
-        staging:
-          myapp_vpc:
-            template: myapp_vpc.rb
-        production:
-          myapp_vpc:
-            template: myapp_vpc.rb
+        myapp_vpc:
+          template: myapp_vpc.rb
       """
     And a directory named "templates"
     And a directory named "parameters"

features/resources.feature

@@ -4,9 +4,8 @@ Feature: Resources command
     Given a file named "stack_master.yml" with:
       """
       stacks:
-        us_east_1:
-          myapp_vpc:
-            template: myapp_vpc.rb
+        myapp_vpc:
+          template: myapp_vpc.rb
       """
     And a directory named "templates"
     And a file named "templates/myapp_vpc.rb" with:

features/stack_defaults.feature

@@ -21,18 +21,16 @@ Feature: Stack defaults
           tags:
             environment: production
       stacks:
-        ap_southeast_2:
-          myapp_vpc:
-            template: myapp_vpc.rb
-            tags:
-              role: network
-            notification_arns:
-              - test_arn_3
-        us_east_1:
-          myapp_vpc:
-            template: myapp_vpc.rb
-            tags:
-              role: network
+        myapp_vpc:
+          template: myapp_vpc.rb
+          tags:
+            role: network
+          notification_arns:
+            - test_arn_3
+        myotherapp_vpc:
+          template: myapp_vpc.rb
+          tags:
+            role: network
       """
     And a directory named "templates"
     And a directory named "policies"

features/status.feature

@@ -4,13 +4,12 @@ Feature: Status command
     Given a file named "stack_master.yml" with:
       """
       stacks:
-        us_east_1:
-          stack1:
-            template: stack1.json
-          stack2:
-            template: stack2.json
-          stack3:
-            template: stack3.json
+        stack1:
+          template: stack1.json
+        stack2:
+          template: stack2.json
+        stack3:
+          template: stack3.json
       """
     And a directory named "parameters"
     And a file named "parameters/stack1.yml" with:
@@ -106,7 +105,7 @@ Feature: Status command
 }
       """
 
-    When I run `stack_master status --trace`
+    When I run `stack_master status us-east-1 --trace`
     And the output should contain all of these lines:
       | REGION    \| STACK_NAME \| STACK_STATUS    \| DIFFERENT |
       | ----------\|------------\|-----------------\|---------- |

features/validate.feature

@@ -4,9 +4,8 @@ Feature: Validate command
     Given a file named "stack_master.yml" with:
       """
       stacks:
-        us_east_1:
-          stack1:
-            template: stack1.json
+        stack1:
+          template: stack1.json
       """
     And a directory named "parameters"
     And a file named "parameters/stack1.yml" with:

lib/stack_master/cli.rb

@@ -115,7 +115,7 @@ def execute!
         c.action do |args, options|
           options.defaults config: default_config_file
           say "Invalid arguments." if args.size > 0
-          config = load_config(options.config)
+          config = load_config(options.config, 'us-east-1')
           StackMaster::Commands::ListStacks.perform(config)
         end
       end
@@ -154,14 +154,13 @@ def execute!
       end
 
       command :status do |c|
-        c.syntax = 'stack_master status'
+        c.syntax = 'stack_master status [region]'
         c.summary = 'Check the current status stacks.'
         c.description = 'Checks the status of all stacks defined in the stack_master.yml file. Warning this operation can be somewhat slow.'
         c.example 'description', 'Check the status of all stack definitions'
         c.action do |args, options|
           options.defaults config: default_config_file
-          say "Invalid arguments. stack_master status" and return unless args.size == 0
-          config = load_config(options.config)
+          config = load_config(options.config, args[0])
           StackMaster::Commands::Status.perform(config)
         end
       end
@@ -180,8 +179,8 @@ def execute!
 
           # Because delete can work without a stack_master.yml
           if options.config and File.file?(options.config)
-            config = load_config(options.config)
-            region = Utils.underscore_to_hyphen(config.unalias_region(args[0]))
+            config = load_config(options.config, args[0])
+            region = config.region
           else
             region = args[0]
           end
@@ -194,24 +193,23 @@ def execute!
       run!
     end
 
-    def load_config(file)
+    def load_config(file, region)
       stack_file = file || default_config_file
-      StackMaster::Config.load!(stack_file)
+      StackMaster::Config.load!(stack_file, region)
     rescue Errno::ENOENT => e
       say "Failed to load config file #{stack_file}"
       exit 1
     end
 
     def execute_stacks_command(command, args, options)
       command_results = []
-      config = load_config(options.config)
+      config = load_config(options.config, args[0])
       args = [nil, nil] if args.size == 0
       args.each_slice(2) do |aliased_region, stack_name|
-        region = Utils.underscore_to_hyphen(config.unalias_region(aliased_region))
         stack_name = Utils.underscore_to_hyphen(stack_name)
-        stack_definitions = config.filter(region, stack_name)
+        stack_definitions = config.filter(stack_name)
         if stack_definitions.empty?
-          StackMaster.stdout.puts "Could not find stack definition #{stack_name} in region #{region}"
+          StackMaster.stdout.puts "Could not find stack definition #{stack_name}"
         end
         stack_definitions = stack_definitions.select do |stack_definition|
           StackStatus.new(config, stack_definition).changed?

lib/stack_master/commands/compile.rb

@@ -16,7 +16,7 @@ def perform
       private
 
       def stack_definition
-        @stack_definition ||= @config.find_stack(@region, @stack_name)
+        @stack_definition ||= @config.find_stack(@stack_name)
       end
 
       def proposed_stack

lib/stack_master/commands/diff.rb

@@ -16,7 +16,7 @@ def perform
       private
 
       def stack_definition
-        @stack_definition ||= @config.find_stack(@region, @stack_name)
+        @stack_definition ||= @config.find_stack(@stack_name)
       end
 
       def stack

lib/stack_master/commands/lint.rb

@@ -27,7 +27,7 @@ def perform
       private
 
       def stack_definition
-        @stack_definition ||= @config.find_stack(@region, @stack_name)
+        @stack_definition ||= @config.find_stack(@stack_name)
       end
 
       def proposed_stack