kensa 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f100c19fcb05b5c0dd0a94287ac64d745050905
-  data.tar.gz: ac3f713db8e27febba8a41b276de592fa63e469d
+  metadata.gz: a1b0f6152cc582f8ce121149cbf51c06d3a31146
+  data.tar.gz: 2cf35428fd4e02beb72d185581ea8ed500330c74
 SHA512:
-  metadata.gz: c222175a5ce64e55ea5afad73536e716bb38eb66224dd4d84810adcae537dcbb5af2f2b2aea11ee0c7100a3ceeec4c286810962e465149a1bb8673acaede5e1f
-  data.tar.gz: d9cd6cffdd76e56bf78b9d7c1ad8b21abca12729fa59c0deedd4985d29ec9355f8fe8736002d6357d314c6a1216d60ee5a079de494c19d70953acbb9f8a59e16
+  metadata.gz: c90f46e0e4c4757e000078525c306ac07b90e20ca0a2cdd0ce4a718bdfec2dfd24b3a16e8bfc59f39b4c1feedabd92e949d81b5867162fb7fca46dd733f42696
+  data.tar.gz: 3e8f395728af6bbb4a3999c7434aaea9f6b44f5b59879e66bcb99909e0da913ab6dac403bdbb825eca500a8754b653b9d1e71042c8d1a74d6cc88519946889dc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kensa (2.2.0)
+    kensa (2.3.0)
       launchy (~> 2.2.0)
       mechanize (~> 2.6.0)
       netrc (~> 0.10.3)
@@ -38,6 +38,7 @@ GEM
     nokogiri (1.6.5)
       mini_portile (~> 0.6.0)
     ntlm-http (0.1.1)
+    power_assert (0.2.2)
     pry (0.9.11.4)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
@@ -60,6 +61,8 @@ GEM
     slop (3.4.3)
     term-ansicolor (1.3.0)
       tins (~> 1.0)
+    test-unit (3.0.9)
+      power_assert
     tilt (1.3.6)
     timecop (0.6.1)
     tins (1.3.5)
@@ -80,4 +83,5 @@ DEPENDENCIES
   rake
   rr (~> 1.0.4)
   sinatra (~> 1.4.2)
+  test-unit
   timecop (~> 0.6.1)

data/kensa.gemspec

@@ -38,5 +38,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<sinatra>, "~> 1.4.2")
   s.add_development_dependency(%q<timecop>, "~> 0.6.1")
   s.add_development_dependency(%q<pry>)
+  s.add_development_dependency(%q<test-unit>)
 end
 

data/lib/heroku/kensa/check.rb

@@ -68,6 +68,10 @@ module Heroku
           data['api'][env].chomp("/")
         end
       end
+
+      def api_requires?(feature)
+        data["api"].fetch("requires", []).include?(feature)
+      end
     end
 
 
@@ -142,11 +146,11 @@ module Heroku
           end
           check "all config vars are prefixed with the addon id" do
             data["api"]["config_vars"].each do |k|
-              addon_key = data['id'].upcase.gsub('-', '_')
-              if k =~ /^#{addon_key}_/
+              prefix = data["api"]["config_vars_prefix"] || data['id'].upcase.gsub('-', '_')
+              if k =~ /^#{prefix}_/
                 true
               else
-                error "#{k} is not a valid ENV key - must be prefixed with #{addon_key}_"
+                error "#{k} is not a valid ENV key - must be prefixed with #{prefix}_"
               end
             end
           end
@@ -170,7 +174,15 @@ module Heroku
         test "response"
 
         check "contains an id" do
-          response.is_a?(Hash) && response.has_key?("id")
+          response.is_a?(Hash) && response["id"]
+        end
+
+        check "id does not contain heroku_id" do
+          if response["id"].to_s.include? data["heroku_id"].scan(/app(\d+)@/).flatten.first
+            error "id cannot include heroku_id"
+          else
+            true
+          end
         end
 
         screen.message " (id #{response['id']})"
@@ -222,7 +234,7 @@ module Heroku
           end
 
           check "syslog_drain_url is returned if required" do
-            return true unless data.has_key?("requires") && data["requires"].include?("syslog_drain")
+            return true unless api_requires?("syslog_drain")
 
             drain_url = response['syslog_drain_url']
 
@@ -244,7 +256,6 @@ module Heroku
 
     end
 
-
     class ApiCheck < Check
       def base_path
         if data['api'][env].is_a? Hash
@@ -261,6 +272,61 @@ module Heroku
       def credentials
         [ data['id'], data['api']['password'] ]
       end
+
+      def callback
+        "http://localhost:7779/callback/999"
+      end
+
+      def create_provision_payload
+        payload = {
+          :heroku_id => heroku_id,
+          :plan => data[:plan] || 'test',
+          :callback_url => callback,
+          :logplex_token => nil,
+          :region => "amazon-web-services::us-east-1",
+          :options => data[:options] || {},
+          :uuid => SecureRandom.uuid
+        }
+
+        if api_requires?("syslog_drain")
+          payload[:log_drain_token] = SecureRandom.hex
+        end
+        payload
+      end
+    end
+
+    class DuplicateProvisionCheck < ApiCheck
+      include HTTP
+
+      READLEN = 1024 * 10
+
+      def call!
+
+        json = nil
+        response = nil
+
+        code = nil
+        json = nil
+        reader, writer = nil
+
+        payload = create_provision_payload
+
+        code1, json1 = post(credentials, base_path, payload)
+        code2, json2 = post(credentials, base_path, payload)
+
+        json1 = OkJson.decode(json1)
+        json2 = OkJson.decode(json2)
+
+        if api_requires?("many_per_app")
+          check "returns different ids" do
+            if json1["id"] == json2["id"]
+              error "multiple provisions cannot return the same id"
+            else
+              true
+            end
+          end
+        end
+      end
     end
 
     class ProvisionCheck < ApiCheck
@@ -274,17 +340,9 @@ module Heroku
 
         code = nil
         json = nil
-        callback = "http://localhost:7779/callback/999"
         reader, writer = nil
 
-        payload = {
-          :heroku_id => heroku_id,
-          :plan => data[:plan] || 'test',
-          :callback_url => callback,
-          :logplex_token => nil,
-          :region => "amazon-web-services::us-east-1",
-          :options => data[:options] || {}
-        }
+        payload = create_provision_payload
 
         if data[:async]
           reader, writer = IO.pipe
@@ -345,7 +403,11 @@ module Heroku
 
         data[:provision_response] = response
 
-        run ProvisionResponseCheck, data
+        run ProvisionResponseCheck, data.merge("heroku_id" => heroku_id)
+
+        if !api_requires?("many_per_app")
+          run DuplicateProvisionCheck, data
+        end
       end
 
     ensure

data/lib/heroku/kensa/manifest.rb

@@ -26,7 +26,8 @@ module Heroku
     "regions": [ "us" ],
     "password": "#{@password}",#{ sso_key }
     "production": "https://yourapp.com/",
-    "test": "http://localhost:#{@port}/"
+    "test": "http://localhost:#{@port}/",
+    "requires": []
   }
 }
 JSON
@@ -38,6 +39,7 @@ JSON
   "id": "myaddon",
   "api": {
     "config_vars": [ "MYADDON_URL" ],
+    "requires": [],
     "regions": [ "us" ],
     "password": "#{@password}",#{ sso_key }
     "production": {

data/lib/heroku/kensa/version.rb

@@ -1,5 +1,5 @@
 module Heroku
   module Kensa
-    VERSION = '2.2.0'
+    VERSION = '2.3.0'
   end
 end

data/test/all_check_test.rb

@@ -7,6 +7,7 @@ class AllCheckTest < Test::Unit::TestCase
 
   setup do
     @data = Manifest.new(:method => :get).skeleton
+    @data["api"]["requires"] << "many_per_app"
     @data['api']['password'] = 'secret'
     @data['api']['test'] += "working"
     @file = File.dirname(__FILE__) + "/resources/runner.rb"

data/test/duplicate_provision_check_test.rb

@@ -0,0 +1,34 @@
+require 'test/helper'
+
+class DuplicateProvisionCheckTest < Test::Unit::TestCase
+  include Heroku::Kensa
+  include ProviderMock
+
+  def check; DuplicateProvisionCheck; end
+
+  setup do
+    @data = Manifest.new(method: :post).skeleton
+    @data["api"]["password"] = "secret"
+    ProviderServer::ProvisionRecord.reset
+  end
+
+  context "when the provider supports many_per_app" do
+    setup { @data["api"]["requires"] = ["many_per_app"] }
+
+    test "allows duplicate provision attempts" do
+      use_provider_endpoint "working_duplicate"
+      assert_valid
+    end
+
+    test "duplicate provisions return different provider ids" do
+      use_provider_endpoint "working_duplicate"
+      assert_valid
+    end
+
+    test "fails when deuplicate provisions return the same provider id" do
+      use_provider_endpoint "working"
+      assert_invalid
+    end
+  end
+end
+

data/test/helper.rb

@@ -10,6 +10,24 @@ require 'fakefs/safe'
 class Test::Unit::TestCase
   include RR::Adapters::TestUnit
 
+  class ProvisionRecord
+    def self.provisions
+      @provisions ||= 0
+    end
+
+    def self.incr
+      @provisions += 1
+    end
+
+    def self.reset
+      @provisions = 0
+    end
+
+    def self.count
+      @provisions
+    end
+  end
+
   module ProviderMock
     def setup
       Artifice.activate_with(ProviderServer)

data/test/manifest_check_test.rb

@@ -97,6 +97,34 @@ class ManifestCheckTest < Test::Unit::TestCase
           assert_invalid
         end
 
+        context "when config_var_prefix is set" do
+          context "to something other than the slug" do
+            test "config vars matching config_vars_prefix are valid" do
+              @data["api"]["config_vars_prefix"] = "THING"
+              @data["api"]["config_vars"] = ['THING_URL']
+              assert_valid
+            end
+
+            test "config vars matching slug are invalid" do
+              @data["api"]["config_vars_prefix"] = "THING"
+              @data["api"]["config_vars"] << "MYADDON_URL"
+              assert_invalid
+            end
+          end
+        end
+
+        context "when config_var_prefix is not set" do
+          test "config vars matching slug are valid" do
+            @data["api"]["config_vars"] << 'MYADDON_URL'
+            assert_valid
+          end
+
+          test "config vars not matching slug are invalid" do
+            @data["api"]["config_vars"] << "NOT_SLUG_URL"
+            assert_invalid
+          end
+        end
+
         test "assert config var prefixes match addon id" do
           @data["api"]["config_vars"] << 'MONGO_URL'
           assert_invalid

data/test/provision_check_test.rb

@@ -10,6 +10,7 @@ class ProvisionCheckTest < Test::Unit::TestCase
     context "with sso #{method}" do
       setup do
         @data = Manifest.new(:method => method).skeleton
+        @data["api"]["requires"] = ["many_per_app"]
         @data['api']['password'] = 'secret'
       end
 
@@ -29,6 +30,13 @@ class ProvisionCheckTest < Test::Unit::TestCase
         assert_valid
       end
 
+      context "when supporting many_per_app" do
+        test "passes duplicate provision check" do
+          @data["api"]["requires"] = ["many_per_app"]
+          assert_valid
+        end
+      end
+
       test "provision call with extra params" do
         use_provider_endpoint "cmd-line-options"
         @data[:options] = {:foo => 'bar', :bar => 'baz'}

data/test/provision_response_check_test.rb

@@ -13,6 +13,7 @@ class ProvisionResponseCheckTest < Test::Unit::TestCase
                 }}
     @data = Manifest.new.skeleton.merge(:provision_response => @response)
     @data['api']['config_vars'] << "MYADDON_CONFIG"
+    @data["heroku_id"] = "app987@kensa.heroku.com"
   end
 
   test "is valid if no errors" do
@@ -24,6 +25,11 @@ class ProvisionResponseCheckTest < Test::Unit::TestCase
     assert_invalid
   end
 
+  test "id does not contain the heroku_id" do
+    @response["id"] = "987"
+    assert_invalid
+  end
+
   describe "when config is present" do
 
     test "is a hash" do
@@ -74,7 +80,7 @@ class ProvisionResponseCheckTest < Test::Unit::TestCase
 
     describe "when syslog drain is required" do
       setup do
-        @data["requires"] = ["syslog_drain"]
+        @data["api"]["requires"] = ["syslog_drain"]
       end
 
       test "response is invalid without a syslog_drain_url" do

data/test/resources/server.rb

@@ -53,13 +53,50 @@ ERB
   end
 end
 
+class ProvisionRecord
+  def self.provisions
+    @provisions ||= 0
+  end
+
+  def self.incr
+    @provisions += 1
+  end
+
+  def self.reset
+    @provisions = 0
+  end
+
+  def self.count
+    @provisions
+  end
+end
+
+post '/working_duplicate/heroku/resources' do
+  heroku_only!
+  ProvisionRecord.incr
+  { id: ProvisionRecord.count }.to_json
+end
+
+post '/duplicate/heroku/resources' do
+  heroku_only!
+  ProvisionRecord.incr
+
+  if ProvisionRecord.count > 1
+    status 422
+    {}.to_json
+  else
+    status 201
+    { id: 123 }.to_json
+  end
+end
+
 post '/heroku/resources' do
   heroku_only!
   { :id => 123 }.to_json
 end
 
 post '/working/heroku/resources' do
-  json_must_include(%w{heroku_id plan callback_url logplex_token options})
+  json_must_include(%w{heroku_id plan callback_url options})
   heroku_only!
   { :id => 123 }.to_json
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kensa
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Blake Mizerany
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-09 00:00:00.000000000 Z
+date: 2015-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: launchy
@@ -203,6 +203,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Kensa is a command-line tool to help add-on providers integrating their
   services with Heroku. It manages manifest files, and provides a TDD-like approach
   for programmers to test and develop their APIs.
@@ -236,6 +250,7 @@ files:
 - test/all_check_test.rb
 - test/create_test.rb
 - test/deprovision_check_test.rb
+- test/duplicate_provision_check_test.rb
 - test/helper.rb
 - test/init_test.rb
 - test/manifest_check_test.rb
@@ -276,6 +291,7 @@ test_files:
 - test/all_check_test.rb
 - test/create_test.rb
 - test/deprovision_check_test.rb
+- test/duplicate_provision_check_test.rb
 - test/helper.rb
 - test/init_test.rb
 - test/manifest_check_test.rb