ruby-terraform 0.56.0 → 0.59.0.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67b7fb9516bdaf8295be89212e821865edb388d175499d8afd7810bdfbb77ddc
-  data.tar.gz: 285ef85f3b8fe38109b99c10959c93f42366d684397b9993c46a3adade631784
+  metadata.gz: b27da13acbc1f55c269e9addc06368628bf0bba82e276f0a95d0d2745879d67f
+  data.tar.gz: 391a765f337eb7a8f5c26755dd4231fe3cb14469e88e188f7e8b034b6352b657
 SHA512:
-  metadata.gz: 65c3f1430a29dc4e2230ec4e1d5e7f86d27380f829a25fee41eb0b6b3c0cab026e6d21bf4810887a715718481beb6cef88a0fd23f62c643699979b32d5ca17eb
-  data.tar.gz: 63c3b0419c0aaeb4e0f53183e187bc9238c33777ff3e976350d98b425bee154b65da51bf9ae7790e1f7cf1ad41a967504a20aa6f0839f50100b751d9cc4110f6
+  metadata.gz: bff9589bbad206066254a39c2de4eab57c70160d241b4323b012d36f9790f27d38c59f703c6023e8d3d759d6b1c95ca16dc17b4111ee580388ff76133a1e004e
+  data.tar.gz: 56c435100200ae664ea9869880a741b7c116b536f90ed82cb36373cd1187b237bd2ad06ae5d75b95520a2021f3bc37b1cab3717a1de5036d9b33f9d32736f661

data/Gemfile.lock

@@ -1,18 +1,18 @@
 PATH
   remote: .
   specs:
-    ruby-terraform (0.56.0)
+    ruby-terraform (0.59.0.pre.2)
       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,7 +48,9 @@ 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::Format`: executes `terraform fmt`
 * `RubyTerraform::Commands::Validate`: executes `terraform validate`
 * `RubyTerraform::Commands::Workspace`: executes `terraform workspace`
 
@@ -311,6 +313,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
@@ -342,7 +385,38 @@ arguments:
 * `no_color`: whether or not the output from the command should be in color;
   defaults to `false`.
 
+### RubyTerraform::Commands::Format
+
+The format command formats the terraform directory specified. It can be called in the following ways:
 
+```ruby
+RubyTerraform.format(
+  directory: 'infra/networking',
+  vars: {
+    region: 'eu-central'
+  })
+RubyTerraform::Commands::Format.new.execute(
+  directory: 'infra/networking',
+  vars: {
+    region: 'eu-central'
+  })
+```
+
+The format command supports the following options passed as keyword arguments:
+* `directory`: the directory containing terraform configuration to be formatted; required.
+* `recursive`: Processes files in subdirectories;
+  defaults to `false`.
+* `list`: Don't list files whose formatting differs;
+  defaults to `false`.
+* `write`: Don't write to source files;
+  defaults to `false`.
+* `check`: Checks if the input is formatted, exit status will be 0 if all input is properly formatted and non zero otherwise;
+  defaults to `false`.
+* `diff`: Displays a diff of the formatting changes;
+  defaults to `false`.
+* `no_color`: whether or not the output from the command should be in color;
+  defaults to `false`.
+  
 ### RubyTerraform::Commands::Validate
 
 The validate command validates terraform configuration in the provided terraform

data/lib/ruby-terraform.rb

@@ -0,0 +1,3 @@
+# Enable `require 'ruby-terraform'`, to match the gem name
+
+require_relative 'ruby_terraform.rb'

data/lib/ruby_terraform.rb

@@ -68,6 +68,14 @@ module RubyTerraform
     def workspace(opts = {})
       Commands::Workspace.new.execute(opts)
     end
+
+    def import(opts = {})
+      Commands::Import.new.execute(opts)
+    end
+
+    def format(opts = {})
+      Commands::Format.new.execute(opts)
+    end
   end
   extend ClassMethods
 

data/lib/ruby_terraform/commands.rb

@@ -10,6 +10,8 @@ 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'
 
 module RubyTerraform
   module Commands

data/lib/ruby_terraform/commands/format.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'lino'
+require_relative 'base'
+
+module RubyTerraform
+  module Commands
+    class Format < Base
+      def configure_command(builder, opts)
+        directory = opts[:directory]
+        check = opts[:check]
+        diff = opts[:diff]
+        list = opts[:list]
+        no_color = opts[:no_color]
+        recursive = opts[:recursive]
+        write = opts[:write]
+
+        builder.with_subcommand('fmt') do |sub|
+          sub = sub.with_option('-list', list) if list
+          sub = sub.with_option('-write', write) if write
+
+          sub = sub.with_flag('-check') if check
+          sub = sub.with_flag('-diff') if diff
+          sub = sub.with_flag('-no-color') if no_color
+          sub = sub.with_flag('-recursive') if recursive
+          sub
+        end.with_argument(directory)
+      end
+    end
+  end
+end

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/version.rb

@@ -1,3 +1,3 @@
 module RubyTerraform
-  VERSION = "0.56.0"
+  VERSION = "0.59.0.pre.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-terraform
 version: !ruby/object:Gem::Version
-  version: 0.56.0
+  version: 0.59.0.pre.2
 platform: ruby
 authors:
 - Toby Clemson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-09 00:00:00.000000000 Z
+date: 2020-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lino
@@ -166,13 +166,16 @@ files:
 - config/secrets/github/config.yaml
 - config/secrets/rubygems/credentials
 - go
+- lib/ruby-terraform.rb
 - lib/ruby_terraform.rb
 - lib/ruby_terraform/commands.rb
 - lib/ruby_terraform/commands/apply.rb
 - lib/ruby_terraform/commands/base.rb
 - lib/ruby_terraform/commands/clean.rb
 - lib/ruby_terraform/commands/destroy.rb
+- lib/ruby_terraform/commands/format.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
@@ -208,9 +211,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.1
 signing_key: