brightbox-cli 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bbdbad8470b9de08cb4f12df141a2cedd6e39f4
-  data.tar.gz: a629a8cdf9a0bbfe851763bb0e7f51dc4a73b265
+  metadata.gz: 96fa4d23d9ae155d8bed3923b2008147d5f02e5d
+  data.tar.gz: 8e2c0fc64b410dc6f62e35b7e3f5636fa02db1bc
 SHA512:
-  metadata.gz: 3be96e1fea686cb9512a86c144405a3970ac66679aa481ce3c4c513298934d7793ac2073bf1f4d4e5592a01f50dc46c77694107b212cf243748d5ed6a6f2290d
-  data.tar.gz: c9cf607d8de69355b24a441343942e315868349c817bcadf54931589c31629d09cce1a2ebafa74e3197735b5e0593d0190478a1000456fca01618956c0815621
+  metadata.gz: 75b51b5235e6a878194476c16eef375e65b538fc35e7fae7741f2d021b846b54cdf23c80d3040d9d5a583aa61b2ea9b0f2375e69010ae394f33e45f17ffed44c
+  data.tar.gz: 413d50665c92d89d79fc2256cc2dc98811158954d404ba5bbe420c7bff6377989a9f2aa23bb52911a20f98349214be48ea92b53f45fd276762f7136fc0467d64

data/CHANGELOG.md

@@ -1,6 +1,6 @@
-### v2.5.0 / 2016-06-20
+### v2.6.0 / 2016-07-07
 
-[Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v2.4.1...v2.5.0)
+[Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v2.5.0...v2.6.0)
 
 Enhancements:
 
@@ -9,6 +9,26 @@ Enhancements:
   between 06:00-06:59 UTC does not suit for your application.
   The maintenance window is used to automatically apply security updates to the
   instance.
+* Add args `snapshots-schedule` and `remove-snapshots-schedule` to `sql instance`
+  command to enable setting up schedules for automatic snapshots of data. The
+  argument to set takes a crontab format string (e.g. "0 5 * * 0") to specify
+  when it should occur. Schedules must be at hourly or more.
+
+Bug fixes:
+
+* Fix handling of creation time to not error if excluded from JSON.
+* Fix handling of SQL instance's cloud IP is excluded from JSON.
+
+Changes:
+
+* Update `fog-brightbox` to v0.11.0
+* Corrected naming of a number of VCR recordings.
+
+### v2.5.0 / 2016-06-20
+
+[Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v2.4.1...v2.5.0)
+
+Released in error with only version bump.
 
 ### v2.4.1 / 2016-06-06
 

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    brightbox-cli (2.5.0)
-      fog-brightbox (>= 0.10.1)
+    brightbox-cli (2.6.0)
+      fog-brightbox (>= 0.11.0)
       gli (~> 2.12.0)
       highline (~> 1.6.0)
       hirb (~> 0.6)
@@ -20,12 +20,12 @@ GEM
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.2.5)
-    excon (0.49.0)
-    fog-brightbox (0.10.1)
+    excon (0.50.1)
+    fog-brightbox (0.11.0)
       fog-core (~> 1.22)
       fog-json
       inflecto (~> 0.0.2)
-    fog-core (1.39.0)
+    fog-core (1.42.0)
       builder
       excon (~> 0.49)
       formatador (~> 0.2)
@@ -40,7 +40,7 @@ GEM
     inflecto (0.0.2)
     metaclass (0.0.1)
     method_source (0.8.1)
-    mime-types (2.99.1)
+    mime-types (2.99.2)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
     multi_json (1.11.3)

data/brightbox-cli.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "fog-brightbox", ">= 0.10.1"
+  s.add_dependency "fog-brightbox", ">= 0.11.0"
   s.add_dependency "gli", "~> 2.12.0"
   s.add_dependency "i18n", "~> 0.6.0"
   s.add_dependency "mime-types", "~> 2.6"

data/lib/brightbox-cli/api.rb

@@ -186,7 +186,9 @@ module Brightbox
     # Displays creation date in ISO 8601 Complete date format
     #
     def created_on
-      fog_model.created_at.strftime("%Y-%m-%d")
+      if fog_model.created_at
+        fog_model.created_at.strftime("%Y-%m-%d")
+      end
     end
   end
 end

data/lib/brightbox-cli/commands/sql/instances_create.rb

@@ -27,6 +27,16 @@ module Brightbox
         c.desc I18n.t("sql.instances.options.engine_version.desc")
         c.flag ["engine-version"]
 
+        # Maintenance window options
+        c.desc I18n.t("sql.instances.options.maintenance_weekday.desc")
+        c.flag ["maintenance-weekday"]
+        c.desc I18n.t("sql.instances.options.maintenance_hour.desc")
+        c.flag ["maintenance-hour"]
+
+        # Snapshots schedule
+        c.desc I18n.t("sql.instances.options.snapshots_schedule.desc")
+        c.flag [:"snapshots-schedule"]
+
         # Snapshot
         c.desc I18n.t("sql.instances.options.snapshot.desc")
         c.flag [:snapshot]
@@ -35,22 +45,8 @@ module Brightbox
         c.desc I18n.t("sql.instances.options.zone.desc")
         c.flag [:z, "zone"]
 
-        c.action do |global_options, options, _args|
-          params = {}
-
-          params[:name] = options[:n] if options[:n]
-          params[:description] = options[:d] if options[:d]
-
-          if options[:"allow-access"]
-            access_items = options[:"allow-access"].split(",")
-            params[:allow_access] = access_items
-          end
-
-          params[:database_engine] = options[:engine] if options[:engine]
-          params[:database_version] = options["engine-version"] if options["engine-version"]
-          params[:snapshot_id] = options[:snapshot] if options[:snapshot]
-          params[:flavor_id] = options[:type] if options[:type]
-          params[:zone_id] = options[:zone] if options[:zone]
+        c.action do |global_options, options, args|
+          params = DatabaseServer.clean_arguments(options)
 
           server = DatabaseServer.create(params)
           table_options = global_options.merge(

data/lib/brightbox-cli/commands/sql/instances_update.rb

@@ -15,6 +15,18 @@ module Brightbox
         c.desc I18n.t("sql.instances.options.allow_access.desc")
         c.flag [:"allow-access"]
 
+        # Maintenance window options
+        c.desc I18n.t("sql.instances.options.maintenance_weekday.desc")
+        c.flag ["maintenance-weekday"]
+        c.desc I18n.t("sql.instances.options.maintenance_hour.desc")
+        c.flag ["maintenance-hour"]
+
+        # Snapshots schedule
+        c.desc I18n.t("sql.instances.options.snapshots_schedule.desc")
+        c.flag [:"snapshots-schedule"]
+        c.desc I18n.t("sql.instances.options.remove_snapshots_schedule.desc")
+        c.switch [:"remove-snapshots-schedule"], :negatable => false
+
         c.action do |global_options, options, args|
           dbs_id = args.shift
           unless dbs_id =~ /^dbs-/
@@ -22,17 +34,7 @@ module Brightbox
           end
 
           server = DatabaseServer.find dbs_id
-
-          params = NilableHash.new
-          params[:name] = options[:n] if options[:n]
-          params[:description] = options[:d] if options[:d]
-
-          if options[:"allow-access"]
-            access_items = options[:"allow-access"].split(",")
-            params[:allow_access] = access_items
-          end
-
-          params.nilify_blanks
+          params = DatabaseServer.clean_arguments(options)
 
           info "Updating #{server}"
           server.update params

data/lib/brightbox-cli/database_server.rb

@@ -1,3 +1,5 @@
+require "date"
+
 module Brightbox
   class DatabaseServer < Api
     def self.require_account?
@@ -51,6 +53,9 @@ module Brightbox
         :zone,
         :created_on,
         :admin_username, :admin_password,
+        :maintenance_window,
+        :snapshots_schedule,
+        :snapshots_schedule_next_at,
         :allow_access,
         :cloud_ip_ids, :cloud_ips
       ]
@@ -76,6 +81,9 @@ module Brightbox
       a[:db_engine] = engine_version
       a[:engine] = database_engine
       a[:version] = database_version
+      a[:maintenance_weekday] = maintenance_weekday
+      a[:maintenance_hour] = maintenance_hour
+      a[:maintenance_window] = maintenance_window
       a[:zone] = zone_handle
       a[:created_on] = created_on
       a[:allow_access] = allow_access
@@ -88,6 +96,17 @@ module Brightbox
       [database_engine, database_version].join("-")
     end
 
+    # A more humanised version of the maintenance window
+    def maintenance_window
+      return nil if maintenance_weekday.nil?
+      weekday = Date::DAYNAMES[maintenance_weekday]
+      sprintf("%s %02d:00 UTC", weekday, maintenance_hour)
+    end
+
+    def cloud_ips
+      super.nil? ? [] : super
+    end
+
     # Lists the CIP identifiers (cip-12345)
     def cloud_ip_ids
       cloud_ips.map { |cip| cip["id"] }
@@ -97,5 +116,47 @@ module Brightbox
     def cloud_ip_addresses
       cloud_ips.map { |cip| cip["public_ip"] }
     end
+
+    # Converts GLI's arguments to fog based parameters
+    def self.clean_arguments(args)
+      params = NilableHash.new
+
+      params[:name] = args[:n] if args[:n]
+      params[:description] = args[:d] if args[:d]
+
+      if args["allow-access"]
+        params[:allow_access] = args["allow-access"].split(",")
+      end
+
+      if args["maintenance-weekday"]
+        params[:maintenance_weekday] = weekday_index(args["maintenance-weekday"])
+      end
+      params[:maintenance_hour] = args["maintenance-hour"] if args["maintenance-hour"]
+
+      params[:snapshots_schedule] = args["snapshots-schedule"] if args["snapshots-schedule"]
+      if args["remove-snapshots-schedule"]
+        params[:snapshots_schedule] = nil
+      end
+
+      params[:database_engine] = args[:engine] if args[:engine]
+      params[:database_version] = args["engine-version"] if args["engine-version"]
+
+      params[:snapshot_id] = args[:snapshot] if args[:snapshot]
+      params[:flavor_id] = args[:type] if args[:type]
+      params[:zone_id] = args[:zone] if args[:zone]
+
+      params.nilify_blanks
+      params
+    end
+
+    private
+
+    # @param [String] user_input either a day or it's index ('sunday' or '0')
+    # @returns [String] The index
+    def self.weekday_index(user_input)
+      DateTime.parse(user_input).wday.to_s
+    rescue ArgumentError
+      user_input.to_s
+    end
   end
 end

data/lib/brightbox-cli/version.rb

@@ -1,3 +1,3 @@
 module Brightbox
-  VERSION = "2.5.0" unless defined?(Brightbox::VERSION)
+  VERSION = "2.6.0" unless defined?(Brightbox::VERSION)
 end

data/locales/en.yml

@@ -171,12 +171,24 @@ en:
       options:
         allow_access:
           desc: Comma separated list of IPs or IDs for servers or groups to allow access
+        default_maintenance:
+          desc: Use default settings for instance's maintenance window
         engine:
           desc: The database engine to use for the SQL instance (e.g. 'mysql')
         engine_version:
           desc: The version of the engine to use (e.g. '5.6')
+        maintenance_hour:
+          desc: Number representing the hour for the instance's maintenance
+                window (0-24 based on 24hr clock)
+        maintenance_weekday:
+          desc: Number representing the weekday to set for the instance's
+                maintenance window (0-6 where 0=Sunday)
         snapshot:
           desc: ID of a Cloud SQL snapshot to create new instance from
+        snapshots_schedule:
+          desc: Create or reschedule automatic snapshots using crontab format (e.g. "0 5 * * *"). May not be more than hourly.
+        remove_snapshots_schedule:
+          desc: Clear an existing snapshots schedule
         type:
           desc: ID of a Cloud SQL type
         zone:

data/spec/commands/sql/instances/create_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe "brightbox database-servers" do
+describe "brightbox sql instances" do
   describe "create" do
     let(:output) { FauxIO.new { Brightbox.run(argv) } }
     let(:stdout) { output.stdout }
@@ -65,5 +65,70 @@ describe "brightbox database-servers" do
         expect(stderr).to eql("")
       end
     end
+
+    context "--maintenance-weekday=5 --maintenance_hour=11" do
+      let(:argv) { %w(sql instances create --maintenance-weekday=5 --maintenance-hour=11) }
+      let(:expected_args) { { :maintenance_weekday => "5", :maintenance_hour => "11" } }
+
+      before do
+        stub_request(:post, "http://api.brightbox.dev/token").to_return(
+          :status => 200,
+          :body => '{"access_token":"44320b29286077c44f14c4efdfed70f63f4a8361","token_type":"Bearer","refresh_token":"759b2b28c228948a0ba5d07a89f39f9e268a95c0","scope":"infrastructure orbit","expires_in":7200}')
+
+        stub_request(:post, "http://api.brightbox.dev/1.0/database_servers?account_id=acc-12345")
+          .with(:body => "{\"name\":null,\"description\":null,\"maintenance_weekday\":\"5\",\"maintenance_hour\":\"11\"}")
+      end
+
+      it "correctly sends API parameters" do
+        expect(Brightbox::DatabaseServer).to receive(:create).with(expected_args).and_call_original
+        expect(stderr).to eql("")
+      end
+    end
+
+    context "--maintenance-weekday=thursday" do
+      let(:argv) { %w(sql instances create --maintenance-weekday=thursday) }
+      let(:expected_args) { { :maintenance_weekday => "4" } }
+
+      before do
+        stub_request(:post, "http://api.brightbox.dev/token").to_return(
+          :status => 200,
+          :body => '{"access_token":"44320b29286077c44f14c4efdfed70f63f4a8361","token_type":"Bearer","refresh_token":"759b2b28c228948a0ba5d07a89f39f9e268a95c0","scope":"infrastructure orbit","expires_in":7200}')
+
+        stub_request(:post, "http://api.brightbox.dev/1.0/database_servers?account_id=acc-12345")
+          .with(:body => "{\"name\":null,\"description\":null,\"maintenance_weekday\":\"4\",\"maintenance_hour\":null}")
+      end
+
+      it "correctly sends API parameters" do
+        expect(Brightbox::DatabaseServer).to receive(:create).with(expected_args).and_call_original
+        expect(stderr).to eql("")
+      end
+    end
+
+    context "--snapshots-schedule='0 12 * * 4'" do
+      let(:argv) { ["sql", "instances", "create", "--snapshots-schedule=0 12 * * 4"] }
+      let(:expected_args) { { :snapshots_schedule => "0 12 * * 4" } }
+
+      let(:json_response) do
+        <<-EOS
+        {
+          "id":"dbs-12345",
+          "snapshots_schedule":"0 12 * * 4",
+          "snapshots_schedule_next_at":"2016-07-07T12:00:00Z"
+        }
+        EOS
+      end
+
+      before do
+        stub_request(:post, "http://api.brightbox.dev/1.0/database_servers?account_id=acc-12345")
+          .and_return(:status => 202, :body => json_response)
+      end
+
+      it "includes schedule fields in response" do
+        expect(Brightbox::DatabaseServer).to receive(:create).with(expected_args).and_call_original
+        expect(stdout).to include("snapshots_schedule: 0 12 * * 4")
+        expect(stdout).to include("snapshots_schedule_next_at: 2016-07-07T12:00Z")
+        expect(stderr).to eql("")
+      end
+    end
   end
 end

data/spec/commands/sql/instances/show_spec.rb

@@ -0,0 +1,79 @@
+require "spec_helper"
+
+describe "brghtbox sql instances" do
+  describe "show" do
+    let(:output) { FauxIO.new { Brightbox.run(argv) } }
+    let(:stdout) { output.stdout }
+    let(:stderr) { output.stderr }
+
+    before do
+      config = config_from_contents(USER_APP_CONFIG_CONTENTS)
+      cache_access_token(config, "1234567890")
+    end
+
+    context "when id does not exist" do
+      let(:argv) { %w(sql instances show dbs-12345) }
+      let(:json_response) do
+        "{\"error_name\":\"missing_resource\",\"errors\":[\"Resource not found using supplied identifier\"]}"
+      end
+
+      before do
+        stub_request(:get, "http://api.brightbox.dev/1.0/database_servers/dbs-12345?account_id=acc-12345").
+          to_return(:status => 404, :body => json_response, :headers => { "Content-Type" => "" })
+      end
+
+      it "reports error" do
+        expect(stderr).to include("ERROR: Couldn't find an SQL instance with ID dbs-12345")
+        expect(stdout).to be_empty
+      end
+    end
+
+    context "when id exists" do
+      let(:argv) { %w(sql instances show dbs-12345) }
+
+      let(:json_response) do
+        <<-EOS
+        {
+          "id":"dbs-12345",
+          "resource_type":"database_server",
+          "url":"https://api.gb1.brightbox.com/1.0/database_servers/dbs-12345",
+          "name":"",
+          "description":"",
+          "admin_username":"admin",
+          "admin_password":null,
+          "allow_access":[],
+          "database_engine":"mysql",
+          "database_version":"5.5",
+          "status":"active",
+          "maintenance_weekday":0,
+          "maintenance_hour":6,
+          "snapshots_schedule":"0 16 * * 0",
+          "snapshots_schedule_next_at":"2016-07-10T16:00:00Z",
+          "created_at":"2016-07-07T12:34:56Z",
+          "updated_at":"2016-07-07T12:34:56Z",
+          "deleted_at":null,
+          "account":{},
+          "database_server_type":{},
+          "cloud_ips":[],
+          "zone":{}
+        }
+        EOS
+      end
+
+      before do
+        stub_request(:get, "http://api.brightbox.dev/1.0/database_servers/dbs-12345?account_id=acc-12345").
+          to_return(:status => 200, :body => json_response, :headers => { "Content-Type" => "" })
+      end
+
+      it "simplifies the maintenance window" do
+        expect(stdout).to include("maintenance_window: Sunday 06:00 UTC")
+        expect(stderr).to be_empty
+      end
+
+      it "includes snapshots schedule fields" do
+        expect(stdout).to include("snapshots_schedule: 0 16 * * 0")
+        expect(stdout).to include("snapshots_schedule_next_at: 2016-07-10T16:00Z")
+      end
+    end
+  end
+end

data/spec/commands/sql/instances/snapshot_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe "brightbox database-servers" do
+describe "brightbox sql instances" do
   describe "snapshot" do
     let(:output) { FauxIO.new { Brightbox.run(argv) } }
     let(:stdout) { output.stdout }

data/spec/commands/sql/instances/update_spec.rb

@@ -0,0 +1,84 @@
+require "spec_helper"
+require "fog/brightbox/models/compute/database_server"
+
+describe "brightbox sql instances" do
+  describe "update" do
+    let(:output) { FauxIO.new { Brightbox.run(argv) } }
+    let(:stdout) { output.stdout }
+    let(:stderr) { output.stderr }
+
+    before do
+      config = config_from_contents(USER_APP_CONFIG_CONTENTS)
+      cache_access_token(config, "44320b29286077c44f14c4efdfed70f63f4a8361")
+    end
+
+    context "--maintenance-weekday=Monday" do
+      let(:argv) { %w(sql instances update --maintenance-weekday=Monday dbs-12345) }
+      let(:expected_args) { { :maintenance_weekday => "1" } }
+
+      before do
+        stub_request(:get, "http://api.brightbox.dev/1.0/database_servers/dbs-12345?account_id=acc-12345")
+          .to_return(:status => 200, :body => '{"id":"dbs-12345","maintenance_weekday":0, "maintenance_hour":6}')
+          .to_return(:status => 200,
+                     :body => '{
+                       "id":"dbs-12345",
+                       "maintenance_weekday":1,
+                       "maintenance_hour":6}')
+
+        stub_request(:put, "http://api.brightbox.dev/1.0/database_servers/dbs-12345?account_id=acc-12345")
+          .with(:body => "{\"maintenance_weekday\":\"1\"}")
+      end
+
+      it "sets custom maintenance window settings" do
+        expect(stderr).to eql("Updating dbs-12345\n")
+        expect(stdout).to include("dbs-12345")
+      end
+    end
+
+    context "--snapshots-schedule='0 12 * * 4'" do
+      let(:dbs) { Brightbox::DatabaseServer.find("dbs-12345") }
+      let(:argv) { ["sql", "instances", "update", "--snapshots-schedule=0 12 * * 4", "dbs-12345"] }
+      let(:expected_args) { { :snapshots_schedule => "0 12 * * 4" } }
+
+      before do
+        stub_request(:get, "http://api.brightbox.dev/1.0/database_servers/dbs-12345?account_id=acc-12345")
+          .to_return(:status => 200, :body => '{"id":"dbs-12345","snapshots_schedule":null,"snapshots_schedule_next_at":null}')
+          .to_return(:status => 200, :body => '{"id":"dbs-12345","snapshots_schedule":"34 12 * * 4","snapshots_schedule_next_at":"2016-07-07T12:34:56Z"}')
+
+        stub_request(:put, "http://api.brightbox.dev/1.0/database_servers/dbs-12345?account_id=acc-12345")
+          .to_return(:status => 200, :body => '{"id":"dbs-12345","snapshots_schedule":"34 12 * * 4","snapshots_schedule_next_at":"2016-07-07T12:34:56Z"}')
+      end
+
+      it "sets snapshots schedule" do
+        expect(Brightbox::DatabaseServer).to receive(:find).and_return(dbs)
+        expect(dbs).to receive(:update).with(expected_args).and_call_original
+
+        expect(stderr).to eq("Updating dbs-12345\n")
+        expect(stdout).to include("dbs-12345")
+      end
+    end
+
+    context "--remove-snapshots-schedule" do
+      let(:dbs) { Brightbox::DatabaseServer.find("dbs-12345") }
+      let(:argv) { %w(sql instances update --remove-snapshots-schedule dbs-12345) }
+      let(:expected_args) { { :snapshots_schedule => nil } }
+
+      before do
+        stub_request(:get, "http://api.brightbox.dev/1.0/database_servers/dbs-12345?account_id=acc-12345")
+          .to_return(:status => 200, :body => '{"id":"dbs-12345","snapshots_schedule":"34 12 * * 4","snapshots_schedule_next_at":"2016-07-07T12:34:56Z"}')
+          .to_return(:status => 200, :body => '{"id":"dbs-12345","snapshots_schedule":null,"snapshots_schedule_next_at":null}')
+
+        stub_request(:put, "http://api.brightbox.dev/1.0/database_servers/dbs-12345?account_id=acc-12345")
+          .to_return(:status => 200, :body => '{"id":"dbs-12345","snapshots_schedule":null,"snapshots_schedule_next_at":null}')
+      end
+
+      it "clears snapshots schedule" do
+        expect(Brightbox::DatabaseServer).to receive(:find).and_return(dbs)
+        expect(dbs).to receive(:update).with(expected_args).and_call_original
+
+        expect(stderr).to eq("Updating dbs-12345\n")
+        expect(stdout).to include("dbs-12345")
+      end
+    end
+  end
+end

data/spec/commands/sql/snapshots/list_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe "brightbox database-snapshots" do
+describe "brightbox sql snapshots" do
   describe "list" do
     let(:output) { FauxIO.new { Brightbox.run(argv) } }
     let(:stdout) { output.stdout }

data/spec/commands/sql/snapshots/show_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe "brightbox database-snapshots" do
+describe "brightbox sql snapshots" do
   describe "show" do
     let(:output) { FauxIO.new { Brightbox.run(argv) } }
     let(:stdout) { output.stdout }

data/spec/unit/brightbox/api/created_on_spec.rb

@@ -0,0 +1,22 @@
+require "spec_helper"
+
+describe Brightbox::Api, "#created_on" do
+  subject(:api_model) { described_class.new(fog_model) }
+  let(:fog_model) do
+    double id: nil,
+          attributes: attrs,
+          created_at: attrs[:created_at]
+  end
+
+  context "when initialised with no attributes" do
+    let(:attrs) { {} }
+
+    it { expect(api_model.created_on).to be_nil }
+  end
+
+  context "when initialised with created_at" do
+    let(:attrs) { { created_at: Time.utc(2016, 7, 7, 12, 34, 56) } }
+
+    it { expect(api_model.created_on).to eq("2016-07-07") }
+  end
+end

data/spec/unit/brightbox/database_server/clean_arguments_spec.rb

@@ -0,0 +1,45 @@
+require "spec_helper"
+require "fog/brightbox/models/compute/database_server"
+
+describe Brightbox::DatabaseServer do
+
+  describe ".clean_arguments" do
+    let(:parameters) { Brightbox::DatabaseServer.clean_arguments(arguments) }
+
+    context "when no arguments" do
+      let(:arguments) { {} }
+
+      it { expect(parameters.keys).to be_empty }
+    end
+
+    context "when --allow-access=10.0.0.0" do
+      let(:arguments) { { "allow-access" => "10.0.0.0" } }
+
+      it { expect(parameters[:allow_access]).to eql(["10.0.0.0"]) }
+    end
+
+    context "when --allow-access=10.0.0.0,11.0.0.0" do
+      let(:arguments) { { "allow-access" => "10.0.0.0,11.0.0.0" } }
+
+      it { expect(parameters[:allow_access]).to eql(%w(10.0.0.0 11.0.0.0)) }
+    end
+
+    context "when --maintenance-weekday=4" do
+      let(:arguments) { { "maintenance-weekday" => "4" } }
+
+      it { expect(parameters[:maintenance_weekday]).to eql("4") }
+    end
+
+    context "when --maintenance-weekday=wednesday" do
+      let(:arguments) { { "maintenance-weekday" => "3" } }
+
+      it { expect(parameters[:maintenance_weekday]).to eql("3") }
+    end
+
+    context "when --maintenance-weekday=" do
+      let(:arguments) { { "maintenance-weekday" => "" } }
+
+      it { expect(parameters[:maintenance_weekday]).to be_nil }
+    end
+  end
+end

data/spec/unit/brightbox/database_server/cloud_ips_spec.rb

@@ -0,0 +1,23 @@
+require "spec_helper"
+require "fog/brightbox/models/compute/database_server"
+
+describe Brightbox::DatabaseServer, "#cloud_ips" do
+  let(:fog_model) { Fog::Compute::Brightbox::DatabaseServer.new(fog_settings) }
+  let(:dbs) { described_class.new(fog_model) }
+
+  context "when attribute is missing" do
+    let(:fog_settings) { {} }
+    it { expect(dbs.cloud_ips).to be_empty }
+  end
+
+  context "when attribute is empty" do
+    let(:fog_settings) { { cloud_ips: [] } }
+    it { expect(dbs.cloud_ips).to be_empty }
+  end
+
+  context "when attribute contains data" do
+    let(:cloud_ip) { { id: "cip-12345", public_ip: "10.0.0.10" } }
+    let(:fog_settings) { { cloud_ips: [cloud_ip] } }
+    it { expect(dbs.cloud_ips).to include(cloud_ip) }
+  end
+end

data/spec/unit/brightbox/database_server/maintenance_window_spec.rb

@@ -0,0 +1,44 @@
+require "spec_helper"
+require "fog/brightbox/models/compute/database_server"
+
+describe Brightbox::DatabaseServer do
+
+  describe "#maintenance_window" do
+    let(:fog_model) { Fog::Compute::Brightbox::DatabaseServer.new(fog_settings) }
+    let(:dbs) { Brightbox::DatabaseServer.new(fog_model) }
+
+    context "when default values" do
+      let(:fog_settings) do
+        {
+          "maintenance_weekday" => 0,
+          "maintenance_hour" => 6
+        }
+      end
+
+      it "returns 'Sunday 06:00 UTC'" do
+        expect(dbs.maintenance_window).to eql("Sunday 06:00 UTC")
+      end
+    end
+
+    context "when non standard values" do
+      let(:fog_settings) do
+        {
+          "maintenance_weekday" => 6,
+          "maintenance_hour" => 23
+        }
+      end
+
+      it "returns 'Saturday 23:00 UTC'" do
+        expect(dbs.maintenance_window).to eql("Saturday 23:00 UTC")
+      end
+    end
+
+    context "when not initialised" do
+      let(:fog_settings) { {} }
+
+      it "returns nil" do
+        expect(dbs.maintenance_window).to be_nil
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brightbox-cli
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - John Leach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-20 00:00:00.000000000 Z
+date: 2016-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-brightbox
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -482,17 +482,6 @@ files:
 - spec/cassettes/brightbox_config/user_add/when_passing_in_required_arguments_and_api_url/does_not_error.yml
 - spec/cassettes/brightbox_config/user_add/when_passing_in_required_arguments_and_api_url/requests_access_tokens.yml
 - spec/cassettes/brightbox_config/user_add/when_passing_in_required_arguments_and_api_url/sets_up_the_config.yml
-- spec/cassettes/brightbox_database-servers/create/--allow-access_10_0_0_0/correctly_sends_API_parameters.yml
-- spec/cassettes/brightbox_database-servers/create/--allow-access_srv-12345_grp-12345/correctly_sends_API_parameters.yml
-- spec/cassettes/brightbox_database-servers/create/--engine_mysql/correctly_sends_API_parameters.yml
-- spec/cassettes/brightbox_database-servers/create/--engine_mysql_--engine-version_5_6/correctly_sends_API_parameters.yml
-- spec/cassettes/brightbox_database-servers/create/without_arguments/reports_the_new_admin_password.yml
-- spec/cassettes/brightbox_database-servers/create/without_arguments/reports_the_new_admin_username.yml
-- spec/cassettes/brightbox_database-servers/snapshot/when_database_server_active/correctly_sends_API_parameters.yml
-- spec/cassettes/brightbox_database-servers/snapshot/when_database_server_can_not_be_snapshotted/reports_an_error_to_the_user.yml
-- spec/cassettes/brightbox_database-snapshots/list/when_resources_are_available/does_not_output_to_stderr.yml
-- spec/cassettes/brightbox_database-snapshots/list/when_resources_are_available/outputs_table_details_to_stdout.yml
-- spec/cassettes/brightbox_database-snapshots/show/when_resource_exists/does_not_output_to_stderr.yml
 - spec/cassettes/brightbox_login/when_alternative_client_credentials_are_given/does_not_error.yml
 - spec/cassettes/brightbox_login/when_alternative_client_credentials_are_given/does_not_prompt_to_rerun_the_command.yml
 - spec/cassettes/brightbox_login/when_alternative_client_credentials_are_given/prompts_for_the_password.yml
@@ -517,6 +506,17 @@ files:
 - spec/cassettes/brightbox_login/when_no_password_is_given/prompts_for_the_password.yml
 - spec/cassettes/brightbox_login/when_no_password_is_given/requests_access_tokens.yml
 - spec/cassettes/brightbox_login/when_no_password_is_given/sets_up_the_config.yml
+- spec/cassettes/brightbox_sql_instances/create/--allow-access_10_0_0_0/correctly_sends_API_parameters.yml
+- spec/cassettes/brightbox_sql_instances/create/--allow-access_srv-12345_grp-12345/correctly_sends_API_parameters.yml
+- spec/cassettes/brightbox_sql_instances/create/--engine_mysql/correctly_sends_API_parameters.yml
+- spec/cassettes/brightbox_sql_instances/create/--engine_mysql_--engine-version_5_6/correctly_sends_API_parameters.yml
+- spec/cassettes/brightbox_sql_instances/create/without_arguments/reports_the_new_admin_password.yml
+- spec/cassettes/brightbox_sql_instances/create/without_arguments/reports_the_new_admin_username.yml
+- spec/cassettes/brightbox_sql_instances/snapshot/when_database_server_active/correctly_sends_API_parameters.yml
+- spec/cassettes/brightbox_sql_instances/snapshot/when_database_server_can_not_be_snapshotted/reports_an_error_to_the_user.yml
+- spec/cassettes/brightbox_sql_snapshots/list/when_resources_are_available/does_not_output_to_stderr.yml
+- spec/cassettes/brightbox_sql_snapshots/list/when_resources_are_available/outputs_table_details_to_stdout.yml
+- spec/cassettes/brightbox_sql_snapshots/show/when_resource_exists/does_not_output_to_stderr.yml
 - spec/commands/accounts/default_spec.rb
 - spec/commands/accounts/list_spec.rb
 - spec/commands/accounts/reset_ftp_password_spec.rb
@@ -584,7 +584,9 @@ files:
 - spec/commands/servers/update_spec.rb
 - spec/commands/sql/instances/create_spec.rb
 - spec/commands/sql/instances/locking_spec.rb
+- spec/commands/sql/instances/show_spec.rb
 - spec/commands/sql/instances/snapshot_spec.rb
+- spec/commands/sql/instances/update_spec.rb
 - spec/commands/sql/snapshots/list_spec.rb
 - spec/commands/sql/snapshots/locking_spec.rb
 - spec/commands/sql/snapshots/show_spec.rb
@@ -612,6 +614,7 @@ files:
 - spec/unit/brightbox/account/get_spec.rb
 - spec/unit/brightbox/account_spec.rb
 - spec/unit/brightbox/api/conn_spec.rb
+- spec/unit/brightbox/api/created_on_spec.rb
 - spec/unit/brightbox/api/find_spec.rb
 - spec/unit/brightbox/api/fog_model_spec.rb
 - spec/unit/brightbox/api/klass_name_spec.rb
@@ -663,6 +666,9 @@ files:
 - spec/unit/brightbox/config/user_application/valid_spec.rb
 - spec/unit/brightbox/config/user_application_spec.rb
 - spec/unit/brightbox/connection_manager/fetch_connection_spec.rb
+- spec/unit/brightbox/database_server/clean_arguments_spec.rb
+- spec/unit/brightbox/database_server/cloud_ips_spec.rb
+- spec/unit/brightbox/database_server/maintenance_window_spec.rb
 - spec/unit/brightbox/database_server_spec.rb
 - spec/unit/brightbox/database_snapshot_spec.rb
 - spec/unit/brightbox/database_type_spec.rb
@@ -834,17 +840,6 @@ test_files:
 - spec/cassettes/brightbox_config/user_add/when_passing_in_required_arguments_and_api_url/does_not_error.yml
 - spec/cassettes/brightbox_config/user_add/when_passing_in_required_arguments_and_api_url/requests_access_tokens.yml
 - spec/cassettes/brightbox_config/user_add/when_passing_in_required_arguments_and_api_url/sets_up_the_config.yml
-- spec/cassettes/brightbox_database-servers/create/--allow-access_10_0_0_0/correctly_sends_API_parameters.yml
-- spec/cassettes/brightbox_database-servers/create/--allow-access_srv-12345_grp-12345/correctly_sends_API_parameters.yml
-- spec/cassettes/brightbox_database-servers/create/--engine_mysql/correctly_sends_API_parameters.yml
-- spec/cassettes/brightbox_database-servers/create/--engine_mysql_--engine-version_5_6/correctly_sends_API_parameters.yml
-- spec/cassettes/brightbox_database-servers/create/without_arguments/reports_the_new_admin_password.yml
-- spec/cassettes/brightbox_database-servers/create/without_arguments/reports_the_new_admin_username.yml
-- spec/cassettes/brightbox_database-servers/snapshot/when_database_server_active/correctly_sends_API_parameters.yml
-- spec/cassettes/brightbox_database-servers/snapshot/when_database_server_can_not_be_snapshotted/reports_an_error_to_the_user.yml
-- spec/cassettes/brightbox_database-snapshots/list/when_resources_are_available/does_not_output_to_stderr.yml
-- spec/cassettes/brightbox_database-snapshots/list/when_resources_are_available/outputs_table_details_to_stdout.yml
-- spec/cassettes/brightbox_database-snapshots/show/when_resource_exists/does_not_output_to_stderr.yml
 - spec/cassettes/brightbox_login/when_alternative_client_credentials_are_given/does_not_error.yml
 - spec/cassettes/brightbox_login/when_alternative_client_credentials_are_given/does_not_prompt_to_rerun_the_command.yml
 - spec/cassettes/brightbox_login/when_alternative_client_credentials_are_given/prompts_for_the_password.yml
@@ -869,6 +864,17 @@ test_files:
 - spec/cassettes/brightbox_login/when_no_password_is_given/prompts_for_the_password.yml
 - spec/cassettes/brightbox_login/when_no_password_is_given/requests_access_tokens.yml
 - spec/cassettes/brightbox_login/when_no_password_is_given/sets_up_the_config.yml
+- spec/cassettes/brightbox_sql_instances/create/--allow-access_10_0_0_0/correctly_sends_API_parameters.yml
+- spec/cassettes/brightbox_sql_instances/create/--allow-access_srv-12345_grp-12345/correctly_sends_API_parameters.yml
+- spec/cassettes/brightbox_sql_instances/create/--engine_mysql/correctly_sends_API_parameters.yml
+- spec/cassettes/brightbox_sql_instances/create/--engine_mysql_--engine-version_5_6/correctly_sends_API_parameters.yml
+- spec/cassettes/brightbox_sql_instances/create/without_arguments/reports_the_new_admin_password.yml
+- spec/cassettes/brightbox_sql_instances/create/without_arguments/reports_the_new_admin_username.yml
+- spec/cassettes/brightbox_sql_instances/snapshot/when_database_server_active/correctly_sends_API_parameters.yml
+- spec/cassettes/brightbox_sql_instances/snapshot/when_database_server_can_not_be_snapshotted/reports_an_error_to_the_user.yml
+- spec/cassettes/brightbox_sql_snapshots/list/when_resources_are_available/does_not_output_to_stderr.yml
+- spec/cassettes/brightbox_sql_snapshots/list/when_resources_are_available/outputs_table_details_to_stdout.yml
+- spec/cassettes/brightbox_sql_snapshots/show/when_resource_exists/does_not_output_to_stderr.yml
 - spec/commands/accounts/default_spec.rb
 - spec/commands/accounts/list_spec.rb
 - spec/commands/accounts/reset_ftp_password_spec.rb
@@ -936,7 +942,9 @@ test_files:
 - spec/commands/servers/update_spec.rb
 - spec/commands/sql/instances/create_spec.rb
 - spec/commands/sql/instances/locking_spec.rb
+- spec/commands/sql/instances/show_spec.rb
 - spec/commands/sql/instances/snapshot_spec.rb
+- spec/commands/sql/instances/update_spec.rb
 - spec/commands/sql/snapshots/list_spec.rb
 - spec/commands/sql/snapshots/locking_spec.rb
 - spec/commands/sql/snapshots/show_spec.rb
@@ -964,6 +972,7 @@ test_files:
 - spec/unit/brightbox/account/get_spec.rb
 - spec/unit/brightbox/account_spec.rb
 - spec/unit/brightbox/api/conn_spec.rb
+- spec/unit/brightbox/api/created_on_spec.rb
 - spec/unit/brightbox/api/find_spec.rb
 - spec/unit/brightbox/api/fog_model_spec.rb
 - spec/unit/brightbox/api/klass_name_spec.rb
@@ -1015,6 +1024,9 @@ test_files:
 - spec/unit/brightbox/config/user_application/valid_spec.rb
 - spec/unit/brightbox/config/user_application_spec.rb
 - spec/unit/brightbox/connection_manager/fetch_connection_spec.rb
+- spec/unit/brightbox/database_server/clean_arguments_spec.rb
+- spec/unit/brightbox/database_server/cloud_ips_spec.rb
+- spec/unit/brightbox/database_server/maintenance_window_spec.rb
 - spec/unit/brightbox/database_server_spec.rb
 - spec/unit/brightbox/database_snapshot_spec.rb
 - spec/unit/brightbox/database_type_spec.rb