brightbox-cli 5.0.0.alpha → 5.0.0.rc2

data/lib/brightbox-cli/indifferent_access_hash.rb

@@ -0,0 +1,50 @@
+# A simpler wrapper to allows either String or Symbol keys to be used
+# when accessing attributes since fog applies a change on the top
+# level resulting in a mix of both which has introduced issues.
+class IndifferentAccessHash
+  def initialize(hash)
+    @hash = hash
+  end
+
+  # @param key [String, Symbol] the key to look up
+  # @return [Object] the value of the key
+  def [](key)
+    value = @hash[key.to_s] || @hash[key.to_sym]
+    wrap(value)
+  end
+
+  # @param key [String, Symbol] the key to set
+  # @param value [Object] the value to set
+  # @return [Object] the value of the key
+  def []=(key, value)
+    @hash[key.to_sym] = value
+  end
+
+  # @param other [Object] the object to compare
+  # @return [Object] the result of the comparison
+  def ==(other)
+    @hash == (other.is_a?(IndifferentAccessHash) ? other.to_h : other)
+  end
+
+  def method_missing(method, *args, &block)
+    @hash.send(method, *args, &block)
+  end
+
+  def to_h
+    @hash
+  end
+
+  private
+
+  # This is to handle nested hashes to avoid the original issue again
+  def wrap(value)
+    case value
+    when Hash
+      IndifferentAccessHash.new(value)
+    when Array
+      value.map { |v| wrap(v) }
+    else
+      value
+    end
+  end
+end

data/lib/brightbox-cli/load_balancers.rb

@@ -9,26 +9,42 @@ module Brightbox
       new(conn.load_balancers.create(options))
     end
 
-    def acme_domains
-      if attributes["acme"]
-        attributes["acme"]["domains"].map do |domain|
-          [domain["identifier"], domain["status"]].join(":")
-        end.join(",")
+    def acme_cert
+      if attributes[:acme] && attributes[:acme][:certificate]
+        OpenStruct.new(
+          :expires_at => attributes[:acme][:certificate][:expires_at],
+          :fingerprint => attributes[:acme][:certificate][:fingerprint],
+          :issued_at => attributes[:acme][:certificate][:issued_at],
+          :subjects => attributes[:acme][:certificate][:domains].join(",")
+        )
       else
-        []
+        OpenStruct.new(
+          :expires_at => "",
+          :fingerprint => "",
+          :issued_at => "",
+          :subjects => ""
+        )
       end
-    rescue StandardError
-      []
     end
 
-    def attributes
-      fog_model.attributes
+    def formatted_acme_domains
+      return "" unless attributes[:acme]
+
+      attributes[:acme][:domains].map do |domain|
+        [domain[:identifier], domain[:status]].join(":")
+      end.join(",")
+    rescue StandardError
+      ""
     end
 
     def to_row
       attributes.merge(
         :locked => locked?,
-        :acme_domains => acme_domains,
+        :acme_domains => formatted_acme_domains,
+        :acme_cert_expires_at => acme_cert.expires_at,
+        :acme_cert_fingerprint => acme_cert.fingerprint,
+        :acme_cert_issued_at => acme_cert.issued_at,
+        :acme_cert_subjects => acme_cert.subjects,
         :ssl_minimum_version => ssl_minimum_version,
         :ssl_issuer => certificate_issuer,
         :ssl_subject => certificate_subject,

data/lib/brightbox-cli/server_groups.rb

@@ -34,15 +34,11 @@ module Brightbox
       fog_model.destroy
     end
 
-    def attributes
-      fog_model.attributes
-    end
-
     def to_row
-      o = attributes
-      o[:servers] = server_string
-      o[:server_count] = server_count
-      o
+      super.merge(
+        servers: server_string,
+        server_count: server_count
+      ).to_h
     end
 
     def server_ids

data/lib/brightbox-cli/servers.rb

@@ -37,25 +37,31 @@ module Brightbox
     end
 
     def attributes
-      a = fog_model.attributes
-      a[:image] = image_id
-      a[:created_at] = created_at
-      a[:created_on] = created_on
-      a[:type] = server_type["handle"]
-      a[:status] = fog_model.state
-      a[:locked] = locked?
-      a[:zone] = zone && zone["handle"]
-      a[:hostname] = hostname
-      a[:public_hostname] = "public.#{fqdn}" unless cloud_ips.empty?
-      a[:ipv6_hostname] = ipv6_fqdn if interfaces.any? { |i| i["ipv6_address"] }
-      a
+      fog_attributes.tap do |attrs|
+        attrs[:created_at] = created_at
+        attrs[:created_on] = created_on
+        attrs[:hostname] = hostname
+        attrs[:image] = image_id
+        attrs[:locked] = locked?
+        attrs[:status] = fog_model.state
+        attrs[:type] = server_type["handle"]
+        attrs[:zone] = zone && zone["handle"]
+
+        unless cloud_ips.empty?
+          attrs[:public_hostname] = "public.#{fqdn}"
+        end
+
+        if interfaces.any? { |i| i["ipv6_address"] }
+          attrs[:ipv6_hostname] = ipv6_fqdn
+        end
+      end
     end
 
     def to_row
-      o = attributes
-      o[:cloud_ip_ids] = cloud_ips.map { |i| i["id"] }
-      o[:ips] = interfaces.map { |i| i["ipv4_address"] }.join(", ")
-      o
+      attributes.merge(
+        cloud_ips: cloud_ips.map { |i| i["public_ip"] }.join(", "),
+        ips: interfaces.map { |i| i["ipv4_address"] }.join(", ")
+      )
     end
 
     def deleted?

data/lib/brightbox-cli/types.rb

@@ -3,10 +3,10 @@ module Brightbox
     def self.require_account?; true; end
 
     def attributes
-      o = fog_model.attributes
-      o[:ram] = ram
-      o[:disk] = disk
-      o
+      fog_attributes.tap do |attrs|
+        attrs[:ram] = ram
+        attrs[:disk] = disk
+      end
     end
 
     def ram
@@ -17,10 +17,6 @@ module Brightbox
       fog_model.disk.to_i
     end
 
-    def to_row
-      attributes
-    end
-
     def render_cell
       fog_model.handle
     end

data/lib/brightbox-cli/user_collaboration.rb

@@ -69,7 +69,7 @@ module Brightbox
     def to_row
       row_attributes = attributes
       row_attributes[:account] = attributes[:account]["id"]
-      row_attributes
+      row_attributes.to_h
     end
   end
 end

data/lib/brightbox-cli/users.rb

@@ -1,11 +1,9 @@
 module Brightbox
   class User < Api
-    def attributes
-      fog_model.attributes
-    end
-
     def to_row
-      attributes.merge(:accounts => accounts.size)
+      attributes.merge(
+        accounts: accounts.size
+      )
     end
 
     def self.all

data/lib/brightbox-cli/version.rb

@@ -1,3 +1,3 @@
 module Brightbox
-  VERSION = "5.0.0.alpha".freeze unless defined?(Brightbox::VERSION)
+  VERSION = "5.0.0.rc2".freeze unless defined?(Brightbox::VERSION)
 end

data/lib/brightbox-cli/volume.rb

@@ -57,19 +57,15 @@ module Brightbox
     end
 
     def attributes
-      a = fog_model.attributes
-      a[:id] = fog_model.id
-      a[:image] = image_id
-      a[:locked] = locked?
-      a[:server] = server_id
-      a[:status] = state
-      a[:type] = storage_type
-      a[:zone] = zone_id
-      a
-    end
-
-    def to_row
-      attributes
+      super.merge(
+        id: fog_model.id,
+        image: image_id,
+        locked: locked?,
+        server: server_id,
+        status: state,
+        type: storage_type,
+        zone: zone_id
+      )
     end
 
     def update(options)

data/lib/brightbox-cli/zones.rb

@@ -2,10 +2,6 @@ module Brightbox
   class Zone < Api
     def self.require_account?; true; end
 
-    def to_row
-      attributes
-    end
-
     def self.all
       conn.zones
     end

data/lib/brightbox_cli.rb

@@ -71,6 +71,7 @@ require_relative "brightbox/cli/config"
 require_relative "brightbox-cli/connection_manager"
 require_relative "brightbox-cli/tables"
 require_relative "brightbox-cli/logging"
+require_relative "brightbox-cli/indifferent_access_hash"
 require_relative "brightbox-cli/api"
 require_relative "brightbox-cli/config/cache"
 require_relative "brightbox-cli/config/gpg_encrypted_passwords"

data/spec/commands/cloudips/update_spec.rb

@@ -59,7 +59,9 @@ describe "brightbox cloudips update" do
 
       it "puts new name in update" do
         expect(Brightbox::CloudIP.conn).to receive(:update_cloud_ip).with(*expected_args).and_call_original
-        expect(stderr).to eq("")
+
+        expect(stderr).to be_empty unless ENV["DEBUG"]
+
         expect(stdout).to include("cip-12345")
         expect(stdout).to include("New name")
       end
@@ -82,7 +84,7 @@ describe "brightbox cloudips update" do
 
       it "puts new name in update" do
         expect(Brightbox::CloudIP.conn).to receive(:update_cloud_ip).with(*expected_args).and_call_original
-        expect(stderr).to eq("")
+        expect(stderr).to be_empty unless ENV["DEBUG"]
         expect(stdout).to include("cip-12345")
       end
     end
@@ -114,7 +116,7 @@ describe "brightbox cloudips update" do
     end
 
     it "puts new name in update" do
-      expect(stderr).to eq("")
+      expect(stderr).to be_empty unless ENV["DEBUG"]
       expect(stdout).to include("cip-dfsa3")
       expect(stdout).to include("domain.example")
     end
@@ -146,7 +148,7 @@ describe "brightbox cloudips update" do
     end
 
     it "puts new name in update" do
-      expect(stderr).to eq("")
+      expect(stderr).to be_empty unless ENV["DEBUG"]
       expect(stdout).to include("cip-dfsa3")
     end
   end
@@ -155,7 +157,7 @@ describe "brightbox cloudips update" do
     let(:argv) { ["cloudips", "update", "--reverse-dns", "domain.example", "--delete-reverse-dns", "cip-dfsa3"] }
 
     it "puts new name in update" do
-      expect(stderr).to eq("ERROR: You must either specify a reverse DNS record or --delete-reverse-dns\n")
+      expect(stderr).to include("ERROR: You must either specify a reverse DNS record or --delete-reverse-dns\n")
       expect(stdout).to eq("")
     end
   end

data/spec/commands/configmaps/create_spec.rb

@@ -109,7 +109,7 @@ describe "brightbox configmaps create" do
       it "does not error" do
         expect { output }.to_not raise_error
 
-        expect(stderr).to eq("ERROR: Config map data was not valid JSON\n")
+        expect(stderr).to include("ERROR: Config map data was not valid JSON\n")
 
         expect(stdout).to eq("")
       end
@@ -156,7 +156,7 @@ describe "brightbox configmaps create" do
         it "does not error" do
           expect { output }.to_not raise_error
 
-          expect(stderr).to eq("Creating config map\n")
+          expect(stderr).to include("Creating config map\n")
 
           aggregate_failures do
             expect(stdout).to match("cfg-s432l")
@@ -169,7 +169,7 @@ describe "brightbox configmaps create" do
           it "does not error" do
             expect { output }.to_not raise_error
 
-            expect(stderr).to eq("ERROR: Config map data was not valid JSON\n")
+            expect(stderr).to include("ERROR: Config map data was not valid JSON\n")
 
             expect(stdout).to eq("")
           end
@@ -219,7 +219,7 @@ describe "brightbox configmaps create" do
       it "does not error" do
         expect { output }.to_not raise_error
 
-        expect(stderr).to eq("Creating config map\n")
+        expect(stderr).to include("Creating config map\n")
 
         aggregate_failures do
           expect(stdout).to match("cfg-mj53s")
@@ -232,7 +232,7 @@ describe "brightbox configmaps create" do
         it "does not error" do
           expect { output }.to_not raise_error
 
-          expect(stderr).to eq("ERROR: Config map data was not valid JSON\n")
+          expect(stderr).to include("ERROR: Config map data was not valid JSON\n")
 
           expect(stdout).to eq("")
         end
@@ -248,7 +248,7 @@ describe "brightbox configmaps create" do
       it "does not error" do
         expect { output }.to_not raise_error
 
-        expect(stderr).to eq("ERROR: Config map data can only be passed by either 'data' or 'data-file'\n")
+        expect(stderr).to include("ERROR: Config map data can only be passed by either 'data' or 'data-file'\n")
 
         expect(stdout).to eq("")
       end

data/spec/commands/configmaps/destroy_spec.rb

@@ -26,7 +26,7 @@ describe "brightbox configmaps destroy" do
     it "does not error" do
       expect { output }.to_not raise_error
 
-      expect(stderr).to eq("ERROR: You must specify config map IDs as arguments\n")
+      expect(stderr).to include("ERROR: You must specify config map IDs as arguments\n")
 
       expect(stdout).to match("")
     end

data/spec/commands/configmaps/list_spec.rb

@@ -35,7 +35,7 @@ describe "brightbox configmaps list" do
     it "does not error" do
       expect { output }.to_not raise_error
 
-      expect(stderr).to eq("")
+      expect(stderr).to be_empty unless ENV["DEBUG"]
 
       aggregate_failures do
         expect(stdout).to match("id.*name")

data/spec/commands/configmaps/show_spec.rb

@@ -35,7 +35,7 @@ describe "brightbox configmaps show" do
     it "does not error" do
       expect { output }.to_not raise_error
 
-      expect(stderr).to eq("")
+      expect(stderr).to be_empty unless ENV["DEBUG"]
 
       aggregate_failures do
         expect(stdout).to match("id: cfg-12345")
@@ -81,7 +81,7 @@ describe "brightbox configmaps show" do
       it "does not error" do
         expect { output }.to_not raise_error
 
-        expect(stderr).to eq("ERROR: You can only access data for a single config map at a time\n")
+        expect(stderr).to include("ERROR: You can only access data for a single config map at a time\n")
 
         expect(stdout).to eq("")
       end
@@ -137,7 +137,7 @@ describe "brightbox configmaps show" do
       it "does not error" do
         expect { output }.to_not raise_error
 
-        expect(stderr).to eq("")
+        expect(stderr).to be_empty unless ENV["DEBUG"]
 
         expect(stdout).to eq(%({"key":"value","name":"key name"}\n))
       end

data/spec/commands/configmaps/update_spec.rb

@@ -27,7 +27,7 @@ describe "brightbox configmaps update" do
     it "does not error" do
       expect { output }.to_not raise_error
 
-      expect(stderr).to eq("ERROR: You must specify the config map ID as the first argument\n")
+      expect(stderr).to include("ERROR: You must specify the config map ID as the first argument\n")
 
       expect(stdout).to match("")
     end
@@ -73,7 +73,7 @@ describe "brightbox configmaps update" do
     it "does not error" do
       expect { output }.to_not raise_error
 
-      expect(stderr).to eq("Updating cfg-0932s\n")
+      expect(stderr).to include("Updating cfg-0932s\n")
 
       aggregate_failures do
         expect(stdout).to match("cfg-0932s")
@@ -134,7 +134,7 @@ describe "brightbox configmaps update" do
       it "does not error" do
         expect { output }.to_not raise_error
 
-        expect(stderr).to eq("Updating cfg-25hrt\n")
+        expect(stderr).to include("Updating cfg-25hrt\n")
 
         aggregate_failures do
           expect(stdout).to match("cfg-25hrt")
@@ -148,7 +148,7 @@ describe "brightbox configmaps update" do
       it "does not error" do
         expect { output }.to_not raise_error
 
-        expect(stderr).to eq("ERROR: Config map data was not valid JSON\n")
+        expect(stderr).to include("ERROR: Config map data was not valid JSON\n")
 
         expect(stdout).to eq("")
       end
@@ -218,7 +218,7 @@ describe "brightbox configmaps update" do
         it "does not error" do
           expect { output }.to_not raise_error
 
-          expect(stderr).to eq("Updating cfg-gr45a\n")
+          expect(stderr).to include("Updating cfg-gr45a\n")
 
           aggregate_failures do
             expect(stdout).to match("cfg-gr45a")
@@ -231,7 +231,7 @@ describe "brightbox configmaps update" do
           it "does not error" do
             expect { output }.to_not raise_error
 
-            expect(stderr).to eq("ERROR: Config map data was not valid JSON\n")
+            expect(stderr).to include("ERROR: Config map data was not valid JSON\n")
 
             expect(stdout).to eq("")
           end
@@ -303,7 +303,7 @@ describe "brightbox configmaps update" do
         it "does not error" do
           expect { output }.to_not raise_error
 
-          expect(stderr).to eq("Updating cfg-stdin\n")
+          expect(stderr).to include("Updating cfg-stdin\n")
 
           aggregate_failures do
             expect(stdout).to match("cfg-stdin")
@@ -316,7 +316,7 @@ describe "brightbox configmaps update" do
           it "does not error" do
             expect { output }.to_not raise_error
 
-            expect(stderr).to eq("ERROR: Config map data was not valid JSON\n")
+            expect(stderr).to include("ERROR: Config map data was not valid JSON\n")
 
             expect(stdout).to eq("")
           end
@@ -332,7 +332,7 @@ describe "brightbox configmaps update" do
         it "does not error" do
           expect { output }.to_not raise_error
 
-          expect(stderr).to eq("ERROR: Config map data can only be passed by either 'data' or 'data-file'\n")
+          expect(stderr).to include("ERROR: Config map data can only be passed by either 'data' or 'data-file'\n")
 
           expect(stdout).to eq("")
         end

data/spec/commands/images/show_spec.rb

@@ -17,35 +17,51 @@ RSpec.describe "brightbox images" do
     context "without arguments" do
       let(:argv) { %w[images show] }
 
+      it "reports missing IDs" do
+        expect { output }.to_not raise_error
+
+        aggregate_failures do
+          expect(stderr).to match("ERROR: You must specify image IDs to show")
+          expect(stdout).to eq("")
+        end
+      end
+    end
+
+    context "with identifier argument" do
+      let(:argv) { %w[images show img-11111] }
+
       before do
-        stub_request(:get, "#{api_url}/1.0/images?account_id=acc-12345")
+        expect(Brightbox::Image).to receive(:find)
+          .with("img-11111")
+          .and_call_original
+
+        stub_request(:get, "#{api_url}/1.0/images/img-11111?account_id=acc-12345")
           .to_return(
             status: 200,
-            body: [
-              {
-                id: "img-12345"
-              }
-            ].to_json
+            body: {
+              id: "img-11111",
+              min_ram: 2_048
+            }.to_json
           )
       end
 
       it "does not error" do
         expect { output }.to_not raise_error
 
-        expect(stderr).to match("")
-        expect(stderr).not_to match("ERROR")
-        expect(stdout).to match("img-12345")
+        aggregate_failures do
+          expect(stderr).to match("")
+          expect(stderr).not_to match("ERROR")
+          expect(stdout).to match("img-11111")
+
+          expect(stdout).to match("min_ram: 2048")
+        end
       end
     end
 
-    context "with identifier" do
-      let(:argv) { %w[images show img-11111] }
+    context "with multiple identifiers" do
+      let(:argv) { %w[images show img-11111 img-22222] }
 
       before do
-        expect(Brightbox::Image).to receive(:find)
-          .with("img-11111")
-          .and_call_original
-
         stub_request(:get, "#{api_url}/1.0/images/img-11111?account_id=acc-12345")
           .to_return(
             status: 200,
@@ -54,16 +70,30 @@ RSpec.describe "brightbox images" do
               min_ram: 2_048
             }.to_json
           )
+
+        stub_request(:get, "#{api_url}/1.0/images/img-22222?account_id=acc-12345")
+          .to_return(
+            status: 200,
+            body: {
+              id: "img-22222",
+              min_ram: 4_096
+            }.to_json
+          )
       end
 
       it "does not error" do
         expect { output }.to_not raise_error
 
-        expect(stderr).to match("")
-        expect(stderr).not_to match("ERROR")
-        expect(stdout).to match("img-11111")
+        aggregate_failures do
+          expect(stderr).to match("")
+          expect(stderr).not_to match("ERROR")
+
+          expect(stdout).to match("img-11111")
+          expect(stdout).to match("min_ram: 2048")
 
-        expect(stdout).to match("min_ram: 2048")
+          expect(stdout).to match("img-22222")
+          expect(stdout).to match("min_ram: 4096")
+        end
       end
     end
   end