terraspace 2.0.2 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a0597eb436b3d646b4163c32659fefccc2c8a023a1d155e6427ea2c809a9325
-  data.tar.gz: 40219e371fc4c9e8bb9f9b6e8c8e4806b3a1c5490a27d3e566467a966f8cf98e
+  metadata.gz: 3651e7cf7b8fe679a5266a2bc6bbad9f30d2c98d8636bbf6105ee7d61585d2ed
+  data.tar.gz: 8dd9e2fb0801ea3f4e82711460edbf18cc578932443d7ef9c2844fe644e49a09
 SHA512:
-  metadata.gz: 466a494240d4b8c15f0ed6c8fb3a33973b5fbdf590c8ca1b18ce34718b84f0c14ce7487f2813d9a6202b5da9d500c93f408e669642b19c4c86f1e20e90d1d32a
-  data.tar.gz: 798bb6923e162bb18586de66f3ce9f5ac1e0182297a790569d6e40cd8104160b5ad9164bf81cc0e44d13bc140826f3ee30cb7701bb05c916e4ca365ab2d2d0c4
+  metadata.gz: da083a64468e8b447e10881762d52e52859ce74c72be6d8f7ca0e8a457da1818f99cd3e615a87b7f43758abcc46297b1eec1c2e1550b1b89c96e47c0ad851b96
+  data.tar.gz: 6b51fd61cbdabe1a5e51fac73d3a93fba10143ac040526d8283d48afa90a9c3d26e738e1d50449bfd1a029cce99001a2af0f91edb3f0ca005779f256572eac9c

data/.cody/README.md

@@ -10,7 +10,7 @@ This installs the `cody` command to manage the AWS CodeBuild project.
 
 ## Update Project
 
-    cody deploy --type aws
+    cody up --type aws
 
 ## Start a Deploy
 

data/.cody/all/project.rb

@@ -1,6 +1,10 @@
 github("boltops-tools/terraspace")
 image("aws/codebuild/amazonlinux2-x86_64-standard:3.0")
 env_vars(
+  INFRACOST_API_KEY: "ssm:/#{Cody.env}/INFRACOST_API_KEY",
+  TS_API: "ssm:/#{Cody.env}/TS_API",
+  TS_COST: true,
+  TS_LOG_LEVEL: "info",
   TS_ORG: "qa",
   TS_TOKEN: "ssm:/#{Cody.env}/TS_TOKEN",
 )

data/.cody/aws/project.rb

@@ -1,6 +1,10 @@
 github("boltops-tools/terraspace")
 image("aws/codebuild/amazonlinux2-x86_64-standard:3.0")
 env_vars(
+  INFRACOST_API_KEY: "ssm:/#{Cody.env}/INFRACOST_API_KEY",
+  TS_API: "ssm:/#{Cody.env}/TS_API",
+  TS_COST: true, # not ssm so can see in the codebuild logs
+  TS_LOG_LEVEL: "info", # not ssm so can see in the codebuild logs
   TS_ORG: "qa",
   TS_TOKEN: "ssm:/#{Cody.env}/TS_TOKEN",
 )

data/.cody/azurerm/project.rb

@@ -3,6 +3,10 @@ image("aws/codebuild/amazonlinux2-x86_64-standard:3.0")
 env_vars(
   # Used by .cody/azurerm/bin/az/configure.sh
   AZURE_APP_CLIENT_JSON: ssm("/terraspace/#{Cody.env}/azure_app_client_json"),
+  INFRACOST_API_KEY: "ssm:/#{Cody.env}/INFRACOST_API_KEY",
+  TS_API: "ssm:/#{Cody.env}/TS_API",
+  TS_COST: true,
+  TS_LOG_LEVEL: "info",
   TS_ORG: "qa",
   TS_TOKEN: "ssm:/#{Cody.env}/TS_TOKEN",
 )

data/.cody/google/project.rb

@@ -3,6 +3,10 @@ image("aws/codebuild/amazonlinux2-x86_64-standard:3.0")
 env_vars(
   # Used by .cody/google/bin/gcloud/configure.sh
   GOOGLE_CREDS_JSON: ssm("/terraspace/#{Cody.env}/google_creds_json"),
+  INFRACOST_API_KEY: "ssm:/#{Cody.env}/INFRACOST_API_KEY",
+  TS_API: "ssm:/#{Cody.env}/TS_API",
+  TS_COST: true,
+  TS_LOG_LEVEL: "info",
   TS_ORG: "qa",
   TS_TOKEN: "ssm:/#{Cody.env}/TS_TOKEN",
 )

