vcloud-edge_gateway 1.0.2 → 1.1.0

data/.gitignore

@@ -1,17 +1,9 @@
 *.gem
 *.rbc
-*.swp
-*.un~
-vcloud_env.sh
-replace_variables.sh
 /.bundle/
 /.ruby-version
 /Gemfile.lock
-/bundle/
 /pkg/
-vendor/
 coverage/
 spec/integration/vcloud_tools_testing_config.yaml
-results.html
 fog_integration_test.config
-.idea

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 1.1.0 (2014-08-11)
+
+Update to vCloud Core 0.10.0 for the following:
+
+  - New vcloud-login tool for fetching session tokens without the need to
+    store your password in a plaintext FOG_RC file.
+  - Deprecate the use of :vcloud_director_password in a plaintext FOG_RC
+    file. A warning will be printed to STDERR at load time. Please use
+    vcloud-login instead.
+
 ## 1.0.2 (2014-07-14)
 
 Update the dependency on vCloud Core to version 0.6.0 to avoid dependency issues._

data/README.md

@@ -32,41 +32,7 @@ be re-used between environments:
 
 ## Credentials
 
-vCloud Edge Gateway is based around [fog](http://fog.io/). To use it you'll need to give it
-credentials that allow it to talk to a vCloud Director environment.
-
-1. Create a '.fog' file in your home directory.
-
-  For example:
-
-      test_credentials:
-        vcloud_director_host: 'host.api.example.com'
-        vcloud_director_username: 'username@org_name'
-        vcloud_director_password: ''
-
-2. Obtain a session token. First, curl the API:
-
-        curl -D- -d '' \
-            -H 'Accept: application/*+xml;version=5.1' -u '<username>@<org_name>' \
-            https://<host.api.example.com>/api/sessions
-
-  This will prompt for your password.
-
-  From the headers returned, the value of the `x-vcloud-authorization` header is your
-  session token, and this will be valid for 30 minutes idle - any activity will extend
-  its life by another 30 minutes.
-
-3. Specify your credentials and session token at the beginning of the command. For example:
-
-        FOG_CREDENTIAL=test_credentials \
-            FOG_VCLOUD_TOKEN=AAAABBBBBCCCCCCDDDDDDEEEEEEFFFFF= \
-            vcloud-edge-configure input.yaml
-
-  You may find it easier to export one or both of the values as environment variables.
-
-  **NB** It is also possible to sidestep the need for the session token by saving your
-  password in the fog file. This is **not recommended**.
-
+Please see the [vcloud-tools usage documentation](http://gds-operations.github.io/vcloud-tools/usage/).
 
 ### Configure edge gateway services
 

data/jenkins.sh

@@ -1,15 +1,5 @@
-#!/bin/bash -x
+#!/bin/bash
 set -e
 
-git clean -ffdx
-bundle install --path "${HOME}/bundles/${JOB_NAME}"
-bundle exec rake
-
-# Obtain the integration test parameters
-git clone git@github.gds:gds/vcloud-tools-testing-config.git
-mv vcloud-tools-testing-config/vcloud_tools_testing_config.yaml spec/integration/
-rm -rf vcloud-tools-testing-config
-
-RUBYOPT="-r ./tools/fog_credentials" bundle exec rake integration
-
+./jenkins_tests.sh
 bundle exec rake publish_gem

data/jenkins_tests.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+set -eu
+
+function cleanup {
+  rm $FOG_RC
+}
+
+# Override default of ~/.fog and delete afterwards.
+export FOG_RC=$(mktemp /tmp/vcloud_fog_rc.XXXXXXXXXX)
+trap cleanup EXIT
+
+cat <<EOF >${FOG_RC}
+${FOG_CREDENTIAL}:
+  vcloud_director_host: '${API_HOST}'
+  vcloud_director_username: '${API_USERNAME}'
+  vcloud_director_password: ''
+EOF
+
+git clean -ffdx
+bundle install --path "${HOME}/bundles/${JOB_NAME}"
+bundle exec rake
+
+# Obtain the integration test parameters
+git clone git@github.gds:gds/vcloud-tools-testing-config.git
+mv vcloud-tools-testing-config/vcloud_tools_testing_config.yaml spec/integration/
+rm -rf vcloud-tools-testing-config
+
+# Never log token to STDOUT.
+set +x
+eval $(printenv API_PASSWORD | bundle exec vcloud-login)
+
+bundle exec rake integration

data/lib/vcloud/edge_gateway/version.rb

@@ -1,6 +1,6 @@
 module Vcloud
   module EdgeGateway
-    VERSION = '1.0.2'
+    VERSION = '1.1.0'
   end
 end
 

data/lib/vcloud/edge_gateway.rb

@@ -1,7 +1,6 @@
 require 'vcloud/edge_gateway/version'
 
 require 'vcloud/core'
-require 'vcloud/fog'
 
 require 'vcloud/edge_gateway/schema/nat_service'
 require 'vcloud/edge_gateway/schema/firewall_service'

data/vcloud-edge_gateway.gemspec

@@ -21,8 +21,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 1.9.3'
 
-  s.add_runtime_dependency 'fog', '>= 1.21.0'
-  s.add_runtime_dependency 'vcloud-core', '~> 0.6.0'
+  s.add_runtime_dependency 'vcloud-core', '~> 0.10.0'
   s.add_runtime_dependency 'hashdiff'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'rake'
@@ -30,6 +29,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rubocop', '~> 0.23.0'
   s.add_development_dependency 'simplecov', '~> 0.7.1'
   s.add_development_dependency 'gem_publisher', '1.2.0'
-  s.add_development_dependency 'vcloud-tools-tester', '~> 0.1.0'
+  s.add_development_dependency 'vcloud-tools-tester', '~> 0.2.0'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vcloud-edge_gateway
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-15 00:00:00.000000000 Z
+date: 2014-08-11 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: fog
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.21.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.21.0
 - !ruby/object:Gem::Dependency
   name: vcloud-core
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: hashdiff
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +146,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -170,7 +154,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
 description: Tool to configure a VMware vCloud Edge Gateway. Uses vcloud-core.
 email:
 - anna.shipman@digital.cabinet-office.gov.uk
@@ -197,7 +181,7 @@ files:
 - examples/vcloud-configure-edge/template-vars-env1.yaml
 - examples/vcloud-configure-edge/template-vars-env2.yaml
 - jenkins.sh
-- jenkins_integration_tests.sh
+- jenkins_tests.sh
 - lib/vcloud/edge_gateway.rb
 - lib/vcloud/edge_gateway/cli.rb
 - lib/vcloud/edge_gateway/configuration_differ.rb
@@ -259,7 +243,6 @@ files:
 - spec/vcloud/edge_gateway/load_balancer_schema_validation_spec.rb
 - spec/vcloud/edge_gateway/nat_configuration_differ_spec.rb
 - spec/vcloud/edge_gateway/nat_schema_validation_spec.rb
-- tools/fog_credentials.rb
 - vcloud-edge_gateway.gemspec
 homepage: http://github.com/gds-operations/vcloud-edge_gateway
 licenses:
@@ -282,7 +265,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1968196497655824518
+      hash: 4211150760564323959
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/jenkins_integration_tests.sh

@@ -1,12 +0,0 @@
-#!/bin/bash -x
-set -e
-
-git clean -ffdx
-bundle install --path "${HOME}/bundles/${JOB_NAME}"
-
-# Obtain the integration test parameters
-git clone git@github.gds:gds/vcloud-tools-testing-config.git
-mv vcloud-tools-testing-config/vcloud_tools_testing_config.yaml spec/integration/
-rm -rf vcloud-tools-testing-config
-
-RUBYOPT="-r ./tools/fog_credentials" bundle exec rake integration

data/tools/fog_credentials.rb

@@ -1,17 +0,0 @@
-# Initialiser for getting vCloud credentials into Fog from Jenkins build
-# parameters, without needing to write them to disk. To be used with:
-#
-#     RUBYOPT="-r ./tools/fog_credentials" bundle exec integration
-#
-# Replace with FOG_VCLOUD_TOKEN support when we have a tool:
-#
-#     https://www.pivotaltracker.com/story/show/68989754
-#
-require 'bundler/setup'
-require 'fog'
-
-Fog.credentials = {
-  :vcloud_director_host     => ENV['API_HOST'],
-  :vcloud_director_username => ENV['API_USERNAME'],
-  :vcloud_director_password => ENV['API_PASSWORD'],
-}