brightbox-cli 4.8.0 → 5.0.0.rc1

data/lib/brightbox-cli/detailed_server.rb

@@ -1,40 +1,38 @@
 module Brightbox
   class DetailedServer < Server
     def to_row
-      row_attributes = attributes
+      attributes.tap do |attrs|
+        attrs[:compatibility_mode] = attrs["compatibility_mode"]
 
-      row_attributes[:compatibility_mode] = row_attributes["compatibility_mode"]
-
-      if server_type
-        row_attributes[:type] = server_type["id"]
-        row_attributes[:type_handle] = server_type["handle"]
-        row_attributes[:type_name] = server_type["name"]
-        row_attributes[:ram] = server_type["ram"]
-        row_attributes[:cores] = server_type["cores"]
-        row_attributes[:disk] = server_type["disk_size"].to_i
-      end
-
-      if image
-        row_attributes[:image_name] = image.name
-        row_attributes[:arch] = image.arch
-        row_attributes[:image_username] = image.username
-      end
+        if server_type
+          attrs[:type] = server_type["id"]
+          attrs[:type_handle] = server_type["handle"]
+          attrs[:type_name] = server_type["name"]
+          attrs[:ram] = server_type["ram"]
+          attrs[:cores] = server_type["cores"]
+          attrs[:disk] = server_type["disk_size"].to_i
+        end
 
-      row_attributes[:private_ips] = interfaces.map { |i| i["ipv4_address"] }.join(", ")
-      row_attributes[:ipv6_address] = interfaces.map { |i| i["ipv6_address"] }.join(", ")
+        if image
+          attrs[:image_name] = image.name
+          attrs[:arch] = image.arch
+          attrs[:image_username] = image.username
+        end
 
-      row_attributes[:cloud_ip_ids] = cloud_ips.map { |i| i["id"] }.join(", ")
-      row_attributes[:cloud_ipv4s] = cloud_ips.map { |i| i["public_ipv4"] }.join(", ")
-      row_attributes[:cloud_ipv6s] = cloud_ips.map { |i| i["public_ipv6"] }.join(", ")
-      row_attributes[:snapshots] = snapshots.map { |i| i["id"] }.join(", ")
+        attrs[:private_ips] = interfaces.map { |i| i["ipv4_address"] }.join(", ")
+        attrs[:ipv6_address] = interfaces.map { |i| i["ipv6_address"] }.join(", ")
 
-      if server_groups
-        row_attributes[:server_groups] = server_groups.map { |sg| sg["id"] }.join(", ")
-      end
+        attrs[:cloud_ip_ids] = cloud_ips.map { |i| i["id"] }.join(", ")
+        attrs[:cloud_ipv4s] = cloud_ips.map { |i| i["public_ipv4"] }.join(", ")
+        attrs[:cloud_ipv6s] = cloud_ips.map { |i| i["public_ipv6"] }.join(", ")
+        attrs[:snapshots] = snapshots.map { |i| i["id"] }.join(", ")
 
-      row_attributes[:volumes] = volume_ids if volumes
+        if server_groups
+          attrs[:server_groups] = server_groups.map { |sg| sg["id"] }.join(", ")
+        end
 
-      row_attributes
+        attrs[:volumes] = volume_ids if volumes
+      end.to_h
     end
 
     def volume_ids

data/lib/brightbox-cli/detailed_server_group.rb

@@ -1,9 +1,9 @@
 module Brightbox
   class DetailedServerGroup < ServerGroup
     def to_row
-      row_attributes = super
+      row_attributes = attributes
       row_attributes[:firewall_policy] = firewall_policy && firewall_policy.id
-      row_attributes
+      row_attributes.to_h
     end
 
     def self.default_field_order

data/lib/brightbox-cli/firewall_policy.rb

@@ -15,15 +15,11 @@ module Brightbox
     end
 
     def attributes
-      t = fog_model.attributes
-      t[:name] = name
-      t[:description] = description
-      t[:server_group] = server_group_id
-      t
-    end
-
-    def to_row
-      attributes
+      fog_attributes.tap do |attrs|
+        attrs[:name] = name
+        attrs[:description] = description
+        attrs[:server_group] = server_group_id
+      end
     end
 
     def self.default_field_order

data/lib/brightbox-cli/firewall_rule.rb

@@ -19,24 +19,23 @@ module Brightbox
     end
 
     def attributes
