right_scraper 5.1.1 → 5.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aeafef3534344761cfb4b2bc01dc8a8aec848390
-  data.tar.gz: ac21c7c9c6121c4470f8d90b6a8b16a994e963e0
+  metadata.gz: af3229fa87070f86fc76485027161ac82a40b77d
+  data.tar.gz: c65bfccf9eddef84be1fe95dff0d08a9a6d07e63
 SHA512:
-  metadata.gz: 158ca23e31b79c3b9e57f09cce5f1abf95a28132412f6fd1ae5f91d03bc84874c2cc536399ceb465942180d2cc764dbebf6046362a211c9c1759c4a5cbda2752
-  data.tar.gz: 318501b488f55fe9f4ac2701f0d3bad1ee2d26b7e2ab7645818d38f8d1eadd66720436c3a80b80c204b09014d75c4ff140718e2fb813680455822c3c90e2dc21
+  metadata.gz: b0f38e7b46f971944d51e4b44fb4fef807c89a4e246ee7752b7eb8eea5719a188c6cdb549f46b924a8e9f21a1ee481d8225ef1a3a5c9303e3a940a4fc3c7d485
+  data.tar.gz: 6f051b52dc8c674eacf16e9c7a0cbdb0efd06c7cdd256e875bbb4d74a887c5367c057f42d4704032d7310d0882968c94046a94ce957703c8310b6aef3aa81232

data/bin/right_scraper-retrieve

@@ -39,6 +39,15 @@ main = nil
 begin
   options = ::JSON.load(::File.read(::ARGV.shift))
   repository = ::JSON.load(::File.read(::ARGV.shift))
+
+  # use credentials from environment, if available.
+  if !(repo_first_cred = ::ENV['REPOSITORY_FIRST_CREDENTIAL'].to_s).empty?
+    repository['first_credential'] = repo_first_cred
+    if !(repo_second_cred = ::ENV['REPOSITORY_SECOND_CREDENTIAL'].to_s).empty?
+      repository['second_credential'] = repo_second_cred
+    end
+  end
+
   main = ::RightScraper::Main.new(options)
   if retrieved = main.retrieve(repository)
     # remove any credentials from repository after retrieval; not needed in

data/bin/right_scraper-scan

@@ -41,18 +41,35 @@ begin
   retrieved = ::JSON.load(::File.read(::ARGV.shift))
   main = ::RightScraper::Main.new(options)
 
+  # use credentials from environment, if available.
+  if !(aws_access_key_id = ::ENV['AWS_ACCESS_KEY_ID'].to_s).empty?
+    options['s3_key'] = aws_access_key_id
+    if !(aws_secret_access_key = ::ENV['AWS_SECRET_ACCESS_KEY'].to_s).empty?
+      options['s3_secret'] = aws_secret_access_key
+    end
+  end
+
   # cleanup any leftover errors/warnings in retrieved hash.
   retrieved.delete('errors')
   retrieved.delete('warnings')
   if main.scan(retrieved)
-    retrieved[:warnings] = main.warnings unless main.warnings.empty?
-    retrieved[:resources] = main.resources.map do |r|
-      # remove repository from each returned cookbook due to redundancy.
-      h = r.to_hash
-      h.delete(:repository)
-      h
+    result = {}
+    result[:warnings] = main.warnings unless main.warnings.empty?
+
+    # we can optimize by not marshaling back resources when the only scanner is
+    # CookbookMetadata. the reason is that we expect this scanner to only be
+    # called in unprivileged isolation followed by more scanners with more
+    # privileges and only the latter need to return fully resolved resources.
+    if main.scanners != [RightScraper::Scanners::CookbookMetadata]
+      result[:resources] = main.resources.map do |r|
+        # remove relational repository from each returned cookbook due to being
+        # the same for each resource and already known to caller.
+        h = r.to_hash
+        h.delete(:repository)
+        h
+      end
     end
-    $stdout.puts(::JSON.generate(retrieved))
+    $stdout.puts(::JSON.generate(result))
   else
     result = { errors: main.errors }
     $stderr.puts(::JSON.generate(result))

data/lib/right_scraper/main.rb

@@ -221,6 +221,16 @@ module RightScraper
       @logger.warnings
     end
 
+    # (Array):: scanners or empty
+    def builders
+      return @options[:builders]
+    end
+
+    # (Array):: scanners or empty
+    def scanners
+      return @options[:scanners]
+    end
+
     # Was scraping successful?
     # Call errors to get error messages if false
     #

data/lib/right_scraper/resources/cookbook.rb

@@ -72,8 +72,8 @@ module RightScraper::Resources
     def to_hash
       {
         repository: repository,
-        metadata: metadata,
-        manifest: manifest,
+        metadata: ::JSON.dump(metadata),  # pass these as opaque JSON blobs to
+        manifest: ::JSON.dump(manifest),  # be unmarshaled only by from_hash
         pos: pos
       }
     end
@@ -82,7 +82,14 @@ module RightScraper::Resources
     def self.from_hash(h)
       h = ::RightSupport::Data::Mash.new(h)
       c = self.new(h[:repository], h[:pos], h[:repo_dir])
-      c.manifest = h[:manifest]
+      if (md = h[:metadata]).kind_of?(::String)
+        md = ::JSON.load(md)
+      end
+      c.metadata = md
+      if (mf = h[:manifest]).kind_of?(::String)
+        mf = ::JSON.load(mf)
+      end
+      c.manifest = mf
       c
     end
 

data/lib/right_scraper/version.rb

@@ -23,7 +23,7 @@
 
 module RightScraper
   # for gemspec, etc.
-  GEM_VERSION = '5.1.1'
+  GEM_VERSION = '5.2.2'
 
   # (Fixnum) protocol versioning scheme; prepended to hashes to
   # prevent collisions.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: right_scraper
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 5.2.2
 platform: ruby
 authors:
 - Raphael Simon
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-15 00:00:00.000000000 Z
+date: 2016-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: right_aws