lib/rspec/terraform/helpers/apply.rb in rspec-terraform-0.1.0.pre.26 vs lib/rspec/terraform/helpers/apply.rb in rspec-terraform-0.1.0.pre.27

@@ -88,39 +88,54 @@
           FileUtils.rm_rf(parameters[:configuration_directory])
           FileUtils.mkdir_p(parameters[:configuration_directory])
         end
 
         def init(parameters)
-          execution_parameters = {
-            chdir: parameters[:configuration_directory],
-            input: parameters[:input]
-          }
-          if execution_mode == :isolated
-            execution_parameters =
-              execution_parameters
-                .merge(from_module: parameters[:source_directory])
-          end
-
-          init_command.execute(execution_parameters)
+          init_command.execute(init_parameters(parameters))
         end
 
         def apply(parameters)
-          apply_command.execute(
-            chdir: parameters[:configuration_directory],
-            state: parameters[:state_file],
-            vars: parameters[:vars],
-            input: parameters[:input],
-            auto_approve: parameters[:auto_approve]
-          )
+          apply_command.execute(apply_parameters(parameters))
         end
 
         def init_command
           RubyTerraform::Commands::Init.new(binary: binary)
         end
 
         def apply_command
           RubyTerraform::Commands::Apply.new(binary: binary)
         end
+
+        def init_parameters(parameters)
+          init_parameters = parameters.merge(
+            chdir: parameters[:configuration_directory],
+            input: false
+          )
+          if execution_mode == :isolated
+            init_parameters =
+              init_parameters.merge(from_module: parameters[:source_directory])
+          end
+
+          init_parameters
+        end
+
+        # rubocop:disable Metrics/MethodLength
+        def apply_parameters(parameters)
+          apply_parameters =
+            parameters.merge(
+              chdir: parameters[:configuration_directory],
+              input: false,
+              auto_approve: true
+            )
+
+          if parameters[:state_file]
+            apply_parameters =
+              apply_parameters.merge(state: parameters[:state_file])
+          end
+
+          apply_parameters
+        end
+        # rubocop:enable Metrics/MethodLength
       end
     end
   end
 end