-      t = @attributes || fog_model.attributes
-      t[:sport] = t[:source_port]
-      t[:dport] = t[:destination_port]
-      t[:firewall_policy] = t[:firewall_policy_id]
-      t[:icmp_type] = t[:icmp_type_name]
-      t
-    end
-
-    def to_row
-      attrs = attributes.dup
-      %i[protocol source sport destination dport icmp_type].each do |key|
-        attrs[key] = attributes[key] || "-"
+      (@attributes || fog_attributes).tap do |attrs|
+        attrs[:sport] = attrs[:source_port]
+        attrs[:dport] = attrs[:destination_port]
+        attrs[:firewall_policy] = attrs[:firewall_policy_id]
+        attrs[:icmp_type] = attrs[:icmp_type_name]
       end
-      attrs
     end
 
-    def ret_val(attributes, key)
-      attributes[key] || "-"
+    def to_row
+      attributes.merge(
+        protocol: attributes[:protocol] || "-",
+        source: attributes[:source] || "-",
+        sport: attributes[:sport] || "-",
+        destination: attributes[:destination] || "-",
+        dport: attributes[:dport] || "-",
+        icmp_type: attributes[:icmp_type] || "-"
+      )
     end
 
     def self.default_field_order

data/lib/brightbox-cli/images.rb

@@ -68,31 +68,32 @@ module Brightbox
     end
 
     def status
-      if fog_model.attributes[:status] == "available"
+      if fog_attributes[:status] == "available"
         public? ? "public" : "private"
+      elsif fog_attributes[:status] == "deprecated"
+        public? ? "deprecated" : "private"
       else
-        fog_model.attributes[:status]
+        fog_attributes[:status]
       end
     end
 
     def to_row
-      o = fog_model.attributes
-      o[:id] = fog_model.id
-      o[:status] = status
-      o[:locked] = locked?
-      o[:username] = username
-      o[:arch] = arch
-      o[:name] = name.to_s + " (#{arch})"
-      o[:owner] = owner_id
-      o[:owner] = "brightbox" if official
-      o[:type] = type
-      o[:created_at] = created_at
-      o[:created_on] = created_on
-      o[:description] = description if description
-      o[:licence_name] = licence_name
-      o[:size] = virtual_size
-      o[:min_ram] = min_ram
-      o
+      fog_attributes.merge(
+        id: fog_model.id,
+        status: status,
+        locked: locked?,
+        username: username,
+        arch: arch,
+        name: name.to_s + " (#{arch})",
+        owner: official ? "brightbox" : owner_id,
+        type: type,
+        created_at: created_at,
+        created_on: created_on,
+        description: description,
+        licence_name: licence_name,
+        size: virtual_size,
+        min_ram: min_ram
+      )
     end
 
     def public?
@@ -100,7 +101,7 @@ module Brightbox
     end
 
     def status_sort_code
-      case fog_model.attributes[:status]
+      case fog_attributes[:status]
       when "available"
         (public? ? 1 : 2)
       when "deprecated"

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

@@ -3,16 +3,48 @@ module Brightbox
     def self.require_account?; true; end
 
     def self.create(options)
+      options.delete(:buffer_size) if options[:buffer_size].nil?
+      options[:buffer_size] = options[:buffer_size].to_i if options[:buffer_size]
+
       new(conn.load_balancers.create(options))
     end
 
-    def attributes
-      fog_model.attributes
+    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
+    end
+
+    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 => 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,
@@ -31,11 +63,13 @@ module Brightbox
     end
 
     def cloud_ip_ids
-      @cloud_ip_ids ||= attributes["cloud_ips"].map { |n| n["id"] } if attributes["cloud_ips"]
+      cips = attributes["cloud_ips"] || attributes[:cloud_ips]
+      @cloud_ip_ids ||= cips.map { |n| n["id"] } if cips
     end
 
     def cloud_ips
-      @cloud_ips ||= attributes["cloud_ips"].map { |n| n["public_ip"] } if attributes["cloud_ips"]
+      cips = attributes["cloud_ips"] || attributes[:cloud_ips]
+      @cloud_ips ||= cips.map { |n| n["public_ip"] } if cips
     end
 
     def listeners

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] = id
-      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 = "4.8.0".freeze unless defined?(Brightbox::VERSION)
+  VERSION = "5.0.0.rc1".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