brightbox-cli 3.0.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cc8d372e2c0c019461ab6f5302f71d9a5241646d57cc91eaba2be3033794012
-  data.tar.gz: 95314299e02e4d28ea02467a00eb5093f7e74c9dbc561459ea892175edc08043
+  metadata.gz: c00fe9b9159d0df304bc91413fe0110a76efda76cf0685af77a5cf49506b43fa
+  data.tar.gz: a6484bd3ac805cad060686e19434f0a962c28fad1c2676df2c745f1d940abd0f
 SHA512:
-  metadata.gz: e32fdba2d13ad2917a7200f5cba06223ec2fcf059dc3404685b790f81b64c009857e7f984e9c9a7e01f06d55db31f00820413c77ff1570ed5a934c78cc9c03a2
-  data.tar.gz: 1d7c5414f09b8b1ffba4a3a00792dacb5555b0b2da38da9044591d8ab6ddbcc36dcb7a35e700ad61a839f414f26f9b7d5fe04210221438e82b864eb5a607a3cc
+  metadata.gz: fc691b5fabc3fb9191ec9e8518161d30ed2c8d88b2a291f83482f174be65aee5d1fe304dc2437e8fafc94cb5df5b18e9967d871704c6c24546d30b2b212bff61
+  data.tar.gz: ef35d51c5ff89422276886fbcd5a31c71131997433a06701e79bbc2c7f448ec203e5ada7887fa57370f1697aee79c89f11d155adc784e334e47ad6351ece5c32

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+### v3.1.0 / 2020-11-17
+
+[Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v3.0.1...v3.1.0)
+
+Changes:
+
+* Update `fog-brightbox` to v1.2.0
+* Add `lbs` option for `--min-ssl-ver` to specify the minimum TLS/SSL protocol
+  that should be acceptable for use with the load balancer
+
 ### v3.0.1 / 2020-07-01
 
 [Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v3.0.0...v3.0.1)

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    brightbox-cli (3.0.1)
+    brightbox-cli (3.1.0)
       dry-inflector (< 0.2)
-      fog-brightbox (>= 1.1.0)
+      fog-brightbox (>= 1.2.0)
       fog-core (< 2.0)
       gli (~> 2.12.0)
       highline (~> 1.6.0)
@@ -22,8 +22,8 @@ GEM
       safe_yaml (~> 1.0.0)
     diff-lcs (1.4.3)
     dry-inflector (0.1.2)
-    excon (0.75.0)
-    fog-brightbox (1.1.0)
+    excon (0.78.0)
+    fog-brightbox (1.2.0)
       dry-inflector
       fog-core (>= 1.45, < 3.0)
       fog-json

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", ">= 1.1.0"
+  s.add_dependency "fog-brightbox", ">= 1.2.0"
   s.add_dependency "fog-core", "< 2.0"
   s.add_dependency "gli", "~> 2.12.0"
   s.add_dependency "i18n", "~> 0.6.0"

data/lib/brightbox-cli/commands/lbs/create.rb

@@ -52,6 +52,10 @@ module Brightbox
       c.desc "Filepath to the private key used to sign SSL certificate (OpenSSL supported formats)."
       c.flag ["ssl-key"]
 
+      c.desc "Sets the minimum version of TLS/SSL to support in the format 'TLSv1.x'"
+      c.default_value "TLSv1.2"
+      c.flag ["ssl-min-ver"]
+
       c.desc "Enable SSL v3 support"
       c.switch ["sslv3"]
 
@@ -118,6 +122,7 @@ module Brightbox
                                  :listeners => listeners,
                                  :certificate_pem => ssl_cert,
                                  :certificate_private_key => ssl_key,
+                                 :ssl_minimum_version => options["ssl-min-ver"],
                                  :sslv3 => options["sslv3"],
                                  :nodes => nodes)
         render_table([lb], global_options)

data/lib/brightbox-cli/commands/lbs/show.rb

@@ -18,6 +18,7 @@ module Brightbox
             :created_at,
             :deleted_at,
             :policy,
+            :ssl_minimum_version,
             :ssl_issuer,
             :ssl_subject,
             :ssl_valid_from,

data/lib/brightbox-cli/commands/lbs/update.rb

@@ -45,6 +45,9 @@ module Brightbox
       c.desc "Filepath to the private key used to sign SSL certificate (OpenSSL supported formats)."
       c.flag ["ssl-key"]
 
