mixlib-install 0.8.0.alpha.2 → 0.8.0.alpha.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40e1403861a8c56ae5bef0076ede1a889cece701
-  data.tar.gz: eab4f0ae8dd1b27a235afd950015421fa7998345
+  metadata.gz: 7db151f3905eb7a527cf687018366832a80a2811
+  data.tar.gz: 6186b2ea33ee9a2809084e768a33dcb57c162f00
 SHA512:
-  metadata.gz: 2434a31ab88a137f45b16df69bfdb61db9fe247a01a26f071977b87086164172ac46d9e144fbc679923f680f843eec408132d9f272901873fc55c96412281fbd
-  data.tar.gz: e37efeda997e33f7095b3e49b39ce8fa7e9efd1f08e5ae065fa9594eff4d49dba22be2e1d077918ede15814038898a59e15c13e250a4f2147a25f739d0f12af6
+  metadata.gz: fc15e3ca92d5ad638a1e9a35ff30b8cd07a88ab091b26816eaebf1de9849db3e97ec88d98c4afdd9cd78eb723276b11e90698dcdf89847a3f87379319cf6caff
+  data.tar.gz: d98e85481f590f9e77357bfcf4223620bdfcd7ca623343b20f7a3f174e1b0350c720794b45249de50c9aafc0f964486b0b9608736f09ddeff9155a468b713aea

data/README.md

@@ -35,9 +35,16 @@ artifacts.first.url
 # => "http://opscode-omnibus-packages-current.s3.amazonaws.com/mac_os_x/10.9/x86_64/chef-12.5.1%2B20151009083009-1.dmg"
 ```
 
+## Unstable channel
+The `:unstable` channel is currently only available when connected to Chef's internal network.
+Configure Artifactory access by setting the following environment variables:
+```
+export ARTIFACTORY_USERNAME='username'
+export ARTIFACTORY_PASSWORD='password'
+```
 
-## Test
-Some tests are tagged `:unstable` and can only run when connected to Chef's internal network.  These are excluded by default.  To run the `:unstable` tests run: `bundle exec rspec --tag unstable`.
+### Unstable channel specs
+Some spec examples are tagged `:unstable` and can only run when connected to Chef's internal network.  These are excluded by default.  To run the `:unstable` tests run: `rake unstable`.
 
 ## Contributing
 

data/Rakefile

@@ -18,6 +18,11 @@ end
 desc "Run all tests"
 task test: [:rubocop, :spec]
 
+desc "Run unstable channel tests"
+task "unstable" do
+  system("bundle exec rspec -t unstable")
+end
+
 desc "Render product matrix documentation"
 task "matrix" do
   require "mixlib/install/product"

data/acceptance/Gemfile

@@ -1,10 +1,12 @@
 source "https://rubygems.org"
 
 gem "mixlib-install", path: "../"
-gem "test-kitchen", github: "sersut/test-kitchen"
+gem "test-kitchen", github: "sersut/test-kitchen", branch: "sersut/mixlib-install-update"
 gem "chef-acceptance", github: "chef/chef-acceptance"
 gem "pry"
 
 group(:development) do
   gem "kitchen-vagrant"
+  gem "windows_chef_zero"
+  gem "winrm-transport"
 end

data/acceptance/Gemfile.lock

@@ -1,16 +1,16 @@
 GIT
   remote: git://github.com/chef/chef-acceptance.git
-  revision: e28d67891b0359af83836ec55c91eb07e8b062d1
+  revision: 47f5f54e561981802122168ca01ae03907965312
   specs:
     chef-acceptance (0.2.0)
       thor (~> 0.19)
 
 GIT
   remote: git://github.com/sersut/test-kitchen.git
-  revision: 5e4fa6baff5d51dc983be3f7b67ffe1bcbf2a8d2
+  revision: fd05389ec556fdcac96b92b1aea2a9ed48802e75
+  branch: sersut/mixlib-install-update
   specs:
     test-kitchen (1.4.3.dev.0)
-      mixlib-install (~> 0.7)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)
       net-ssh (~> 2.7, < 2.10)
@@ -20,7 +20,7 @@ GIT
 PATH
   remote: ../
   specs:
-    mixlib-install (0.8.0.alpha.0)
+    mixlib-install (0.8.0.alpha.2)
       artifactory (~> 2.3.0)
       mixlib-versioning (~> 1.1.0)
 
@@ -28,22 +28,52 @@ GEM
   remote: https://rubygems.org/
   specs:
     artifactory (2.3.2)
+    builder (3.2.2)
     coderay (1.1.0)
+    ffi (1.9.10)
+    gssapi (1.2.0)
+      ffi (>= 1.0.1)
+    gyoku (1.3.1)
+      builder (>= 2.1.2)
+    httpclient (2.7.0.1)
     kitchen-vagrant (0.19.0)
       test-kitchen (~> 1.4)
+    little-plugger (1.1.4)
+    logging (2.0.0)
+      little-plugger (~> 1.1)
+      multi_json (~> 1.10)
     method_source (0.8.2)
-    mixlib-shellout (2.2.3)
+    mixlib-shellout (2.2.5)
     mixlib-versioning (1.1.0)
+    multi_json (1.11.2)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (2.9.2)
+    nori (2.6.0)
     pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
+    rubyntlm (0.4.0)
+    rubyzip (1.1.7)
     safe_yaml (1.0.4)
     slop (3.6.0)
     thor (0.19.1)
+    uuidtools (2.1.5)
+    windows_chef_zero (2.0.0)
+      test-kitchen (>= 1.2.1)
+    winrm (1.3.6)
+      builder (>= 2.1.2)
+      gssapi (~> 1.2)
+      gyoku (~> 1.0)
+      httpclient (~> 2.2, >= 2.2.0.2)
+      logging (>= 1.6.1, < 3.0)
+      nori (~> 2.0)
+      rubyntlm (~> 0.4.0)
+      uuidtools (~> 2.1.2)
+    winrm-transport (1.0.3)
+      rubyzip (~> 1.1, >= 1.1.7)
+      winrm (~> 1.3)
 
 PLATFORMS
   ruby
@@ -54,6 +84,8 @@ DEPENDENCIES
   mixlib-install!
   pry
   test-kitchen!
+  windows_chef_zero
+  winrm-transport
 
 BUNDLED WITH
    1.10.6

data/acceptance/current/.acceptance/acceptance-cookbook/recipes/provision.rb

@@ -1 +1,3 @@
-log 'provision recipe'
+execute 'kitchen converge' do
+  cwd node['chef-acceptance']['suite-dir']
+end

data/acceptance/current/.kitchen.yml

@@ -7,39 +7,34 @@ driver:
 
 provisioner:
   name: chef_zero
-  product_name: chef
-  product_version: latest
-  channel: current
 
 platforms:
   - name: centos-6.5
     run_list:
-  # - name: debian-7.4
-  #   run_list:
-  # - name: freebsd-10.0
-  #   run_list:
+  - name: debian-7.4
+    run_list:
+  - name: freebsd-10.0
+    run_list:
   - name: ubuntu-14.04
     run_list:
-  # - name: macosx-10.10
-  #   driver:
-  #     box: chef/macosx-10.10 # private
-  # - name: windows-7-professional
-  #   provisioner:
-  #     name: windows_chef_zero
-  #     require_chef_omnibus: 11.12.4
-  #   driver:
-  #     box: chef/windows-7-professional # private
+  - name: macosx-10.10
+    driver:
+      box: chef/macosx-10.10 # private
+  - name: windows-server-2012r2-standard
+    driver:
+      box: chef/windows-server-2012r2-standard # private
 
 suites:
-  - name: mixlib-install-chef
+  - name: chef-current-install
     provisioner:
       product_name: chef
       product_version: latest
       channel: current
     run_list:
-  # - name: mixlib-install-chefdk
-  #   provisioner:
-  #     product_name: chefdk
-  #     product_version: latest
-  #     channel: current
-  #   run_list:
+  - name: chefdk-current-install
+    excludes: [ 'freebsd-10.0' ]
+    provisioner:
+      product_name: chefdk
+      product_version: latest
+      channel: current
+    run_list:

data/acceptance/unstable/.acceptance/acceptance-cookbook/.gitignore

@@ -0,0 +1,2 @@
+tmp/
+nodes/

data/acceptance/unstable/.acceptance/acceptance-cookbook/metadata.rb

@@ -0,0 +1 @@
+name 'acceptance-cookbook'

data/acceptance/unstable/.acceptance/acceptance-cookbook/recipes/destroy.rb

@@ -0,0 +1,3 @@
+execute 'kitchen destroy' do
+  cwd node['chef-acceptance']['suite-dir']
+end

data/acceptance/unstable/.acceptance/acceptance-cookbook/recipes/provision.rb

@@ -0,0 +1,3 @@
+execute 'kitchen converge' do
+  cwd node['chef-acceptance']['suite-dir']
+end

data/acceptance/unstable/.acceptance/acceptance-cookbook/recipes/verify.rb

@@ -0,0 +1,3 @@
+execute 'kitchen verify' do
+  cwd node['chef-acceptance']['suite-dir']
+end

data/acceptance/unstable/.kitchen.yml

@@ -0,0 +1,40 @@
+driver:
+  name: vagrant
+  forward_agent: yes
+  customize:
+    cpus: 2
+    memory: 1024
+
+provisioner:
+  name: chef_zero
+
+platforms:
+  - name: centos-6.5
+    run_list:
+  - name: debian-7.4
+    run_list:
+  - name: freebsd-10.0
+    run_list:
+  - name: ubuntu-14.04
+    run_list:
+  - name: macosx-10.10
+    driver:
+      box: chef/macosx-10.10 # private
+  - name: windows-server-2012r2-standard
+    driver:
+      box: chef/windows-server-2012r2-standard # private
+
+suites:
+  - name: chef-unstable-install
+    provisioner:
+      product_name: chef
+      product_version: latest
+      channel: unstable
+    run_list:
+  - name: chefdk-unstable-install
+    excludes: [ 'freebsd-10.0' ]
+    provisioner:
+      product_name: chefdk
+      product_version: latest
+      channel: unstable
+    run_list:

data/lib/mixlib/install.rb

@@ -22,6 +22,8 @@ require "mixlib/versioning"
 require "mixlib/install/backend"
 require "mixlib/install/options"
 require "mixlib/install/generator"
+require "mixlib/install/generator/bourne"
+require "mixlib/install/generator/powershell"
 
 module Mixlib
   class Install
@@ -56,10 +58,13 @@ module Mixlib
     # @return [String] the installation directory for the project
     #
     def root
-      # TODO: Support root as "$env:systemdrive\\opscode\\chef" when on windows.
       # This only works for chef and chefdk but they are the only projects
       # we are supporting as of now.
-      "/opt/#{options.product_name}"
+      if options.for_ps1?
+        "$env:systemdrive\\opscode\\#{options.product_name}"
+      else
+        "/opt/#{options.product_name}"
+      end
     end
 
     #
@@ -72,7 +77,12 @@ module Mixlib
       # install directory which can be different than the product name (e.g.
       # chef-server -> /opt/opscode). But this is OK for now since
       # chef & chefdk are the only supported products.
-      version_manifest_file = "/opt/#{options.product_name}/version-manifest.json"
+      version_manifest_file = if options.for_ps1?
+        "$env:systemdrive\\opscode\\#{options.product_name}\\version-manifest.json"
+      else
+        "/opt/#{options.product_name}/version-manifest.json"
+      end
+
       if File.exist? version_manifest_file
         JSON.parse(File.read(version_manifest_file))["build_version"]
       end
@@ -88,5 +98,27 @@ module Mixlib
       current_ver = Mixlib::Versioning.parse(current_version)
       (available_ver > current_ver)
     end
+
+    #
+    # Returns the install.sh script
+    # Supported context parameters:
+    # ------------------
+    # base_url [String]
+    #   url pointing to the omnitruck to be queried by the script.
+    #
+    def self.install_sh(context = {})
+      Mixlib::Install::Generator::Bourne.install_sh(context)
+    end
+
+    #
+    # Returns the install.ps1 script
+    # Supported context parameters:
+    # ------------------
+    # base_url [String]
+    #   url pointing to the omnitruck to be queried by the script.
+    #
+    def self.install_ps1(context = {})
+      Mixlib::Install::Generator::PowerShell.install_ps1(context)
+    end
   end
 end

data/lib/mixlib/install/backend/artifactory.rb

@@ -25,64 +25,138 @@ module Mixlib
   class Install
     class Backend
       class Artifactory
-        ARTIFACTORY_ENDPOINT = "http://artifactory.chef.co".freeze
+        class ConnectionError < StandardError; end
+        class AuthenticationError < StandardError; end
 
-        attr_reader :options
-        attr_reader :client
+        ENDPOINT = "http://artifactory.chef.co".freeze
+
+        attr_accessor :options
 
         def initialize(options)
           @options = options
-          @client = ::Artifactory::Client.new(endpoint: ARTIFACTORY_ENDPOINT)
         end
 
+        # Create filtered list of artifacts
+        #
+        # @return [Array<ArtifactInfo>] list of artifacts for the configured
+        # channel, product name, and product version.
+        # @return [ArtifactInfo] arifact info for the configured
+        # channel, product name, product version and platform info
+        #
         def info
-          begin
-            results = client.get("/api/search/prop", params, headers)["results"]
-          rescue Errno::ETIMEDOUT => e
-            raise e, "unstable channel uses endpoint #{ARTIFACTORY_ENDPOINT} \
-which is currently only accessible through Chef's internal network."
+          artifacts = artifactory_info.collect { |a| create_artifact(a) }
+
+          artifacts_for_version = artifacts.find_all do |a|
+            a.version == options.resolved_version(artifacts)
           end
 
           if options.platform
-            artifact(results.first)
-          else
-            results.collect do |result|
-              artifact(result)
+            artifacts_for_version.find do |a|
+              a.platform == options.platform &&
+                a.platform_version == options.platform_version &&
+                a.architecture == options.architecture
             end
+          else
+            artifacts_for_version
           end
         end
 
-        private
+        # Fetches all artifacts from the configured Artifactory repository using
+        # channel and product name as search criteria
+        #
+        # @return [Array<Hash>] list of artifactory hash data
+        #
+        # Hash data:
+        #   download_uri: The full url download path
+        #   <property_name>: The names of the properties associcated to the artifact
+        #
+        def artifactory_info
+          query = <<-QUERY
+items.find(
+  {"repo": "omnibus-#{options.channel}-local"},
+  {"@omnibus.project": "#{options.product_name}"}
+).include("repo", "path", "name", "property")
+          QUERY
 
-        def artifact(result)
+          results = artifactory_request do
+            client.post("/api/search/aql", query, "Content-Type" => "text/plain")
+          end
+
+          # Merge artifactory properties and downloadUri to a flat Hash
+          results["results"].collect do |result|
+            { "downloadUri" => generate_download_uri(result) }.merge(
+              map_properties(result["properties"])
+            )
+          end
+        end
+
+        def create_artifact(artifact_map)
           ArtifactInfo.new(
-            md5:              result["properties"]["omnibus.md5"].first,
-            sha256:           result["properties"]["omnibus.sha256"].first,
-            version:          result["properties"]["omnibus.version"].first,
-            platform:         result["properties"]["omnibus.platform"].first,
-            platform_version: result["properties"]["omnibus.platform_version"].first,
-            architecture:     result["properties"]["omnibus.architecture"].first,
-            url:              result["uri"]
+            md5:              artifact_map["omnibus.md5"],
+            sha256:           artifact_map["omnibus.sha256"],
+            version:          artifact_map["omnibus.version"],
+            platform:         artifact_map["omnibus.platform"],
+            platform_version: artifact_map["omnibus.platform_version"],
+            architecture:     artifact_map["omnibus.architecture"],
+            url:              artifact_map["downloadUri"]
           )
         end
 
-        def params
-          params = {
-            "repos" => "omnibus-current-local",
-            "omnibus.version" => options.product_version
-          }
+        private
 
-          if options.platform
-            params["omnibus.platform"] = options.platform
-            params["omnibus.platform_version"] = options.platform_version
-            params["omnibus.architecture"] = options.architecture
+        # Converts Array<Hash> where the Hash is a key pair and
+        # value pair to a simplifed key/pair Hash
+        #
+        def map_properties(properties)
+          return {} if properties.nil?
+          properties.each_with_object({}) do |prop, h|
+            h[prop["key"]] = prop["value"]
           end
+        end
+
+        # Construct the downloadUri from raw artifactory data
+        #
+        def generate_download_uri(result)
+          uri = []
+          uri << endpoint.sub(/\/$/, "")
+          uri << result["repo"]
+          uri << result["path"]
+          uri << result["name"]
+          uri.join("/")
+        end
 
-          params
+        def client
+          @client ||= ::Artifactory::Client.new(
+            endpoint: endpoint,
+            username: ENV["ARTIFACTORY_USERNAME"],
+            password: ENV["ARTIFACTORY_PASSWORD"]
+          )
         end
 
-        def headers
-          { "X-Result-Detail" => "properties" }
+        def endpoint
+          @endpoint ||= ENV.fetch("ARTIFACTORY_ENDPOINT", ENDPOINT)
+        end
+
+        def artifactory_request
+          begin
+            results = yield
+          rescue Errno::ETIMEDOUT, ::Artifactory::Error::ConnectionError
+            raise ConnectionError, <<-EOS
+Artifactory endpoint '#{::Artifactory.endpoint}' is unreachable. Check that
+the endpoint is correct and there is an open connection to Chef's private network.
+            EOS
+          rescue ::Artifactory::Error::HTTPError => e
+            if e.code == 401 && e.message =~ /Bad credentials/
+              raise AuthenticationError, <<-EOS
+Artifactory server denied credentials. Verify ARTIFACTORY_USERNAME and
+ARTIFACTORY_PASSWORD environment variables are configured properly.
+              EOS
+            else
+              raise e
+            end
+          end
+
+          results
         end
       end
     end