terrafying 1.6.4 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e1cf9104f84f628cffa6d3f21ca8499d71656da8a009eec4513f065b8e1e94f
-  data.tar.gz: 698b1c1e06d88272895e989f6bb0080f030fe241e4678729ba0eeac10c35ca92
+  metadata.gz: a509b0bbe3300b3eaae6b0e96b76c06324665436ee34db2ab774b03fb1c98d8c
+  data.tar.gz: 9ced8e28714340b035ff5c45073e6a6f6ec37882dec03ee3b423774f84e73de5
 SHA512:
-  metadata.gz: b4c0ca294effdd7b80deb593413cb2e9b1f46b92da1d1715e1a22aa8dd6592c909137958ad46d9da1a9b221c49d212658525a805a2b11695f37773e3f14c3f0f
-  data.tar.gz: 8c910312687617ac95d2068ea91fa81e5dbc477a8793ed16ad3a4e9bef6d8a580d34c32e3a75b4c2497d6de85393ae98aa39cb59bb2317cbf0a8b88b5d1bea35
+  metadata.gz: 40e724f5449740072f33cad7607468c622fab5960297da09802455fbd0b767a86bb0e759267bbd4c9ff47a2961175de26931fb6bf8e78361201dedbc12c14b31
+  data.tar.gz: 21ea84b4da168023f1e8c588cb8f8d768e4f704917ccff33c497f4e883e4deddeb58a2bbf4f6f4ed096af18a7e9bd84bbf0b77a54323201128f8a2385e03ecfe

data/lib/terrafying/aws.rb

@@ -40,6 +40,10 @@ module Terrafying
         @account_id_cache ||= @sts_client.get_caller_identity.account
       end
 
+      def all_regions
+        @all_regions ||= @ec2_client.describe_regions.regions.map(&:region_name)
+      end
+
       def all_security_groups
         @all_security_groups ||= @ec2_resource.security_groups.to_a
       end

data/lib/terrafying/cli.rb

@@ -69,5 +69,8 @@ module Terrafying
       exit Config.new(path, options).import(addr, id)
     end
 
+    def method_missing(*args)
+      json(args[0].to_s)
+    end
   end
 end

data/lib/terrafying/generator.rb

@@ -9,20 +9,53 @@ module Terrafying
 
   class Ref
 
-    def initialize(var)
-      @var = var
+    def initialize(
+          kind: :resource,
+          type: "",
+          name:,
+          key: nil,
+          fns: []
+        )
+      @kind = kind
+      @type = type
+      @name = name
+      @key = key
+      @fns = Array(fns)
+    end
+
+    def resource?
+      @kind == :resource
+    end
+
+    def fn_call(fn)
+      Ref.new(kind: @kind, type: @type, name: @name, key: @key, fns: Array(fn) + @fns)
     end
 
     def downcase
-      Ref.new("lower(#{@var})")
+      fn_call("lower")
     end
 
     def strip
-      Ref.new("trimspace(#{@var})")
+      fn_call("trimspace")
     end
 
     def to_s
-      "${#{@var}}"
+      closing_parens = ")" * @fns.count
+      calls = @fns.reduce("") { |m, v| m << "#{v}(" }
+
+      type = @type
+      if ! resource?
+        type = [@kind.to_s, @type]
+      end
+
+      key = @key
+      if resource? && key == nil
+        key = "id"
+      end
+
+      var = [type, @name, key].flatten.compact.reject { |s| s.empty? }.join('.')
+
+      "${#{calls}#{var}#{closing_parens}}"
     end
 
     def to_str
@@ -37,6 +70,17 @@ module Terrafying
       self.to_s == other.to_s
     end
 
+    def [](key)
+      new_key = [@key, key].compact.join('.')
+
+      Ref.new(kind: @kind, type: @type, name: @name, key: new_key, fns: @fns)
+    end
+
+    def []=(k, v)
+      raise "You can't set a value this way"
+    end
+
+
   end
 
   class Context
@@ -47,6 +91,12 @@ module Terrafying
       aws: { region: REGION }
     }
 
+    def self.bundle(&block)
+      ctx = Context.new
+      ctx.instance_eval(&block)
+      ctx
+    end
+
     attr_reader :output
 
     def initialize
@@ -79,7 +129,7 @@ module Terrafying
 
       raise "Data already exists #{type.to_s}.#{name.to_s}" if @output["data"][type.to_s].has_key? name.to_s
       @output["data"][type.to_s][name.to_s] = spec
-      id_of(type, name)
+      Ref.new(kind: :data, type: type, name: name)
     end
 
     def resource(type, name, attributes)
@@ -87,7 +137,7 @@ module Terrafying
 
       raise "Resource already exists #{type.to_s}.#{name.to_s}" if @output["resource"][type.to_s].has_key? name.to_s
       @output["resource"][type.to_s][name.to_s] = attributes
-      id_of(type, name)
+      Ref.new(kind: :resource, type: type, name: name)
     end
 
     def template(relative_path, params = {})
@@ -106,8 +156,8 @@ module Terrafying
       output_of(type, name, "id")
     end
 
-    def output_of(type, name, value)
-      Ref.new("#{type}.#{name}.#{value}")
+    def output_of(type, name, key)
+      Ref.new(kind: :resource, type: type, name: name, key: key)
     end
 
     def pretty_generate
@@ -175,4 +225,25 @@ module Terrafying
 
   Generator = RootContext.new
 
+  module DSL
+
+    %w[
+      add!
+      aws
+      backend
+      provider
+      resource
+      data
+      template
+      tf_safe
+      id_of
+      output_of
+    ].each { |name|
+      define_method(name) { |*args|
+        Generator.send(name, *args)
+      }
+    }
+
+  end
+
 end

data/lib/terrafying/version.rb

@@ -1,4 +1,4 @@
 module Terrafying
-  VERSION = "1.6.4" # will be inserted by Drone
+  VERSION = "1.7.0" # will be inserted by Drone
   CLI_VERSION = "0.11.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terrafying
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 1.7.0
 platform: ruby
 authors:
 - uSwitch Limited
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-21 00:00:00.000000000 Z
+date: 2019-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -274,8 +274,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: No.