ruby-terraform 1.7.0.pre.1 → 1.7.0.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 680283afcf36ed8fa426c1223836e60e576efcad33524e459ba287e22cf803a2
-  data.tar.gz: 15513e05d5002247601634b071794d6b2f04cbc91d1f147d7100d92210c1df9d
+  metadata.gz: f456092f582718db648a5bdfab600d022ffd02b464da155088de1f1ca5247aa2
+  data.tar.gz: e79d368374b9f892ac2fec66d5262f6b9d0999542772e8542912b18791ac1656
 SHA512:
-  metadata.gz: 19cddfe7e77d1601eccab259866df3c16cb15b3d98ca2e5b4852b253e5e5303b27141a8c8ce204aba7a13ad2fef452e1eb61cca9a85f4bd53c7a1c9e2724def4
-  data.tar.gz: d8bd7161d5343e1696d3386e58b84aec9d51e4bb2b93f88c1e51df998b7adf44f00e03b3fba47b0484701280ab4b963ab239a12055a1d2e59ef73b509b2b34c2
+  metadata.gz: 7e00c371ab4abea3f4d9448fc8a9fdd0dcdb7abcdd069aeb77f74ef1f16944dd2bc1f597cdb9ff5c6b2ede990f35c064adcb56dac50bcb9ac9cd74c0a1411703
+  data.tar.gz: 01f44d86b1c2ef64a2ea9511a14ece5903d34e554b6908cfe9c41dd724e2a3d7f934fca8f1168b9c94544dcf2b07fb20c3d94f1071dbc408ea8825819eb2398a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruby-terraform (1.7.0.pre.1)
+    ruby-terraform (1.7.0.pre.2)
       immutable-struct (~> 2.4)
       lino (~> 3.0)
 
@@ -129,8 +129,8 @@ GEM
       parser (>= 3.1.1.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.11.1)
-      rubocop (~> 1.19)
+    rubocop-rspec (2.12.1)
+      rubocop (~> 1.31)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
     ruby_gpg2 (0.8.0)

data/lib/ruby_terraform/models/objects.rb

@@ -8,14 +8,21 @@ module RubyTerraform
     module Objects
       class << self
         # rubocop:disable Style/RedundantAssignment
-        def box(object, unknown: {}, sensitive: {})
+        def box(object, unknown: nil, sensitive: nil)
+          initial = boxed_empty_by_value(object)
+          unknown ||= native_empty_by_value(object)
+          sensitive ||= native_empty_by_value(object)
+
+          return Values.unknown(sensitive: sensitive) if unknown == true
+
           boxed_unknown =
-            box_unknown(unknown, sensitive: sensitive)
+            box_unknown(unknown, sensitive: sensitive, initial: initial)
           boxed_object =
             box_known(object, sensitive: sensitive, initial: boxed_unknown)
 
           boxed_object
         end
+
         # rubocop:enable Style/RedundantAssignment
 
         def paths(object, current = [], accumulator = [])
@@ -49,11 +56,15 @@ module RubyTerraform
 
         private
 
+        # rubocop:disable Metrics/MethodLength
         def box_unknown(unknown, sensitive: {}, initial: Values.empty_map)
           unknown_paths = paths(unknown)
+          if root_path(unknown_paths)
+            return Values.unknown(sensitive: sensitive)
+          end
+
           unknown_values = unknown_values(
-            unknown_paths,
-            unknown: unknown, sensitive: sensitive
+            unknown_paths, unknown: unknown, sensitive: sensitive
           )
 
           object(
@@ -61,12 +72,17 @@ module RubyTerraform
             sensitive: sensitive, initial: initial
           )
         end
+        # rubocop:enable Metrics/MethodLength
 
+        # rubocop:disable Metrics/MethodLength
         def box_known(object, sensitive: {}, initial: Values.empty_map)
           object_paths = paths(object)
+          if root_path(object_paths)
+            return Values.known(object, sensitive: sensitive)
+          end
+
           object_values = known_values(
-            object_paths,
-            object: object, sensitive: sensitive
+            object_paths, object: object, sensitive: sensitive
           )
 
           object(
@@ -74,6 +90,7 @@ module RubyTerraform
             sensitive: sensitive, initial: initial
           )
         end
+        # rubocop:enable Metrics/MethodLength
 
         def object(paths, values, sensitive: {}, initial: Values.empty_map)
           paths
@@ -95,6 +112,7 @@ module RubyTerraform
           object
         end
 
+        # rubocop:disable Metrics/MethodLength
         def update_object_for_step(object, pointer, value, sensitive: {})
           seen, step, remaining = pointer
 
@@ -102,14 +120,16 @@ module RubyTerraform
           upcoming = remaining.first
 
           resolved_sensitive = try_dig(sensitive, seen + [step]) == true
-          resolved = if remaining.empty?
-                       value
-                     else
-                       empty_by_type(upcoming, sensitive: resolved_sensitive)
-                     end
+          resolved =
+            if remaining.empty?
+              value
+            else
+              boxed_empty_by_key(upcoming, sensitive: resolved_sensitive)
+            end
 
           parent[step] ||= resolved
         end
+        # rubocop:enable Metrics/MethodLength
 
         def update_context_for_step(pointer)
           seen, step, remaining = pointer
@@ -125,14 +145,29 @@ module RubyTerraform
           default
         end
 
-        def empty_by_type(value, sensitive: false)
-          if value.is_a?(Numeric)
+        def boxed_empty_by_key(key, sensitive: false)
+          if key.is_a?(Numeric)
             Values.empty_list(sensitive: sensitive)
           else
             Values.empty_map(sensitive: sensitive)
           end
         end
 
+        def boxed_empty_by_value(value, sensitive: false)
+          case value
+          when Array then Values.empty_list(sensitive: sensitive)
+          when Hash then Values.empty_map(sensitive: sensitive)
+          end
+        end
+
+        def native_empty_by_value(value)
+          case value
+          when Array then []
+          when Hash then {}
+          else false
+          end
+        end
+
         def normalise(object)
           case object
           when Array then object.each_with_index.to_a
@@ -140,6 +175,10 @@ module RubyTerraform
           else object
           end
         end
+
+        def root_path(paths)
+          paths.count == 1 && paths[0].empty?
+        end
       end
     end
     # rubocop:enable Metrics/ModuleLength

data/lib/ruby_terraform/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyTerraform
-  VERSION = '1.7.0.pre.1'
+  VERSION = '1.7.0.pre.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-terraform
 version: !ruby/object:Gem::Version
-  version: 1.7.0.pre.1
+  version: 1.7.0.pre.2
 platform: ruby
 authors:
 - InfraBlocks Maintainers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-02 00:00:00.000000000 Z
+date: 2022-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: immutable-struct