tfw 0.1.12 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2202602ca2643b8387cc9c81999e64790143c10e2fa36cd85d8da69cfd7bcbf9
-  data.tar.gz: e11b79e32962941ff85bde48c81fa3375c4881792cf787fa98b0b3860ac0b9a3
+  metadata.gz: d1667921d8444a91df964f9a1549bb1de15da91a8c4b725bba68d388c0c647f9
+  data.tar.gz: aac7e1a4de69d0a03144c0f12349efc1805039fb33bc667d7772cf38f2605776
 SHA512:
-  metadata.gz: d84fd7abb4ac45f9c879edd847b176207271cc978358ab4758ccf3b276e7cefd3daa61666a6fe792f723a092033667d72bc55e7a9f5c64352042124b3e163bd1
-  data.tar.gz: e8dcdf47ff0124ac384b3df9e4f6e1a1dc5943638d11049e954ddce46f7122c83c1d4b00d986feef8b6122884082d4c0621bdb2c9d15509fb3f8980d9775500e
+  metadata.gz: bd9f23b7ed8d16722b51052d8127900f71a26f9c91d5ace1687212a80f6b0f6ea85afada6a9bbf263309704ecb541e032740bbbc06fd612c1d05e6134b3bf8de
+  data.tar.gz: '025349e20a5ead689646c6779a185cb0dc39090aca8a760b93de9bfc26b539670dbbad8bf891284bde12796a2f1c7158af20bfc1c66b3fc448f7ab5e048680c5'

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    tfw (0.1.12)
-      tfdsl (= 0.1.8)
+    tfw (0.1.17)
+      tfdsl (= 0.1.11)
 
 GEM
   remote: https://rubygems.org/
@@ -15,9 +15,10 @@ GEM
       term-ansicolor (~> 1.3)
       thor (~> 0.19.4)
       tins (~> 1.6)
+    deep_merge (1.2.1)
     docile (1.3.1)
     jaro_winkler (1.5.4)
-    json (2.1.0)
+    json (2.3.1)
     method_source (0.9.2)
     minitest (5.12.2)
     parallel (1.19.1)
@@ -43,7 +44,8 @@ GEM
     simplecov-html (0.10.2)
     term-ansicolor (1.7.1)
       tins (~> 1.0)
-    tfdsl (0.1.8)
+    tfdsl (0.1.11)
+      deep_merge (~> 1.2)
     thor (0.19.4)
     tins (1.20.2)
     unicode-display_width (1.6.1)

data/lib/tfw.rb

@@ -14,6 +14,8 @@ module TFW
 
   require "#{LIB_DIR}/setters"
   require "#{LIB_DIR}/module"
+  require "#{LIB_DIR}/stack_methods"
+  require "#{LIB_DIR}/aws_sg_workaround"
 
   WORKSPACE = './.tfw'
   FileUtils.mkdir_p WORKSPACE
@@ -92,7 +94,7 @@ module TFW
 
     if as_json?
       stack_file = "#{stack_file}.json"
-      File.write stack_file, pretty_json(stack.to_json)
+      File.write stack_file, pretty_json(AwsSgWorkaround.fix(stack.to_json))
     else
       File.write stack_file, stack
     end

data/lib/tfw/aws_sg_workaround.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module TFW
+  # This module is a workaround the issue that when using json some fields that are optional become required
+  # https://github.com/hashicorp/terraform/issues/23347
+  module AwsSgWorkaround
+    module_function
+
+    def fix(stack_json)
+      stack = JSON.parse stack_json
+      return stack.to_json unless stack.key? 'resource'
+
+      r = stack['resource']
+      return stack.to_json unless r.key? 'aws_security_group'
+
+      asg = r['aws_security_group']
+      asg.each do |_, sg|
+        replace_and_fill sg, 'egress' if sg.key? 'egress'
+        replace_and_fill sg, 'ingress' if sg.key? 'ingress'
+      end
+      stack.to_json
+    end
+
+    def replace_and_fill(obj, key)
+      backup = obj[key]
+      fill_fields(backup)
+      obj[key] = [backup]
+    end
+
+    def fill_fields(obj)
+      obj['description'] = '' unless obj.key? 'description'
+      obj['security_groups'] = [] unless obj.key? 'security_groups'
+      obj['self'] = false unless obj.key? 'self'
+      obj['ipv6_cidr_blocks'] = [] unless obj.key? 'ipv6_cidr_blocks'
+      obj['prefix_list_ids'] = [] unless obj.key? 'prefix_list_ids'
+    end
+  end
+end

data/lib/tfw/stack_methods.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module TFW
+  # Dynamically create stack methods
+  module CreateStackMethods
+    def create_stack_methods
+      stack = TFW::State.instance.stack
+      %w[provider variable locals tfmodule datasource resource output terraform].each do |name|
+        define_method(name) { |*args, &block| stack.method(name).call(*args, &block) }
+      end
+    end
+  end
+
+  # This class carries stack methods, use it through inheritance class SomeClass < StackMethods
+  class StackMethods
+    extend CreateStackMethods
+    create_stack_methods
+  end
+end

data/lib/tfw/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TFW
-  VERSION = '0.1.12'
+  VERSION = '0.1.17'
 end

data/tfw.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'tfdsl', '0.1.8'
+  spec.add_dependency 'tfdsl', '0.1.11'
 
   spec.add_development_dependency 'bundler', '~> 1.17'
   spec.add_development_dependency 'coveralls', '~> 0.8'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tfw
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.17
 platform: ruby
 authors:
 - Tiago Lopo
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-04-19 00:00:00.000000000 Z
+date: 2021-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tfdsl
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.1.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.1.11
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -132,8 +132,10 @@ files:
 - exe/tfw
 - exe/tfw-test
 - lib/tfw.rb
+- lib/tfw/aws_sg_workaround.rb
 - lib/tfw/module.rb
 - lib/tfw/setters.rb
+- lib/tfw/stack_methods.rb
 - lib/tfw/state.rb
 - lib/tfw/version.rb
 - tfw.gemspec
@@ -142,7 +144,7 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/tlopo-ruby/tfw
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -157,8 +159,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Terraform Wrapper using Terraform DSL for Ruby
 test_files: []