sparkle_formation 3.0.32 → 3.0.34

data/lib/sparkle_formation/sparkle_attribute/aws.rb

@@ -8,6 +8,33 @@ class SparkleFormation
     # AWS specific helper implementations
     module Aws
 
+      # CIDR generator
+      #
+      # @param ipblock [String] CIDR address block
+      # @param count [Integer] Number of CIDRs to generate
+      # @param cidrbits [Integer] Number of subnet bits for the CIDR
+      # @return [Hash]
+      def _cf_cidr(ipblock, count, cidrbits)
+        {"Fn::Cidr" => [ipblock, count, cidrbits]}
+      end
+
+      alias_method :_cidr, :_cf_cidr
+      alias_method :cidr!, :_cf_cidr
+
+      # Transform generator
+      #
+      # @param name [String] name of transformation
+      # @param parameters [Hash] transformation parameters
+      # @return [Hash]
+      def _cf_transform(name, parameters)
+        __t_stringish(name)
+        __t_hashish(parameters)
+        {"Fn::Transform" => {"Name" => name, "Parameters" => parameters}}
+      end
+
+      alias_method :_transform, :_cf_transform
+      alias_method :transform!, :_cf_transform
+
       # @overload _cf_join(*args, opts={})
       #   Fn::Join generator
       #   @param args [String, Hash] list of items to join
@@ -24,6 +51,7 @@ class SparkleFormation
         {"Fn::Join" => [options[:options][:delimiter] || "", *args]}
       end
 
+      alias_method :_join, :_cf_join
       alias_method :join!, :_cf_join
 
       # Split generator
@@ -37,6 +65,7 @@ class SparkleFormation
         {"Fn::Split" => [delimiter, string]}
       end
 
+      alias_method :_split, :_cf_split
       alias_method :split!, :_cf_split
 
       # Sub generator
@@ -170,18 +199,20 @@ class SparkleFormation
         {"Fn::Select" => [index, item]}
       end
 
+      alias_method :_select, :_cf_select
       alias_method :select!, :_cf_select
 
       # Condition generator
       #
       # @param name [String, Symbol] symbol will be processed
       # @return [Hash]
-      def _condition(name)
+      def _cf_condition(name)
         __t_stringish(name)
         {"Condition" => __attribute_key(name)}
       end
 
-      alias_method :condition!, :_condition
+      alias_method :_condition, :_cf_condition
+      alias_method :condition!, :_cf_condition
 
       # Condition setter
       #
@@ -189,11 +220,12 @@ class SparkleFormation
       # @return [SparkleStruct]
       # @note this is used to set a {"Condition" => "Name"} into the
       #   current context, generally the top level of a resource
-      def _on_condition(name)
+      def _cf_on_condition(name)
         _set(*_condition(name).to_a.flatten)
       end
 
-      alias_method :on_condition!, :_on_condition
+      alias_method :_on_condition, :_cf_on_condition
+      alias_method :on_condition!, :_cf_on_condition
 
       # Fn::If generator
       #
@@ -201,11 +233,12 @@ class SparkleFormation
       # @param true_value [Object] item to be used when true
       # @param false_value [Object] item to be used when false
       # @return [Hash]
-      def _if(cond, true_value, false_value)
+      def _cf_if(cond, true_value, false_value)
         {"Fn::If" => _array(__attribute_key(cond), true_value, false_value)}
       end
 
-      alias_method :if!, :_if
+      alias_method :_if, :_cf_if
+      alias_method :if!, :_cf_if
 
       # Fn::And generator
       #
@@ -213,7 +246,7 @@ class SparkleFormation
       # @return [Hash]
       # @note symbols will be processed and set as condition. strings
       #   will be set as condition directly. procs will be evaluated
-      def _and(*args)
+      def _cf_and(*args)
         {
           "Fn::And" => _array(
             *args.map { |v|
@@ -227,24 +260,26 @@ class SparkleFormation
         }
       end
 
-      alias_method :and!, :_and
+      alias_method :_and, :_cf_and
+      alias_method :and!, :_cf_and
 
       # Fn::Equals generator
       #
       # @param v1 [Object]
       # @param v2 [Object]
       # @return [Hash]
-      def _equals(v1, v2)
+      def _cf_equals(v1, v2)
         {"Fn::Equals" => _array(v1, v2)}
       end
 
-      alias_method :equals!, :_equals
+      alias_method :_equals, :_cf_equals
+      alias_method :equals!, :_cf_equals
 
       # Fn::Not generator
       #
       # @param arg [Object]
       # @return [Hash]
-      def _not(arg)
+      def _cf_not(arg)
         if arg.is_a?(String) || arg.is_a?(Symbol)
           arg = _condition(arg)
         else
@@ -253,14 +288,15 @@ class SparkleFormation
         {"Fn::Not" => [arg]}
       end
 
-      alias_method :not!, :_not
+      alias_method :_not, :_cf_not
+      alias_method :not!, :_cf_not
 
       # Fn::Or generator
       #
       # @param v1 [Object]
       # @param v2 [Object]
       # @return [Hash]
-      def _or(*args)
+      def _cf_or(*args)
         {
           "Fn::Or" => _array(
             *args.map { |v|
@@ -274,61 +310,68 @@ class SparkleFormation
         }
       end
 
-      alias_method :or!, :_or
+      alias_method :_or, :_cf_or
+      alias_method :or!, :_cf_or
 
       # No value generator
       #
       # @return [Hash]
-      def _no_value
+      def _cf_no_value
         _ref("AWS::NoValue")
       end
 
-      alias_method :no_value!, :_no_value
+      alias_method :_no_value, :_cf_no_value
+      alias_method :no_value!, :_cf_no_value
 
       # Region generator
       #
       # @return [Hash]
-      def _region
+      def _cf_region
         _ref("AWS::Region")
       end
 
-      alias_method :region!, :_region
+      alias_method :_region, :_cf_region
+      alias_method :region!, :_cf_region
 
       # Notification ARNs generator
       #
       # @return [Hash]
-      def _notification_arns
+      def _cf_notification_arns
         _ref("AWS::NotificationARNs")
       end
 
-      alias_method :notification_arns!, :_notification_arns
+      alias_method :_notification_arns, :_cf_notification_arns
+      alias_method :notification_arns!, :_cf_notification_arns
 
       # Account ID generator
       #
       # @return [Hash]
-      def _account_id
+      def _cf_account_id
         _ref("AWS::AccountId")
       end
 
-      alias_method :account_id!, :_account_id
+      alias_method :_account_id, :_cf_account_id
+      alias_method :account_id!, :_cf_account_id
 
       # Stack ID generator
       #
       # @return [Hash]
-      def _stack_id
+      def _cf_stack_id
         _ref("AWS::StackId")
       end
 
-      alias_method :stack_id!, :_stack_id
+      alias_method :_stack_id, :_cf_stack_id
+      alias_method :stack_id!, :_cf_stack_id
 
       # Stack name generator
       #
       # @return [Hash]
-      def _stack_name
+      def _cf_stack_name
         _ref("AWS::StackName")
       end
 
-      alias_method :stack_name!, :_stack_name
+      alias_method :_stack_name, :_cf_stack_name
+      alias_method :stack_name!, :_cf_stack_name
 
       # Resource dependency generator
       # @overload _depends_on(resource_name)
@@ -339,21 +382,23 @@ class SparkleFormation
       #   @param resource_names [Array<String, Symbol>] list of logical resource names
       # @return [Array<String>]
       # @note this will directly modify the struct at its current context to inject depends on structure
-      def _depends_on(*args)
+      def _cf_depends_on(*args)
         _set("DependsOn", [args].flatten.compact.map { |s| __attribute_key(s) })
       end
 
-      alias_method :depends_on!, :_depends_on
+      alias_method :_depends_on, :_cf_depends_on
+      alias_method :depends_on!, :_cf_depends_on
 
       # Reference output value from nested stack
       #
       # @param stack_name [String, Symbol] logical resource name of stack
       # @apram output_name [String, Symbol] stack output name
-      def _stack_output(stack_name, output_name)
+      def _cf_stack_output(stack_name, output_name)
         _cf_attr(_process_key(stack_name), "Outputs.#{__attribute_key(output_name)}")
       end
 
-      alias_method :stack_output!, :_stack_output
+      alias_method :_stack_output, :_cf_stack_output
+      alias_method :stack_output!, :_cf_stack_output
 
       # @return [TrueClass, FalseClass] resource can be tagged
       def taggable?
@@ -371,7 +416,7 @@ class SparkleFormation
       #
       # @param hash [Hash] Key/value pair tags
       # @return [SparkleStruct]
-      def _tags(hash)
+      def _cf_tags(hash)
         __t_hashish(hash)
         _set("Tags",
              hash.map { |k, v|
@@ -379,7 +424,8 @@ class SparkleFormation
         })
       end
 
-      alias_method :tags!, :_tags
+      alias_method :_tags, :_cf_tags
+      alias_method :tags!, :_cf_tags
     end
   end
 end

data/lib/sparkle_formation/sparkle_attribute/terraform.rb

@@ -118,13 +118,32 @@ class SparkleFormation
         alias_method "#{f_name}!".to_sym, "_#{f_name}".to_sym
       end
 
+      # Lookup resource based on name and provide formatted
+      # reference to the resource with type included.
+      #
+      # @param name [String, Symbol] resource name
+      # @return [String] resource name
       def __resource_lookup(name)
-        resource = root!.resources[name]
-        if resource.nil?
-          name
-        else
-          "#{resource.type}.#{name}"
+        return name.to_s if name.to_s.include?(".")
+        if root!.key?(:resources) && root!.resources.key?(name)
+          resource = root!.resources[name]
+          if resource.key?(:type)
+            return "#{resource.type}.#{name}"
+          end
+        end
+        if root!.key?(:resource)
+          types = root!.resource._keys
+          matches = types.find_all do |type|
+            root!.resource._set(type).key?(name)
+          end
+          if matches.size > 1
+            raise ArgumentError.new "Non-unique resource name. Multiple type " \
+                                    "matches for resource `#{name}`"
+          elsif matches.size == 1
+            return "#{matches.first}.#{name}"
+          end
         end
+        name.to_s
       end
 
       # Resource dependency generator

data/lib/sparkle_formation/sparkle_formation.rb

@@ -18,6 +18,10 @@ class SparkleFormation
   DEFAULT_STACK_RESOURCE = "AWS::CloudFormation::Stack"
   # @return [Array<String>] collection of valid stack resource types
   VALID_STACK_RESOURCES = [DEFAULT_STACK_RESOURCE]
+  # @return [Hash] name mappings for providers used in lookups (resources/sparkles)
+  PROVIDER_MAPPINGS = Smash.new(
+    :open_stack => :heat,
+  ).freeze
 
   class << self
     include SparkleFormation::Utils::TypeCheckers
@@ -707,10 +711,7 @@ class SparkleFormation
       else
         struct_class = SparkleStruct
       end
-      if Resources.const_defined?(camel(provider))
-        @provider_resources = Resources.const_get(camel(provider))
-        provider_resources.load!
-      end
+      load_resources!
       compiled = struct_class.new
       compiled._set_self(self)
       compiled._struct_class = struct_class
@@ -994,4 +995,17 @@ class SparkleFormation
     end
     MultiJson.dump(compile.dump!, *args)
   end
+
+  protected
+
+  # Load provider specific resources handling
+  def load_resources!
+    if provider && @provider_resources.nil?
+      provider_name = camel(PROVIDER_MAPPINGS.fetch(provider, provider))
+      if Resources.const_defined?(provider_name)
+        @provider_resources = Resources.const_get(provider_name)
+        provider_resources.load!
+      end
+    end
+  end
 end

data/lib/sparkle_formation/version.rb

@@ -1,5 +1,5 @@
 # Unicorns and rainbows
 class SparkleFormation
   # Current library version
-  VERSION = Gem::Version.new("3.0.32")
+  VERSION = Gem::Version.new("3.0.34")
 end

data/sparkle_formation.gemspec

@@ -1,26 +1,26 @@
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__)) + '/lib/'
-require 'sparkle_formation/version'
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__)) + "/lib/"
+require "sparkle_formation/version"
 Gem::Specification.new do |s|
-  s.name = 'sparkle_formation'
+  s.name = "sparkle_formation"
   s.version = SparkleFormation::VERSION.version
-  s.summary = 'Orchestration Template Generator'
-  s.author = 'Chris Roberts'
-  s.email = 'chrisroberts.code@gmail.com'
-  s.homepage = 'http://github.com/heavywater/sparkle_formation'
-  s.description = 'Ruby DSL for programmatic orchestration API template generation'
-  s.license = 'Apache-2.0'
-  s.require_path = 'lib'
-  s.required_ruby_version = '>= 2.1'
-  s.add_runtime_dependency 'attribute_struct', '>= 0.3.5', '< 0.5'
-  s.add_runtime_dependency 'multi_json'
-  s.add_runtime_dependency 'bogo'
-  s.add_development_dependency 'minitest'
-  s.add_development_dependency 'rspec', '~> 3.5'
-  s.add_development_dependency 'rake', '~> 10'
-  s.add_development_dependency 'yard'
-  s.add_development_dependency 'rufo', '~> 0.3.0'
-  s.add_development_dependency 'redcarpet', '~> 2.0'
-  s.add_development_dependency 'github-markup'
-  s.executables << 'generate_sparkle_docs'
-  s.files = Dir['{lib,docs}/**/*'] + %w(sparkle_formation.gemspec README.md CHANGELOG.md LICENSE)
+  s.summary = "Orchestration Template Generator"
+  s.author = "Chris Roberts"
+  s.email = "chrisroberts.code@gmail.com"
+  s.homepage = "http://github.com/sparkleformation/sparkle_formation"
+  s.description = "Ruby DSL for programmatic orchestration API template generation"
+  s.license = "Apache-2.0"
+  s.require_path = "lib"
+  s.required_ruby_version = ">= 2.1"
+  s.add_runtime_dependency "attribute_struct", ">= 0.4.3", "< 0.5"
+  s.add_runtime_dependency "multi_json"
+  s.add_runtime_dependency "bogo"
+  s.add_development_dependency "minitest"
+  s.add_development_dependency "rspec", "~> 3.5"
+  s.add_development_dependency "rake", "~> 10"
+  s.add_development_dependency "yard"
+  s.add_development_dependency "rufo", "~> 0.3.0"
+  s.add_development_dependency "redcarpet", "~> 2.0"
+  s.add_development_dependency "github-markup"
+  s.executables << "generate_sparkle_docs"
+  s.files = Dir["{lib,docs}/**/*"] + %w(sparkle_formation.gemspec README.md CHANGELOG.md LICENSE)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sparkle_formation
 version: !ruby/object:Gem::Version
-  version: 3.0.32
+  version: 3.0.34
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-06 00:00:00.000000000 Z
+date: 2018-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: attribute_struct
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.4.3
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.5'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.4.3
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.5'
@@ -210,7 +210,99 @@ files:
 - lib/sparkle_formation/resources/rackspace.rb
 - lib/sparkle_formation/resources/rackspace_resources.json
 - lib/sparkle_formation/resources/terraform.rb
+- lib/sparkle_formation/resources/terraform_account_resources.json
+- lib/sparkle_formation/resources/terraform_acme_resources.json
+- lib/sparkle_formation/resources/terraform_alicloud_resources.json
+- lib/sparkle_formation/resources/terraform_arukas_resources.json
+- lib/sparkle_formation/resources/terraform_aws_resources.json
+- lib/sparkle_formation/resources/terraform_azure_resources.json
+- lib/sparkle_formation/resources/terraform_azurerm_resources.json
+- lib/sparkle_formation/resources/terraform_azurestack_resources.json
+- lib/sparkle_formation/resources/terraform_bigip_resources.json
+- lib/sparkle_formation/resources/terraform_bitbucket_resources.json
+- lib/sparkle_formation/resources/terraform_brightbox_resources.json
+- lib/sparkle_formation/resources/terraform_bucket_resources.json
+- lib/sparkle_formation/resources/terraform_chef_resources.json
+- lib/sparkle_formation/resources/terraform_circonus_resources.json
+- lib/sparkle_formation/resources/terraform_clc_resources.json
+- lib/sparkle_formation/resources/terraform_cloudflare_resources.json
+- lib/sparkle_formation/resources/terraform_cloudscale_resources.json
+- lib/sparkle_formation/resources/terraform_cloudstack_resources.json
+- lib/sparkle_formation/resources/terraform_cobbler_resources.json
+- lib/sparkle_formation/resources/terraform_consul_resources.json
+- lib/sparkle_formation/resources/terraform_databases_resources.json
+- lib/sparkle_formation/resources/terraform_datadog_resources.json
+- lib/sparkle_formation/resources/terraform_digitalocean_resources.json
+- lib/sparkle_formation/resources/terraform_dme_resources.json
+- lib/sparkle_formation/resources/terraform_dns_resources.json
+- lib/sparkle_formation/resources/terraform_dnsimple_resources.json
+- lib/sparkle_formation/resources/terraform_docker_resources.json
+- lib/sparkle_formation/resources/terraform_dyn_resources.json
+- lib/sparkle_formation/resources/terraform_fastly_resources.json
+- lib/sparkle_formation/resources/terraform_flexibleengine_resources.json
+- lib/sparkle_formation/resources/terraform_github_resources.json
+- lib/sparkle_formation/resources/terraform_gitlab_resources.json
+- lib/sparkle_formation/resources/terraform_google_resources.json
+- lib/sparkle_formation/resources/terraform_grafana_resources.json
+- lib/sparkle_formation/resources/terraform_hcloud_resources.json
+- lib/sparkle_formation/resources/terraform_heroku_resources.json
+- lib/sparkle_formation/resources/terraform_huaweicloud_resources.json
+- lib/sparkle_formation/resources/terraform_icinga2_resources.json
+- lib/sparkle_formation/resources/terraform_influxdb_resources.json
+- lib/sparkle_formation/resources/terraform_kubernetes_resources.json
+- lib/sparkle_formation/resources/terraform_librato_resources.json
+- lib/sparkle_formation/resources/terraform_linode_resources.json
+- lib/sparkle_formation/resources/terraform_local_resources.json
+- lib/sparkle_formation/resources/terraform_logentries_resources.json
+- lib/sparkle_formation/resources/terraform_logicmonitor_resources.json
+- lib/sparkle_formation/resources/terraform_mailgun_resources.json
+- lib/sparkle_formation/resources/terraform_mysql_resources.json
+- lib/sparkle_formation/resources/terraform_netlify_resources.json
+- lib/sparkle_formation/resources/terraform_newrelic_resources.json
+- lib/sparkle_formation/resources/terraform_nomad_resources.json
+- lib/sparkle_formation/resources/terraform_ns1_resources.json
+- lib/sparkle_formation/resources/terraform_nsxt_resources.json
+- lib/sparkle_formation/resources/terraform_nutanix_resources.json
+- lib/sparkle_formation/resources/terraform_oci_resources.json
+- lib/sparkle_formation/resources/terraform_oneandone_resources.json
+- lib/sparkle_formation/resources/terraform_opc_resources.json
+- lib/sparkle_formation/resources/terraform_openstack_resources.json
+- lib/sparkle_formation/resources/terraform_opentelekomcloud_resources.json
+- lib/sparkle_formation/resources/terraform_opsgenie_resources.json
+- lib/sparkle_formation/resources/terraform_oraclepaas_resources.json
+- lib/sparkle_formation/resources/terraform_ovh_resources.json
+- lib/sparkle_formation/resources/terraform_packet_resources.json
+- lib/sparkle_formation/resources/terraform_pagerduty_resources.json
+- lib/sparkle_formation/resources/terraform_panos_resources.json
+- lib/sparkle_formation/resources/terraform_postgresql_resources.json
+- lib/sparkle_formation/resources/terraform_powerdns_resources.json
+- lib/sparkle_formation/resources/terraform_profitbricks_resources.json
+- lib/sparkle_formation/resources/terraform_projects_resources.json
+- lib/sparkle_formation/resources/terraform_rabbitmq_resources.json
+- lib/sparkle_formation/resources/terraform_rancher_resources.json
+- lib/sparkle_formation/resources/terraform_random_resources.json
 - lib/sparkle_formation/resources/terraform_resources.json
+- lib/sparkle_formation/resources/terraform_rightscale_resources.json
+- lib/sparkle_formation/resources/terraform_ring_resources.json
+- lib/sparkle_formation/resources/terraform_rundeck_resources.json
+- lib/sparkle_formation/resources/terraform_runscope_resources.json
+- lib/sparkle_formation/resources/terraform_scaleway_resources.json
+- lib/sparkle_formation/resources/terraform_ses_resources.json
+- lib/sparkle_formation/resources/terraform_sfn_resources.json
+- lib/sparkle_formation/resources/terraform_softlayer_resources.json
+- lib/sparkle_formation/resources/terraform_spotinst_resources.json
+- lib/sparkle_formation/resources/terraform_statuscake_resources.json
+- lib/sparkle_formation/resources/terraform_subnetwork_resources.json
+- lib/sparkle_formation/resources/terraform_telefonicaopencloud_resources.json
+- lib/sparkle_formation/resources/terraform_template_resources.json
+- lib/sparkle_formation/resources/terraform_tencentcloud_resources.json
+- lib/sparkle_formation/resources/terraform_tfe_resources.json
+- lib/sparkle_formation/resources/terraform_tls_resources.json
+- lib/sparkle_formation/resources/terraform_triton_resources.json
+- lib/sparkle_formation/resources/terraform_ultradns_resources.json
+- lib/sparkle_formation/resources/terraform_vault_resources.json
+- lib/sparkle_formation/resources/terraform_vcd_resources.json
+- lib/sparkle_formation/resources/terraform_vsphere_resources.json
 - lib/sparkle_formation/sparkle.rb
 - lib/sparkle_formation/sparkle_attribute.rb
 - lib/sparkle_formation/sparkle_attribute/aws.rb
@@ -229,7 +321,7 @@ files:
 - lib/sparkle_formation/utils.rb
 - lib/sparkle_formation/version.rb
 - sparkle_formation.gemspec
-homepage: http://github.com/heavywater/sparkle_formation
+homepage: http://github.com/sparkleformation/sparkle_formation
 licenses:
 - Apache-2.0
 metadata: {}