ruby-terraform 0.54.0 → 0.58.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2385ec22d2a91817d5ab78b2a8564b014e0d3c60598766dce4d94996f9e5cabe
-  data.tar.gz: e0756e8af43ca107aa9ea094a067b9dec50ac947262b3cb30dfe485f8d9cabf3
+  metadata.gz: a169d8302479fd0aa777ea6f3a7f2fe5243e49fd54a1d45548be4fae4937c1cb
+  data.tar.gz: ee71f858ae3783e6d0bf83f1e7ae3a5083d083ca885cc5465ac065dd7a1a84e7
 SHA512:
-  metadata.gz: a789683f855b4e23881f56dbfe52f5fbbbd3468ddd1789cb35f4ad20be2a6bfa03bc61e0d44e4e8ef9b725c80c784da51769b68818ed83f79102b11105732f19
-  data.tar.gz: 6ed327dc742af0a41c2e7b0df6258879a732357b2c0c7b1cc5077a073400e222c39113ba7aafcdbba6d94484e68a1b4c3e8a45c687a64569b2a82b38f60210ed
+  metadata.gz: fdbcf07a395455bf0d6ffad1811fe836b5921183426fa65818a7939ffcb605691c949eadc66d47f6899b0bd6475d2a8c6dc03649da667cbd2b1b294e85374f3d
+  data.tar.gz: b853e31c72eb7bb358d203b98d68087de8b752ee24d1b78d474136a4aae71e64cc335275f1a8867d3deab7fcf58f78e8a5f904c1382447b8840696d6665366f4

data/Gemfile.lock

@@ -1,18 +1,18 @@
 PATH
   remote: .
   specs:
-    ruby-terraform (0.54.0)
+    ruby-terraform (0.58.0)
       lino (>= 1.1, < 2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.2.2)
+    activesupport (6.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
+      zeitwerk (~> 2.2, >= 2.2.2)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     colored2 (3.1.2)
@@ -29,13 +29,13 @@ GEM
     lino (1.3.0)
       hamster (~> 3.0)
       open4 (~> 1.3)
-    minitest (5.14.0)
+    minitest (5.14.1)
     multipart-post (2.1.1)
     octokit (4.18.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     open4 (1.3.4)
-    public_suffix (4.0.4)
+    public_suffix (4.0.5)
     rake (13.0.1)
     rake_circle_ci (0.7.0)
       colored2 (~> 3.1)
@@ -60,7 +60,7 @@ GEM
       rspec-mocks (~> 3.9.0)
     rspec-core (3.9.2)
       rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.1)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)

data/README.md

@@ -48,6 +48,7 @@ Currently, there is partial support for the following commands:
 * `RubyTerraform::Commands::Destroy`: executes `terraform destroy`
 * `RubyTerraform::Commands::Output`: executes `terraform output`
 * `RubyTerraform::Commands::Refresh`: executes `terraform refresh`
+* `RubyTerraform::Commands::Import`: executes `terraform import`
 * `RubyTerraform::Commands::RemoteConfig`: executes `terraform remote config`
 * `RubyTerraform::Commands::Validate`: executes `terraform validate`
 * `RubyTerraform::Commands::Workspace`: executes `terraform workspace`
@@ -311,6 +312,47 @@ The refresh command supports the following options passed as keyword arguments:
   defaults to `false`.
 
 
+### RubyTerraform::Commands::Import
+
+The import command imports existing infrastructure into your terraform state.
+It can be called in the following ways:
+
+```ruby
+RubyTerraform.import(
+  directory: 'infra/networking',
+  address: 'a.resource.address',
+  id: 'a-resource-id',
+  vars: {
+    region: 'eu-central'
+  }))
+RubyTerraform::Commands::Import.new.execute(
+  directory: 'infra/networking',
+  address: 'a.resource.address',
+  id: 'a-resource-id',
+  vars: {
+    region: 'eu-central'
+  }))
+```
+
+The import command supports the following options passed as keyword arguments:
+* `directory`: the directory containing terraform configuration; required.
+* `address`: a valid resource address; required.
+* `id`: id of resource being imported; required.
+* `vars`: a map of vars to be passed in to the terraform configuration.
+* `var_file`: the path to a terraform var file; if both `var_file` and
+  `var_files` are provided, all var files will be passed to terraform.
+* `var_files`: an array of paths to terraform var files; if both `var_file` and
+  `var_files` are provided, all var files will be passed to terraform.
+* `input`: when `false`, will not ask for input for variables not directly set;
+  defaults to `true`.
+* `state`: the path to the state file containing the current state; defaults to
+  terraform.tfstate in the working directory or the remote state if configured.
+* `no_backup`: when `true`, no backup file will be written; defaults to `false`.
+* `backup`: the path to the backup file in which to store the state backup.
+* `no_color`: whether or not the output from the command should be in color;
+  defaults to `false`.
+
+
 ### RubyTerraform::Commands::RemoteConfig
 
 The remote config command configures storage of state using a remote backend. It

