ruby-terraform 0.65.0.pre.7 → 0.65.0.pre.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9addf5887a0f81258238fceea9f31f92f8653b4593c0684e3511723e5d7ee969
-  data.tar.gz: 660b6fb332e8b93e4ca3f7bb8dc1b48052a2116130273968d148d983b9ee0f4f
+  metadata.gz: 1aa09973516552eca1e86476c1a12da268f105a8a78d87ac4366c59e8051e5d4
+  data.tar.gz: ccfc2afc555c53f30fb61f429e33d9451102aba3d3a39b68e69ebb546406bc10
 SHA512:
-  metadata.gz: 444f51e2e53816404a78770d21873b060b2b117fe36a34516c1c1748db60d87ed10a1fa07bd75e0d7ff010617b1ce7ed3618ede7bc80263539be6454a703b962
-  data.tar.gz: cbb17a6a9b74be5a809b3d68058f383634482fdc3aa06151fc70b165195f230dd692da4b8494a20ffbe09bb7075acd15d9238b07a8a5dc53c3d4590990369000
+  metadata.gz: ed32ad7e4f4b6f98a78cea339ddfc2464d11a892a9ad8d4402a9af7a7d2224bae3cd75384c1a85c210a12efecd40b22bd85b575031ecef390c6da637150756e9
+  data.tar.gz: 98304e9c66825275ee0891b244bbe5ee47c3073f0b2c845afbb8cd30bd1297e791ab8367e151ebaf9b2452c0490ad3b55e013416b92f49b6af0dcc305b6ff190

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in ruby_terraform.gemspec

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    ruby-terraform (0.65.0.pre.7)
-      lino (>= 2.3)
+    ruby-terraform (0.65.0.pre.12)
+      immutable-struct (>= 2.4)
+      lino (>= 2.5)
 
 GEM
   remote: https://rubygems.org/
@@ -50,7 +51,8 @@ GEM
       concurrent-ruby (~> 1.0)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    lino (2.3.0)
+    immutable-struct (2.4.1)
+    lino (2.5.0)
       hamster (~> 3.0)
       open4 (~> 1.3)
     listen (3.5.1)
@@ -69,9 +71,9 @@ GEM
       sawyer (~> 0.8.0, >= 0.5.3)
     open4 (1.3.4)
     parallel (1.20.1)
-    parser (3.0.0.0)
+    parser (3.0.1.0)
       ast (~> 2.4.1)
-    pry (0.14.0)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (4.0.6)
@@ -126,6 +128,8 @@ GEM
       unicode-display_width (>= 1.4.0, < 3.0)
     rubocop-ast (1.4.1)
       parser (>= 2.7.1.5)
+    rubocop-rake (0.5.1)
+      rubocop
     rubocop-rspec (2.2.0)
       rubocop (~> 1.0)
       rubocop-ast (>= 1.1.0)
@@ -166,9 +170,10 @@ DEPENDENCIES
   rake_ssh (~> 0.4)
   rspec (~> 3.9)
   rubocop (~> 1.12)
+  rubocop-rake (~> 0.5)
   rubocop-rspec (~> 2.2)
   ruby-terraform!
   simplecov (~> 0.21)
 
 BUNDLED WITH
-   2.2.15
+   2.2.16

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 require 'rake_circle_ci'
 require 'rake_github'
@@ -7,13 +9,14 @@ require 'securerandom'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
 
-task default: [
-  #:'library:fix',
-  :'test:unit'
+task default: %i[
+  library:fix
+  test:unit
 ]
 
 namespace :encryption do
   namespace :passphrase do
+    desc 'Generate encryption passphrase for CI GPG key'
     task :generate do
       File.open('config/secrets/ci/encryption.passphrase', 'w') do |f|
         f.write(SecureRandom.base64(36))
@@ -94,6 +97,7 @@ RakeGithub.define_repository_tasks(
 end
 
 namespace :pipeline do
+  desc 'Prepare CircleCI Pipeline'
   task prepare: %i[
     circle_ci:project:follow
     circle_ci:env_vars:ensure

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'bundler/setup'
 require 'ruby_terraform'

data/lib/ruby-terraform.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Enable `require 'ruby-terraform'`, to match the gem name
 
 require_relative 'ruby_terraform'

data/lib/ruby_terraform.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ruby_terraform/version'
 require 'ruby_terraform/errors'
 require 'ruby_terraform/options'
@@ -27,21 +29,67 @@ module RubyTerraform
       clean: RubyTerraform::Commands::Clean,
       destroy: RubyTerraform::Commands::Destroy,
       format: RubyTerraform::Commands::Format,
+      force_unlock: RubyTerraform::Commands::ForceUnlock,
       get: RubyTerraform::Commands::Get,
+      graph: RubyTerraform::Commands::Graph,
       import: RubyTerraform::Commands::Import,
       init: RubyTerraform::Commands::Init,
+      login: RubyTerraform::Commands::Login,
+      logout: RubyTerraform::Commands::Logout,
       output: RubyTerraform::Commands::Output,
       plan: RubyTerraform::Commands::Plan,
+      providers: RubyTerraform::Commands::Providers,
+      providers_lock: RubyTerraform::Commands::ProvidersLock,
+      providers_mirror: RubyTerraform::Commands::ProvidersMirror,
+      providers_schema: RubyTerraform::Commands::ProvidersSchema,
       refresh: RubyTerraform::Commands::Refresh,
       remote_config: RubyTerraform::Commands::RemoteConfig,
       show: RubyTerraform::Commands::Show,
+      state_list: RubyTerraform::Commands::StateList,
+      state_mv: RubyTerraform::Commands::StateMove,
+      state_pull: RubyTerraform::Commands::StatePull,
+      state_push: RubyTerraform::Commands::StatePush,
+      state_replace_provider: RubyTerraform::Commands::StateReplaceProvider,
+      state_rm: RubyTerraform::Commands::StateRemove,
+      state_show: RubyTerraform::Commands::StateShow,
+      taint: RubyTerraform::Commands::Taint,
+      untaint: RubyTerraform::Commands::Untaint,
       validate: RubyTerraform::Commands::Validate,
-      workspace: RubyTerraform::Commands::Workspace
+      workspace_list: RubyTerraform::Commands::WorkspaceList,
+      workspace_select: RubyTerraform::Commands::WorkspaceSelect,
+      workspace_new: RubyTerraform::Commands::WorkspaceNew,
+      workspace_delete: RubyTerraform::Commands::WorkspaceDelete,
+      workspace_show: RubyTerraform::Commands::WorkspaceShow
     }.each do |method, command_class|
-      define_method(method) do |opts = {}|
-        command_class.new.execute(opts)
+      define_method(method) do |parameters = {}|
+        exec(command_class, parameters)
+      end
+    end
+
+    def workspace(parameters = {}) # rubocop:disable Metrics/MethodLength
+      case parameters[:operation]
+      when nil, 'list'
+        exec(RubyTerraform::Commands::WorkspaceList, parameters)
+      when 'select'
+        exec(RubyTerraform::Commands::WorkspaceSelect, parameters)
+      when 'new'
+        exec(RubyTerraform::Commands::WorkspaceNew, parameters)
+      when 'delete'
+        exec(RubyTerraform::Commands::WorkspaceDelete, parameters)
+      when 'show'
+        exec(RubyTerraform::Commands::WorkspaceShow, parameters)
+      else
+        raise(
+          "Invalid operation '#{parameters[:operation]}' supplied to workspace"
+        )
       end
     end
+
+    private
+
+    def exec(command_class, parameters)
+      command_class.new.execute(parameters)
+    end
   end
   extend ClassMethods
 
@@ -50,7 +98,7 @@ module RubyTerraform
   end
 
   class Configuration
-    attr_accessor :binary, :logger, :stdin, :stdout, :stderr
+    attr_accessor :binary, :logger, :options, :stdin, :stdout, :stderr
 
     def default_logger
       logger = Logger.new($stdout)
@@ -58,9 +106,14 @@ module RubyTerraform
       logger
     end
 
+    def default_options
+      Options::Factory.new(Options::DEFINITIONS)
+    end
+
     def initialize
       @binary = 'terraform'
       @logger = default_logger
+      @options = default_options
       @stdin = ''
       @stdout = $stdout
       @stderr = $stderr
@@ -79,5 +132,9 @@ module RubyTerraform
     def close
       @targets.each(&:close)
     end
+
+    def reopen(*args)
+      @targets.each { |t| t.reopen(*args) }
+    end
   end
 end

data/lib/ruby_terraform/commands.rb

@@ -1,17 +1,40 @@
-require_relative 'commands/clean'
-require_relative 'commands/init'
-require_relative 'commands/get'
-require_relative 'commands/validate'
-require_relative 'commands/plan'
+# frozen_string_literal: true
+
 require_relative 'commands/apply'
+require_relative 'commands/clean'
 require_relative 'commands/destroy'
+require_relative 'commands/force_unlock'
+require_relative 'commands/format'
+require_relative 'commands/get'
+require_relative 'commands/graph'
+require_relative 'commands/import'
+require_relative 'commands/init'
+require_relative 'commands/login'
+require_relative 'commands/logout'
 require_relative 'commands/output'
+require_relative 'commands/plan'
+require_relative 'commands/providers'
+require_relative 'commands/providers_lock'
+require_relative 'commands/providers_mirror'
+require_relative 'commands/providers_schema'
 require_relative 'commands/refresh'
 require_relative 'commands/remote_config'
 require_relative 'commands/show'
-require_relative 'commands/workspace'
-require_relative 'commands/import'
-require_relative 'commands/format'
+require_relative 'commands/state_list'
+require_relative 'commands/state_move'
+require_relative 'commands/state_pull'
+require_relative 'commands/state_push'
+require_relative 'commands/state_replace_provider'
+require_relative 'commands/state_remove'
+require_relative 'commands/state_show'
+require_relative 'commands/taint'
+require_relative 'commands/untaint'
+require_relative 'commands/validate'
+require_relative 'commands/workspace_delete'
+require_relative 'commands/workspace_list'
+require_relative 'commands/workspace_new'
+require_relative 'commands/workspace_select'
+require_relative 'commands/workspace_show'
 
 module RubyTerraform
   module Commands

data/lib/ruby_terraform/commands/apply.rb

@@ -1,39 +1,46 @@
+# frozen_string_literal: true
+
 require_relative 'base'
+require_relative '../options/common'
 
 module RubyTerraform
   module Commands
     class Apply < Base
-      def subcommands(_values)
+      include RubyTerraform::Options::Common
+
+      def subcommands
         %w[apply]
       end
 
-      # rubocop:disable Metrics/MethodLength
-      def switches
+      def options # rubocop:disable Metrics/MethodLength
         %w[
-          -auto-approve
           -backup
-          -input
+          -compact-warnings
           -lock
           -lock-timeout
+          -input
+          -auto-approve
           -no-color
+          -parallelism
+          -refresh
           -state
+          -state-out
           -target
           -var
           -var-file
-        ]
+        ] + super
       end
-      # rubocop:enable Metrics/MethodLength
 
-      def arguments(values)
-        [values[:plan] || values[:directory]]
+      def arguments(parameters)
+        [parameters[:plan] || parameters[:directory]]
       end
 
-      def option_default_values(_opts)
+      def parameter_defaults(_parameters)
         { vars: {}, var_files: [], targets: [] }
       end
 
-      def option_override_values(opts)
-        { backup: opts[:no_backup] ? '-' : opts[:backup] }
+      def parameter_overrides(parameters)
+        { backup: parameters[:no_backup] ? '-' : parameters[:backup] }
       end
     end
   end

data/lib/ruby_terraform/commands/base.rb

@@ -1,26 +1,25 @@
+# frozen_string_literal: true
+
 require 'lino'
 
 require_relative '../errors'
-require_relative '../options/factory'
 
 module RubyTerraform
   module Commands
     class Base
-      def initialize(
-        binary: nil, logger: nil, stdin: nil, stdout: nil, stderr: nil
-      )
-        @binary = binary || RubyTerraform.configuration.binary
-        @logger = logger || RubyTerraform.configuration.logger
-        @stdin = stdin || RubyTerraform.configuration.stdin
-        @stdout = stdout || RubyTerraform.configuration.stdout
-        @stderr = stderr || RubyTerraform.configuration.stderr
-        initialize_command
+      def initialize(**opts) # rubocop:disable Metrics/AbcSize
+        @binary  = opts[:binary]  || RubyTerraform.configuration.binary
+        @logger  = opts[:logger]  || RubyTerraform.configuration.logger
+        @options = opts[:options] || RubyTerraform.configuration.options
+        @stdin   = opts[:stdin]   || RubyTerraform.configuration.stdin
+        @stdout  = opts[:stdout]  || RubyTerraform.configuration.stdout
+        @stderr  = opts[:stderr]  || RubyTerraform.configuration.stderr
       end
 
-      def execute(opts = {})
-        do_before(opts)
-        build_and_execute_command(opts)
-        do_after(opts)
+      def execute(parameters = {})
+        do_before(parameters)
+        build_and_execute_command(parameters)
+        do_after(parameters)
       rescue Open4::SpawnError
         message = "Failed while running '#{command_name}'."
         logger.error(message)
@@ -31,8 +30,9 @@ module RubyTerraform
 
       attr_reader :binary, :logger, :stdin, :stdout, :stderr
 
-      def build_and_execute_command(opts)
-        command = build_command(opts)
+      def build_and_execute_command(parameters)
+        command = build_command(parameters)
+
         logger.debug("Running '#{command}'.")
         command.execute(
           stdin: stdin,
@@ -45,54 +45,47 @@ module RubyTerraform
         self.class.to_s.split('::')[-1].downcase
       end
 
-      def do_before(_opts); end
+      def do_before(_parameters); end
 
-      def do_after(_opts); end
+      def do_after(_parameters); end
 
       private
 
-      def initialize_command; end
-
-      def build_command(opts)
-        values = apply_option_defaults_and_overrides(opts)
+      def build_command(parameters)
+        parameters = resolve_parameters(parameters)
 
         Lino::CommandLineBuilder
           .for_command(@binary)
           .with_options_after_subcommands
           .with_option_separator('=')
-          .with_appliables(options(values))
-          .with_subcommands(subcommands(values))
-          .with_arguments(arguments(values))
-          .build
+          .with_appliables(@options.resolve(options, parameters))
+          .with_subcommands(subcommands)
+          .with_arguments(arguments(parameters)).build
       end
 
-      def apply_option_defaults_and_overrides(opts)
-        option_default_values(opts)
-          .merge(opts)
-          .merge(option_override_values(opts))
+      def resolve_parameters(parameters)
+        parameter_defaults(parameters)
+          .merge(parameters)
+          .merge(parameter_overrides(parameters))
       end
 
-      def option_default_values(_values)
+      def parameter_defaults(_parameters)
         {}
       end
 
-      def option_override_values(_values)
+      def parameter_overrides(_parameters)
         {}
       end
 
-      def subcommands(_values)
+      def subcommands
         []
       end
 
-      def options(values)
-        RubyTerraform::Options::Factory.from(values, switches)
-      end
-
-      def switches
+      def options
         []
       end
 
-      def arguments(_values)
+      def arguments(_parameters)
         []
       end
     end