knife-oraclecloud 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49df83d788f0a9af86cda7d1315148301d25a8b6
-  data.tar.gz: d1b121f29a59c8d46bb9526ee4626aa2cb4ece7b
+  metadata.gz: 8a5f09710336f43f39cf4c6265ce3f586c6f82ac
+  data.tar.gz: 854c35c78538ce9aa3f78dbdfca8ec95117c8afc
 SHA512:
-  metadata.gz: 9846f994432e915791d3fb7932530bee6ae3f55b71f432b9e82c9f5dba841ca9830643e307a33f86e43a1234b762a17e248aa5ffa3c313ab1735432750eb16ef
-  data.tar.gz: 4236056d5bc84ba75a6b4735f70f763c1991cfea25e443d4e64590de93c79aace6da286261dc2063226807250e45ab3ec0369a8f6e6093b35c569b7361cfe47d
+  metadata.gz: c0e1377013cd712f9bd5e7062d78f2ef62fee2d55c1dec6d49609dfbff901f4641a6a6f168a9a2d2481675b56c4770fff44029b1aeff3360413d4cc374e02027
+  data.tar.gz: 9c46f5d060b6ee32b9cc99cad405ff168ebcd9e045c250ce0350bc399e7589c212cfe972c15b92655acc60536c4b7125b94925928914014c63f6e5ba48a8a60b

data/.travis.yml

@@ -0,0 +1,19 @@
+language: ruby
+cache: bundler
+sudo: false
+
+rvm:
+- 2.0.0
+- 2.1
+- 2.2
+
+branches:
+  only:
+    - master
+
+notifications:
+  slack:
+    on_success: change
+    on_failure: always
+    rooms:
+      secure: iESaLLqy5RK9os0fB83vXF0DgmMaWE8/tuhEg6rL6m2YlHq+mHwT5Hoc+YIFHbzl4PXS07i99ICFpGiUXuyHSn0jrNrI4z4BRA+3EZ+DLmhHGis3znWZJ1SxrCjYCZazj0SFG49mwaZjeggQNafPm/++sqzVVI5zJuLx+92Dwuztr4sa20Oa2UOKtCsgkNojmNwTKNqlN+bh+/pX7IH5rVUDMkd3k8Sdrd8Jk0AblztGvXJO/Sn+L6Ud9NAb38bVkC7Pw8Zows6Icw4ioCIwH4tl/AI6NwfvHJu33UqoEZu/8aBkSvgjGi+hTaztcwK9xMpK70AZlYEqNS4bVTAw/otAbw+xnqWUQfL3Kc2MjSpxdiLDXhELtV9jV/VlnDwX3L79B0sICKFdcLHrG8I4tMgCDxYTNjUHY+UcccHrPsYwXn01lkCc6Pa7LZnCqS69/2vVfdb8i2LOaEvMvj9uLeeADu2EHeqM0VV1Y58dRCef7Ls8cOiOZEqghG24H1Cu26vHKamLUMZu0ctYOOmxGP159j1iwCkygb2k10BXTGdFuMch3GE3RfwaPFk8UZoY+0tQNP5OGiHhhLyLo16yxXQuDyHq5kkSMuhT/34kdY2cZuJAi8U79YJkNb29CGPUeBJ1QqXulYg/xPKW03FBWxpbkPjdPr9WTbpMGOlhBwc=

data/CHANGELOG.md

@@ -1,7 +1,9 @@
 # knife-oraclecloud
 
-## v1.1.0 (2015-12-07)
+## v1.2.0 (2015-12-22)
+* [pr#3](https://github.com/chef-partners/knife-oraclecloud/pull/3) Adding support for private cloud deployments
 
+## v1.1.0 (2015-12-07)
 * [pr#2](https://github.com/chef-partners/knife-oraclecloud/pull/2) Updated identity domain method calls to match recent changes in the underlying Oracle Cloud client library
 
 ## v1.0.0 (2015-10-15)

data/README.md

@@ -40,6 +40,18 @@ knife[:oraclecloud_domain]   = 'my_identity_domain'
 knife oraclecloud command --oraclecloud-username myuser ...
 ```
 
+### Using with a Oracle Cloud private cloud endpoint
+
+If you are running a deployment of Oracle Cloud behind your firewall, you need to indicate that the API endpoint is a private cloud endpoint. This is required due to the differences in how the identity domain is used in their public cloud vs. their private cloud.
+
+To indicate you are using a private cloud, set the following in your knife.rb:
+
+```ruby
+knife[:oraclecloud_private_cloud] = true
+```
+
+... or simply pass `--oraclecloud-private-cloud` on the CLI.
+
 ## Usage
 
 ### knife oraclecloud server create (options)

data/Rakefile

@@ -1,6 +1,8 @@
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
+RuboCop::RakeTask.new(:style)
 
-task default: :spec
+task default: [ :spec, :style ]

data/knife-oraclecloud.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake',    '~> 10.0'
+  spec.add_development_dependency 'rubocop', '~> 0.35'
 end

data/lib/chef/knife/cloud/oraclecloud_service.rb

@@ -40,6 +40,7 @@ class Chef
           @verify_ssl      = options[:verify_ssl]
           @wait_time       = options[:wait_time]
           @refresh_time    = options[:refresh_time]
+          @private_cloud   = options[:private_cloud]
         end
 
         def connection
@@ -48,7 +49,8 @@ class Chef
             identity_domain: @identity_domain,
             username:        @username,
             password:        @password,
-            verify_ssl:      @verify_ssl
+            verify_ssl:      @verify_ssl,
+            private_cloud:   @private_cloud
           )
         end
 

data/lib/chef/knife/cloud/oraclecloud_service_helpers.rb

@@ -27,6 +27,7 @@ class Chef
                                                      identity_domain: locate_config_value(:oraclecloud_domain),
                                                      wait_time:       locate_config_value(:wait_time),
                                                      refresh_time:    locate_config_value(:request_refresh_rate),
+                                                     private_cloud:   locate_config_value(:oraclecloud_private_cloud),
                                                      verify_ssl:      verify_ssl?)
         end
 

data/lib/chef/knife/cloud/oraclecloud_service_options.rb

@@ -45,6 +45,12 @@ class Chef
               boolean:     true,
               default:     false
 
+            option :oraclecloud_private_cloud,
+              long:        '--oraclecloud-private-cloud',
+              description: 'Indicate the --oraclecloud-api-url is a private cloud endpoint',
+              boolean:     true,
+              default:     false
+
             option :request_refresh_rate,
               long:        '--request-refresh-rate SECS',
               description: 'Number of seconds to sleep between each check of the request status, defaults to 2',

data/lib/knife-oraclecloud/version.rb

@@ -17,5 +17,5 @@
 #
 
 module KnifeOracleCloud
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/spec/unit/cloud/oraclecloud_service_helpers_spec.rb

@@ -41,6 +41,7 @@ describe 'Chef::Knife::Cloud::OraclecloudServiceHelpers' do
       allow(tester).to receive(:locate_config_value).with(:oraclecloud_domain).and_return('test_domain')
       allow(tester).to receive(:locate_config_value).with(:wait_time).and_return(300)
       allow(tester).to receive(:locate_config_value).with(:request_refresh_rate).and_return(5)
+      allow(tester).to receive(:locate_config_value).with(:oraclecloud_private_cloud).and_return(false)
       allow(tester).to receive(:verify_ssl?).and_return(true)
 
       expect(Chef::Knife::Cloud::OraclecloudService).to receive(:new)
@@ -50,6 +51,7 @@ describe 'Chef::Knife::Cloud::OraclecloudServiceHelpers' do
               identity_domain: 'test_domain',
               wait_time:       300,
               refresh_time:    5,
+              private_cloud:   false,
               verify_ssl:      true)
 
       tester.create_service_instance

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-oraclecloud
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Chef Partner Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-07 00:00:00.000000000 Z
+date: 2015-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.35'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.35'
 description: Knife plugin to interact with Oracle Cloud.
 email:
 - partnereng@chef.io
@@ -90,6 +104,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt