Merge pull request #245 from hunner/revert_3stuff

Revert "Release prep for 3.0.0"
2017-06-21 15:23:30 -07:00 · 2017-06-21 15:16:31 -07:00 · 2017-06-20 16:49:21 -07:00 · 2017-06-20 16:22:10 -07:00 · 2017-06-15 16:03:40 -07:00 · 2017-06-15 17:14:13 +01:00
10 changed files with 168 additions and 70 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,17 @@
+## Supported Release 2.1.0
+### Summary
+This release adds fixes to restore the ability to install Oracle Java. It also
+fixes the paths for the latest RHEL 7 1.7.0 and 1.8.0 OpenJDKs.
+
+### Added
+- java::oracle parameter `url`
+- java::oracle parameter `url_hash`
+
+### Fixed
+- Let `java_default_home` fact work when /usr/bin/java doesn't exist
+- Add puppet 4 parameter types
+- Use `/usr/lib/jvm/java-1.x.0` symlinks for `java_home` defaults.
+
 ## Supported Release 2.0.0
 ### Summary

--- a/README.markdown
+++ b/README.markdown
@@ -22,29 +22,30 @@ The java module can automatically install Java jdk or jre on a wide variety of s
 ## Setup

 ### Beginning with the java module
+
 To install the correct Java package on your system, include the `java` class: `include java`.

 ## Usage

 The java module installs the correct jdk or jre package on a wide variety of systems. By default, the module installs the jdk package, but you can set different installation parameters as needed. For example, to install jre instead of jdk, you would set the distribution parameter:

-~~~
+```puppet
 class { 'java':
  distribution => 'jre',
 }
-~~~
+```

 To install the latest patch version of Java 8 on CentOS

