sfn 1.1.8 → 1.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 698f214f1cdff652dc16b36120697090de470f87
-  data.tar.gz: 7efbb32522675152516584455f8f317b9816e6f8
+  metadata.gz: 8ee7d09945927cfc75821041ef90090dba2ef9c0
+  data.tar.gz: fad23bceb0be9ba52eab93f31e51d508c5109de1
 SHA512:
-  metadata.gz: 0f2de1bf189064aa4213a6211730d7a0d0760ff613ce5974db6e8957ee7a5301574fcaa15411be1235ca7c7f9f251bd34c9274288d809f1683f540ffa85c7a71
-  data.tar.gz: c268b90db20e18cb7534ef63b19883026d73e47e62d3cffcfae0d894cb7ad41d58032c715d172d0005f772212250803595c62b06eb9253b92d210ae75940b141
+  metadata.gz: adac24b09b2ab1681f88fc4c60d41fb21ca9026e4246527ff63a337c1300de2a8186cfab28b88df7599a2ae092206493ea29e053cd3d1e1dccd3b117844ae827
+  data.tar.gz: 55e2b6bdc3cbd30512c8818c2551f2c8253dfc2f5058b03b557816c2cdc8afe48e01c52f2ba2daa057e61b71e70a4791ddac17374b2a8c78bf084dbf7d021bc6

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v1.1.10
+* [enhancement] Better configuration related errors
+* [fix] Planning display on stack removal (#75)
+* [fix] Remove stack properties on update request (#76)
+* [enhancement] Add `retries` config alias for `retry` (#77)
+
 ## v1.1.8
 * [fix] Disable knife config mashing to get expected values (#72)
 * [feature] Add new `conf` command (#72)

data/README.md

@@ -76,82 +76,6 @@ Configuration.new do
 end
 ```
 
-### Configuration Options
-
-* `processing` - Enable SparkleFormation processing
-  * Valid: Boolean
-  * Default: `true`
-
-* `apply_nesting` - Style of nested stack processing
-  * Valid: `"shallow"`, `"deep"`
-  * Default: `"deep"`
-
-* `options` - API options for target orchestration API (see miasma)
-  * Valid: `Hash`
-  * Default: none
-
-* `ssh_attempt_users` - List of users to attempt SSH connection on node failure
-  * Valid: `Array<String>`
-  * Default: none
-
-* `identity_file` - Custom SSH identity file to use for connection on node failure
-  * Valid: `String`
-  * Default: none
-
-* `nesting_bucket` - Name of bucket to store nested stack templates
-  * Valid: `String`
-  * Default: none
-
-* `credentials` - API credentials for target orchestration API (see [miasma](https://github.com/miasma-rb/miasma))
-  * Valid: `Hash`
-  * Default: none
-
-* `callbacks` - Callbacks to execute around API calls
-  * Valid: `Hash`
-  * Default: none
-    * `before` - Callbacks to execute before _any_ API call
-      * Valid: `Array<String>`
-      * Default: none
-    * `after` - Callbacks to execute after _any_ API call
-      * Valid: `Array<String>`
-      * Default: none
-    * `before_COMMAND` - Callbacks to execute before specific `COMMAND` API call
-      * Valid: `Array<String>`
-      * Default: none
-    * `after_COMMAND` - Callbacks to execute after specific `COMMAND` API call
-      * Valid: `Array<String>`
-      * Default: none
-    * `template` - Callbacks to execute on template
-      * Valid: `Array<String>`
-      * Default: none
-    * `default` - Callbacks to always execute
-      * Valid: `Array<String>`
-      * Default: none
-    * `require` - List of custom libraries to load
-      * Valid: `Array<String>`
-      * Default: none
-
-* `retry` - Configuration of API request retries
-  * Valid: `Hash`
-  * Default: none
-    * `type` - Type of retry
-      * Valid: `"flat"`, `"linear"`, `"exponential"`
-      * Default: `"exponential"`
-    * `interval` - Base wait interval for retry
-      * Valid: `Numeric`
-      * Default: 5
-    * `max_attempts` - Maximum number of attempts allowed
-      * Valid: `Numeric`
-      * Default: 20
-      * _NOTE_: Set to `nil` for infinite retry
-
-* `stack_types` - Valid stack resource types
-  * Valid: `Array<String>`
-  * Default: `[DEFAULT_PROVIDER_TYPE]`
-
-* `locations` - API credentials for named locations
-  * Valid: `Hash`
-  * Default: none
 
 ## Commands
 
@@ -179,57 +103,6 @@ Validates template with API
 
 Creates a new stack with the provided name (`NAME`).
 
-#### Apply Stacks
-
-The `--apply-stack` option allows providing the name of an existing
-stack when creating or updating. Applying stacks is simply fetching
-the outputs from the applied stacks and automatically defaulting the
-set parameter of the new or updated stack. Outputs are matched
-by name to the parameters of the target stack. This allows an easy
-way to use values from existing stacks when building new stacks.
-
-Example:
-
-StackA:
-
-```json
-...
-  "Outputs": {
-    "LoadBalancerAddress": {
-      "Description": "Address of Load Balancer",
-      "Value": {
-        "Fn::GetAtt": [
-          "LoadBalancerResource",
-          "DNSName"
-        ]
-      }
-    }
-  }
-...
-```
-
-StackB:
-
-```json
-...
-  "Parameters": {
-    "LoadBalancerAddress": {
-      "Type": "String",
-      "Default": "unset"
-    }
-  }
-...
-```
-
-When creating StackB, if we use the `--apply-stack` option:
-
-```
-$ sfn create StackB --apply-stack StackA
-```
-
-when prompted for the stack parameters, we will find the parameter
-value for `LoadBalancerAddress` to be filled in with the output
-provided from StackA.
 
 #### Processing
 

data/docs/commands.md

@@ -0,0 +1,343 @@
+---
+title: "Commands"
+weight: 4
+anchors:
+  - title: "Lifecycle commands"
+    url: "#lifecycle-commands"
+  - title: "Inspection and Information commands"
+    url: "#inspection-and-information-commands"
+  - title: "Configuration commands"
+    url: "#configuration-commands"
+---
+
+## SparkleFormation CLI commands
+
+The `sfn` command provides a collection of subcommands to handle stack
+lifecycles as well as subcommands to aid in inspection of existing
+stacks.
+
+### Lifecycle commands
+
+#### Stack create
+
+Stacks can be created via `sfn` using SparkleFormation templates or raw JSON
+templates.
+
+~~~
+$ sfn create my-stack
+~~~
+
+`sfn` will prompt for selection of a template to build for this new stack. To
+disable this prompting behavior, you can provide the path or name of the desired
+template:
+
+~~~
+$ sfn create my-stack --file my_template
+~~~
+
+By default `sfn` will process and build SparkleFormation templates. To build a JSON
+template, disable processing in the configuration file, or via flag:
+
+~~~
+$ sfn create my-stack --file ./my_template.json --no-processing
+~~~
+
+The `create` command is only responsible for initiating the stack creation with the
+remote provider API. This does not report back the success or failure of the actual
+stack creation. To provide this behavior, the `create` command will automatically poll
+the stack's resource events. Once the stack as reached a completed state, the `create`
+command can properly notify of a _success_ or _failed_ state and exit with the proper
+status code. The automatic polling behavior can be disabled:
+
+~~~
+$ sfn create my-stack --file my_template --no-poll
+~~~
+
+The `--apply-stack` option allows providing the name of an existing
+stack when creating or updating. Applying stacks is simply fetching
+the outputs from the applied stacks and automatically defaulting the
+set parameter of the new or updated stack. Outputs are matched
+by name to the parameters of the target stack. This allows an easy
+way to use values from existing stacks when building new stacks.
+
+Example:
+
+StackA:
+
+~~~json
+...
+  "Outputs": {
+    "LoadBalancerAddress": {
+      "Description": "Address of Load Balancer",
+      "Value": {
+        "Fn::GetAtt": [
+          "LoadBalancerResource",
+          "DNSName"
+        ]
+      }
+    }
+  }
+...
+~~~
+
+StackB:
+
+~~~json
+...
+  "Parameters": {
+    "LoadBalancerAddress": {
+      "Type": "String",
+      "Default": "unset"
+    }
+  }
+...
+~~~
+
+When creating StackB, if we use the `--apply-stack` option:
+
+~~~
+$ sfn create StackB --apply-stack StackA
+~~~
+
+when prompted for the stack parameters, we will find the parameter
+value for `LoadBalancerAddress` to be filled in with the output
+provided from StackA.
+
+Example of stack creation:
+
+![stack create](./images/d_create.png)
+
+#### Stack update
+
+Existing stacks can be updated via `sfn`:
+
+~~~
+$ sfn update my-stack
+~~~
+
+This will start an "in place" update. Only the parameters of the stack are updated. To
+update the template of the stack as well:
+
+~~~
+$ sfn update my-stack --file my_template
+~~~
+
+The `update` command behaves like the `create` command. It is only responsible for initiating
+the request with the remote provider API. It will poll the stack events to detect final stack
+state. The polling can be disabled:
+
+~~~
+$ sfn update my-stack --file my_template --no-poll
+~~~
+
+Example of stack update:
+
+![stack update](./images/d_update.png)
+
+#### Stack destroy
+
+Existing stacks can be destroyed via `sfn`:
+
+~~~
+$ sfn destroy my-stack
+~~~
+
+By default a confirmation prompt will be provided prior to destroying an existing stack.
+This can be disabled by automatically confirming:
+
+~~~
+$ sfn destroy my-stack --yes
+~~~
+
+The `destroy` command will poll the stack resource events until the stack has been successfully
+deleted, or has reached a "complete" state (which would indicate a failure to destroy). The polling
+can be disabled:
+
+~~~
+$ sfn destroy my-stack --yes --no-poll
+~~~
+
+The `destroy` command also provides glob support when specifying stack names. This can make cleanup
+very easy when multiple testing stacks may exist:
+
+~~~
+$ sfn destroy my-stack-*
+~~~
+
+This will destroy all stacks whose name start with `my-stack-`. The command will prompt for confirmation
+and provide a list of all matching stacks prior to destruction.
+
+Example of stack destroy:
+
+![stack destroy](./images/d_destroy.png)
+
+### Inspection and Information commands
+
+#### Stack list
+
+To list existing stacks:
+
+~~~
+$ sfn list
+~~~
+
+Example of a stack list:
+
+![stack list](./images/d_list.png)
+
+#### Stack describe
+
+A description of an existing stack will display resources allocated to the stack and any outputs
+that were defined within the stack's template:
+
+~~~
+$ sfn describe my-stack
+~~~
+
+If the stack contains nested stacks, it will display the resources and outputs for those stacks
+as well.
+
+To describe only resources:
+
+~~~
+$ sfn describe my-stack --resources
+~~~
+
+To describe only outputs:
+
+~~~
+$ sfn describe my-stack --outputs
+~~~
+
+Example of a stack describe:
+
+![stack describe](./images/d_describe.png)
+
+#### Stack events
+
+List the events genereted by the resources allocated to an existing stack:
+
+~~~
+$ sfn events my-stack
+~~~
+
+If the resources within the stack are currently being modified (via a `create`, `update`, or `destroy`)
+command, the events can be polled until the stack reaches a completed state:
+
+~~~
+$ sfn events my-stack --poll
+~~~
+
+Example of stack events:
+
+![stack events](./images/d_events.png)
+
+#### Stack inspection
+
+Existing stacks can have their resources inspected via `sfn` using the miasma model API. The `inspect`
+command provides the ability to directly access resource information where the miasma library has
+modeling support enabled.
+
+One builtin helper for the `inspect` command is listing all compute resources available within a stack.
+This includes standalone compute instances as well as compute instances attached to auto-scaling groups
+defined within the stack.
+
+~~~
+$ sfn inspect my-stack --nodes
+~~~
+
+Example of stack node inspection:
+
+![stack inspect nodes](./images/d_inspect-nodes.png)
+
+When run with no options, the `inspect` command will output the data model information of the stack:
+
+~~~
+$ sfn inspect my-stack
+~~~
+
+Individual items can be displayed using the attribute flag:
+
+~~~
+$ sfn inspect my-stack --attribute template
+~~~
+
+The attribute flag is gets applied to the miasma data model and will output the result of request. For
+example, if the stack consisted of one resource, and that resource was a compute instance, we could view
+the resource information from the orchestration API point of view:
+
+~~~
+$ sfn inspect my-stack --attribute "resources.all.first"
+~~~
+
+The information here will be sparse because the orchestration API only keeps a reference to the actual
+resource within its own system. Because the miasma library has compute modeling defined, we can utilize
+the library to automatically load the compute instance:
+
+~~~
+$ sfn inspect my-stack --attribute "resources.all.first.expand"
+~~~
+
+If only the addresses allocated to the compute instance were desired, that can be requested:
+
+~~~
+$ sfn inspect my-stack --attribute "resources.all.first.expand.addresses"
+~~~
+
+Example of stack attribute inspection
+
+![stack inspect attribute](./images/d_inspect-attribute.png)
+
+#### Template print
+
+To display a generated template:
+
+~~~
+$ sfn print --file my_template
+~~~
+
+#### Template validation
+
+Templates can be validated with the remote provide API prior to creation:
+
+~~~
+$ sfn validate --file my_template
+~~~
+
+If the template is a JSON style template, disable processing:
+
+~~~
+$ sfn validate --file my_template --no-processing
+~~~
+
+Example of stack validate:
+
+![stack validate](./images/d_validate.png)
+
+#### Template diff
+
+Template updates can be diff'ed against an existing stack's template to display information about
+what resource modifications will be introduced by the new template:
+
+~~~
+$ sfn diff my-stack --file my_template
+~~~
+
+Example of stack diff:
+
+![stack diff](./images/d_diff.png)
+
+### Configuration commands
+
+To aid setup and configuration, `sfn` provides a configuration helper:
+
+~~~
+$ sfn conf
+~~~
+
+This will display the current configuration. If no configuration file is present, the user can have
+one automatically generated for them:
+
+~~~
+$ sfn conf --generate
+~~~

data/docs/configuration.md

@@ -6,6 +6,8 @@ anchors:
     url: "#sfn-based"
   - title: "knife-based"
     url: "#knife-based"
+  - title: "configuration-options"
+    url: "#configuration-options"
 ---
 
 
@@ -43,4 +45,93 @@ can be accessed via:
 $ knife sparkleformation --help
 ~~~
 
+### Configuration Options
+
+| Option                     | Attribute     | Value
+|----------------------------|---------------|---------------------------------------------------------------
+| `processing`               | Description   | Enable SparkleFormation processing
+|                            | Valid         | `TrueClass`, `FalseClass`
+|                            | Default       | `true`
+|----------------------------|---------------|---------------------------------------------------------------
+| `apply_nesting`            | Description   | Style of nested stack processing
+|                            | Valid         | `"shallow"`, `"deep"`
+|                            | Default       | `"deep"`
+|----------------------------|---------------|---------------------------------------------------------------
+| `options`                  | Description   | API options for target API (see miasma)
+|                            | Valid         | `Hash`
+|                            | Default       | none
+|----------------------------|---------------|---------------------------------------------------------------
+| `ssh_attempt_users`        | Description   | List of users to attempt SSH connection on node failure
+|                            | Valid         | `Array<String>`
+|                            | Default       | none
+|----------------------------|---------------|---------------------------------------------------------------
+| `identity_file`            | Description   | Custom SSH identity file for node failure connection
+|                            | Valid         | `String`
+|                            | Default       | none
+|----------------------------|---------------|---------------------------------------------------------------
+| `nesting_bucket`           | Description   | Name of bucket to store nested stack templates
+|                            | Valid         | `String`
+|                            | Default       | none
+|----------------------------|---------------|---------------------------------------------------------------
+| `credentials`              | Description   | API credentials for target orchestration API
+|                            | Valid         | `Hash`
+|                            | Default       | none
+|----------------------------|---------------|---------------------------------------------------------------
+| `callbacks`                | Description   | Callbacks to execute around API calls
+|                            | Valid         | `Hash`
+|                            | Default       | none
+|----------------------------|---------------|---------------------------------------------------------------
+| `callbacks.before`         | Description   | Callbacks to execute before _any_ API call
+|                            | Valid         | `Array<String>`
+|                            | Default       | none
+|----------------------------|---------------|---------------------------------------------------------------
+| `callbacks.after`          | Description   | Callbacks to execute after _any_ API call
+|                            | Valid         | `Array<String>`
+|                            | Default       | none
+|----------------------------|---------------|---------------------------------------------------------------
+| `callbacks.before_COMMAND` | Description   | Callbacks to execute before specific `COMMAND` API call
+|                            | Valid         | `Array<String>`
+|                            | Default       | none
+|----------------------------|---------------|---------------------------------------------------------------
+| `callbacks.after_COMMAND`  | Description   | Callbacks to execute after specific `COMMAND` API call
+|                            | Valid         | `Array<String>`
+|                            | Default       | none
+|----------------------------|---------------|---------------------------------------------------------------
+| `callbacks.template`       | Description   | Callbacks to execute on template
+|                            | Valid         | `Array<String>`
+|                            | Default       | none
+|----------------------------|---------------|---------------------------------------------------------------
+| `callbacks.default`        | Description   | Callbacks to always execute
+|                            | Valid         | `Array<String>`
+|                            | Default       | none
+|----------------------------|---------------|---------------------------------------------------------------
+| `callbacks.require`        | Description   | List of custom libraries to load
+|                            | Valid         | `Array<String>`
+|                            | Default       | none
+|----------------------------|---------------|---------------------------------------------------------------
+| `retries`                  | Description   | Configuration of API request retries
+|                            | Valid         | `Hash`
+|                            | Default       | none
+|----------------------------|---------------|---------------------------------------------------------------
+| `retries.type`             | Description   | Retry implementation
+|                            | Valid         | `"flat"`, `"linear"`, `"exponential"`
+|                            | Default       | `"exponential"`
+|----------------------------|---------------|---------------------------------------------------------------
+| `retries.interval`         | Description   | Base wait interval for retry
+|                            | Valid         | `Numeric`
+|                            | Default       | `5`
+|----------------------------|---------------|---------------------------------------------------------------
+| `retries.max_attempts`     | Description   | Maximum number of attempts allowed (`nil` for infinite retry)
+|                            | Valid         | `Numeric`, `NilClass`
+|                            | Default       | `20`
+|----------------------------|---------------|---------------------------------------------------------------
+| `stack_types`              | Description   | Define customized stack resource types
+|                            | Valid         | `Array<String>`
+|                            | Default       | `[DEFAULT_PROVIDER_TYPE]`
+|----------------------------|---------------|---------------------------------------------------------------
+| `locations`                | Description   | API credentials for named locations (JackalStack resources)
+|                            | Valid         | `Hash`
+|                            | Default       | none
+|----------------------------|---------------|---------------------------------------------------------------
+
 [knife]: https://docs.chef.io/knife.html

data/lib/sfn/command/conf.rb

@@ -14,6 +14,25 @@ module Sfn
             format_value(config[k], '  ')
           end
         end
+        if(config[:generate])
+          ui.puts
+          ui.info 'Generating .sfn configuration file..'
+          generate_config!
+          ui.info "Generation of .sfn configuration file #{ui.color('complete!', :green, :bold)}"
+        end
+      end
+
+      def generate_config!
+        if(File.exists?('.sfn'))
+          ui.warn 'Existing .sfn configuration file detected!'
+          ui.confirm 'Overwrite current .sfn configuration file?'
+        end
+        run_action 'Writing .sfn file' do
+          File.open('.sfn', 'w') do |file|
+            file.write SFN_CONFIG_CONTENTS
+          end
+          nil
+        end
       end
 
       def format_value(value, indent='')
@@ -34,6 +53,35 @@ module Sfn
         end
       end
 
+      SFN_CONFIG_CONTENTS = <<-EOF
+# This is an auto-generated configuration file for
+# the sfn CLI. To view all available configuration
+# options, please see:
+# http://www.sparkleformation.io/docs/sfn/configuration.html
+Configuration.new do
+  apply_nesting 'deep'
+  processing true
+  options do
+    on_failure 'nothing'
+    notification_topics []
+    capabilities ['CAPABILITY_IAM']
+    tags do
+      creator ENV['USER']
+    end
+  end
+  # nesting_bucket 'BUCKET_NAME'
+  credentials do
+    provider :aws
+    aws_access_key_id ENV['AWS_ACCESS_KEY_ID']
+    aws_secret_access_key ENV['AWS_SECRET_ACCESS_KEY']
+    aws_region ENV['AWS_REGION']
+    aws_bucket_region ENV['AWS_REGION']
+    # aws_sts_role_arn ENV['AWS_STS_ROLE_ARN']
+  end
+end
+EOF
+
+
     end
   end
 end

data/lib/sfn/command/update.rb

@@ -97,7 +97,7 @@ module Sfn
             end
 
             stack.parameters = config_root_parameters
-            stack.template = Sfn::Utils::StackParameterScrubber.scrub!(update_template)
+            stack.template = scrub_template(update_template)
           else
             apply_stacks!(stack)
 
@@ -240,6 +240,20 @@ module Sfn
         end
       end
 
+      # Scrub sparkle/sfn customizations from the stack resource data
+      #
+      # @param template [Hash]
+      # @return [Hash]
+      def scrub_template(template)
+        template = Sfn::Utils::StackParameterScrubber.scrub!(template)
+        (template['Resources'] || {}).each do |r_name, r_content|
+          if(valid_stack_types.include?(r_content['Type']))
+            (r_content['Properties'] || {}).delete('Stack')
+          end
+        end
+        template
+      end
+
     end
   end
 end

data/lib/sfn/command_module/base.rb

@@ -8,6 +8,11 @@ module Sfn
       # Instance methods for cloudformation command classes
       module InstanceMethods
 
+        # @return [Array<String>]
+        def valid_stack_types
+          provider.connection.data[:stack_types]
+        end
+
         # @return [Array<String>]
         def custom_stack_types
           [config.fetch(:stack_types, [])].flatten.compact
@@ -15,25 +20,33 @@ module Sfn
 
         # @return [KnifeCloudformation::Provider]
         def provider
-          memoize(:provider, :direct) do
-            result = Sfn::Provider.new(
-              :miasma => config[:credentials],
-              :async => false,
-              :fetch => false
-            )
-            result.connection.data[:stack_types] = (
-              [
-                result.connection.class.const_get(:RESOURCE_MAPPING).detect do |klass, info|
-                  info[:api] == :orchestration
-                end.first
-              ] + custom_stack_types
-            ).compact.uniq
-            result.connection.data[:retry_ui] = ui
-            result.connection.data[:locations] = config.fetch(:locations, {})
-            result.connection.data[:retry_type] = config.fetch(:retry, :type, :exponential)
-            result.connection.data[:retry_interval] = config.fetch(:retry, :interval, 5)
-            result.connection.data[:retry_max] = config.fetch(:retry, :max_attempts, 20)
-            result
+          begin
+            memoize(:provider, :direct) do
+              result = Sfn::Provider.new(
+                :miasma => config[:credentials],
+                :async => false,
+                :fetch => false
+              )
+              result.connection.data[:stack_types] = (
+                [
+                  result.connection.class.const_get(:RESOURCE_MAPPING).detect do |klass, info|
+                    info[:api] == :orchestration
+                  end.first
+                ] + custom_stack_types
+              ).compact.uniq
+              retry_config = config.fetch(:retry,
+                config.fetch(:retries, {})
+              )
+              result.connection.data[:retry_ui] = ui
+              result.connection.data[:locations] = config.fetch(:locations, {})
+              result.connection.data[:retry_type] = retry_config.fetch(:type, :exponential)
+              result.connection.data[:retry_interval] = retry_config.fetch(:interval, 5)
+              result.connection.data[:retry_max] = retry_config.fetch(:max_attempts, 20)
+              result
+            end
+          rescue
+            ui.error 'Failed to create remote API connection. Please validate configuration!'
+            raise
           end
         end
 

data/lib/sfn/config/conf.rb

@@ -4,6 +4,12 @@ module Sfn
   class Config
     # Config command configuration (subclass create to get all the configs)
     class Conf < Create
+
+      attribute(
+        :generate, [TrueClass, FalseClass],
+        :description => 'Generate a basic configuration file'
+      )
+
     end
   end
 end

data/lib/sfn/config/validate.rb

@@ -7,7 +7,8 @@ module Sfn
 
       attribute(
         :processing, [TrueClass, FalseClass],
-        :description => 'Call the unicorns and explode the glitter bombs'
+        :description => 'Call the unicorns and explode the glitter bombs',
+        :default => true
       )
       attribute(
         :file, String,

data/lib/sfn/planner/aws.rb

@@ -243,9 +243,8 @@ module Sfn
           n_exists = is_stack?(update_template['Resources'].fetch(n_name, {})['Type'])
           n_template = update_template['Resources'].fetch(n_name, {}).fetch('Properties', {})['Stack']
           n_parameters = update_template['Resources'].fetch(n_name, {}).fetch('Properties', {})['Parameters']
-          n_type = update_template['Resources'].fetch(n_name, {}).fetch('Type',
+          n_type = update_template['Resources'].fetch(n_name, {})['Type'] ||
             origin_template['Resources'][n_name]['Type']
-          )
           resource = Smash.new(
             :name => n_name,
             :type => n_type,

data/lib/sfn/provider.rb

@@ -41,7 +41,7 @@ module Sfn
     def initialize(args={})
       args = args.to_smash
       unless(args.get(:miasma, :provider))
-        best_guess = args.fetch(:miasma, {}).keys.group_by do |key|
+        best_guess = (args[:miasma] || {}).keys.group_by do |key|
           key.to_s.split('_').first
         end.sort do |x, y|
           y.size <=> x.size

data/lib/sfn/version.rb

@@ -1,4 +1,4 @@
 module Sfn
   # Current library version
-  VERSION = Gem::Version.new('1.1.8')
+  VERSION = Gem::Version.new('1.1.10')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sfn
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.1.10
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-04 00:00:00.000000000 Z
+date: 2015-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bogo-cli
@@ -108,7 +108,19 @@ files:
 - bin/sfn
 - docs/README.md
 - docs/callbacks.md
+- docs/commands.md
 - docs/configuration.md
+- docs/images/d_create.png
+- docs/images/d_create_prompt.png
+- docs/images/d_describe.png
+- docs/images/d_destroy.png
+- docs/images/d_diff.png
+- docs/images/d_events.png
+- docs/images/d_inspect-attribute.png
+- docs/images/d_inspect-nodes.png
+- docs/images/d_list.png
+- docs/images/d_update.png
+- docs/images/d_validate.png
 - docs/overview.md
 - docs/usage.md
 - docs/v/0.3.2/marked.js
@@ -209,3 +221,4 @@ signing_key:
 specification_version: 4
 summary: SparkleFormation CLI
 test_files: []
+has_rdoc: