vara 0.17.2 → 0.17.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b7ad623bfe74edb46c3a0d2ea8d0caff857045b
-  data.tar.gz: a4da45b3a28751e767f4a4a5a93b28aea5411184
+  metadata.gz: 6ce2c2e730b28154e9a4dec7266f2ea1e35113e6
+  data.tar.gz: f5304de651d5f0d8ab77168af2477d0e00b36c97
 SHA512:
-  metadata.gz: 1e3c08d3f8072090718e4679833ec24e6dc0c8b9b84cbbb566300bf404d7dcdd5292f058f35ab302c22406cadb35709c255866ebe256dc44e7dec5ef1ce1ae99
-  data.tar.gz: 0824ab84abfcd9f0fbad0f9d8aab2592692fd00ec70dfa30b98b05aaaf719c4f1c97a334cb0a468cf911abcfd2942c678c86ad3f75ef5836ac2ac66f938555d7
+  metadata.gz: 67043f52e18867c3dc258d89125df22884be362d09e42d62c3c209e2ae66bcc463f2ea71ae8ad1dd7efdcd6a079ff7ce38f904b8055ee07fd675bfdc9679a908
+  data.tar.gz: b88c30cf4ced4e267fd5b95d1c808b9609f624c8b5fce4a0ae683d75557f28c65cabd2f13f121425b7d544303d6881097ca2f80aa4ba449883bacf065f050927

data/lib/vara/product_metadata_processor.rb

@@ -31,7 +31,9 @@ module Vara
 
     attr_reader :product_dir, :versioner, :external_release_paths
 
-    ALLOWED_RELEASE_KEYS = %w(file name url md5 version)
+    REQUIRED_RELEASE_KEYS = %w(file name md5 version)
+    EXCLUSIVE_KEYS = %w(url aws)
+    REQUIRED_AWS_KEYS = %w(access_key_id secret_access_key bucket_name region filename)
 
     def merged_metadata
       binaries_path = File.join(product_dir, 'metadata_parts', 'binaries.yml')
@@ -63,13 +65,38 @@ module Vara
       end
     end
 
+    # rubocop:disable CyclomaticComplexity
     def validate_release(external_release, external_release_path)
-      missing_keys = ALLOWED_RELEASE_KEYS - external_release.keys.to_a
-      fail "Specified release #{File.basename(external_release_path)} is missing keywords: #{missing_keys}" unless missing_keys.empty?
-      extra_keys = external_release.keys.to_a - ALLOWED_RELEASE_KEYS
-      fail "Specified release #{File.basename(external_release_path)} has extra keywords: #{extra_keys}" unless extra_keys.empty?
+      missing_keys = REQUIRED_RELEASE_KEYS - external_release.keys.to_a
+      specified_release = "Specified release #{File.basename(external_release_path)} "
+
+      fail specified_release + "is missing required keywords: #{missing_keys}" unless missing_keys.empty?
+
+      exclusive_key_count = (EXCLUSIVE_KEYS - external_release.keys.to_a).length
+      case
+      when exclusive_key_count < 1
+        fail specified_release + "contains more than one of the following keys, but only one is allowed: #{EXCLUSIVE_KEYS}"
+      when exclusive_key_count > 1
+        fail specified_release + "requires one of the following keys: #{EXCLUSIVE_KEYS}"
+      end
+
+      if external_release.key?('aws')
+        missing_aws_keys = missing_aws_keys(external_release)
+
+        fail specified_release + "is missing required aws hash keywords: #{missing_aws_keys}" unless missing_aws_keys.empty?
+      end
+
+      extra_keys = external_release.keys.to_a - REQUIRED_RELEASE_KEYS - EXCLUSIVE_KEYS
+      fail specified_release + "has extra keywords: #{extra_keys}" unless extra_keys.empty?
       external_release
     end
+    # rubocop:enable CyclomaticComplexity
+
+    def missing_aws_keys(external_release)
+      REQUIRED_AWS_KEYS.select do |required_aws_key|
+        !external_release['aws'].key?(required_aws_key)
+      end
+    end
 
     def save_processed_metadata(processed_metadata_hash)
       product_name = processed_metadata_hash.fetch('name').tr('-', '_')

data/lib/vara/version.rb

@@ -1,5 +1,5 @@
 module Vara
-  VERSION = '0.17.2'
+  VERSION = '0.17.3'
 end
 
 # Copyright (c) 2014-2015 Pivotal Software, Inc.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vara
 version: !ruby/object:Gem::Version
-  version: 0.17.2
+  version: 0.17.3
 platform: ruby
 authors:
 - CF Release Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-22 00:00:00.000000000 Z
+date: 2016-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -205,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Vara starts with a product git repository that meets specific requirements.