cyoi 0.10.0 → 0.10.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDdkOWUzMjRmM2Q4OThkNmFkNjc5NDJlMjQxN2NhZTYwZGRhMDdiNQ==
+    Y2ExOTQzNDFhNWU2NjgyMzdlM2FlMWM3YWJmMTVkOGQ0NTNmMTQ4NQ==
   data.tar.gz: !binary |-
-    NTA2ZDgyZTFiZWI5OTA5MzA2NzgyMjU0ZjcxMzk2Y2E5M2ZiODUyNw==
+    OTYwZGYwMGVhNjM2MTk4YTkwOTExZjQzNDZlN2MwZWQzMGE1ZTAwZQ==
 SHA512:
   metadata.gz: !binary |-
-    NTNkM2FiZDczOGEzYzAxYjZhNTBlZWU3Yjc2ZTBmYzlhZmEzYmE0MjkxODIx
-    ZGIzZGVmMjhmZmUzMjI0MzMxOGY0YzQ3ZjQwYzllNjVhNGM5ZjMxMmJjMGNm
-    NzRlNmRkMmQ5ZTAyODFjY2NjMTZkYzA2Yjk3ZWQ3OGFkZDRmOWI=
+    MDBhNDQ5NGM0OWRmODg4YzQwMThiMWM5ZDRlNzRiM2ViZDRiZTdmMTJkZTRj
+    Y2VjNmM3MGFmMWE1ZDFjYTNiMzNlNzA4YTJlMWQ1MTkwN2RhOTQ0MjYzMmE2
+    ZWUxY2E5NTM4YjdhZjRiMjE4NDFjNDBlNGZhMWM4NDkwZDI5YzY=
   data.tar.gz: !binary |-
-    MTg1YTFlZWU4NzNmZGE1MzM1YTI4OTVkZjI5MGUwN2RlNjk0ZmI1MWFiZWI5
-    NzhkNTc3ODQ4NjkzYTY3YWM4NzMxNzg2ZWJiMzM5MjcwNjdiMjQzMDE3YmEy
-    NGU4Y2VlNDQ5YWYwZGVlNTM0ODczZjZjNTA0NTA3OTVmY2Q1N2E=
+    ZWIzYmE1MDllMTI1NGU4N2QxNDhlN2Q5N2EyYTFmNGRkOWM5NjQ2MzhiNDNh
+    MjUxZmIxMjJiZTUwNGEyMzE1YmJkYTRjNjkxYjZlMGIyYmNiZTBmOTQzZmVh
+    NzQ3NTZkZDE4MTI4YzMxZDRiOTk2ZTk0ZjQxODcwMmI4NGQzOTk=

data/ChangeLog.md

@@ -7,6 +7,7 @@ v0.10
 -----
 
 - `blobstores` - create a bucket/container on AWS/OpenStack
+- `blobstores` - AWS bucket is made publicly readable via bucket policy [v0.10.1]
 
 v0.9
 ----

data/lib/cyoi/cli/provider_blobstore/blobstore_cli_openstack.rb

@@ -2,4 +2,4 @@ require "cyoi/cli/provider_blobstore/blobstore_cli_base"
 class Cyoi::Cli::Blobstore::BlobstoreCliOpenStack < Cyoi::Cli::Blobstore::BlobstoreCliBase
 end
 
-Cyoi::Cli::Blobstore.register_cli("aws", Cyoi::Cli::Blobstore::BlobstoreCliOpenStack)
+Cyoi::Cli::Blobstore.register_cli("openstack", Cyoi::Cli::Blobstore::BlobstoreCliOpenStack)

data/lib/cyoi/providers/clients/aws_provider_client.rb

@@ -8,6 +8,26 @@ require "cyoi/providers/constants/aws_constants"
 class Cyoi::Providers::Clients::AwsProviderClient < Cyoi::Providers::Clients::FogProviderClient
   include Cyoi::Providers::Constants::AwsConstants
 
+  # Creates a bucket and makes it publicly read-only
+  def create_blobstore(blobstore_name)
+    super
+    policy = {
+      "Version" => "2008-10-17",
+      "Statement" => [
+        {
+          "Sid" => "AddPerm",
+          "Effect" => "Allow",
+          "Principal" => {
+            "AWS" => "*"
+          },
+          "Action" => "s3:GetObject",
+          "Resource" => "arn:aws:s3:::#{blobstore_name}/*"
+        }
+      ]
+    }
+    fog_storage.put_bucket_policy(blobstore_name, policy)
+  end
+
   # @return [Integer] megabytes of RAM for requested flavor of server
   def ram_for_server_flavor(server_flavor_id)
     if flavor = fog_compute_flavor(server_flavor_id)

data/lib/cyoi/providers/clients/fog_provider_client.rb

@@ -23,18 +23,25 @@ class Cyoi::Providers::Clients::FogProviderClient
     false
   end
 
+  # Creates a bucket/object-store/directory/blobstore
+  # To be overridden to make the bucket publicly read-only
+  # per IaaS.
   def create_blobstore(blobstore_name)
     unless supports_blobstore_service?
       puts "Provider does not support blobstore service"
       false
     else
-      print "Attempting to create blobstore #{blobstore_name}... "
+      print "Creating publicly readable blobstore #{blobstore_name}... "
       blobstore = fog_storage.directories.create(key: blobstore_name)
       puts "done"
       blobstore
     end
+  rescue Excon::Errors::Forbidden => e
+    puts "failed: credentials do not allow blobstore to be created"
+    false
   rescue Excon::Errors::Conflict => e
     puts "failed: blobstore already exists but owned by someone else"
+    false
   end
 
   def create_key_pair(key_pair_name)

data/lib/cyoi/version.rb

@@ -1,3 +1,3 @@
 module Cyoi
-  VERSION = "0.10.0"
+  VERSION = "0.10.1"
 end

data/spec/integration/cli/address/address_openstack_spec.rb

@@ -20,7 +20,7 @@ describe "cyoi address openstack" do
     end
 
     it "address aleady assigned" do
-      pending("Fog::Compute::OpenStack.list_address_pools does not provide a mock test")
+      skip("Fog::Compute::OpenStack.list_address_pools does not provide a mock test")
       setting "provider.name", "openstack"
       setting "provider.credentials.openstack_username", "USERNAME"
       setting "provider.credentials.openstack_api_key", "PASSWORD"
@@ -33,10 +33,10 @@ describe "cyoi address openstack" do
     end
 
     it "address is provisioned from OpenStack" do
-      pending("Fog::Compute::OpenStack.list_address_pools does not provide a mock test")
+      skip("Fog::Compute::OpenStack.list_address_pools does not provide a mock test")
       run_interactive(unescape("cyoi address #{settings_dir}"))
       assert_passing_with("Confirming: Using address")
     end
   end
 
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cyoi
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Dr Nic Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-25 00:00:00.000000000 Z
+date: 2014-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog