terrafying 1.7.2 → 1.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ecc26605ed318c6f2556fc9f7fcf9f32d297a433ee33b591f3c381aa281f329
-  data.tar.gz: 17a9b780067edc702efbbde4d684093aa6c4bd26b5b5689a74c3a6f54f5dca9e
+  metadata.gz: 32f4ef6c7f02da11c400fc113d16991f83f4349bc6b816fd0fd185a5bc2a3960
+  data.tar.gz: 420109d3c89f7da19b0c07caff82aeba01da61a47d334f2a650af44077a1af1d
 SHA512:
-  metadata.gz: 81e8df58a1fb53f0cb08e6e156430edbd06d86a78d96a65090542a2b762958a391bf1e5694d15d9951ef18a65dd717a91dca770ae5fa937144eee98d0dbb83c7
-  data.tar.gz: 75523ba860d3d064465e7af424de2452e3ab2928d7bd6fe9570967eba78f1c5b541f366d662cbafe56c4b70f4eb81b33ce693e8acecb60e8022ae0eeb649f0fb
+  metadata.gz: 7112e9865bc46955679826bebdecad789aa32a1f8b420f5e873921b6235b515790af4f0c5f9b99def4ad02d234497fe21679bb8bd3324282e5bb194e8c70a1aa
+  data.tar.gz: e89e709c6db84c2c263dc554fbe56a46b60b4bf5d0bf1f036efdd7c2a3abbc4c8c0687d322e9f8a8ce1d5172239f8564ab4699704497268d71eeed5a857ac3d6

data/lib/terrafying/generator.rb

@@ -7,28 +7,15 @@ require 'terrafying/aws'
 
 module Terrafying
 
-  class Ref
+  ARG_PLACEHOLDER = "ARG_PLACEHOLDER123"
 
-    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
+  class Ref
 
-    def fn_call(fn)
-      Ref.new(kind: @kind, type: @type, name: @name, key: @key, fns: Array(fn) + @fns)
+    def fn_call(fn, *args)
+      if args.length == 0
+        args = [ARG_PLACEHOLDER]
+      end
+      FnRef.new(fn: fn, args: args, ref: self)
     end
 
     def downcase
@@ -39,23 +26,24 @@ module Terrafying
       fn_call("trimspace")
     end
 
-    def to_s
-      closing_parens = ")" * @fns.count
-      calls = @fns.reduce("") { |m, v| m << "#{v}(" }
-
-      type = @type
-      if ! resource?
-        type = [@kind.to_s, @type]
-      end
+    def split(separator)
+      fn_call("split", separator, ARG_PLACEHOLDER)
+    end
 
-      key = @key
-      if resource? && key == nil
-        key = "id"
+    def slice(idx, length=0)
+      if length != 0
+        fn_call("slice", ARG_PLACEHOLDER, idx, idx+length)
+      else
+        fn_call("element", ARG_PLACEHOLDER, idx)
       end
+    end
 
-      var = [type, @name, key].flatten.compact.reject { |s| s.empty? }.join('.')
+    def realise
+      ""
+    end
 
-      "${#{calls}#{var}#{closing_parens}}"
+    def to_s
+      "${#{realise}}"
     end
 
     def to_str
@@ -71,16 +59,109 @@ module Terrafying
     end
 
     def [](key)
-      new_key = [@key, key].compact.join('.')
-
-      Ref.new(kind: @kind, type: @type, name: @name, key: new_key, fns: @fns)
+      if key.is_a? Numeric
+        IndexRef.new(ref: self, idx: key)
+      else
+        AttributeRef.new(ref: self, key: key)
+      end
     end
 
     def []=(k, v)
       raise "You can't set a value this way"
     end
 
+  end
+
+  class RootRef < Ref
+    def initialize(
+          kind: :resource,
+          type: "",
+          name:
+        )
+      @kind = kind
+      @type = type
+      @name = name
+    end
 
+    def realise
+      type = [@type]
+      if @kind != :resource
+        type = [@kind, @type]
+      end
+
+      (type + [@name]).reject(&:empty?).join(".")
+    end
+
+    def fn_call(fn, *args)
+      if @kind == :resource
+        self["id"].fn_call(fn, *args)
+      else
+        super
+      end
+    end
+
+    def to_s
+      if @kind == :resource
+        "${#{realise}.id}"
+      else
+        super
+      end
+    end
+  end
+
+  class AttributeRef < Ref
+    def initialize(
+          ref:,
+          key:
+        )
+      @ref = ref
+      @key = key
+    end
+
+    def realise
+      "#{@ref.realise}.#{@key}"
+    end
+  end
+
+  class IndexRef < Ref
+    def initialize(
+          ref:,
+          idx:
+        )
+      @ref = ref
+      @idx = idx
+    end
+
+    def realise
+      "#{@ref.realise}[#{@idx}]"
+    end
+  end
+
+  class FnRef < Ref
+    def initialize(
+          ref:,
+          fn:,
+          args: []
+        )
+      @ref = ref
+      @fn = fn
+      @args = args
+    end
+
+    def realise
+      ref = @ref.realise
+      args = @args.map { |arg|
+        if arg == ARG_PLACEHOLDER
+          ref
+        elsif arg.is_a? String
+          "\"#{arg}\""
+        else
+          arg
+        end
+      }.join(", ")
+
+      "#{@fn}(#{args})"
+    end
   end
 
   class Context
@@ -129,7 +210,7 @@ module Terrafying
       raise "Local already exists #{name.to_s}" if @output["locals"].has_key? name.to_s
 
       @output["locals"][name.to_s] = value
-      Ref.new(kind: :local, name: name)
+      RootRef.new(kind: :local, name: name)
     end
 
     def var(name, spec)
@@ -138,7 +219,7 @@ module Terrafying
       raise "Var already exists #{name.to_s}" if @output["variable"].has_key? name.to_s
 
       @output["variable"][name.to_s] = spec
-      Ref.new(kind: :var, name: name)
+      RootRef.new(kind: :var, name: name)
     end
 
     def data(type, name, spec)
@@ -147,7 +228,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
-      Ref.new(kind: :data, type: type, name: name)
+      RootRef.new(kind: :data, type: type, name: name)
     end
 
     def resource(type, name, attributes)
@@ -155,7 +236,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
-      Ref.new(kind: :resource, type: type, name: name)
+      RootRef.new(kind: :resource, type: type, name: name)
     end
 
     def template(relative_path, params = {})
@@ -175,7 +256,7 @@ module Terrafying
     end
 
     def output_of(type, name, key)
-      Ref.new(kind: :resource, type: type, name: name, key: key)
+      RootRef.new(kind: :resource, type: type, name: name)[key]
     end
 
     def pretty_generate
@@ -248,6 +329,8 @@ module Terrafying
     %w[
       add!
       aws
+      local
+      var
       backend
       provider
       resource

data/lib/terrafying/version.rb

@@ -1,4 +1,4 @@
 module Terrafying
-  VERSION = "1.7.2" # will be inserted by Drone
+  VERSION = "1.7.3" # 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.7.2
+  version: 1.7.3
 platform: ruby
 authors:
 - uSwitch Limited
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-28 00:00:00.000000000 Z
+date: 2019-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -274,7 +274,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: No.