data/.cody/none/project.rb

@@ -1,6 +1,10 @@
 github("boltops-tools/terraspace")
 image("aws/codebuild/amazonlinux2-x86_64-standard:3.0")
 env_vars(
+  INFRACOST_API_KEY: "ssm:/#{Cody.env}/INFRACOST_API_KEY",
+  TS_API: "ssm:/#{Cody.env}/TS_API",
+  TS_LOG_LEVEL: "info",
+  TS_COST: true,
   TS_ORG: "qa",
   TS_TOKEN: "ssm:/#{Cody.env}/TS_TOKEN",
 )

data/.cody/shared/script/install/infracost.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -eu
+# install infracost
+# https://www.infracost.io/docs/
+curl -fsSL https://raw.githubusercontent.com/infracost/infracost/master/scripts/install.sh | sh

data/.cody/shared/script/install/terraform.sh

@@ -2,8 +2,8 @@
 
 set -eu
 
-#TERRAFORM_VERSION=latest
-TERRAFORM_VERSION=1.1.9
+# TERRAFORM_VERSION=latest
+TERRAFORM_VERSION=1.2.4
 
 git clone https://github.com/tfutils/tfenv.git ~/.tfenv
 echo 'export PATH="$HOME/.tfenv/bin:$PATH"' >> ~/.bash_profile

data/.cody/shared/script/install.sh

@@ -4,3 +4,4 @@ set -eu
 
 .cody/shared/script/install/terraform.sh
 .cody/shared/script/install/terraspace.sh
+.cody/shared/script/install/infracost.sh

data/.github/FUNDING.yml

@@ -0,0 +1 @@
+github: boltops-tools

data/.pipedream/README.md

@@ -12,7 +12,7 @@ This installs both the `pipe` and `pipedream` commands. They do the same thing,
 
 To update the CodePipeline pipelines:
 
-    pipedream deploy
+    pipedream up
 
 ## Start a Execution
 

data/.pipedream/pipeline.rb

@@ -7,13 +7,20 @@ stage "Source" do
 end
 
 stage "Build" do
-  # in parallel
-  codebuild(
-    "terraspace-all",
-    "terraspace-aws",
-    "terraspace-azurerm",
-    "terraspace-google",
-    "terraspace-none",
-    "terraspace-unit",
+  vars = env_vars(
+    INFRACOST_API_KEY: "ssm:/#{Pipedream.env}/INFRACOST_API_KEY",
+    TS_API: "ssm:/#{Pipedream.env}/TS_API",
+    TS_LOG_LEVEL: "info",  # not ssm so can see in the codebuild logs
+    TS_COST: true,
+    TS_ORG: "qa",
+    TS_TOKEN: "ssm:/#{Pipedream.env}/TS_TOKEN",
   )
+  in_parallel do
+    codebuild(Name: "terraspace-all", EnvironmentVariables: vars)
+    codebuild(Name: "terraspace-aws", EnvironmentVariables: vars)
+    codebuild(Name: "terraspace-azurerm", EnvironmentVariables: vars)
+    codebuild(Name: "terraspace-google", EnvironmentVariables: vars)
+    codebuild(Name: "terraspace-none", EnvironmentVariables: vars)
+    codebuild(Name: "terraspace-unit") # does not have EnvironmentVariables
+  end
 end

data/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [2.1.1] - 2022-07-12
+- [#248](https://github.com/boltops-tools/terraspace/pull/248) fix destroy success return
+
+## [2.1.0] - 2022-07-11
+- [#247](https://github.com/boltops-tools/terraspace/pull/247) cost estimates and real-time stream logging
+- Cloud Cost Estimation support
+- Live Stream Logging support
+- CI/CD plugin updates. Decoupled CI from PR plugins
+- Improve git info. Get git info with or without CI
+- Fix utf8 encoding edge cases
+
+## [2.0.3] - 2022-07-04
+- [#237](https://github.com/boltops-tools/terraspace/pull/237) remove duplicate paths in layering
+- [#244](https://github.com/boltops-tools/terraspace/pull/244) rename _cache2 to .cache2
+- [#245](https://github.com/boltops-tools/terraspace/pull/245) set utf8 in case system is not configured with LANG=en_US.UTF-8
+
 ## [2.0.2] - 2022-06-21
 - [#242](https://github.com/boltops-tools/terraspace/pull/242) :PROJECT variable: TS_PROJECT as well as config.cloud.project
 

data/lib/templates/base/project/Gemfile.tt

@@ -7,3 +7,8 @@ build_gemfile(
   plugin_gem_name,
 )
 %>
+
+# Uncomment the ci and vcs provider you wish to use. Should use both ci and vcs gem
+# Docs: https://terraspace.cloud/docs/ci/
+# gem "terraspace_ci_github"
+# gem "terraspace_vcs_github"

data/lib/templates/base/project/config/app.rb

@@ -2,6 +2,10 @@
 Terraspace.configure do |config|
   config.logger.level = :info
 
-  # config.cloud.org = "ORG"      # replace with your org. only letters, numbers, underscore and dashes allowed
-  # config.cloud.project = "main" # optional. main is the default project name. only letters, numbers, underscore and dashes allowed
+  # To enable Terraspace Cloud set config.cloud.org
+  # config.cloud.org = "ORG"          # required: replace with your org. only letters, numbers, underscore and dashes allowed
+  # config.cloud.project = "main"     # optional. main is the default project name. only letters, numbers, underscore and dashes allowed
+
+  # Uncomment to enable Cost Estimation. See: http://terraspace.cloud/docs/cloud/cost-estimation/
+  # config.cloud.cost.enabled = true
 end

data/lib/templates/plugin/ci/CHANGELOG.md.tt

@@ -1,5 +1,5 @@
 ## [Unreleased]
 
-## [0.1.0] - <%= Time.now.strftime("%Y-%m-%d") %>
+## [0.1.0] - Unreleased
 
 - Initial release

data/lib/templates/plugin/ci/lib/%gem_name%/vars.rb.tt

@@ -5,7 +5,7 @@ module <%= gem_class_name %>
     # Provide as many CI system as possible.
     def data
       {
-        build_system: "REPLACE_ME",
+        build_system: "<%= name %>",
         host: ENV['REPLACE_ME'],
         full_repo: ENV['REPLACE_ME'],
         branch_name: ENV['REPLACE_ME'],

data/lib/terraspace/app.rb

@@ -51,6 +51,10 @@ module Terraspace
       config.cloud.org = ENV['TS_ORG'] # required for Terraspace cloud
       config.cloud.record = "changes" # IE: changes or all
       config.cloud.stack = ":APP-:ROLE-:MOD_NAME-:ENV-:EXTRA-:REGION"
+      config.cloud.cost = ActiveSupport::OrderedOptions.new
+      config.cloud.cost.enabled = cast_value(ENV['TS_COST'])
+      config.cloud.vcs = ActiveSupport::OrderedOptions.new
+      config.cloud.vcs.name = nil # github, gitlab, bitbucket. Else default to registered terraspace_vcs_* plugin
 
       config.hooks = ActiveSupport::OrderedOptions.new
       config.hooks.show = true
@@ -95,6 +99,18 @@ module Terraspace
       config
     end
 
+    # https://stackoverflow.com/questions/36228873/ruby-how-to-convert-a-string-to-boolean
+    # https://github.com/rails/rails/blob/5-1-stable/activemodel/lib/active_model/type/boolean.rb
+    # so dont have to add activemodel as a dependency just for this method
+    FALSE_VALUES = [false, 0, "0", "f", "F", "false", "FALSE", "off", "OFF"].to_set
+    def cast_value(value)
+      if value == ""
+        nil
+      else
+        !FALSE_VALUES.include?(value)
+      end
+    end
+
     def ts_logger
       Logger.new(ENV['TS_LOG_PATH'] || $stderr)
     end

data/lib/terraspace/cli/base.rb

@@ -1,5 +1,6 @@
 class Terraspace::CLI
   class Base
+    extend Memoist
     include Terraspace::Util
 
     def initialize(options={})

data/lib/terraspace/cli/commander.rb

@@ -8,7 +8,8 @@ class Terraspace::CLI
     def run
       Terraspace::Builder.new(@options).run unless @options[:build] # Up already ran build
       Init.new(@options).run
-      Terraspace::Terraform::Runner.new(@name, @options).run
+      @runner = Terraspace::Terraform::Runner.new(@name, @options)
+      @runner.run
     end
   end
 end

data/lib/terraspace/cli/concerns/plan_path.rb

@@ -2,7 +2,7 @@ module Terraspace::CLI::Concerns
   module PlanPath
     # Use when --out option not used
     def plan_path
-      ".terraspace-cache/_cache2/plan/plan.binary"
+      ".terraspace-cache/.cache2/plan/plan.binary"
     end
   end
 end

data/lib/terraspace/cli/down.rb

@@ -1,11 +1,34 @@
 class Terraspace::CLI
   class Down < Base
-    include TfcConcern
     include Concerns::PlanPath
+    include Terraspace::Cloud::Streamer
+    include Terraspace::Cloud::Vcs::Commenter
+    include TfcConcern
 
     def run
-      plan if @options[:yes] && !tfc?
-      destroy
+      cloud_update.cani?
+      @stream = cloud_stream.open("down")
+      success = perform
+      cloud_stream.close(success, @exception)
+      exit 1 unless success
+    end
+
+    def perform
+      success = nil
+      if @options[:yes] && !tfc?
+        success = plan
+      else
+        skip_plan = true
+      end
+      if success or skip_plan
+        success = destroy
+      end
+      success
+    rescue Exception => e
+      @exception = true
+      logger.info "Exception #{e.class}: #{e.message}".color(:red)
+      logger.info e.backtrace.join("\n")
+      false
     end
 
   private
@@ -13,12 +36,26 @@ class Terraspace::CLI
       if Terraspace.cloud? && !@options[:out]
         @options[:out] = plan_path
       end
-      Commander.new("plan", @options.merge(destroy: true)).run
+      plan = Plan.new(@options.merge(destroy: true))
+      plan.plan_only # returns success: true or false
     end
 
     def destroy
-      Commander.new("destroy", @options.merge(command: "down")).run
-      Terraspace::Terraform::Tfc::Workspace.new(@options).destroy if @options[:destroy_workspace]
+      commander = Commander.new("destroy", @options.merge(command: "down"))
+      success = commander.run
+      update = cloud_update.create(success, @stream)
+
+      if success && @options[:destroy_workspace]
+        Terraspace::Terraform::Tfc::Workspace.new(@options).destroy
+      end
+
+      logger.info "Terraspace Cloud #{update['data']['attributes']['url']}" if update
+      success
+    end
+
+    def cloud_update
+      Terraspace::Cloud::Update.new(@options.merge(stack: @mod.name, kind: kind, vcs_vars: vcs_vars))
     end
+    memoize :cloud_update
   end
 end

data/lib/terraspace/cli/logs/concern.rb

@@ -2,7 +2,7 @@ class Terraspace::CLI::Logs
   module Concern
     # Filters for lines that belong to the last ran process pid
     def readlines(path)
-      lines = IO.readlines(path)
+      lines = IO.readlines(path).map { |l| l.force_encoding('UTF-8') }
       found = lines.reverse.find do |line|
         pid(line) # search in reverse order for lines with interesting info
       end

data/lib/terraspace/cli/new/plugin/ci.rb

@@ -7,7 +7,6 @@ class Terraspace::CLI::New::Plugin
     def self.options
       [
         [:force, aliases: %w[y], type: :boolean, desc: "Bypass overwrite are you sure prompt for existing files"],
-        [:pr, type: :boolean, desc: "Generate pr code also. Most CI systems don't have PR support"],
       ]
     end
     options.each { |args| class_option(*args) }
@@ -15,8 +14,7 @@ class Terraspace::CLI::New::Plugin
     def create_plugin
       puts "=> Creating new ci plugin: #{name}"
       core_template_source("plugin/ci")
-      exclude_pattern = "pr\.rb" unless options[:pr]
-      directory ".", "terraspace_ci_#{name}", exclude_pattern: exclude_pattern
+      directory ".", "terraspace_ci_#{name}"
     end
 
     def finish_message
@@ -27,7 +25,6 @@ class Terraspace::CLI::New::Plugin
         "lib/#{gem_name}/interface.rb",
         "README.md",
       ]
-      files << "lib/#{gem_name}/pr.rb" if @options[:pr]
       files.sort!
       list = files.map { |file| "    #{file}" }.join("\n")
       puts <<~EOL

data/lib/terraspace/cli/plan.rb

@@ -1,13 +1,77 @@
 class Terraspace::CLI
   class Plan < Base
-    include TfcConcern
     include Concerns::PlanPath
+    include Terraspace::Cloud::Streamer
+    include Terraspace::Cloud::Vcs::Commenter
+    include TfcConcern
 
     def run
+      cloud_plan.cani?
+      @stream = cloud_stream.open("plan")
+      success = perform
+      cloud_stream.close(success, @exception)
+      exit 1 unless success
+    end
+
+    def perform
+      success = plan_only
+      plan = cloud_plan.create(success, @stream)
+      if success && plan # possible from no changes / recording is disabled
+        resp = cloud_cost.cani?(exit_on_error: false)
+        if resp['errors'] # info on why cannot create a plan from resp
+          logger.info "WARN: Not creating a cost estimate."
+          logger.info resp['errors'][0]['detail']
+        else
+          cost = cloud_cost.create(uid: plan['data']['id'], stream: @stream)
+          pr_comment(plan, cost)
+        end
+        logger.info "Terraspace Cloud #{plan['data']['attributes']['url']}"
+      end
+      success
+    rescue Exception => e
+      @exception = true
+      logger.info "Exception #{e.class}: #{e.message}".color(:red)
+      logger.info e.backtrace.join("\n")
+      false
+    end
+
+    def plan_only
       if Terraspace.cloud? && !@options[:out]
         @options[:out] = plan_path
       end
-      Commander.new("plan", @options).run
+      cloud_plan.setup
+      success = commander.run
+      copy_out_file_to_root
+      success
+    end
+
+    def commander
+      Commander.new("plan", @options)
+    end
+    memoize :commander
+
+    def copy_out_file_to_root
+      file = @mod.out_option
+      return if !file || @options[:copy_to_root] == false
+      return if file =~ %r{^/} # not need to copy absolute path
+
+      name = file.sub("#{Terraspace.root}/",'')
+      src = "#{@mod.cache_dir}/#{name}"
+      dest = name
+      return unless File.exist?(src) # plan wont exists if the plan errors
+      FileUtils.mkdir_p(File.dirname(dest))
+      FileUtils.cp(src, dest)
+      !!dest
+    end
+
+    def cloud_plan
+      Terraspace::Cloud::Plan.new(@options.merge(stack: @mod.name, kind: kind, vcs_vars: vcs_vars))
+    end
+    memoize :cloud_plan
+
+    def cloud_cost
+      Terraspace::Cloud::Cost.new(@options.merge(stack: @mod.name, kind: kind, vcs_vars: vcs_vars))
     end
+    memoize :cloud_cost
   end
 end

data/lib/terraspace/cli/up.rb

@@ -1,26 +1,80 @@
-require 'securerandom'
-
 class Terraspace::CLI
   class Up < Base
-    include TfcConcern
     include Concerns::PlanPath
+    include Terraspace::Cloud::Streamer
+    include Terraspace::Cloud::Vcs::Commenter
+    include TfcConcern
 
     def run
+      cloud_update.cani?
+      @stream = cloud_stream.open("up")
+      success = perform
+      create_cloud_records(success)
+      cloud_stream.close(success, @exception)
+      exit 1 unless success
+    end
+
+    def perform
+      success = nil
       build
       if @options[:yes] && !@options[:plan] && !tfc?
-        if Terraspace.cloud? && !@options[:plan]
-          @options[:plan] = plan_path # for terraform apply
-          @options[:out] = plan_path  # for terraform plan
-        end
-        Commander.new("plan", @options).run
-        return unless File.exist?(plan_path) if Terraspace.cloud? # happens if plan fails
-        Commander.new("apply", @options).run
+        success = plan
       else
-        Commander.new("apply", @options).run
+        skip_plan = true
+      end
+      if success or skip_plan
+        success = apply
       end
+      success
+    rescue Exception => e
+      @exception = true
+      logger.info "Exception #{e.class}: #{e.message}".color(:red)
+      logger.info e.backtrace.join("\n")
+      false
     end
 
   private
+    def plan
+      if Terraspace.cloud? && !@options[:plan]
+        @options[:plan] = plan_path # for terraform apply
+        @options[:out] = plan_path  # for terraform plan
+      end
+
+      plan = Plan.new(@options)
+      plan.plan_only # returns success: true or false
+    end
+
+    def apply
+      commander = Commander.new("apply", @options)
+      commander.run
+    end
+
+    def create_cloud_records(success)
+      update = cloud_update.create(success, @stream)
+      return unless success && update # possible from no changes / recording is disabled
+
+      resp = cloud_cost.cani?(exit_on_error: false)
+      if resp['errors'] # info on why cannot create a plan from resp
+        logger.info "WARN: Not creating a cost estimate."
+        logger.info resp['errors'][0]['detail']
+      else
+        cost = cloud_cost.create(uid: update['data']['id'], stream: @stream)
+        pr_comment(update, cost)
+      end
+
+      logger.info "Terraspace Cloud #{update['data']['attributes']['url']}" if update
+    end
+
+    def cloud_update
+      Terraspace::Cloud::Update.new(@options.merge(stack: @mod.name, kind: kind, vcs_vars: vcs_vars))
+    end
+    memoize :cloud_update
+
+    def cloud_cost
+      Terraspace::Cloud::Cost.new(@options.merge(stack: @mod.name, kind: kind, vcs_vars: vcs_vars))
+    end
+    memoize :cloud_cost
+
     # must build to compute tfc?
     def build
       Terraspace::Builder.new(@options).run

data/lib/terraspace/cloud/api/cani.rb

@@ -1,14 +1,16 @@
 class Terraspace::Cloud::Api
   class Cani
+    class Cannot < Terraspace::Error; end
     include Terraspace::Util::Logging
 
     def initialize(result)
       @result = result
     end
 
-    # {"data":{"attributes":{"detail":"You are authorized to perform this action.","status":200,"title":"Authoriz
+    # Example http responses:
+    # {"data":{"attributes":{"detail":"You are authorized to perform this action.","status":200,"title":"Authoriz...
     # {"errors":[{"detail":"You are not authorized to perform this action. Double check your token or check with your admin that you have permissions.","status":403,"title":"Forbidden"}]}
-    def handle
+    def handle(exit_on_error=true)
       yes = false # assume do not have permission
       detail = @result&.dig('data', 'attributes', 'detail')
       if detail&.include?('You are authorized to perform this action')
@@ -16,15 +18,19 @@ class Terraspace::Cloud::Api
       end
       return if yes
 
-      if @result.nil? # 400 Bad Request
-        logger.info "ERROR: It doesn't look like TS_TOKEN is valid".color(:red)
+      if exit_on_error
+        if @result.nil? # 400 Bad Request
+          logger.info "ERROR: It doesn't look like TS_TOKEN is valid".color(:red)
+        else
+          errors = @result.dig('errors')
+          detail = errors.first['detail']
+          # {"errors":[{"detail":"You are not authorized to perform this action. Double check your token or check with your admin that you have permissions.","status":403,"title":"Forbidden"}]}
+          logger.info "ERROR: #{detail}".color(:red)
+        end
+        exit 1
       else
-        errors = @result.dig('errors')
-        detail = errors.first['detail']
-        # {"errors":[{"detail":"You are not authorized to perform this action. Double check your token or check with your admin that you have permissions.","status":403,"title":"Forbidden"}]}
-        logger.info "ERROR: #{detail}".color(:red)
+        @result # original http response with error info
       end
-      exit 1
     end
   end
 end

data/lib/terraspace/cloud/api/concern.rb

@@ -2,7 +2,6 @@ class Terraspace::Cloud::Api
   module Concern
     extend Memoist
     include Errors
-    include Record
     include Validate
 
     def api

data/lib/terraspace/cloud/api/http_methods.rb

@@ -5,6 +5,7 @@ class Terraspace::Cloud::Api
 
     # Always translate raw json response to ruby Hash
     def request(klass, path, data={})
+      exit_on_error = data.delete(:exit_on_error) # for cani logic
       url = url(path)
       req = build_request(klass, url, data)
       retries = 0
@@ -26,7 +27,7 @@ class Terraspace::Cloud::Api
         end
       end
       result = load_json(url, resp)
-      Cani.new(result).handle if data[:cani]
+      Cani.new(result).handle(exit_on_error) if data[:cani]
       result
     end
 
@@ -93,7 +94,11 @@ class Terraspace::Cloud::Api
       "#{endpoint}/#{path}"
     end
 
-    def get(path)
+    def get(path, data={})
+      unless data.empty?
+        separator = path.include?('?') ? '&' : '?'
+        path += separator + data.to_query
+      end
       request(Net::HTTP::Get, path)
     end