Skip to content

Commit 3958e09

Browse files
committed
Merge pull request #96 from fcheung/elasticache_config_endpoint
Parse elasticache configuration endpoint from response
2 parents 377d74b + 9f0ba1c commit 3958e09

File tree

2 files changed

+16
-3
lines changed

2 files changed

+16
-3
lines changed

lib/fog/aws/models/elasticache/cluster.rb

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ class Cluster < Fog::Model
2323
attribute :cache_subnet_group_name, :aliases => 'CacheSubnetGroupName'
2424
attribute :vpc_security_groups, :aliases => 'VpcSecurityGroups', :type => :array
2525
attribute :s3_snapshot_location, :aliases => 'SnapshotArns', :type => :array
26+
attribute :configuration_endpoint, :aliases => 'ConfigurationEndpoint'
2627

2728
attr_accessor :parameter_group_name
2829

lib/fog/aws/parsers/elasticache/cache_cluster_parser.rb

+15-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ def reset_cache_cluster
1414
@cache_cluster = {
1515
'CacheSecurityGroups' => [],
1616
'CacheNodes' => [],
17-
'CacheParameterGroup' => {}
17+
'CacheParameterGroup' => {},
18+
'ConfigurationEndpoint' => {}
1819
}
1920
end
2021

@@ -24,6 +25,7 @@ def start_element(name, attrs = [])
2425
when 'CacheSecurityGroup'; then @security_group = {}
2526
when 'CacheNode'; then @cache_node = {}
2627
when 'PendingModifiedValues'; then @pending_values = {}
28+
when 'ConfigurationEndpoint'; then @configuration_endpoint = {}
2729
end
2830
end
2931

@@ -49,6 +51,8 @@ def end_element(name)
4951
@cache_cluster[name] = DateTime.parse(value)
5052
when 'CacheSecurityGroup'
5153
@cache_cluster["#{name}s"] << @security_group unless @security_group.empty?
54+
when 'ConfigurationEndpoint'
55+
@cache_cluster['ConfigurationEndpoint'] = @configuration_endpoint
5256
when 'CacheSecurityGroupName', 'Status', 'CacheSubnetGroupName'
5357
@cache_cluster[name] = value
5458
when 'CacheNode'
@@ -57,8 +61,16 @@ def end_element(name)
5761
when'PendingModifiedValues'
5862
@cache_cluster[name] = @pending_values
5963
@pending_values = nil
60-
when 'CacheNodeCreateTime', 'CacheNodeStatus', 'Address',
61-
'ParameterGroupStatus', 'Port', 'CacheNodeId'
64+
when 'Port', 'Address'
65+
if @cache_node
66+
@cache_node[name] = value ? value.strip : name
67+
elsif @pending_values
68+
@pending_values[name] = value ? value.strip : name
69+
elsif @configuration_endpoint
70+
@configuration_endpoint[name] = value ? value.strip : name
71+
end
72+
when 'CacheNodeCreateTime', 'CacheNodeStatus',
73+
'ParameterGroupStatus', 'CacheNodeId'
6274
if @cache_node
6375
@cache_node[name] = value ? value.strip : name
6476
elsif @pending_values

0 commit comments

Comments
 (0)