-~~~
+```puppet
 class { 'java' :
  package => 'java-1.8.0-openjdk-devel',
 }
-~~~
+```

 The defined type `java::oracle` installs one or more versions of Oracle Java SE. `java::oracle` depends on [puppet/archive](https://github.com/voxpupuli/puppet-archive).  By using `java::oracle` you agree to Oracle's licensing terms for Java SE.

-~~~
+```puppet
 java::oracle { 'jdk6' :
  ensure  => 'present',
  version => '6',
@@ -56,18 +57,18 @@ java::oracle { 'jdk8' :
  version => '8',
  java_se => 'jdk',
 }
-~~~
+```

 To install a specific release of a Java version, e.g. 8u101-b13, provide both parameters `version_major` and `version_minor` as follows:

-~~~
+```puppet
 java::oracle { 'jdk8' :
  ensure  => 'present',
  version_major => '8u101',
  version_minor => 'b13',
  java_se => 'jdk',
 }
-~~~
+```

 ## Reference

@@ -85,25 +86,31 @@ java::oracle { 'jdk8' :


 #### Parameters
+
 The following parameters are available in `java`:

 ##### `distribution`
+
 Specifies the Java distribution to install.
 Valid options:  'jdk', 'jre', or, where the platform supports alternative packages, 'sun-jdk', 'sun-jre', 'oracle-jdk', 'oracle-jre'. Default: 'jdk'.

 ##### `java_alternative`
+
 Specifies the name of the Java alternative to use. If you set this parameter, *you must also set the `java_alternative_path`.*
 Valid options: Run command `update-java-alternatives -l` for a list of available choices. Default: OS and distribution dependent defaults on *deb systems, undef on others.

 ##### `java_alternative_path`
+
 *Required when `java_alternative` is specified.* Defines the path to the `java` command.
 Valid option: String. Default: OS and distribution dependent defaults on *deb systems, undef on others.

 ##### `package`
+
 Specifies the name of the Java package. This is configurable in case you want to install a non-standard Java package. If not set, the module installs the appropriate package for the `distribution` parameter and target platform. If you set `package`, the `distribution` parameter does nothing.
 Valid option: String. Default: undef.

 ##### `version`
+
 Sets the version of Java to install, if you want to ensure a particular version.
 Valid options: 'present', 'installed', 'latest', or a string matching `/^[.+_0-9a-zA-Z:-]+$/`. Default: 'present'.

@@ -119,26 +126,41 @@ The following parameters are available in `java::oracle`:
 Version of Java Standard Edition (SE) to install. 6, 7 or 8.

 ##### `version_major`
+
 Major version of the Java Standard Edition (SE) to install. Must be used together with `version_minor`. For example, '8u101'.

 ##### `version_minor`
+
 Minor version (or build version) of the Java Standard Edition (SE) to install. Must be used together with `version_major`. For example, 'b13'.

 ##### `java_se`
+
 Type of Java SE to install, jdk or jre.

 ##### `ensure`
+
 Install or remove the package.

 ##### `oracle_url`
+
 Official Oracle URL to download the binaries from.

 ##### `proxy_server`
+
 Specify a proxy server, with port number if needed. ie: https://example.com:8080. (passed to archive)

 ##### `proxy_type`
+
 Proxy server type (none|http|https|ftp). (passed to archive)

+##### `url`
+
+Pass an entire URL to download the installer from rather than building the complete URL from other parameters. This will allow the module to be used even if the URLs are changed by Oracle. If this parameter is used, matching `version_major` and `version_minor` parameters must also be passed to the class.
+
+##### `url_hash`
+
+Directory hash used by the download.oracle.com site. This value is a 32 character string which is part of the file URL returned by the JDK download site.
+
 ### Facts

 The java module includes a few facts to describe the version of Java installed on the system:
@@ -178,10 +200,13 @@ Sun Java is supported on:
 * Debian 6

 Oracle Java is supported on:
+
 * CentOS 6

 ### Known issues

+Where Oracle change the format of the URLs to different installer packages, the curl to fetch the package may fail with a HTTP/404 error. In this case, passing a full known good URL using the `url` parameter will allow the module to still be able to install specific versions of the JRE/JDK. Note the `version_major` and `version_minor` parameters must be passed and must match the version downloaded using the known URL in the `url` parameter. 
+
 #### OpenBSD

 OpenBSD packages install Java JRE/JDK in a unique directory structure, not linking
--- a/lib/facter/java_default_home.rb
+++ b/lib/facter/java_default_home.rb
@@ -15,7 +15,9 @@ Facter.add(:java_default_home) do
  setcode do
    if Facter::Util::Resolution.which('readlink')
      java_bin = Facter::Util::Resolution.exec('readlink -e /usr/bin/java').strip
-      if java_bin =~ %r(/jre/)
+      if java_bin.empty?
+        nil
+      elsif java_bin =~ %r(/jre/)
        java_default_home = File.dirname(File.dirname(File.dirname(java_bin)))
      else
        java_default_home = File.dirname(File.dirname(java_bin))
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -46,22 +46,16 @@
 # Sample Usage:
 #
 class java(
-  $distribution          = 'jdk',
-  $version               = 'present',
-  $package               = undef,
-  $package_options       = undef,
-  $java_alternative      = undef,
-  $java_alternative_path = undef,
-  $java_home             = undef
+  String $distribution                                              = 'jdk',
+  Pattern[/present|installed|latest|^[.+_0-9a-zA-Z:~-]+$/] $version = 'present',
+  Optional[String] $package                                         = undef,
+  Optional[Array] $package_options                                  = undef,
+  Optional[String] $java_alternative                                = undef,
+  Optional[String] $java_alternative_path                           = undef,
+  Optional[String] $java_home                                       = undef
 ) {
  include java::params

-  validate_re($version, 'present|installed|latest|^[.+_0-9a-zA-Z:~-]+$')
-
-  if $package_options != undef {
-    validate_array($package_options)
-  }
-
  if has_key($java::params::java, $distribution) {
    $default_package_name     = $java::params::java[$distribution]['package']
    $default_alternative      = $java::params::java[$distribution]['alternative']
--- a/manifests/oracle.pp
+++ b/manifests/oracle.pp
@@ -10,7 +10,7 @@
 # the licensing terms.
 # wget --no-cookies --no-check-certificate --header \
 # "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" \
-# "http://download.oracle.com/otn-pub/java/jdk/8u25-b17/jre-8u25-linux-x64.tar.gz"
+# "http://download.oracle.com/otn-pub/java/jdk/8u131-b11/d54c1d3a095b4ff2b6607d096fa80163/jdk-8u131-linux-x64.tar.gz"
 #
 # Parameters
 # [*version*]
@@ -80,7 +80,12 @@
 #
 # [*url*]
 # Full URL, including oracle_url, release_major, release_minor and package_name, to
-# download the Oracle java_se installer.
+# download the Oracle java_se installer. Originally present but not used, activated
+# to workaround MODULES-5058
+#
+# [*url_hash*]
+# Directory hash used by the download.oracle.com site.  This value is a 32 character string
+# which is part of the file URL returned by the JDK download site.
 #
 # ### Author
 # mike@marseglia.org
@@ -94,6 +99,8 @@ define java::oracle (
  $oracle_url    = 'http://download.oracle.com/otn-pub/java/jdk/',
  $proxy_server  = undef,
  $proxy_type    = undef,
+  $url           = undef,
+  $url_hash      = undef,
 ) {

  # archive module is used to download the java package
@@ -108,8 +115,11 @@ define java::oracle (

  # determine Oracle Java major and minor version, and installation path
  if $version_major and $version_minor {
+
    $release_major = $version_major
    $release_minor = $version_minor
+    $release_hash  = $url_hash
+
    if $release_major =~ /(\d+)u(\d+)/ {
      $install_path = "${java_se}1.${1}.0_${2}"
    } else {
@@ -122,21 +132,25 @@ define java::oracle (
        $release_major = '6u45'
        $release_minor = 'b06'
        $install_path = "${java_se}1.6.0_45"
+        $release_hash  = undef
      }
      '7' : {
        $release_major = '7u80'
        $release_minor = 'b15'
        $install_path = "${java_se}1.7.0_80"
+        $release_hash  = undef
      }
      '8' : {
-        $release_major = '8u51'
-        $release_minor = 'b16'
-        $install_path = "${java_se}1.8.0_51"
+        $release_major = '8u131'
+        $release_minor = 'b11'
+        $install_path = "${java_se}1.8.0_131"
+        $release_hash  = 'd54c1d3a095b4ff2b6607d096fa80163'
      }
      default : {
-        $release_major = '8u51'
-        $release_minor = 'b16'
-        $install_path = "${java_se}1.8.0_51"
+        $release_major = '8u131'
+        $release_minor = 'b11'
+        $install_path = "${java_se}1.8.0_131"
+        $release_hash  = 'd54c1d3a095b4ff2b6607d096fa80163'
      }
    }
  }
@@ -175,11 +189,11 @@ define java::oracle (
  }

  # following are based on this example:
-  # http://download.oracle.com/otn/java/jdk/7u80-b15/jre-7u80-linux-i586.rpm
+  # http://download.oracle.com/otn-pub/java/jdk/7u80-b15/jre-7u80-linux-i586.rpm
  #
  # JaveSE 6 distributed in .bin format
-  # http://download.oracle.com/otn/java/jdk/6u45-b06/jdk-6u45-linux-i586-rpm.bin
-  # http://download.oracle.com/otn/java/jdk/6u45-b06/jdk-6u45-linux-i586.bin
+  # http://download.oracle.com/otn-pub/java/jdk/6u45-b06/jdk-6u45-linux-i586-rpm.bin
+  # http://download.oracle.com/otn-pub/java/jdk/6u45-b06/jdk-6u45-linux-i586.bin
  # package name to download from Oracle's website
  case $package_type {
    'bin' : {
@@ -196,6 +210,15 @@ define java::oracle (
    }
  }

+  # if complete URL is provided, use this value for source in archive resource
+  if $url {
+    $source = $url
+  } elsif $release_hash != undef {
+    $source = "${oracle_url}/${release_major}-${release_minor}/${release_hash}/${package_name}"
+  } else {
+    $source = "${oracle_url}/${release_major}-${release_minor}/${package_name}"
+  }
+
  # full path to the installer
  $destination = "${destination_dir}${package_name}"
  notice ("Destination is ${destination}")
@@ -219,7 +242,7 @@ define java::oracle (
    'present' : {
      archive { $destination :
        ensure       => present,
-        source       => "${oracle_url}${release_major}-${release_minor}/${package_name}",
+        source       => $source,
        cookie       => 'gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie',
        extract_path => '/tmp',
        cleanup      => false,
@@ -233,7 +256,7 @@ define java::oracle (
            path    => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin',
            command => $install_command,
            creates => $creates_path,
-            require => Archive[$destination]
+            require => Archive[$destination],
          }
        }
        default : {
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -21,20 +21,22 @@ class java::params {
            $jre_package = 'java-1.6.0-sun'
            $java_home   = '/usr/lib/jvm/java-1.6.0-sun/jre/'
          }
+          # See cde7046 for why >= 5.0 < 6.3
          elsif (versioncmp($::operatingsystemrelease, '6.3') < 0) {
            $jdk_package = 'java-1.6.0-openjdk-devel'
            $jre_package = 'java-1.6.0-openjdk'
-            $java_home   = "/usr/lib/jvm/java-1.6.0-openjdk-${::architecture}/"
+            $java_home   = '/usr/lib/jvm/java-1.6.0/'
          }
+          # See PR#160 / c8e46b5 for why >= 6.3 < 7.1
          elsif (versioncmp($::operatingsystemrelease, '7.1') < 0) {
            $jdk_package = 'java-1.7.0-openjdk-devel'
            $jre_package = 'java-1.7.0-openjdk'
-            $java_home   = "/usr/lib/jvm/java-1.7.0-openjdk-${::architecture}/"
+            $java_home   = '/usr/lib/jvm/java-1.7.0/'
          }
          else {
            $jdk_package = 'java-1.8.0-openjdk-devel'
            $jre_package = 'java-1.8.0-openjdk'
-            $java_home   = "/usr/lib/jvm/java-1.8.0-openjdk-${::architecture}/"
+            $java_home   = '/usr/lib/jvm/java-1.8.0/'
          }
        }
        'Fedora': {
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
  "name": "puppetlabs-java",
-  "version": "2.0.0",
+  "version": "2.1.0",
  "author": "puppetlabs",
  "summary": "Installs the correct Java package on various platforms.",
  "license": "Apache-2.0",
@@ -89,7 +89,13 @@
    }
  ],
  "dependencies": [
-    {"name":"puppetlabs/stdlib","version_requirement":">= 2.4.0 < 5.0.0"},
-    {"name":"puppet/archive","version_requirement":">= 1.1.0 < 2.0.0"}
+    {
+      "name":"puppetlabs/stdlib",
+      "version_requirement": ">= 4.13.1 < 5.0.0"
+    },
+    {
+      "name":"puppet/archive",
+      "version_requirement": ">= 1.1.0 < 2.0.0"
+    }
  ]
 }
--- a/spec/classes/java_spec.rb
+++ b/spec/classes/java_spec.rb
@@ -5,19 +5,19 @@ describe 'java', :type => :class do
  context 'select openjdk for Centos 5.8' do
    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '5.8', :architecture => 'x86_64'} }
    it { is_expected.to contain_package('java').with_name('java-1.6.0-openjdk-devel') }
-    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.6.0-openjdk-x86_64/') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.6.0/') }
  end

  context 'select openjdk for Centos 6.3' do
    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '6.3', :architecture => 'x86_64'} }
    it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk-devel') }
-    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-x86_64/') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.7.0/') }
  end

  context 'select openjdk for Centos 7.1.1503' do
    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '7.1.1503', :architecture => 'x86_64'} }
    it { is_expected.to contain_package('java').with_name('java-1.8.0-openjdk-devel') }
-    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-x86_64/') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.8.0/') }
  end

  context 'select openjdk for Centos 6.2' do
@@ -193,14 +193,14 @@ describe 'java', :type => :class do
    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Scientific', :operatingsystemrelease => '6.4', :architecture => 'x86_64'} }
    let(:params) { { 'distribution' => 'jre' } }
    it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk') }
-    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-x86_64/') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.7.0/') }
  end

  context 'select passed value for Scientific Linux CERN (SLC)' do
    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'SLC', :operatingsystemrelease => '6.4', :architecture => 'x86_64'} }
    let(:params) { { 'distribution' => 'jre' } }
    it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk') }
-    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-x86_64/') }
+    it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.7.0/') }
  end

  context 'select default for OpenSUSE 12.3' do
--- a/spec/defines/oracle_spec.rb
+++ b/spec/defines/oracle_spec.rb
@@ -23,9 +23,9 @@ describe 'java::oracle', :type => :define do
    context 'Oracle Java SE 8 JDK' do
      let(:params) { {:ensure => 'present', :version => '8', :java_se => 'jdk'} }
      let :title do 'jdk8' end
-        it { is_expected.to contain_archive('/tmp/jdk-8u51-linux-x64.rpm')}
-        it { is_expected.to contain_exec('Install Oracle java_se jdk 8').with_command('rpm --force -iv /tmp/jdk-8u51-linux-x64.rpm') }
-        it { is_expected.to contain_exec('Install Oracle java_se jdk 8').that_requires('Archive[/tmp/jdk-8u51-linux-x64.rpm]') }
+        it { is_expected.to contain_archive('/tmp/jdk-8u131-linux-x64.rpm')}
+        it { is_expected.to contain_exec('Install Oracle java_se jdk 8').with_command('rpm --force -iv /tmp/jdk-8u131-linux-x64.rpm') }
+        it { is_expected.to contain_exec('Install Oracle java_se jdk 8').that_requires('Archive[/tmp/jdk-8u131-linux-x64.rpm]') }
    end

    context 'Oracle Java SE 6 JRE' do
@@ -47,11 +47,35 @@ describe 'java::oracle', :type => :define do
    context 'select Oracle Java SE 8 JRE' do
      let(:params) { {:ensure => 'present', :version => '8', :java_se => 'jre'} }
      let :title do 'jre8' end
-        it { is_expected.to contain_archive('/tmp/jre-8u51-linux-x64.rpm')}
-        it { is_expected.to contain_exec('Install Oracle java_se jre 8').with_command('rpm --force -iv /tmp/jre-8u51-linux-x64.rpm') }
-        it { is_expected.to contain_exec('Install Oracle java_se jre 8').that_requires('Archive[/tmp/jre-8u51-linux-x64.rpm]') }
+        it { is_expected.to contain_archive('/tmp/jre-8u131-linux-x64.rpm')}
+        it { is_expected.to contain_exec('Install Oracle java_se jre 8').with_command('rpm --force -iv /tmp/jre-8u131-linux-x64.rpm') }
+        it { is_expected.to contain_exec('Install Oracle java_se jre 8').that_requires('Archive[/tmp/jre-8u131-linux-x64.rpm]') }
    end

+    context 'Pass URL to url parameter' do
+      let(:params) { {
+        :ensure => 'present',
+        :version_major => '8u131',
+        :version_minor => 'b11',
+        :java_se => 'jdk',
+        :url => 'http://download.oracle.com/otn-pub/java/jdk/8u131-b11/d54c1d3a095b4ff2b6607d096fa80163/jdk-8u131-linux-x64.rpm',
+        :url_hash => 'ignored',
+      } }
+      let :title do 'jdk8' end
+      it { is_expected.to contain_archive('/tmp/jdk-8u131-linux-x64.rpm').with_source('http://download.oracle.com/otn-pub/java/jdk/8u131-b11/d54c1d3a095b4ff2b6607d096fa80163/jdk-8u131-linux-x64.rpm') }
+    end
+
+    context 'Pass a hash to url_hash parameter' do
+      let(:params) { {
+        :ensure => 'present',
+        :version_major => '8u131',
+        :version_minor => 'b11',
+        :java_se => 'jdk',
+        :url_hash => 'abcdef01234567890',
+      } }
+      let :title do 'jdk8' end
+      it { is_expected.to contain_archive('/tmp/jdk-8u131-linux-x64.rpm').with_source('http://download.oracle.com/otn-pub/java/jdk//8u131-b11/abcdef01234567890/jdk-8u131-linux-x64.rpm') }
+    end
  end

  context 'On CentOS 32-bit' do
@@ -76,9 +100,9 @@ describe 'java::oracle', :type => :define do
    context 'select Oracle Java SE 8 JDK on RedHat family, 32-bit' do
      let(:params) { {:ensure => 'present', :version => '8', :java_se => 'jdk'} }
      let :title do 'jdk8' end
-        it { is_expected.to contain_archive('/tmp/jdk-8u51-linux-i586.rpm')}
-        it { is_expected.to contain_exec('Install Oracle java_se jdk 8').with_command('rpm --force -iv /tmp/jdk-8u51-linux-i586.rpm') }
-        it { is_expected.to contain_exec('Install Oracle java_se jdk 8').that_requires('Archive[/tmp/jdk-8u51-linux-i586.rpm]') }
+        it { is_expected.to contain_archive('/tmp/jdk-8u131-linux-i586.rpm')}
+        it { is_expected.to contain_exec('Install Oracle java_se jdk 8').with_command('rpm --force -iv /tmp/jdk-8u131-linux-i586.rpm') }
+        it { is_expected.to contain_exec('Install Oracle java_se jdk 8').that_requires('Archive[/tmp/jdk-8u131-linux-i586.rpm]') }
    end

    context 'select Oracle Java SE 6 JRE on RedHat family, 32-bit' do
@@ -100,9 +124,9 @@ describe 'java::oracle', :type => :define do
    context 'select Oracle Java SE 8 JRE on RedHat family, 32-bit' do
      let(:params) { {:ensure => 'present', :version => '8', :java_se => 'jre'} }
      let :title do 'jdk8' end
-        it { is_expected.to contain_archive('/tmp/jre-8u51-linux-i586.rpm')}
-        it { is_expected.to contain_exec('Install Oracle java_se jre 8').with_command('rpm --force -iv /tmp/jre-8u51-linux-i586.rpm') }
-        it { is_expected.to contain_exec('Install Oracle java_se jre 8').that_requires('Archive[/tmp/jre-8u51-linux-i586.rpm]') }
+        it { is_expected.to contain_archive('/tmp/jre-8u131-linux-i586.rpm')}
+        it { is_expected.to contain_exec('Install Oracle java_se jre 8').with_command('rpm --force -iv /tmp/jre-8u131-linux-i586.rpm') }
+        it { is_expected.to contain_exec('Install Oracle java_se jre 8').that_requires('Archive[/tmp/jre-8u131-linux-i586.rpm]') }
    end
  end

--- a/spec/unit/facter/java_default_home_spec.rb
+++ b/spec/unit/facter/java_default_home_spec.rb
@@ -29,6 +29,14 @@ describe Facter::Util::Fact do
        end
      end
    end
+    context 'returns nil when readlink is present but java is not' do
+      it do
+        java_path_output = ""
+        Facter::Util::Resolution.expects(:which).with("readlink").returns(true)
+        Facter::Util::Resolution.expects(:exec).with("readlink -e /usr/bin/java").returns(java_path_output)
+        expect(Facter.value(:java_default_home)).to be_nil
+      end
+    end

    context 'returns nil when readlink not present' do
      it do
