From fde4a8d2a0bc5d28b8829a2a9a1dfed82ae2812d Mon Sep 17 00:00:00 2001 From: Scott Carleton Date: Tue, 11 Mar 2014 15:17:24 -0400 Subject: [PATCH 1/6] Adding S3 snapshot location for elasticache Only viable for redis engine --- lib/fog/aws/models/elasticache/cluster.rb | 3 +++ lib/fog/aws/requests/elasticache/create_cache_cluster.rb | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/lib/fog/aws/models/elasticache/cluster.rb b/lib/fog/aws/models/elasticache/cluster.rb index e4e9dddea..1d12440ae 100644 --- a/lib/fog/aws/models/elasticache/cluster.rb +++ b/lib/fog/aws/models/elasticache/cluster.rb @@ -32,6 +32,8 @@ module Fog :aliases => 'CacheSubnetGroupName' attribute :vpc_security_groups, :aliases => 'VpcSecurityGroups', :type => :array + attribute :s3_snapshot_location, + :aliases => 'SnapshotArns', :type => :array attr_accessor :parameter_group_name @@ -63,6 +65,7 @@ module Fog :port => port, :preferred_availablility_zone => zone, :preferred_maintenance_window => maintenance_window, + :s3_snapshot_location => s3_snapshot_location, :parameter_group_name => parameter_group_name || parameter_group['CacheParameterGroupName'], :cache_subnet_group_name => cache_subnet_group_name, :vpc_security_groups => vpc_security_groups, diff --git a/lib/fog/aws/requests/elasticache/create_cache_cluster.rb b/lib/fog/aws/requests/elasticache/create_cache_cluster.rb index 31da7173d..d54e4fc03 100644 --- a/lib/fog/aws/requests/elasticache/create_cache_cluster.rb +++ b/lib/fog/aws/requests/elasticache/create_cache_cluster.rb @@ -23,6 +23,7 @@ module Fog # * :preferred_availablility_zone <~String> # * :preferred_maintenance_window <~String> # * :cache_subnet_group_name <~String> + # * :s3_snapshot_location <~String> - Amazon resource location for snapshot # === Returns # * response <~Excon::Response>: # * body <~Hash> @@ -45,6 +46,10 @@ module Fog :parser => Fog::Parsers::AWS::Elasticache::SingleCacheCluster.new } + if s3_snapshot_location = options.delete(:s3_snapshot_location) + req_options.merge!(Fog::AWS.indexed_param('SnapshotArns.member.%d', [*s3_snapshot_location])) + end + if cache_security_groups = options.delete(:security_group_names) req_options.merge!(Fog::AWS.indexed_param('CacheSecurityGroupNames.member.%d', [*cache_security_groups])) end From 03fadf2c72a3606e45f9d27e23428a1ff28552a4 Mon Sep 17 00:00:00 2001 From: Eric Johnson Date: Thu, 13 Mar 2014 13:17:02 +0000 Subject: [PATCH 2/6] fix mismatched variable names in disk.create_snapshot --- lib/fog/google/models/compute/disk.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fog/google/models/compute/disk.rb b/lib/fog/google/models/compute/disk.rb index 892d3035b..1e3112c87 100644 --- a/lib/fog/google/models/compute/disk.rb +++ b/lib/fog/google/models/compute/disk.rb @@ -99,7 +99,7 @@ module Fog requires :name requires :zone_name - if snap_name.nil? or snap_name.empty? + if snapshot_name.nil? or snapshot_name.empty? raise ArgumentError, 'Invalid snapshot name' end From 21662f9b8ddb40b309c745f0b5e5637d21abda63 Mon Sep 17 00:00:00 2001 From: geemus Date: Fri, 14 Mar 2014 09:45:54 -0500 Subject: [PATCH 3/6] bump excon dependency --- fog.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fog.gemspec b/fog.gemspec index 85b6b4f98..67eb53501 100644 --- a/fog.gemspec +++ b/fog.gemspec @@ -45,7 +45,7 @@ Gem::Specification.new do |s| s.add_dependency("fog-json") s.add_dependency('builder') - s.add_dependency('excon', '~>0.31.0') + s.add_dependency('excon', '~>0.32.0') s.add_dependency('formatador', '~>0.2.0') s.add_dependency('mime-types') s.add_dependency('net-scp', '~>1.1') From bb6c32b9234d723fa3b743ac6608e61819cb2778 Mon Sep 17 00:00:00 2001 From: geemus Date: Fri, 14 Mar 2014 15:51:32 -0500 Subject: [PATCH 4/6] defer fog-core deps to fog-core --- fog.gemspec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/fog.gemspec b/fog.gemspec index 67eb53501..686c5f3c8 100644 --- a/fog.gemspec +++ b/fog.gemspec @@ -44,12 +44,6 @@ Gem::Specification.new do |s| s.add_dependency("fog-core", "~> 1.21.0") s.add_dependency("fog-json") - s.add_dependency('builder') - s.add_dependency('excon', '~>0.32.0') - s.add_dependency('formatador', '~>0.2.0') - s.add_dependency('mime-types') - s.add_dependency('net-scp', '~>1.1') - s.add_dependency('net-ssh', '>=2.1.3') s.add_dependency('nokogiri', '>=1.5.11') # Modular providers From bcd1209d6de5e9baff7be1c08b7b59186e720d9a Mon Sep 17 00:00:00 2001 From: geemus Date: Fri, 14 Mar 2014 16:04:43 -0500 Subject: [PATCH 5/6] bump fog-core dep --- fog.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fog.gemspec b/fog.gemspec index 686c5f3c8..559f7cb84 100644 --- a/fog.gemspec +++ b/fog.gemspec @@ -41,7 +41,7 @@ Gem::Specification.new do |s| ## List your runtime dependencies here. Runtime dependencies are those ## that are needed for an end user to actually USE your code. - s.add_dependency("fog-core", "~> 1.21.0") + s.add_dependency("fog-core", "~> 1.21.1") s.add_dependency("fog-json") s.add_dependency('nokogiri', '>=1.5.11') From e4b431eb1bc7ed86c50feccb10305a1265d47b33 Mon Sep 17 00:00:00 2001 From: Christopher Snell Date: Fri, 14 Mar 2014 14:13:13 -0700 Subject: [PATCH 6/6] Fix a typo in error message that could cause problems for cut-n-pasters --- lib/fog/rackspace/service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fog/rackspace/service.rb b/lib/fog/rackspace/service.rb index 27754eac7..f11ea0ac6 100644 --- a/lib/fog/rackspace/service.rb +++ b/lib/fog/rackspace/service.rb @@ -91,7 +91,7 @@ module Fog if v2_authentication? :authenticate_v2 else - Fog::Logger.deprecation "Authentication using a v1.0/v1.1 endpoint is deprecated. Please specify a v2.0 endpoint using :rackpace_auth_url.\ + Fog::Logger.deprecation "Authentication using a v1.0/v1.1 endpoint is deprecated. Please specify a v2.0 endpoint using :rackspace_auth_url.\ For a list of v2.0 endpoints refer to http://docs.rackspace.com/auth/api/v2.0/auth-client-devguide/content/Endpoints-d1e180.html" :authenticate_v1 end