ruby-terraform 0.51.0.pre.2 → 0.51.0.pre.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cff48b117932b50d1b445d3b16a37667023415fc65e4b8ab2cf9f290cf79484c
-  data.tar.gz: 4d95ede4e7f14a6cd9f450a6c09c00168329ae3b7ebcb4b83da5d5adc532647c
+  metadata.gz: b32c2fed8d63ca562c5ad4cbe2c18b00bbf19db4c4d5262bea6a290584772148
+  data.tar.gz: 11c94a94582af564921061abd45b3ec1c6f822e8b7bbb9be557866fa40cce1cc
 SHA512:
-  metadata.gz: 19de637a5acaf2da3d7fdc88b010e12824084d45e264895a060b4005218cf7523c80cbed26bdcadde427fcff15f6883f80fabec5ade0f924523b404b4d0b33f9
-  data.tar.gz: e3a1dc2a9381648e8383d1c815e9996786588c7722c08b2749bdf4a7e476763a6f2c6035303d20ccb8d587a2db3a6258de1991348de2b8062dc6f404a13f9b01
+  metadata.gz: 121d8804c41fa72ea5e183dda506a0474c4d168bd219e527a0489fd1ba8a2ff7e689865b46eb55eecbe41f96a07958fa2e27d932659661cd28974ebb2a1ca12e
+  data.tar.gz: de0297b0602f436d247aa9d48969bebc9d27c73119ad3699b8c58813976044c227d26a836f9feb57cd6c257f3c884e6efd476a4d0884c83b85462e90a37078b5

data/.circleci/config.yml

@@ -1,16 +1,16 @@
 version: 2.1
 jobs:
   test:
-    working_directory: ~/ruby-terraform
+    working_directory: ~/source
     docker:
-    - image: ruby:2.4.7
+    - image: ruby:2.6.0
     steps:
     - checkout
     - run: ./scripts/ci/steps/test.sh
   prerelease:
-    working_directory: ~/ruby-terraform
+    working_directory: ~/source
     docker:
-    - image: ruby:2.4.7
+    - image: ruby:2.6.0
     steps:
     - checkout
     - run: ./scripts/ci/common/install-git-crypt.sh
@@ -19,9 +19,9 @@ jobs:
     - run: ./scripts/ci/common/configure-rubygems.sh
     - run: ./scripts/ci/steps/prerelease.sh
   release:
-    working_directory: ~/ruby-terraform
+    working_directory: ~/source
     docker:
-    - image: ruby:2.4.7
+    - image: ruby:2.6.0
     steps:
     - checkout
     - run: ./scripts/ci/common/install-git-crypt.sh

data/.ruby-version

@@ -1 +1 @@
-2.4.7
+2.6.0

data/Gemfile.lock

@@ -1,39 +1,66 @@
 PATH
   remote: .
   specs:
-    ruby-terraform (0.51.0.pre.2)
+    ruby-terraform (0.51.0.pre.3)
       lino (~> 1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (6.0.2.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
+    colored2 (3.1.2)
     concurrent-ruby (1.1.6)
     diff-lcs (1.3)
-    excon (0.72.0)
-    faraday (1.0.0)
+    excon (0.73.0)
+    faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
     gem-release (2.1.1)
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
+    i18n (1.8.2)
+      concurrent-ruby (~> 1.0)
     lino (1.1.0)
       hamster (~> 3.0)
       open4 (~> 1.3)
+    minitest (5.14.0)
     multipart-post (2.1.1)
-    octokit (4.16.0)
+    octokit (4.18.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     open4 (1.3.4)
-    public_suffix (4.0.3)
+    public_suffix (4.0.4)
     rake (13.0.1)
+    rake_circle_ci (0.7.0)
+      colored2 (~> 3.1)
+      excon (~> 0.72)
+      rake_factory (~> 0.23)
+      sshkey (~> 2.0)
+    rake_factory (0.27.0)
+      activesupport (>= 4)
+      rake (~> 13.0)
+    rake_github (0.5.0)
+      colored2 (~> 3.1)
+      octokit (~> 4.16)
+      rake_factory (~> 0.23)
+      sshkey (~> 2.0)
+    rake_ssh (0.4.0)
+      colored2 (~> 3.1)
+      rake_factory (~> 0.23)
+      sshkey (~> 2.0)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
     rspec-core (3.9.1)
       rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
+    rspec-expectations (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)
@@ -44,19 +71,23 @@ GEM
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
     sshkey (2.0.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.7)
+      thread_safe (~> 0.1)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 2.0)
-  excon (~> 0.72)
   gem-release (~> 2.1)
-  octokit (~> 4.16)
   rake (~> 13.0)
+  rake_circle_ci (~> 0.3)
+  rake_github (~> 0.3)
+  rake_ssh (~> 0.2)
   rspec (~> 3.9)
   ruby-terraform!
-  sshkey (~> 2.0)
 
 BUNDLED WITH
    2.1.4

data/README.md

@@ -78,12 +78,12 @@ RubyTerraform.init
 RubyTerraform.init(from_module: 'some/module/path', path: 'infra/module')
 RubyTerraform::Commands::Init.new.execute
 RubyTerraform::Commands::Init.new.execute(
-    from_module: 'some/module/path', 
+    from_module: 'some/module/path',
     path: 'infra/module')
 ```
 
 The init command supports the following options passed as keyword arguments:
-* `from_module`: the source module to use to initialise; required if `path` is 
+* `from_module`: the source module to use to initialise; required if `path` is
   specified
 * `path`: the path to initialise.
 * `backend`: `true`/`false`, whether or not to configure the backend.
@@ -145,7 +145,7 @@ The plan command supports the following options passed as keyword arguments:
 * `state`: the path to the state file in which to store state; defaults to
   terraform.tfstate in the working directory or the remote state if configured.
 * `plan`: the name of the file in which to save the generated plan.
-* `input`: when `false`, will not ask for input for variables not directly set; 
+* `input`: when `false`, will not ask for input for variables not directly set;
   defaults to `true`.
 * `destroy`: when `true`, a plan will be generated to destroy all resources
   managed by the given configuration and state; defaults to `false`.
@@ -185,18 +185,18 @@ The apply command supports the following options passed as keyword arguments:
 * `state`: the path to the state file in which to store state; defaults to
   terraform.tfstate in the working directory or the remote state if configured.
 * `backup`: the path to the backup file in which to store the state backup.
-* `input`: when `false`, will not ask for input for variables not directly set; 
+* `input`: when `false`, will not ask for input for variables not directly set;
   defaults to `true`.
 * `no_backup`: when `true`, no backup file will be written; defaults to `false`.
 * `no_color`: whether or not the output from the command should be in color;
   defaults to `false`.
-* `auto_approve`: if `true`, the command applys without prompting the user to 
+* `auto_approve`: if `true`, the command applys without prompting the user to
   confirm the changes; defaults to `false`.
 
 
 ### RubyTerraform::Commands::Show
 
-The show command produces human-readable output from a state file or a plan 
+The show command produces human-readable output from a state file or a plan
 file. It can be called in the following ways:
 
 ```ruby
@@ -210,7 +210,7 @@ The show command supports the following options passed as keyword arguments:
 * `path`: the path to a state or plan file; required.
 * `no_color`: whether or not the output from the command should be in color;
   defaults to `false`.
-* `module_depth`: the depth of modules to show in the output; defaults to 
+* `module_depth`: the depth of modules to show in the output; defaults to
   showing all modules.
 * `json`: whether or not the output from the command should be in json format;
   defaults to `false`.
@@ -305,7 +305,7 @@ The refresh command supports the following options passed as keyword arguments:
   `targets` are provided, all targets will be passed to terraform.
 * `state`: the path to the state file in which to store state; defaults to
   terraform.tfstate in the working directory or the remote state if configured.
-* `input`: when `false`, will not ask for input for variables not directly set; 
+* `input`: when `false`, will not ask for input for variables not directly set;
   defaults to `true`.
 * `no_color`: whether or not the output from the command should be in color;
   defaults to `false`.
@@ -314,7 +314,7 @@ The refresh command supports the following options passed as keyword arguments:
 ### RubyTerraform::Commands::RemoteConfig
 
 The remote config command configures storage of state using a remote backend. It
-has been deprecated and since removed from terraform but is retained in this 
+has been deprecated and since removed from terraform but is retained in this
 library for backwards compatibility. It can be called in the following ways:
 
 ```ruby
@@ -372,12 +372,13 @@ The validate command supports the following options passed as keyword arguments:
   defaults to `false`.
 * `check_variables`: if `true`, the command checks whether all variables have
   been provided; defaults to `true`.
-
+* `json`: whether or not the output from the command should be in json format;
+  defaults to `false`.
 
 ### RubyTerraform::Commands::Workspace
 
-The `workspace` command configures 
-[Terraform Workspaces](https://www.terraform.io/docs/state/workspaces.html#using-workspaces). 
+The `workspace` command configures
+[Terraform Workspaces](https://www.terraform.io/docs/state/workspaces.html#using-workspaces).
 It can be used as follows:
 
 ```ruby
@@ -390,7 +391,7 @@ RubyTerraform.workspace(operation: 'delete', workspace: 'staging')
 ```
 
 arguments:
-* `directory`: the directory containing terraform configuration, the default is 
+* `directory`: the directory containing terraform configuration, the default is
   the current path.
 * `operation`: `list`, `select`, `new` or `delete`. default `list`.
 * `workspace`: Workspace name.
@@ -398,10 +399,10 @@ arguments:
 
 ## Configuration
 
-In addition to configuring the location of the terraform binary, RubyTerraform 
+In addition to configuring the location of the terraform binary, RubyTerraform
 offers configuration of logging and standard streams. By default standard
-streams map to `$stdin`, `$stdout` and `$stderr` and all logging goes to 
-`$stdout`.  
+streams map to `$stdin`, `$stdout` and `$stderr` and all logging goes to
+`$stdout`.
 
 ### Logging
 
@@ -420,7 +421,7 @@ RubyTerraform.configure do |config|
 end
 ```
 
-RubyTerraform supports logging to multiple different outputs at once, 
+RubyTerraform supports logging to multiple different outputs at once,
 for example:
 
 ``` ruby
@@ -436,7 +437,7 @@ RubyTerraform.configure do |config|
 end
 ```
 
-Configured in this way, any logging performed by RubyTerraform will log to both 
+Configured in this way, any logging performed by RubyTerraform will log to both
 `STDOUT` and the provided `log_file`.
 
 ### Standard Streams
@@ -466,9 +467,9 @@ input = StringIO.new("user\ninput\n")
 RubyTerraform.configure do |config|
   config.stdin = input
 end
-``` 
+```
 
-In this way, terraform can be driven by input from somewhere other than 
+In this way, terraform can be driven by input from somewhere other than
 interactive input from the terminal.
 
 

data/Rakefile

@@ -1,132 +1,61 @@
-require 'sshkey'
-require 'octokit'
+require 'yaml'
+require 'rake_circle_ci'
+require 'rake_github'
+require 'rake_ssh'
 require 'rspec/core/rake_task'
 
-require_relative 'rake/circleci'
-
-RSpec::Core::RakeTask.new(:spec)
-
 task :default => :spec
 
-namespace :ssh_key do
-  desc "Generate a new SSH key for CI"
-  task :generate do
-    print "Generating a new SSH key... "
-    key = SSHKey.generate(
-        type: "RSA",
-        bits: 4096,
-        comment: "maintainers@infrablocks.io")
-    File.write('config/secrets/ci/ssh.private', key.private_key)
-    File.write('config/secrets/ci/ssh.public', key.public_key)
-    puts "Done."
-  end
-end
-
-namespace :circle_ci do
-  circle_ci_config_path = 'config/secrets/circle_ci/config.yaml'
-
-  namespace :env_vars do
-    desc "Destroy all environment variables from the CircleCI pipeline"
-    task :destroy do
-      print "Deleting all environment variables from pipeline... "
-      circle_ci = CircleCI.new(circle_ci_config_path)
-      circle_ci.delete_env_vars
-      puts "Done."
-    end
+RSpec::Core::RakeTask.new(:spec)
 
-    desc "Provision all environment variables to the CircleCI pipeline"
-    task :provision do
-      puts "Creating all environment variables in the pipeline... "
-      env_vars = {
-          'ENCRYPTION_PASSPHRASE':
-              File.read('config/secrets/ci/encryption.passphrase').chomp
+RakeSSH.define_key_tasks(
+    namespace: :deploy_key,
+    path: 'config/secrets/ci/',
+    comment: 'maintainers@infrablocks.io'
+)
+
+RakeCircleCI.define_project_tasks(
+    namespace: :circle_ci,
+    project_slug: 'github/infrablocks/ruby_terraform'
+) do |t|
+  circle_ci_config =
+      YAML.load_file('config/secrets/circle_ci/config.yaml')
+
+  t.api_token = circle_ci_config["circle_ci_api_token"]
+  t.environment_variables = {
+      ENCRYPTION_PASSPHRASE:
+          File.read('config/secrets/ci/encryption.passphrase')
+              .chomp
+  }
+  t.ssh_keys = [
+      {
+          hostname: "github.com",
+          private_key: File.read('config/secrets/ci/ssh.private')
       }
-
-      circle_ci = CircleCI.new(circle_ci_config_path)
-      env_vars.each do |name, value|
-        print "Creating environment variable: #{name}... "
-        circle_ci.create_env_var(name, value)
-      end
-
-      puts "Done."
-    end
-
-    desc "Ensure all environment variables are configured on the CircleCI " +
-        "pipeline"
-    task :ensure => [:'destroy', :'provision']
-  end
-
-  namespace :ssh_key do
-    desc "Destroy SSH key from the CircleCI pipeline"
-    task :destroy do
-      print "Destroying SSH key in the pipeline... "
-      circle_ci = CircleCI.new(circle_ci_config_path)
-      circle_ci.delete_ssh_keys
-      puts "Done."
-    end
-
-    desc "Provision SSH key to the CircleCI pipeline"
-    task :provision do
-      print "Creating SSH key in the pipeline... "
-      circle_ci = CircleCI.new(circle_ci_config_path)
-      circle_ci.create_ssh_key(
-          SSHKey.new(
-              File.read('config/secrets/ci/ssh.private'),
-              comment: 'github.com'))
-      puts "Done."
-    end
-
-    desc "Ensure SSH key is configured on the CircleCI pipeline"
-    task :ensure => [:'destroy', :'provision']
-  end
+  ]
 end
 
-namespace :github do
-  namespace :deploy_key do
-    desc "Remove deploy key from the Github repository"
-    task :destroy do
-      print "Removing deploy key from the Github repository... "
-      config = YAML.load_file('config/secrets/github/config.yaml')
-      access_token = config["github_personal_access_token"]
-      repo = config["github_repository"]
-      client = Octokit::Client.new(access_token: access_token)
-
-      deploy_keys = client.list_deploy_keys(repo)
-      circle_ci_deploy_key = deploy_keys.find { |k| k[:title] == 'CircleCI' }
-      if circle_ci_deploy_key
-        client.remove_deploy_key(repo, circle_ci_deploy_key[:id])
-      end
-      puts "Done."
-    end
-
-    desc "Add deploy key to the Github repository"
-    task :provision do
-      print "Adding deploy key to the Github repository... "
-      config = YAML.load_file('config/secrets/github/config.yaml')
-      access_token = config["github_personal_access_token"]
-      repo = config["github_repository"]
-      client = Octokit::Client.new(access_token: access_token)
-
-      ssh_key = SSHKey.new(
-          File.read('config/secrets/ci/ssh.private'),
-          comment: 'CircleCI')
-      client.add_deploy_key(repo,
-          ssh_key.comment,
-          ssh_key.ssh_public_key,
-          read_only: false)
-      puts "Done."
-    end
-
-    desc "Ensure deploy key is configured on the Github repository"
-    task :ensure => [:'destroy', :'provision']
-  end
+RakeGithub.define_repository_tasks(
+    namespace: :github,
+    repository: 'infrablocks/ruby_terraform',
+) do |t|
+  github_config =
+      YAML.load_file('config/secrets/github/config.yaml')
+
+  t.access_token = github_config["github_personal_access_token"]
+  t.deploy_keys = [
+      {
+          title: 'CircleCI',
+          public_key: File.read('config/secrets/ci/ssh.public')
+      }
+  ]
 end
 
 namespace :pipeline do
   task :prepare => [
       :'circle_ci:env_vars:ensure',
-      :'circle_ci:ssh_key:ensure',
-      :'github:deploy_key:ensure'
+      :'circle_ci:ssh_keys:ensure',
+      :'github:deploy_keys:ensure'
   ]
 end
 

data/config/secrets/ci/ssh.private

@@ -1,51 +1,51 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----

data/config/secrets/ci/ssh.public

@@ -1,14 +1 @@
------BEGIN PUBLIC KEY-----
-MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAlAor5NjXEpgtJfzyBHlY
-PMLQhactLFTZu3txw8y/jzvdpRC0pkCapzzf2pqG1Ig+MZRfhwoStBqz20TBk1+j
-wyjrlCBd9PzbNYVr1QUpib8X2fPowrTVBSKEYB9TYgutzfi8Ze/On1stMrZ9Gf15
-xzZCyfOyHhUkm+ajS2beArmEA4OxrQ0jO8tgRdvi7zbP/tdYRtyiFCZ2nfofuKpO
-8Br4pL1LBHz7I8PYuXH0qRDW4zeuAUFpyxFSBhzv8LnkifFUuuhk7TktM9JTDNRs
-0iuvBf5w1lJNOb6iLZ4C8thoNqE/4V8GKvmpccorvQcRbjrvmIyz8g+TMYgBvi6K
-f1QIlZBBj2AOxew1nSCTWKn4QpTye8j2HUaC+2AuxjQwth6Tp969c/RAJq5zWCuL
-KR58TpdD2X3ODWWgYnucdTzchtVXsIWSwHAjSeRIj7U0b0g7dJL9JSaPLwev9tKz
-rx5Ju7XWh/xhBf7urEly+pCwYnpGwctNBsoWqtPdJuxP3tVAZTCico8gYM3/J6hO
-OCDlop4AGObtdsJSXaLu637+svzZiPoOYdp5jmzJJYiz9Z9XgsaWgkLsDubmfieY
-Gs9MAGSRZytG7OAxgI18tlRmkmJveaK5vzE1d5SlDK0JdnzZ+UFvR9hVeRdUFSUZ
-XJpeOsRAvv+6ahmauvxQFyUCAwEAAQ==
------END PUBLIC KEY-----
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCtbYSGfBIhnbw9EypyUlwkM3wY7R6XtNpb7P1odUffyN3T1PphD3gm1y3OR8YHi+WIGmSrcsBGWc6gGyrIRVPA077AxZQ3RzNEpjZF8b7urNp2KlzPcZZOzQeAqmzpCciyrvK0AKraeTAON2O+H6HnkIY+cWLYTcvg/h82xpHVrv8URnW2Rki0PZ3S7t0rJ5y8+kxeBFWfWwwLUR9wYY7DkG7DMTdRqkwwUEFfRp3IBLxqqeqgAqupCZTIIAudrOAgL+pDWBI/pASD9sSwI/xQqQO1UTMjHEX53O0zBlOIDx2DK9MQKyTmJDH44HeB35jgUfIwA1BBS+i6Ns3LQ7+Jr0pc/rq9xmK4bKRL8k60Dh87CyyRlN/zEFsKjR6ptZjXg9vJfrn0FzwTQjIY0j+V/uDLQrP9AdSA5Fbwqgpsb71YIjYoJ0l71oyRSPjWqhmvYc4doQduJidoLqrLjUWglwkDfwnJ96daHGF3eNsbRHglDcn7AGdCgCxNcrOx+gqeJSTdWEOYiQ0taffoSidZZKcVjIJhtd4V8fxNZUalcsA17yjiVZujMIs0Wj+LUrj+96yO7BSHXrBV7p33dMzALnvgVHdPT6nFLiRqTBUuCZ8tUR/MIeVi9jJlHFNJxSWhOi7PtztVrrR78W8YgUrl4PvM5Efc5MqoR1oJef339w== maintainers@infrablocks.io

data/config/secrets/circle_ci/config.yaml

@@ -1,4 +1,2 @@
 ---
 circle_ci_api_token: "27393e98772c1342785957a776ca4acbaea7f7cb"
-circle_ci_base_url: "https://circleci.com/api"
-circle_ci_project_slug: "github/infrablocks/ruby_terraform"

data/config/secrets/github/config.yaml

@@ -1,3 +1,2 @@
 ---
 github_personal_access_token: "6deebdb15c371069618942f48acd76f35880ebb5"
-github_repository: "infrablocks/ruby_terraform"

data/lib/ruby_terraform/commands/validate.rb

@@ -12,6 +12,7 @@ module RubyTerraform
         state = opts[:state]
         check_variables = opts[:check_variables]
         no_color = opts[:no_color]
+        json_format = opts[:json]
 
         builder
             .with_subcommand('validate') do |sub|
@@ -28,6 +29,7 @@ module RubyTerraform
               sub = sub.with_option('-check-variables', check_variables) unless
                   check_variables.nil?
               sub = sub.with_flag('-no-color') if no_color
+              sub = sub.with_flag('-json') if json_format
               sub
             end
             .with_argument(directory)

data/lib/ruby_terraform/version.rb

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

data/ruby_terraform.gemspec

@@ -23,15 +23,15 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) {|f| File.basename(f)}
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.4.7'
+  spec.required_ruby_version = '>= 2.6'
 
   spec.add_dependency 'lino', '~> 1.1'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rake_circle_ci', '~> 0.3'
+  spec.add_development_dependency 'rake_github', '~> 0.3'
+  spec.add_development_dependency 'rake_ssh', '~> 0.2'
   spec.add_development_dependency 'rspec', '~> 3.9'
-  spec.add_development_dependency 'excon', '~> 0.72'
-  spec.add_development_dependency 'sshkey', '~> 2.0'
-  spec.add_development_dependency 'octokit', '~> 4.16'
   spec.add_development_dependency 'gem-release', '~> 2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-terraform
 version: !ruby/object:Gem::Version
-  version: 0.51.0.pre.2
+  version: 0.51.0.pre.3
 platform: ruby
 authors:
 - Toby Clemson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-07 00:00:00.000000000 Z
+date: 2020-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lino
@@ -53,61 +53,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake_circle_ci
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: excon
+  name: rake_github
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.72'
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.72'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: sshkey
+  name: rake_ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: octokit
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.16'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.16'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: gem-release
   requirement: !ruby/object:Gem::Requirement
@@ -178,7 +178,6 @@ files:
 - lib/ruby_terraform/errors.rb
 - lib/ruby_terraform/errors/execution_error.rb
 - lib/ruby_terraform/version.rb
-- rake/circleci.rb
 - ruby_terraform.gemspec
 - scripts/ci/common/configure-git.sh
 - scripts/ci/common/configure-rubygems.sh
@@ -199,14 +198,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.7
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: A simple Ruby wrapper for invoking Terraform commands.

data/rake/circleci.rb

@@ -1,114 +0,0 @@
-require 'rubygems'
-require 'excon'
-require 'yaml'
-require 'json'
-
-class CircleCI
-  def initialize(config_path)
-    config = YAML.load_file(config_path)
-
-    @api_token = config["circle_ci_api_token"]
-    @base_url = config["circle_ci_base_url"]
-    @project_slug = config["circle_ci_project_slug"]
-  end
-
-  def find_env_vars
-    response = assert_successful(Excon.get(env_vars_url, headers: headers))
-    body = JSON.parse(response.body)
-    env_vars = body["items"].map { |item| item["name"] }
-
-    env_vars
-  end
-
-  def delete_env_var(name)
-    assert_successful(Excon.delete(env_var_url(name), headers: headers))
-  end
-
-  def delete_env_vars
-    env_vars = find_env_vars
-    env_vars.each do |env_var|
-      delete_env_var(env_var)
-    end
-  end
-
-  def create_env_var(name, value)
-    body = JSON.dump(name: name, value: value)
-    assert_successful(
-        Excon.post(env_vars_url, body: body, headers: headers))
-  end
-
-  def find_ssh_keys
-    response = assert_successful(Excon.get(settings_url, headers: headers))
-    body = JSON.parse(response.body)
-    ssh_keys = body["ssh_keys"].map do |ssh_key|
-      {
-          fingerprint: ssh_key["fingerprint"],
-          hostname: ssh_key["hostname"]
-      }
-    end
-
-    ssh_keys
-  end
-
-  def delete_ssh_key(ssh_key_identifier)
-    assert_successful(
-        Excon.delete(ssh_keys_url,
-            body: JSON.dump(ssh_key_identifier),
-            headers: headers))
-  end
-
-  def delete_ssh_keys
-    ssh_keys = find_ssh_keys
-    ssh_keys.each do |ssh_key|
-      delete_ssh_key(ssh_key)
-    end
-  end
-
-  def create_ssh_key(ssh_key)
-    body = JSON.dump({
-        fingerprint: ssh_key.sha1_fingerprint,
-        hostname: ssh_key.comment,
-        private_key: ssh_key.private_key
-    })
-    assert_successful(
-        Excon.post(ssh_keys_url, body: body, headers: headers))
-  end
-
-  private
-
-  def headers
-    {
-        "Circle-Token": @api_token,
-        "Content-Type": "application/json",
-        "Accept": "application/json"
-    }
-  end
-
-  def assert_successful(response)
-    unless response.status >= 200 && response.status < 300
-      host = response.data[:host]
-      path = response.data[:path]
-      status = response.status
-      reason = response.data[:reason_phrase]
-      raise "Unsuccessful request: #{host}#{path} #{status} #{reason}"
-    end
-    response
-  end
-
-  def env_vars_url
-    "#{@base_url}/v2/project/#{@project_slug}/envvar"
-  end
-
-  def env_var_url(name)
-    "#{@base_url}/v2/project/#{@project_slug}/envvar/#{name}"
-  end
-
-  def settings_url
-    "#{@base_url}/v1.1/project/#{@project_slug}/settings"
-  end
-
-  def ssh_keys_url
-    "#{@base_url}/v1.1/project/#{@project_slug}/ssh-key?" +
-        "circle-token=#{@api_token}"
-  end
-end