data/lib/ruby_terraform.rb

@@ -69,13 +69,8 @@ module RubyTerraform
       Commands::Workspace.new.execute(opts)
     end
 
-    def output_from_remote(opts)
-      output_name = opts[:name]
-      remote_opts = opts[:remote]
-
-      clean
-      remote_config(remote_opts)
-      output(name: output_name)
+    def import(opts = {})
+      Commands::Import.new.execute(opts)
     end
   end
   extend ClassMethods

data/lib/ruby_terraform/commands.rb

@@ -10,6 +10,7 @@ require_relative 'commands/refresh'
 require_relative 'commands/remote_config'
 require_relative 'commands/show'
 require_relative 'commands/workspace'
+require_relative 'commands/import'
 
 module RubyTerraform
   module Commands

data/lib/ruby_terraform/commands/import.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'lino'
+require_relative 'base'
+
+module RubyTerraform
+  module Commands
+    class Import < Base
+      def configure_command(builder, opts)
+        directory = opts[:directory]
+        vars = opts[:vars] || {}
+        var_file = opts[:var_file]
+        var_files = opts[:var_files] || []
+        no_color = opts[:no_color]
+        no_backup = opts[:no_backup]
+        backup = no_backup ? '-' : opts[:backup]
+        state = opts[:state]
+        input = opts[:input]
+        address = opts[:address]
+        id = opts[:id]
+
+        builder
+          .with_subcommand('import') do |sub|
+            sub = sub.with_option('-config', directory)
+            vars.each do |key, value|
+              var_value = value.is_a?(String) ? value : JSON.generate(value)
+              sub = sub.with_option(
+                '-var', "'#{key}=#{var_value}'", separator: ' '
+              )
+            end
+            sub = sub.with_option('-var-file', var_file) if var_file
+            var_files.each do |file|
+              sub = sub.with_option('-var-file', file)
+            end
+            sub = sub.with_option('-state', state) if state
+            sub = sub.with_option('-input', input) if input
+            sub = sub.with_option('-backup', backup) if backup
+            sub = sub.with_flag('-no-color') if no_color
+            sub
+          end
+          .with_argument(address)
+          .with_argument(id)
+      end
+    end
+  end
+end

data/lib/ruby_terraform/output.rb

@@ -0,0 +1,21 @@
+module RubyTerraform
+  class Output
+    def self.for(opts)
+      name = opts[:name]
+      backend_config = opts[:backend_config]
+
+      source_directory = opts[:source_directory]
+      work_directory = opts[:work_directory]
+
+      configuration_directory = File.join(work_directory, source_directory)
+
+      FileUtils.mkdir_p File.dirname(configuration_directory)
+      FileUtils.cp_r source_directory, configuration_directory
+
+      Dir.chdir(configuration_directory) do
+        RubyTerraform.init(backend_config: backend_config)
+        RubyTerraform.output(name: name)
+      end
+    end
+  end
+end

data/lib/ruby_terraform/version.rb

@@ -1,3 +1,3 @@
 module RubyTerraform
-  VERSION = "0.54.0"
+  VERSION = "0.58.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-terraform
 version: !ruby/object:Gem::Version
-  version: 0.54.0
+  version: 0.58.0
 platform: ruby
 authors:
 - Toby Clemson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-06 00:00:00.000000000 Z
+date: 2020-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lino
@@ -173,6 +173,7 @@ files:
 - lib/ruby_terraform/commands/clean.rb
 - lib/ruby_terraform/commands/destroy.rb
 - lib/ruby_terraform/commands/get.rb
+- lib/ruby_terraform/commands/import.rb
 - lib/ruby_terraform/commands/init.rb
 - lib/ruby_terraform/commands/output.rb
 - lib/ruby_terraform/commands/plan.rb
@@ -183,6 +184,7 @@ files:
 - lib/ruby_terraform/commands/workspace.rb
 - lib/ruby_terraform/errors.rb
 - lib/ruby_terraform/errors/execution_error.rb
+- lib/ruby_terraform/output.rb
 - lib/ruby_terraform/version.rb
 - ruby_terraform.gemspec
 - scripts/ci/common/configure-git.sh