tfw 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bc1a297f3a4298321ef182f415a28d25855a65fb9c221c54733b91baa1087e3
-  data.tar.gz: 2062ad35f45c0939844fabf28cc2b67e7c8e189911b5a73b3885aa7df36aab9f
+  metadata.gz: 7b0c2b01dc0ddb7fb04866d224078305f07d8e8799c316744dd4a5df4f592ded
+  data.tar.gz: b7b0ae7609fafb733ccd124b6dcf7b47d6aa186837432ace94b13dd4a96befde
 SHA512:
-  metadata.gz: 8521b1c5ae3ca1c671ae43744033a162427abde06084aa7e6f117196c821ea0b425d9e963f7a7333997a19ca53d601804b768348baac3612074a07fcd34f2a94
-  data.tar.gz: 18f7ac5a1b377bb88396577503447fb906232da4376e34ee77eb8072f8c926a4fa906a29f28fd29bf268a7ab27ae08c27548d4845acf7152273267dd762fe1d0
+  metadata.gz: 2afd6ef9fe9192169571a9c7b055d5ee051e94b65ee7e97a1f31441ae238881c64025b25e0c7007a632307c70f7bf8764c72f04b5f4db910d5a63d3eac9532b1
+  data.tar.gz: 45d8bfbc8e1ecc952a2b683ab51c377d9ce5c91c1a987d0137562e8026b39c615c0e2ad67d2d9a3dfb8415b0414b561a29b1dc56d8874bbbf313ad58bb2be759

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tfw (0.1.14)
+    tfw (0.1.15)
       tfdsl (= 0.1.10)
 
 GEM

data/lib/tfw.rb

@@ -14,6 +14,7 @@ module TFW
 
   require "#{LIB_DIR}/setters"
   require "#{LIB_DIR}/module"
+  require "#{LIB_DIR}/aws_sg_workaround"
 
   WORKSPACE = './.tfw'
   FileUtils.mkdir_p WORKSPACE
@@ -92,7 +93,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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tfw
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Tiago Lopo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-07 00:00:00.000000000 Z
+date: 2020-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tfdsl
@@ -132,6 +132,7 @@ 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/state.rb