+      c.desc "Sets the minimum version of TLS/SSL to support in the format 'TLSv1.x'"
+      c.flag ["ssl-min-ver"]
+
       c.desc "Clears SSL details from the load balancer."
       c.switch ["remove-ssl"], :negatable => false
 
@@ -128,6 +131,10 @@ module Brightbox
           lbopts[:certificate_private_key] = ""
         end
 
+        if options["ssl-min-ver"]
+          lbopts[:ssl_minimum_version] = options["ssl-min-ver"] unless options["ssl-min-ver"].nil?
+        end
+
         lbopts.nilify_blanks
 
         lb = LoadBalancer.find lb_id

data/lib/brightbox-cli/load_balancers.rb

@@ -12,6 +12,7 @@ module Brightbox
     def to_row
       attributes.merge(
         :locked => locked?,
+        :ssl_minimum_version => ssl_minimum_version,
         :ssl_issuer => certificate_issuer,
         :ssl_subject => certificate_subject,
         :ssl_valid_from => certificate_valid_from,

data/lib/brightbox-cli/version.rb

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

data/spec/commands/lbs/create_spec.rb

@@ -7,6 +7,11 @@ describe "brightbox lbs" do
     let(:stdout) { output.stdout }
     let(:stderr) { output.stderr }
 
+    before do
+      config = config_from_contents(USER_APP_CONFIG_CONTENTS)
+      cache_access_token(config, "f83da712e6299cda953513ec07f7a754f747d727")
+    end
+
     context "" do
       let(:argv) { %w(lbs create) }
 
@@ -14,5 +19,31 @@ describe "brightbox lbs" do
         expect { output }.to_not raise_error
       end
     end
+
+    context "--ssl-min-ver=TLSv1.0" do
+      let(:argv) { ["lbs", "create", "--ssl-min-ver", "TLSv1.0", "srv-12345"] }
+      let(:expected_args) { { ssl_minimum_version: "TLSv1.0" } }
+
+      let(:json_response) do
+        <<-EOS
+        {
+          "id":"lba-12345",
+          "ssl_minimum_version":"TLSv1.0"
+        }
+        EOS
+      end
+
+      before do
+        stub_request(:post, "http://api.brightbox.dev/1.0/load_balancers?account_id=acc-12345")
+          .with(:body => hash_including("ssl_minimum_version" => "TLSv1.0"))
+          .to_return(:status => 202, :body => json_response)
+      end
+
+      it "includes ssl_minimum_version in response" do
+        expect(Brightbox::LoadBalancer).to receive(:create).with(hash_including(expected_args)).and_call_original
+        expect(stderr).to eq("Creating a new load balancer\n")
+        expect(stdout).to include("lba-12345")
+      end
+    end
   end
 end

data/spec/commands/lbs/update_spec.rb

@@ -7,6 +7,11 @@ describe "brightbox lbs" do
     let(:stdout) { output.stdout }
     let(:stderr) { output.stderr }
 
+    before do
+      config = config_from_contents(USER_APP_CONFIG_CONTENTS)
+      cache_access_token(config, "f83da712e6299cda953513ec07f7a754f747d727")
+    end
+
     context "" do
       let(:argv) { %w(lbs update) }
 
@@ -14,5 +19,32 @@ describe "brightbox lbs" do
         expect { output }.to_not raise_error
       end
     end
+
+    context "--ssl-min-ver=TLSv1.0" do
+      let(:argv) { ["lbs", "update", "--ssl-min-ver", "TLSv1.0", "lba-12345"] }
+
+      let(:json_response) do
+        <<-EOS
+        {
+          "id":"lba-12345",
+          "ssl_minimum_version":"TLSv1.0"
+        }
+        EOS
+      end
+
+      before do
+        stub_request(:get, "http://api.brightbox.dev/1.0/load_balancers/lba-12345?account_id=acc-12345")
+          .to_return(:status => 200, :body => '{"id":"lba-12345"}')
+
+        stub_request(:put, "http://api.brightbox.dev/1.0/load_balancers/lba-12345?account_id=acc-12345")
+          .with(:body => hash_including("ssl_minimum_version" => "TLSv1.0"))
+          .to_return(:status => 202, :body => json_response)
+      end
+
+      it "includes ssl_minimum_version in response" do
+        expect(stderr).to eq("Updating load balancer lba-12345\n")
+        expect(stdout).to include("lba-12345")
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brightbox-cli
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.0
 platform: ruby
 authors:
 - John Leach
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: fog-core
   requirement: !ruby/object:Gem::Requirement