kotovalexarian-likes-github/fog--fog
1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00
Code Releases Activity

[aws|cdn] update to support custom origins

Browse source
This commit is contained in:
geemus 2010-11-09 15:49:38 -08:00
parent 070e2565d3
commit b498079f80
7 changed files with 169 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/fog/aws/cdn.rb
View file

@ -12,6 +12,7 @@ module Fog
request 'get_distribution_list'
request 'post_distribution'
request 'post_invalidation'
request 'put_distribution_config'
class Mock
@ -69,7 +70,7 @@ module Fog
@path = options[:path] || '/'
@port = options[:port] || 443
@scheme = options[:scheme] || 'https'
@version = options[:version] || '2010-08-01'
@version = options[:version] || '2010-11-01'
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", options[:persistent] || true)
end

17
lib/fog/aws/parsers/cdn/distribution.rb
View file

@ -9,6 +9,15 @@ module Fog
@response = { 'DistributionConfig' => { 'CNAME' => [], 'Logging' => {}, 'TrustedSigners' => [] } }
end
def start_element(name, attrs = [])
super
case name
when 'CustomOrigin', 'S3Origin'
@origin = name
@response['DistributionConfig'][@origin] = {}
end
end
def end_element(name)
case name
when 'AwsAccountNumber'
@ -17,16 +26,22 @@ module Fog
@response['DistributionConfig']['Logging'][name] = @value
when 'CNAME'
@response['DistributionConfig']['CNAME'] << @value
when 'DNSName', 'OriginAccessIdentity', 'OriginProtocolPolicy'
@response['DistributionConfig'][@origin][name] = @value
when 'DomainName', 'Id', 'Status'
@response[name] = @value
when 'CallerReference', 'Comment', 'DefaultRootObject', 'Origin', 'OriginAccessIdentity'
@response['DistributionConfig'][name] << @value
@response['DistributionConfig'][name] = @value
when 'Enabled'
if @value == 'true'
@response['DistributionConfig'][name] = true
else
@response['DistributionConfig'][name] = false
end
when 'HTTPPort', 'HTTPSPort'
@response['DistributionConfig'][@origin][name] = @value.to_i
when 'InProgressInvalidationBatches'
@response[name] = @value.to_i
when 'LastModifiedTime'
@response[name] = Time.parse(@value)
when 'Protocol'

13
lib/fog/aws/parsers/cdn/get_distribution_list.rb
View file

@ -10,6 +10,15 @@ module Fog
@response = { 'DistributionSummary' => [] }
end
def start_element(name, attrs = [])
super
case name
when 'CustomOrigin', 'S3Origin'
@origin = name
@distribution_summary[@origin] = {}
end
end
def end_element(name)
case name
when 'DistributionSummary'
@ -19,12 +28,16 @@ module Fog
@distribution_summary[name] = @value
when 'CNAME'
@distribution_summary[name] << @value
when 'DNSName', 'OriginAccessIdentity', 'OriginProtocolPolicy'
@distribution_summary[@origin][name] = @value
when 'Enabled'
if @value == 'true'
@distribution_summary[name] = true
else
@distribution_summary[name] = false
end
when 'HTTPPort', 'HTTPSPort'
@distribution_summary[@origin][name] = @value.to_i
when 'LastModifiedTime'
@distribution_summary[name] = Time.parse(@value)
when 'IsTruncated'

12
lib/fog/aws/requests/cdn/get_distribution.rb
View file

@ -13,7 +13,16 @@ module Fog
# ==== Returns
# * response<~Excon::Response>:
# * body<~Hash>:
# * 'DomainName'<~String>: Domain name of distribution
# * 'S3Origin'<~Hash>:
# * 'DNSName'<~String> - origin to associate with distribution, ie 'mybucket.s3.amazonaws.com'
# * 'OriginAccessIdentity'<~String> - Optional: Used when serving private content
# or
# * 'CustomOrigin'<~Hash>:
# * 'DNSName'<~String> - origin to associate with distribution, ie 'www.example.com'
# * 'HTTPPort'<~Integer> - HTTP port of origin, in [80, 443] or (1024...65535)
# * 'HTTPSPort'<~Integer> - HTTPS port of origin, in [80, 443] or (1024...65535)
# * 'OriginProtocolPolicy'<~String> - Policy on using http vs https, in ['http-only', 'match-viewer']
#
# * 'Id'<~String> - Id of distribution
# * 'LastModifiedTime'<~String> - Timestamp of last modification of distribution
# * 'Status'<~String> - Status of distribution
@ -22,6 +31,7 @@ module Fog
# * 'CNAME'<~Array> - array of associated cnames
# * 'Comment'<~String> - comment associated with distribution
# * 'Enabled'<~Boolean> - whether or not distribution is enabled
# * 'InProgressInvalidationBatches'<~Integer> - number of invalidation batches in progress
# * 'Logging'<~Hash>:
# * 'Bucket'<~String> - bucket logs are stored in
# * 'Prefix'<~String> - prefix logs are stored with

10
lib/fog/aws/requests/cdn/get_distribution_list.rb
View file

@ -21,9 +21,17 @@ module Fog
# * 'MaxItems'<~Integer> - Maximum number of keys specified for query
# * 'NextMarker'<~String> - Marker to specify for next page (id of last result of current page)
# * 'DistributionSummary'<~Array>:
# * 'S3Origin'<~Hash>:
# * 'DNSName'<~String> - origin to associate with distribution, ie 'mybucket.s3.amazonaws.com'
# * 'OriginAccessIdentity'<~String> - Optional: Used when serving private content
# or
# * 'CustomOrigin'<~Hash>:
# * 'DNSName'<~String> - origin to associate with distribution, ie 'www.example.com'
# * 'HTTPPort'<~Integer> - HTTP port of origin, in [80, 443] or (1024...65535)
# * 'HTTPSPort'<~Integer> - HTTPS port of origin, in [80, 443] or (1024...65535)
# * 'OriginProtocolPolicy'<~String> - Policy on using http vs https, in ['http-only', 'match-viewer']
# * 'Comment'<~String> - comment associated with distribution
# * 'CNAME'<~Array> - array of associated cnames
# * 'DomainName'<~String> - Domain name of distribution
# * 'Enabled'<~Boolean> - whether or not distribution is enabled
# * 'Id'<~String> - Id of distribution
# * 'LastModifiedTime'<~String> - Timestamp of last modification of distribution

19
lib/fog/aws/requests/cdn/post_distribution.rb
View file

@ -8,8 +8,18 @@ module Fog
# create a new distribution in CloudFront
#
# ==== Parameters
# * origin<~String> - s3 bucket, ie 'mybucket.s3.amazonaws.com'
# * config<~Hash> - config for distribution. Defaults to {}.
# * options<~Hash> - config for distribution. Defaults to {}.
# REQUIRED:
# * 'S3Origin'<~Hash>:
# * 'DNSName'<~String> - origin to associate with distribution, ie 'mybucket.s3.amazonaws.com'
# * 'OriginAccessIdentity'<~String> - Optional: Used when serving private content
# or
# * 'CustomOrigin'<~Hash>:
# * 'DNSName'<~String> - origin to associate with distribution, ie 'www.example.com'
# * 'HTTPPort'<~Integer> - HTTP port of origin, in [80, 443] or (1024...65535)
# * 'HTTPSPort'<~Integer> - HTTPS port of origin, in [80, 443] or (1024...65535)
# * 'OriginProtocolPolicy'<~String> - Policy on using http vs https, in ['http-only', 'match-viewer']
# OPTIONAL:
# * 'CallerReference'<~String> - Used to prevent replay, defaults to Time.now.to_i.to_s
# * 'Comment'<~String> - Optional comment about distribution
# * 'CNAME'<~Array> - Optional array of strings to set as CNAMEs
@ -43,7 +53,8 @@ module Fog
# ==== See Also
# http://docs.amazonwebservices.com/AmazonCloudFront/latest/APIReference/CreateDistribution.html
def post_distribution(origin, options = {})
def post_distribution(options = {})
options['CallerReference'] = Time.now.to_i.to_s
data = '<?xml version="1.0" encoding="UTF-8"?>'
data << "<DistributionConfig xmlns=\"http://cloudfront.amazonaws.com/doc/#{@version}/\">"
for key, value in options
@ -78,7 +89,7 @@ module Fog
class Mock # :nodoc:all
def post_distribution(origin, options = {})
def post_distribution(options = {})
Fog::Mock.not_implemented
end

102
lib/fog/aws/requests/cdn/put_distribution_config.rb Normal file
View file

@ -0,0 +1,102 @@
module Fog
module AWS
class CDN
class Real
require 'fog/aws/parsers/cdn/distribution'
# update a distribution in CloudFront
#
# ==== Parameters
# * distribution_id<~String> - Id of distribution to update config for
# * options<~Hash> - config for distribution. Defaults to {}.
# REQUIRED:
# * 'S3Origin'<~Hash>:
# * 'DNSName'<~String> - origin to associate with distribution, ie 'mybucket.s3.amazonaws.com'
# * 'OriginAccessIdentity'<~String> - Optional: Used when serving private content
# or
# * 'CustomOrigin'<~Hash>:
# * 'DNSName'<~String> - origin to associate with distribution, ie 'www.example.com'
# * 'HTTPPort'<~Integer> - HTTP port of origin, in [80, 443] or (1024...65535)
# * 'HTTPSPort'<~Integer> - HTTPS port of origin, in [80, 443] or (1024...65535)
# * 'OriginProtocolPolicy'<~String> - Policy on using http vs https, in ['http-only', 'match-viewer']
# OPTIONAL:
# * 'CallerReference'<~String> - Used to prevent replay, defaults to Time.now.to_i.to_s
# * 'Comment'<~String> - Optional comment about distribution
# * 'CNAME'<~Array> - Optional array of strings to set as CNAMEs
# * 'DefaultRootObject'<~String> - Optional default object to return for '/'
# * 'Enabled'<~Boolean> - Whether or not distribution should accept requests, defaults to true
# * 'Logging'<~Hash>: Optional logging config
# * 'Bucket'<~String> - Bucket to store logs in, ie 'mylogs.s3.amazonaws.com'
# * 'Prefix'<~String> - Optional prefix for log filenames, ie 'myprefix/'
# * 'OriginAccessIdentity'<~String> - Used for serving private content, in format 'origin-access-identity/cloudfront/ID'
# * 'RequiredProtocols'<~String> - Optional, set to 'https' to force https connections
# * 'TrustedSigners'<~Array> - Optional grant of rights to up to 5 aws accounts to generate signed URLs for private content, elements are either 'Self' for your own account or an AWS Account Number
#
# ==== Returns
# * response<~Excon::Response>:
# * body<~Hash>:
# * 'DomainName'<~String>: Domain name of distribution
# * 'Id'<~String> - Id of distribution
# * 'LastModifiedTime'<~String> - Timestamp of last modification of distribution
# * 'Status'<~String> - Status of distribution
# * 'DistributionConfig'<~Array>:
# * 'CallerReference'<~String> - Used to prevent replay, defaults to Time.now.to_i.to_s
# * 'CNAME'<~Array> - array of associated cnames
# * 'Comment'<~String> - comment associated with distribution
# * 'Enabled'<~Boolean> - whether or not distribution is enabled
# * 'Logging'<~Hash>:
# * 'Bucket'<~String> - bucket logs are stored in
# * 'Prefix'<~String> - prefix logs are stored with
# * 'Origin'<~String> - s3 origin bucket
# * 'TrustedSigners'<~Array> - trusted signers
#
# ==== See Also
# http://docs.amazonwebservices.com/AmazonCloudFront/latest/APIReference/CreateDistribution.html
def put_distribution_config(distribution_id, etag, options = {})
data = '<?xml version="1.0" encoding="UTF-8"?>'
data << "<DistributionConfig xmlns=\"http://cloudfront.amazonaws.com/doc/#{@version}/\">"
for key, value in options
case value
when Array
for item in value
data << "<#{key}>#{item}</#{key}>"
end
when Hash
data << "<#{key}>"
for inner_key, inner_value in value
data << "<#{inner_key}>#{inner_value}</#{inner_key}>"
end
data << "</#{key}>"
else
data << "<#{key}>#{value}</#{key}>"
end
end
data << "</DistributionConfig>"
request({
:body => data,
:expects => 200,
:headers => {
'Content-Type' => 'text/xml',
'If-Match' => etag
},
:idempotent => true,
:method => 'PUT',
:parser => Fog::Parsers::AWS::CDN::Distribution.new,
:path => "/distribution/#{distribution_id}/config"
})
end
end
class Mock # :nodoc:all
def put_distribution_config(distribution_id, etag, options = {})
Fog::Mock.not_implemented
end
end
end
end
end