stack_master 2.17.0 → 2.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 637daba2dddc707df22584fad412d87df4ee24aab069885231561d847c762496
-  data.tar.gz: 7abcea21ecfbc080886b4181dc66392066a9360255ed2186bf2e7d652f6101e2
+  metadata.gz: e73f1b3d79a230203a083898d14d256ac7c61fb0dd4a49627af097759341ca96
+  data.tar.gz: 193c5824b8972d6ddc36f66dd23d83360c1af43562a3b038c413bb6ff624626a
 SHA512:
-  metadata.gz: dba94d8ecf220d837673ef95f68c8d534b979bd31d67b8056e0836355a88f713499ca55420906ffb16855f7c3acb17e320c41ec90cb9c84263c59539f00c4cb2
-  data.tar.gz: 680f31e8fef7a94d387582acdb6c9381844aae4e2c56e6c4088f36d9c1ac2969feb27b9703c90c21416cef96572efc32455d4621951567611a18cb3481f22f56
+  metadata.gz: 41d00dda80224d66ae46e73746b43f1e0738ef075ad8ce3122494db579c545b6cd2b15497622cf5aa683efa2bf6f67f411a031c1cb5063c0a94b40dcef8261a0
+  data.tar.gz: e26a3fa7eeae1b2be191fa579e585f34f8f781c4b94e68d42c0619a3d1effbe86cd0761b119a79058a86d98f113d6db573dfbfd0b733792ca9d21554de98684c

data/README.md

@@ -794,11 +794,6 @@ CLI directly rather than via a stack update.
 applied in CloudFormation. This can happen if the template or computed parameters have changed in code and the change
 hasn't been applied to this stack.
 
-## Maintainers
-
-- [Steve Hodgkiss](https://github.com/stevehodgkiss)
-- [Glen Stampoultzis](https://github.com/gstamp)
-
 ## License
 
 StackMaster uses the MIT license. See [LICENSE.txt](https://github.com/envato/stack_master/blob/master/LICENSE.txt) for details.

data/lib/stack_master/aws_driver/cloud_formation.rb

@@ -14,31 +14,33 @@ module StackMaster
         end
       end
 
-      def_delegators :cf, :create_change_set,
-                          :describe_change_set,
-                          :execute_change_set,
-                          :delete_change_set,
-                          :delete_stack,
-                          :cancel_update_stack,
-                          :describe_stack_resources,
-                          :get_template,
-                          :get_stack_policy,
-                          :set_stack_policy,
-                          :describe_stack_events,
-                          :update_stack,
-                          :create_stack,
-                          :validate_template,
-                          :describe_stacks,
-                          :detect_stack_drift,
-                          :describe_stack_drift_detection_status,
-                          :describe_stack_resource_drifts
+      def_delegators(
+        :cf,
+        :create_change_set,
+        :describe_change_set,
+        :execute_change_set,
+        :delete_change_set,
+        :delete_stack,
+        :cancel_update_stack,
+        :describe_stack_resources,
+        :get_template,
+        :get_stack_policy,
+        :set_stack_policy,
+        :describe_stack_events,
+        :update_stack,
+        :create_stack,
+        :validate_template,
+        :describe_stacks,
+        :detect_stack_drift,
+        :describe_stack_drift_detection_status,
+        :describe_stack_resource_drifts
+      )
 
       private
 
       def cf
         @cf ||= Aws::CloudFormation::Client.new({ region: region, retry_limit: 10 })
       end
-
     end
   end
 end

data/lib/stack_master/aws_driver/s3.rb

@@ -11,16 +11,20 @@ module StackMaster
       end
 
       def upload_files(bucket: nil, prefix: nil, region: nil, files: {})
-        raise StackMaster::AwsDriver::S3ConfigurationError, 'A bucket must be specified in order to use S3' unless bucket
+        unless bucket
+          raise StackMaster::AwsDriver::S3ConfigurationError, 'A bucket must be specified in order to use S3'
+        end
 
         return if files.empty?
 
         s3 = new_s3_client(region: region)
 
-        current_objects = s3.list_objects({
-          prefix: prefix,
-          bucket: bucket
-        }).map(&:contents).flatten.inject({}){|h,obj|
+        current_objects = s3.list_objects(
+          {
+            prefix: prefix,
+            bucket: bucket
+          }
+        ).map(&:contents).flatten.inject({}) { |h, obj|
           h.merge(obj.key => obj)
         }
 
@@ -35,15 +39,18 @@ module StackMaster
           s3_md5 = current_objects[object_key] ? current_objects[object_key].etag.gsub("\"", '') : nil
 
           next if compiled_template_md5 == s3_md5
+
           s3_uri = "s3://#{bucket}/#{object_key}"
           StackMaster.stdout.print "- #{File.basename(path)} => #{s3_uri} "
 
-          s3.put_object({
-            bucket: bucket,
-            key: object_key,
-            body: body,
-            metadata: { md5: compiled_template_md5 }
-          })
+          s3.put_object(
+            {
+              bucket: bucket,
+              key: object_key,
+              body: body,
+              metadata: { md5: compiled_template_md5 }
+            }
+          )
           StackMaster.stdout.puts "done."
         end
       end

data/lib/stack_master/change_set.rb

@@ -42,15 +42,15 @@ module StackMaster
     end
 
     def display(io)
-      io.puts <<-EOL
+      io.puts <<~EOL
 
-========================================
-Proposed change set:
-EOL
+        ========================================
+        Proposed change set:
+      EOL
       @response.changes.each do |change|
         display_resource_change(io, change.resource_change)
       end
-io.puts "========================================"
+      io.puts "========================================"
     end
 
     def failed?

data/lib/stack_master/cli.rb

@@ -5,7 +5,7 @@ module StackMaster
   class CLI
     include Commander::Methods
 
-    def initialize(argv, stdin=STDIN, stdout=STDOUT, stderr=STDERR, kernel=Kernel)
+    def initialize(argv, stdin = STDIN, stdout = STDOUT, stderr = STDERR, kernel = Kernel)
       @argv, @stdin, @stdout, @stderr, @kernel = argv, stdin, stdout, stderr, kernel
       Commander::Runner.instance_variable_set('@instance', Commander::Runner.new(argv))
       StackMaster.stdout = @stdout
@@ -41,9 +41,14 @@ module StackMaster
       command :apply do |c|
         c.syntax = 'stack_master apply [region_or_alias] [stack_name]'
         c.summary = 'Creates or updates a stack'
-        c.description = "Creates or updates a stack. Shows a diff of the proposed stack's template and parameters. Tails stack events until CloudFormation has completed."
+        c.description = "Creates or updates a stack. Shows a diff of the proposed stack's template and parameters. " \
+                        'Tails stack events until CloudFormation has completed.'
         c.example 'update a stack named myapp-vpc in us-east-1', 'stack_master apply us-east-1 myapp-vpc'
-        c.option '--on-failure ACTION', String, "Action to take on CREATE_FAILURE. Valid Values: [ DO_NOTHING | ROLLBACK | DELETE ]. Default: ROLLBACK\nNote: You cannot use this option with Serverless Application Model (SAM) templates."
+        c.option '--on-failure ACTION', String,
+                 'Action to take on CREATE_FAILURE. ' \
+                 'Valid Values: [ DO_NOTHING | ROLLBACK | DELETE ]. ' \
+                 "Default: ROLLBACK\n" \
+                 'Note: You cannot use this option with Serverless Application Model (SAM) templates.'
         c.option '--yes-param PARAM_NAME', String, "Auto-approve stack updates when only parameter PARAM_NAME changes"
         c.action do |args, options|
           options.default config: default_config_file
@@ -171,11 +176,13 @@ module StackMaster
       command :status do |c|
         c.syntax = 'stack_master status'
         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.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.default config: default_config_file
           say "Invalid arguments. stack_master status" and return unless args.size == 0
+
           config = load_config(options.config)
           StackMaster::Commands::Status.perform(config, nil, options)
         end
@@ -184,11 +191,13 @@ module StackMaster
       command :tidy do |c|
         c.syntax = 'stack_master tidy'
         c.summary = 'Try to identify extra & missing files.'
-        c.description = 'Cross references stack_master.yml with the template and parameter directories to identify extra or missing files.'
+        c.description = 'Cross references stack_master.yml with the template ' \
+                        'and parameter directories to identify extra or missing files.'
         c.example 'description', 'Check for missing or extra files'
         c.action do |args, options|
           options.default config: default_config_file
           say "Invalid arguments. stack_master tidy" and return unless args.size == 0
+
           config = load_config(options.config)
           StackMaster::Commands::Tidy.perform(config, nil, options)
         end
@@ -269,11 +278,14 @@ module StackMaster
           success = false
         end
         stack_definitions = stack_definitions.select do |stack_definition|
-          running_in_allowed_account?(stack_definition.allowed_accounts) && StackStatus.new(config, stack_definition).changed?
+          running_in_allowed_account?(stack_definition.allowed_accounts) &&
+            StackStatus.new(config, stack_definition).changed?
         end if options.changed
         stack_definitions.each do |stack_definition|
           StackMaster.cloud_formation_driver.set_region(stack_definition.region)
-          StackMaster.stdout.puts "Executing #{command.command_name} on #{stack_definition.stack_name} in #{stack_definition.region}"
+          StackMaster.stdout.puts(
+            "Executing #{command.command_name} on #{stack_definition.stack_name} in #{stack_definition.region}"
+          )
           success = execute_if_allowed_account(stack_definition.allowed_accounts) do
             command.perform(config, stack_definition, options).success?
           end
@@ -283,7 +295,7 @@ module StackMaster
     end
 
     def show_other_region_candidates(config, stack_name)
-      candidates = config.filter(region="", stack_name=stack_name)
+      candidates = config.filter(region = "", stack_name = stack_name)
       return if candidates.empty?
 
       StackMaster.stdout.puts "Stack name #{stack_name} exists in regions: #{candidates.map(&:region).join(', ')}"
@@ -291,12 +303,15 @@ module StackMaster
 
     def execute_if_allowed_account(allowed_accounts, &block)
       raise ArgumentError, "Block required to execute this method" unless block_given?
+
       if running_in_allowed_account?(allowed_accounts)
         block.call
       else
         account_text = "'#{identity.account}'"
         account_text << " (#{identity.account_aliases.join(', ')})" if identity.account_aliases.any?
-        StackMaster.stdout.puts "Account #{account_text} is not an allowed account. Allowed accounts are #{allowed_accounts}."
+        StackMaster.stdout.puts(
+          "Account #{account_text} is not an allowed account. Allowed accounts are #{allowed_accounts}."
+        )
         false
       end
     end

data/lib/stack_master/commands/apply.rb

@@ -144,6 +144,7 @@ module StackMaster
 
       def upload_files
         return unless use_s3?
+
         s3.upload_files(**s3_options)
       end
 
@@ -153,7 +154,8 @@ module StackMaster
 
       def template_value
         if use_s3?
-          s3.url(bucket: @s3_config['bucket'], prefix: @s3_config['prefix'], region: @s3_config['region'], template: @stack_definition.s3_template_file_name)
+          s3.url(bucket: @s3_config['bucket'], prefix: @s3_config['prefix'], region: @s3_config['region'],
+                 template: @stack_definition.s3_template_file_name)
         else
           proposed_stack.template
         end
@@ -161,6 +163,7 @@ module StackMaster
 
       def files_to_upload
         return {} unless use_s3?
+
         @stack_definition.s3_files.tap do |files|
           files[@stack_definition.s3_template_file_name] = {
             path: @stack_definition.template_file_path,
@@ -218,6 +221,7 @@ module StackMaster
         proposed_policy = proposed_stack.stack_policy_body
         # No need to reset a stack policy if it's nil or not changed
         return if proposed_policy.nil? || proposed_policy == current_policy
+
         StackMaster.stdout.print 'Setting a stack policy...'
         cf.set_stack_policy(
           stack_name: stack_name,

data/lib/stack_master/commands/delete.rb

@@ -12,7 +12,6 @@ module StackMaster
       end
 
       def perform
-
         return unless check_exists
 
         unless ask?("Really delete stack #{@stack_name} (y/n)? ")
@@ -27,11 +26,11 @@ module StackMaster
       private
 
       def delete_stack
-        cf.delete_stack({stack_name: @stack_name})
+        cf.delete_stack({ stack_name: @stack_name })
       end
 
       def check_exists
-        cf.describe_stacks({stack_name: @stack_name})
+        cf.describe_stacks({ stack_name: @stack_name })
         true
       rescue Aws::CloudFormation::Errors::ValidationError
         failed("Stack does not exist")

data/lib/stack_master/commands/drift.rb

@@ -15,7 +15,8 @@ module StackMaster
         detect_stack_drift_result = cf.detect_stack_drift(stack_name: stack_name)
         drift_results = wait_for_drift_results(detect_stack_drift_result.stack_drift_detection_id)
 
-        puts colorize("Drift Status: #{drift_results.stack_drift_status}", stack_drift_status_color(drift_results.stack_drift_status))
+        puts colorize("Drift Status: #{drift_results.stack_drift_status}",
+                      stack_drift_status_color(drift_results.stack_drift_status))
         return if drift_results.stack_drift_status == 'IN_SYNC'
 
         failed
@@ -51,8 +52,10 @@ module StackMaster
       end
 
       def display_resource_drift(drift)
-        diff = ::StackMaster::Diff.new(before: prettify_json(drift.expected_properties),
-                        after: prettify_json(drift.actual_properties))
+        diff = ::StackMaster::Diff.new(
+          before: prettify_json(drift.expected_properties),
+          after: prettify_json(drift.actual_properties)
+        )
         diff.display_colorized_diff
       end
 

data/lib/stack_master/commands/init.rb

@@ -28,11 +28,12 @@ module StackMaster
         @region_parameters_filename = File.join("parameters", @region, "#{@stack_name}.yml")
 
         if !@options.overwrite
-          [@stack_master_filename, @stack_json_filename, @parameters_filename, @region_parameters_filename].each do |filename|
-            if File.exist?(filename)
-              StackMaster.stderr.puts("Aborting: #{filename} already exists. Use --overwrite to force overwriting file.")
-              return false
-            end
+          [@stack_master_filename, @stack_json_filename, @parameters_filename,
+           @region_parameters_filename].each do |filename|
+            next unless File.exist?(filename)
+
+            StackMaster.stderr.puts("Aborting: #{filename} already exists. Use --overwrite to force overwriting file.")
+            return false
           end
         end
         true

data/lib/stack_master/commands/nag.rb

@@ -24,7 +24,6 @@ module StackMaster
       def proposed_stack
         @proposed_stack ||= Stack.generate(stack_definition, @config)
       end
-
     end
   end
 end

data/lib/stack_master/commands/resources.rb

@@ -8,7 +8,15 @@ module StackMaster
 
       def perform
         if stack_resources
-          tp stack_resources, :logical_resource_id, :resource_type, :timestamp, :resource_status, :resource_status_reason, :description
+          tp(
+            stack_resources,
+            :logical_resource_id,
+            :resource_type,
+            :timestamp,
+            :resource_status,
+            :resource_status_reason,
+            :description
+          )
         else
           failed("Stack doesn't exist")
         end

data/lib/stack_master/commands/tidy.rb

@@ -19,7 +19,10 @@ module StackMaster
             templates.delete(template)
 
             if !File.exist?(template)
-              StackMaster.stdout.puts "Stack \"#{stack_definition.stack_name}\" in \"#{stack_definition.region}\" missing template \"#{rel_path(template)}\""
+              StackMaster.stdout.puts(
+                "Stack \"#{stack_definition.stack_name}\" in \"#{stack_definition.region}\" " \
+                "missing template \"#{rel_path(template)}\""
+              )
             end
           end
         end

data/lib/stack_master/config.rb

@@ -14,14 +14,16 @@ module StackMaster
       raise ConfigParseError, "Unable to parse #{resolved_config_file}: #{error}"
     end
 
-    attr_accessor :stacks,
-                  :base_dir,
-                  :template_dir,
-                  :parameters_dir,
-                  :stack_defaults,
-                  :region_defaults,
-                  :region_aliases,
-                  :template_compilers,
+    attr_accessor(
+      :stacks,
+      :base_dir,
+      :template_dir,
+      :parameters_dir,
+      :stack_defaults,
+      :region_defaults,
+      :region_aliases,
+      :template_compilers
+    )
 
     def self.search_up_and_chdir(config_file)
       return config_file unless File.dirname(config_file) == "."
@@ -52,6 +54,7 @@ module StackMaster
       @stacks = []
 
       raise ConfigParseError.new("Stack defaults can't be undefined") if @stack_defaults.nil?
+
       load_template_compilers(config)
       load_config
     end
@@ -72,6 +75,7 @@ module StackMaster
     end
 
     private
+
     def load_template_compilers(config)
       @template_compilers = {}
       populate_template_compilers(config.fetch('template_compilers', {}))
@@ -92,9 +96,9 @@ module StackMaster
       {
         rb: :sparkle_formation,
         json: :json,
-        yml:  :yaml,
+        yml: :yaml,
         yaml: :yaml,
-        erb:  :yaml_erb,
+        erb: :yaml_erb,
       }
     end
 
@@ -123,7 +127,8 @@ module StackMaster
             'base_dir' => @base_dir,
             'template_dir' => @template_dir,
             'parameters_dir' => @parameters_dir,
-            'additional_parameter_lookup_dirs' => @region_to_aliases[region])
+            'additional_parameter_lookup_dirs' => @region_to_aliases[region]
+          )
           stack_attributes['allowed_accounts'] = attributes['allowed_accounts'] if attributes['allowed_accounts']
           @stacks << StackDefinition.new(stack_attributes)
         end

data/lib/stack_master/identity.rb

@@ -21,7 +21,8 @@ module StackMaster
     def account_aliases
       @aliases ||= iam.list_account_aliases.account_aliases
     rescue Aws::IAM::Errors::AccessDenied
-      raise MissingIamPermissionsError, 'Failed to retrieve account aliases. Missing required IAM permission: iam:ListAccountAliases'
+      raise MissingIamPermissionsError,
+            'Failed to retrieve account aliases. Missing required IAM permission: iam:ListAccountAliases'
     end
 
     private

data/lib/stack_master/parameter_loader.rb

@@ -2,13 +2,12 @@ require 'active_support/core_ext/object/deep_dup'
 
 module StackMaster
   class ParameterLoader
-
     COMPILE_TIME_PARAMETERS_KEY = 'compile_time_parameters'
 
     def self.load(parameter_files: [], parameters: {})
       StackMaster.debug 'Searching for parameter files...'
       all_parameters = parameter_files.map { |file_name| load_parameters(file_name) } + [parameters]
-      all_parameters.reduce({template_parameters: {}, compile_time_parameters: {}}) do |hash, parameters|
+      all_parameters.reduce({ template_parameters: {}, compile_time_parameters: {} }) do |hash, parameters|
         template_parameters = create_template_parameters(parameters)
         compile_time_parameters = create_compile_time_parameters(parameters)
 
@@ -32,7 +31,8 @@ module StackMaster
 
     def self.create_template_parameters(parameters)
       parameters.deep_dup.tap do |parameters_clone|
-        parameters_clone.delete(COMPILE_TIME_PARAMETERS_KEY) || parameters_clone.delete(COMPILE_TIME_PARAMETERS_KEY.camelize)
+        parameters_clone.delete(COMPILE_TIME_PARAMETERS_KEY) ||
+          parameters_clone.delete(COMPILE_TIME_PARAMETERS_KEY.camelize)
       end
     end
 
@@ -43,6 +43,5 @@ module StackMaster
     def self.merge_and_camelize(hash, parameters)
       parameters.each { |key, value| hash[key.camelize] = value }
     end
-
   end
 end

data/lib/stack_master/parameter_resolver.rb

@@ -49,6 +49,7 @@ module StackMaster
       return parameter_value.to_s if Numeric === parameter_value || parameter_value == true || parameter_value == false
       return resolve_array_parameter_values(key, parameter_value).join(',') if Array === parameter_value
       return parameter_value unless Hash === parameter_value
+
       resolve_parameter_resolver_hash(key, parameter_value)
     rescue Aws::CloudFormation::Errors::ValidationError
       raise InvalidParameter, $!.message
@@ -77,6 +78,7 @@ module StackMaster
       if account.nil? || role.nil?
         raise InvalidParameter, "Both 'account' and 'role' are required to assume role for parameter '#{key}'"
       end
+
       role_assumer.assume_role(account, role) do
         yield
       end
@@ -105,7 +107,8 @@ module StackMaster
         begin
           @resolvers[class_name] = resolver_class_const(class_name).new(@config, @stack_definition)
         rescue NameError
-          raise ResolverNotFound, "Could not find parameter resolver called #{class_name}, please double check your configuration"
+          raise ResolverNotFound,
+                "Could not find parameter resolver called #{class_name}, please double check your configuration"
         end
       end
     end

data/lib/stack_master/parameter_resolvers/acm_certificate.rb

@@ -10,7 +10,10 @@ module StackMaster
 
       def resolve(domain_name)
         cert_arn = find_cert_arn_by_domain_name(domain_name)
-        raise CertificateNotFound, "Could not find certificate #{domain_name} in #{@stack_definition.region}" unless cert_arn
+        unless cert_arn
+          raise CertificateNotFound, "Could not find certificate #{domain_name} in #{@stack_definition.region}"
+        end
+
         cert_arn
       end
 

data/lib/stack_master/parameter_resolvers/ami_finder.rb

@@ -15,7 +15,7 @@ module StackMaster
       end
 
       def build_filters_from_hash(hash)
-        hash.map { |key, value| {name: key, values: Array(value.to_s)}}
+        hash.map { |key, value| { name: key, values: Array(value.to_s) } }
       end
 
       def find_latest_ami(filters, owners = ['self'])

data/lib/stack_master/parameter_resolvers/ejson.rb

@@ -23,16 +23,19 @@ module StackMaster
 
       def validate_ejson_file_specified
         if @stack_definition.ejson_file.nil?
-          raise ArgumentError, "No ejson_file defined for stack definition #{@stack_definition.stack_name} in #{@stack_definition.region}"
+          raise ArgumentError, 'No ejson_file defined for stack definition ' \
+                               "#{@stack_definition.stack_name} in #{@stack_definition.region}"
         end
       end
 
       def decrypt_ejson_file
         ejson_file_key = credentials_key
         @decrypted_ejson_files.fetch(ejson_file_key) do
-          @decrypted_ejson_files[ejson_file_key] = EJSONWrapper.decrypt(ejson_file_path,
-                                                                        use_kms: @stack_definition.ejson_file_kms,
-                                                                        region: ejson_file_region)
+          @decrypted_ejson_files[ejson_file_key] = EJSONWrapper.decrypt(
+            ejson_file_path,
+            use_kms: @stack_definition.ejson_file_kms,
+            region: ejson_file_region
+          )
         end
       end
 

data/lib/stack_master/parameter_resolvers/env.rb

@@ -1,7 +1,6 @@
 module StackMaster
   module ParameterResolvers
     class Env < Resolver
-
       def initialize(config, stack_definition)
         @config = config
         @stack_definition = stack_definition
@@ -10,9 +9,9 @@ module StackMaster
       def resolve(value)
         environment_variable = ENV[value]
         raise ArgumentError, "The environment variable #{value} is not set" if environment_variable.nil?
+
         environment_variable
       end
-
     end
   end
 end

data/lib/stack_master/parameter_resolvers/latest_container.rb

@@ -28,7 +28,8 @@ module StackMaster
         latest_image = images.first
 
         # aws_account_id.dkr.ecr.region.amazonaws.com/repository@sha256:digest
-        "#{latest_image.registry_id}.dkr.ecr.#{@region}.amazonaws.com/#{parameters['repository_name']}@#{latest_image.image_digest}"
+        "#{latest_image.registry_id}.dkr.ecr.#{@region}.amazonaws.com/#{parameters['repository_name']}@" \
+        "#{latest_image.image_digest}"
       end
 
       private
@@ -36,15 +37,16 @@ module StackMaster
       def fetch_images(repository_name, registry_id, ecr)
         images = []
         next_token = nil
-        while
-          resp = ecr.describe_images({
+        while resp = ecr.describe_images(
+          {
             repository_name: repository_name,
             registry_id: registry_id,
             next_token: next_token,
             filter: {
               tag_status: "TAGGED",
             },
-          })
+          }
+        )
 
           images += resp.image_details
           next_token = resp.next_token

data/lib/stack_master/parameter_resolvers/one_password.rb

@@ -13,8 +13,12 @@ module StackMaster
         @stack_definition = stack_definition
       end
 
-      def resolve(params={})
-        raise OnePasswordNotAbleToAuthenticate, "1password requires the `OP_SESSION_<name>` to be set, (remember to sign in?)" if ENV.keys.grep(/OP_SESSION_\w+$/).empty?    
+      def resolve(params = {})
+        if ENV.keys.grep(/OP_SESSION_\w+$/).empty?
+          raise OnePasswordNotAbleToAuthenticate,
+                "1password requires the `OP_SESSION_<name>` to be set, (remember to sign in?)"
+        end
+
         get_items(params)
       end
 
@@ -40,7 +44,7 @@ module StackMaster
       end
 
       def password_item(data)
-        data.details.password 
+        data.details.password
       end
 
       def login_item(data)