prefab-cloud-ruby 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57dd1f5909bf80cd820396d039c2d1560faf55e6
-  data.tar.gz: d2e6192bf1126aadc4aaa49e23728cfbaaf2a689
+  metadata.gz: 67f20b7bcbe0cb24df27ec2e6cee485469dfeb15
+  data.tar.gz: 9f298fdd808db6787e89814ef01e750870ae2f7f
 SHA512:
-  metadata.gz: 61ff17aeda32522ed65ace11b48b955f87eeb69cc9ccc781c3dfecca66161469a93a96db42559919f347e4998b3d42038890dd22219e2ec722a01eb61323b6cf
-  data.tar.gz: 87b2c0a1a2544cd9c7f93fdda3d1e96028424642e5d6fd9dd8fd3c9c334ef5f146d5ba0fe006ebb6fa27ad6e7bee6488d92dedcb2546b516e2dec61e71121509
+  metadata.gz: 2c1d7f77547a3c66e62dd9dda07c8e5cf74a374f1335f6318bfdd6c138999692c7ef1d231a7c8cea988eaa2888c63af46ee9779650d4eab2ab2d486f3de5a212
+  data.tar.gz: 3c3d1be6a3c50f2d9550612277b4b969547a89393fcdfb3c9cf98ce138579668bc68f24a672892d100ee7ac9df941f0773fbc2a7d6d92b866854393b6b4fd453

data/.envrc

@@ -0,0 +1,2 @@
+export AWS_ACCESS_KEY_ID=
+export AWS_SECRET_ACCESS_KEY=

data/Gemfile

@@ -1,8 +1,8 @@
 source "https://rubygems.org"
 
-gem 'grpc', '~> 1.17.1'
 gem 'concurrent-ruby', '~> 1.0', '>= 1.0.5'
-gem 'aws-sdk-s3', '~> 1'
+gem 'faraday'
+gem 'grpc', '~> 1.17.1'
 
 group :development do
   gem 'grpc-tools', '~> 1.17.1'

data/Gemfile.lock

@@ -8,19 +8,6 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
-    aws-partitions (1.86.0)
-    aws-sdk-core (3.20.2)
-      aws-partitions (~> 1.0)
-      aws-sigv4 (~> 1.0)
-      jmespath (~> 1.0)
-    aws-sdk-kms (1.5.0)
-      aws-sdk-core (~> 3)
-      aws-sigv4 (~> 1.0)
-    aws-sdk-s3 (1.10.0)
-      aws-sdk-core (~> 3)
-      aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.0)
-    aws-sigv4 (1.0.2)
     builder (3.2.3)
     concurrent-ruby (1.0.5)
     descendants_tracker (0.0.4)
@@ -46,7 +33,6 @@ GEM
     highline (2.0.1)
     i18n (1.0.1)
       concurrent-ruby (~> 1.0)
-    jmespath (1.4.0)
     json (1.8.6)
     juwelier (2.4.9)
       builder
@@ -102,9 +88,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  aws-sdk-s3 (~> 1)
   bundler (~> 1.0)
   concurrent-ruby (~> 1.0, >= 1.0.5)
+  faraday
   grpc (~> 1.17.1)
   grpc-tools (~> 1.17.1)
   juwelier (~> 2.4.9)

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.3.0

data/lib/prefab-cloud-ruby.rb

@@ -1,5 +1,6 @@
 require "concurrent/atomics"
 require 'concurrent'
+require 'faraday'
 require 'openssl'
 require 'prefab_pb'
 require 'prefab_services_pb'
@@ -14,4 +15,3 @@ require 'prefab/auth_interceptor'
 require 'prefab/noop_cache'
 require 'prefab/noop_stats'
 require 'prefab/murmer3'
-require 'aws-sdk-s3'

data/lib/prefab/config_client.rb

@@ -2,6 +2,7 @@ module Prefab
   class ConfigClient
     RECONNECT_WAIT = 5
     DEFAULT_CHECKPOINT_FREQ_SEC = 60
+    DEFAULT_S3CF_BUCKET = 'http://d2j4ed6ti5snnd.cloudfront.net'
 
     def initialize(base_client, timeout)
       @base_client = base_client
@@ -14,8 +15,8 @@ module Prefab
       @config_resolver = Prefab::ConfigResolver.new(@base_client, @config_loader)
 
       @initialization_lock.acquire_write_lock
-      @s3 = Aws::S3::Resource.new(region: 'us-east-1')
 
+      @s3_cloud_front = ENV["PREFAB_S3CF_BUCKET"] || DEFAULT_S3CF_BUCKET
       load_checkpoint
       start_checkpointing_thread
     end
@@ -70,7 +71,6 @@ module Prefab
     # Bootstrap out of the cache
     # returns the high-watermark of what was in the cache
     def load_checkpoint
-
       success = load_checkpoint_from_config
 
       if !success
@@ -99,11 +99,15 @@ module Prefab
     end
 
     def load_checkpoint_from_s3
-      resp = @s3.bucket('prefab-cloud-checkpoints-prod').object(@base_client.api_key.gsub("|", "/")).get
-      deltas = Prefab::ConfigDeltas.decode(resp.body.read)
-      load_deltas(deltas, :s3)
-    rescue Aws::S3::Errors::NoSuchKey
-      @base_client.log_internal Logger::INFO, "No S3 checkpoint. Plan may not support this."
+      url = "#{@s3_cloud_front}/#{@base_client.api_key.gsub("|", "/")}"
+      puts url
+      resp = Faraday.get url
+      if resp.status == 200
+        deltas = Prefab::ConfigDeltas.decode(resp.body)
+        load_deltas(deltas, :s3)
+      else
+        @base_client.log_internal Logger::INFO, "No S3 checkpoint. Response #{resp.status} Plan may not support this."
+      end
     end
 
 

data/prefab-cloud-ruby.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: prefab-cloud-ruby 0.2.0 ruby lib
+# stub: prefab-cloud-ruby 0.3.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "prefab-cloud-ruby".freeze
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
     "README.md"
   ]
   s.files = [
+    ".envrc",
     ".ruby-version",
     "Gemfile",
     "Gemfile.lock",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prefab-cloud-ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jeff Dwyer
@@ -150,6 +150,7 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
+- ".envrc"
 - ".ruby-version"
 - Gemfile
 - Gemfile.lock