vaultez-cli 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2898cfe0e904ce07df993ad6cf78fd5c66b0843a6a90dccafe0fc21f94c462a
-  data.tar.gz: 1792ede773e3d10f26b7a233719690ec660402b21ce1e086e7d1a8b47f7706d9
+  metadata.gz: 14c54ce2993304e11bb04d4295bdc8fbab8596f7387db6fa4639c1e32dd40e7c
+  data.tar.gz: ec8e484b39065e1a3221c60bc3d5acf431c51f8daeb77c03658cbc439f5b73b7
 SHA512:
-  metadata.gz: e920faa7ff226351174c5eb7ada3ce7c71e06a8cc0d7dabff2171d60bf7ce244afb52543763351c9705a9951474c3dfe66ae814c1af9b0a1bd089138eb573bea
-  data.tar.gz: 5efac1f679ae408baaf10bef7de70dd0c76601419f3b2b48daccf60fc1e36c635ca5546561623b55628292653e525d23e49c21fd0fbb73ffe075b10eb6d3037f
+  metadata.gz: 13ba71b6797e10a7cb46d15b9b61e76b18817d1de62c541eadfc44a994172bf2c21df2f526e9b7b2b0f0bbb6464402caf4a0562ca51aa62d20ebcbc698913007
+  data.tar.gz: 9bc5011daa631088362b7bfb6b3153f87eec3471ef568d477b8dde69572690620b67257c819f3a3b9e98e57351637f0200e43c6e0dc3d62f2ad68ac20bc272f6

data/lib/vaultez/cli.rb

@@ -69,6 +69,7 @@ module Vaultez
     option :projects,  type: :boolean, desc: "List projects in a company"
     option :project,   type: :string,  desc: "Project name"
     option :secret,    type: :string,  desc: "Secret name (returns value only)"
+    option :json,      type: :boolean, desc: "Output as JSON (errors go to stderr)"
     def fetch; super; end
 
     desc "config", "Set default company or token"

data/lib/vaultez/client.rb

@@ -51,7 +51,9 @@ module Vaultez
     def request(method, path, body = nil, authenticated: true)
       uri  = URI("#{@api_url}#{path}")
       http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = uri.scheme == "https"
+      http.use_ssl      = uri.scheme == "https"
+      http.open_timeout = 10
+      http.read_timeout = 15
 
       req = build_request(method, uri)
       req["Content-Type"] = "application/json"
@@ -65,7 +67,13 @@ module Vaultez
 
       req.body = body.to_json if body
 
-      parse_response(http.request(req))
+      begin
+        response = http.request(req)
+      rescue StandardError => error
+        raise Vaultez::ApiError, "Could not reach the Vaultez API: #{error.message}"
+      end
+
+      parse_response(response)
     end
 
     def build_request(method, uri)

data/lib/vaultez/commands/fetch.rb

@@ -1,3 +1,5 @@
+require "json"
+
 module Vaultez
   module Commands
     module Fetch
@@ -15,33 +17,45 @@ module Vaultez
         elsif options[:project]
           fetch_secrets(client)
         else
-          puts "Error: not enough options. See `vaultez help fetch`."
-          exit 1
+          fail!("not enough options. See `vaultez help fetch`.")
         end
       rescue Vaultez::NotAuthenticatedError => error
-        puts "Error: #{error.message}"
-        exit 1
+        fail!(error.message)
       rescue Vaultez::NotFoundError => error
-        puts "Error: #{error.message}"
-        exit 1
+        fail!(error.message)
       rescue Vaultez::ApiError => error
-        puts "Error: #{error.message}"
-        exit 1
+        fail!(error.message)
       end
 
       private
 
+      def fail!(message)
+        if options[:json]
+          warn "Error: #{message}"
+        else
+          puts "Error: #{message}"
+        end
+        exit 1
+      end
+
       def fetch_with_project_token(client)
         if options[:secret]
           secrets = fetch_all_secrets_for_token(client)
           secret  = secrets.find { |s| s["name"] == options[:secret] }
           unless secret
-            puts "Error: secret \"#{options[:secret]}\" not found."
-            exit 1
+            fail!("secret \"#{options[:secret]}\" not found.")
+          end
+          if options[:json]
+            puts secret.to_json
+          else
+            print secret["value"]
           end
-          print secret["value"]
         else
           secrets = fetch_all_secrets_for_token(client)
+          if options[:json]
+            puts secrets.to_json
+            return
+          end
           if secrets.empty?
             puts "No secrets found."
             return
@@ -54,20 +68,22 @@ module Vaultez
         companies = client.companies
         company   = companies.first
         unless company
-          puts "Error: no company found for this token."
-          exit 1
+          fail!("no company found for this token.")
         end
         projects = client.projects(company["id"])
         project  = projects.first
         unless project
-          puts "Error: no project found for this token."
-          exit 1
+          fail!("no project found for this token.")
         end
         client.secrets(project["id"])
       end
 
       def fetch_companies(client)
         companies = client.companies
+        if options[:json]
+          puts companies.to_json
+          return
+        end
         if companies.empty?
           puts "No companies found."
           return
@@ -81,6 +97,10 @@ module Vaultez
       def fetch_projects(client)
         company  = resolve_company(client)
         projects = client.projects(company["id"])
+        if options[:json]
+          puts projects.to_json
+          return
+        end
         if projects.empty?
           puts "No projects found in #{company["name"]}."
           return
@@ -95,6 +115,10 @@ module Vaultez
         company = resolve_company(client)
         project = resolve_project(client, company)
         secrets = client.secrets(project["id"])
+        if options[:json]
+          puts secrets.to_json
+          return
+        end
         if secrets.empty?
           puts "No secrets found in #{project["name"]}."
           return
@@ -111,11 +135,14 @@ module Vaultez
         secret  = secrets.find { |s| s["name"] == options[:secret] }
 
         unless secret
-          puts "Error: secret \"#{options[:secret]}\" not found in #{project["name"]}."
-          exit 1
+          fail!("secret \"#{options[:secret]}\" not found in #{project["name"]}.")
         end
 
-        print secret["value"]
+        if options[:json]
+          puts secret.to_json
+        else
+          print secret["value"]
+        end
       end
 
       def resolve_company(client)
@@ -124,8 +151,7 @@ module Vaultez
         if options[:company]
           company = companies.find { |c| c["name"] == options[:company] }
           unless company
-            puts "Error: company \"#{options[:company]}\" not found."
-            exit 1
+            fail!("company \"#{options[:company]}\" not found.")
           end
           return company
         end
@@ -138,16 +164,14 @@ module Vaultez
 
         return companies.first if companies.size == 1
 
-        puts "Error: multiple companies found. Specify one with --company or set a default with `vaultez config --default-company`."
-        exit 1
+        fail!("multiple companies found. Specify one with --company or set a default with `vaultez config --default-company`.")
       end
 
       def resolve_project(client, company)
         projects = client.projects(company["id"])
         project  = projects.find { |p| p["name"] == options[:project] }
         unless project
-          puts "Error: project \"#{options[:project]}\" not found in #{company["name"]}."
-          exit 1
+          fail!("project \"#{options[:project]}\" not found in #{company["name"]}.")
         end
         project
       end

data/lib/vaultez/version.rb

@@ -1,3 +1,3 @@
 module Vaultez
-  VERSION = "0.2.0"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vaultez-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Nur Ketene