Author	SHA1	Message	Date
Glenn Sarti	e8808aca12	Merge pull request #245 from hunner/revert_3stuff Revert "Release prep for 3.0.0"	2017-06-21 15:23:30 -07:00
Hunter Haugen	b410ac0882	Revert "Release prep for 3.0.0" This reverts commit `15a208f3a5`.	2017-06-21 15:16:31 -07:00
Erick Banks	f80715ec6f	Merge pull request #242 from hunner/add_url_hash_test (maint) Add url_hash tests	2017-06-20 16:49:21 -07:00
Hunter Haugen	8458b03bb5	(maint) Add url_hash tests	2017-06-20 16:22:10 -07:00
Eric Putnam	ff33bcfa38	Merge pull request #240 from HelenCampbell/rpreppo Release prep for 3.0.0	2017-06-15 16:03:40 -07:00
Helen Campbell	15a208f3a5	Release prep for 3.0.0	2017-06-15 17:14:13 +01:00
Paula McMaw	9a209faa17	Merge pull request #238 from puppetlabs/release Release Mergeback 2.1.0	2017-06-15 10:42:49 +01:00
Eric Putnam	b7085db8ae	Merge pull request #237 from hunner/release_2.1.0 Release 2.1.0	2017-06-13 16:31:32 -07:00
Hunter Haugen	2c8b460b98	Release 2.1.0	2017-06-13 11:14:20 -07:00
Paula McMaw	a09bc3aa52	Merge pull request #236 from HelenCampbell/adddocsfix MODULES-5047 - Update java::oracle class to work with new download URLs	2017-06-13 15:15:59 +01:00
Michael Watters	08423fb170	MODULES-5047 - Update java::oracle class to work with new download URLs Oracle appears to have changed the JDK URL structure starting with Java 8u121. This update adds a hash to store the values used by Oracle's java download site along with a case statement to lookup the proper key for the java release being installed.	2017-06-13 14:57:18 +01:00
Eric Putnam	da3e40903d	Merge pull request #235 from hunner/fix_rhel7_home (maint) Update java_home for redhat 7	2017-06-12 15:13:16 -07:00
Hunter Haugen	e234375924	(maint) Update java_home for redhat systems It appears that redhat 7 and variants no longer have java-1.7.0-openjdk-$arch symlinks. All redhat 6/7's both 32 and 64 bit seem to include a java-1.7.0 symlink though.	2017-06-12 14:54:22 -07:00
Helen	73604a3419	Merge pull request #234 from spynappels/MODULES-5058 MODULES-5058 Allow a complete URL to be passed to the java::oracle class	2017-06-08 13:48:52 +01:00
Stefan Pijnappels	05b9d1c2ba	MODULES-5058 Allow a complete URL to be passed to the java::oracle class This provides a workaround to the issue of Oracle changing it's URL structure which breaks the dynamic URL building in the module. It allows a complete URL to be passed as an alternative to one built by the logic in the module, and allows the rest of the module to function as expected when this situation is encountered. Changes made to manifests/oracle.pp to pass URL in `url` parameter (if defined) to the `source` directive of the archive resource which fetches the installer package. README.markdown has been updated to document the additional parameter, as well as a note added to known issues describing it's operation. A test has been added to spec/defines/oracle_spec.rb to verify the correct package is present in the tmp archive location. The spec tests have passed and the revised workflow has been tested in a lab environment and found to be working.	2017-06-08 10:29:58 +01:00
Hunter Haugen	49369bd48c	Merge pull request #215 from vrtdev/bugfix/MODULES-4368-java_default_home-invalid-fact See: https://tickets.puppetlabs.com/browse/MODULES-4368	2017-06-07 16:15:47 -07:00
Ben Ford	1af563c6d5	Merge pull request #223 from bastelfreak/puppet4 replace validate_* calls with datatypes & minor fixes	2017-06-07 15:02:15 -07:00
Tim Meusel	cf14116641	add datatypes for all parameters	2017-06-07 23:28:06 +02:00
Tim Meusel	3dacc7abe5	fix markdown linter warnings	2017-06-07 20:59:06 +02:00
Tim Meusel	66662bf4e9	replace validate_* calls with datatypes	2017-06-07 11:17:11 +02:00
Tim Meusel	585bd5795e	bump stdlib to recommended puppet4 version	2017-06-07 11:17:08 +02:00
Tim Meusel	4f7d760f10	use proper syntax highlighting in markdown	2017-06-07 11:16:07 +02:00
Tim Meusel	920748cf0a	purge trailing whitespace	2017-06-07 11:16:06 +02:00
Tim Meusel	75939fffc9	fix headlines in markdown	2017-06-07 11:15:37 +02:00
Glenn Sarti	de802e57bd	Merge branch 'release' * release: (maint) facts update oracle.pp (maint) update metadata fixed formatting errors + made various minor changes (MODULES-4958) prep for 2.0.0 release and some markdown rendering fixes	2017-05-30 16:27:35 -07:00
Jan Vansteenkiste	c0227ce820	MODULES-4368: return nil if java_bin is not found (readlink result is empty)	2017-02-01 08:10:59 +01:00
Jan Vansteenkiste	20960ddb7f	MODULES-4368: Add a test case for the issue	2017-02-01 08:10:15 +01:00