From 82cd45647a48763acdcf15006697e00394a09f73 Mon Sep 17 00:00:00 2001 From: Elyse Salberg Date: Mon, 9 Jul 2018 16:16:34 -0400 Subject: [PATCH 01/12] Add ability to override basedir and package type --- README.markdown | 23 +++++++++++ manifests/oracle.pp | 78 +++++++++++++++++++++++++++---------- spec/defines/oracle_spec.rb | 31 +++++++++++++++ 3 files changed, 112 insertions(+), 20 deletions(-) diff --git a/README.markdown b/README.markdown index b001a0a..ee9d762 100644 --- a/README.markdown +++ b/README.markdown @@ -70,6 +70,29 @@ java::oracle { 'jdk8' : } ``` +To install Oracle Java to a non-default basedir (defaults: /usr/lib/jvm for Debian; /usr/java for RedHat): +```puppet +java::oracle { 'jdk8' : + ensure => 'present', + version_major => '8u101', + version_minor => 'b13', + java_se => 'jdk', + basedir => '/custom/java', +} +``` + +To ensure that a custom basedir is a directory before Oracle Java is installed (note: manage separately for custom ownership or perms): +```puppet +java::oracle { 'jdk8' : + ensure => 'present', + version_major => '8u101', + version_minor => 'b13', + java_se => 'jdk', + manage_basedir => true, + basedir => '/custom/java', +} +``` + ## Reference ### Classes diff --git a/manifests/oracle.pp b/manifests/oracle.pp index ff6557e..5aa1804 100644 --- a/manifests/oracle.pp +++ b/manifests/oracle.pp @@ -54,6 +54,7 @@ # [*package_type*] # Type of installation package for specified version of java_se. java_se 6 comes # in a few installation package flavors and we need to account for them. +# Optional forced package types: rpm, rpmbin, tar.gz # # [*os*] # Oracle java_se OS type. @@ -90,21 +91,32 @@ # [*jce*] # Install Oracles Java Cryptographic Extensions into the JRE or JDK # +# [*basedir*] +# Directory under which the installation will occur. If not set, defaults to +# /usr/lib/jvm for Debian and /usr/java for RedHat. +# +# [*manage_basedir*] +# Whether to manage the basedir directory. Defaults to false. +# Note: /usr/lib/jvm is managed for Debian by default, separate from this parameter. +# # ### Author # mike@marseglia.org # define java::oracle ( - $ensure = 'present', - $version = '8', - $version_major = undef, - $version_minor = undef, - $java_se = 'jdk', - $oracle_url = 'http://download.oracle.com/otn-pub/java/jdk/', - $proxy_server = undef, - $proxy_type = undef, - $url = undef, - $url_hash = undef, - $jce = false, + $ensure = 'present', + $version = '8', + $version_major = undef, + $version_minor = undef, + $java_se = 'jdk', + $oracle_url = 'http://download.oracle.com/otn-pub/java/jdk/', + $proxy_server = undef, + $proxy_type = undef, + $url = undef, + $url_hash = undef, + $jce = false, + $basedir = undef, + $manage_basedir = false, + $package_type = undef, ) { # archive module is used to download the java package @@ -127,6 +139,7 @@ define java::oracle ( # determine Oracle Java major and minor version, and installation path if $version_major and $version_minor { + $label = $version_major $release_major = $version_major $release_minor = $version_minor $release_hash = $url_hash @@ -144,6 +157,7 @@ define java::oracle ( } } else { # use default versions if no specific major and minor version parameters are provided + $label = $version case $version { '6' : { $release_major = '6u45' @@ -178,21 +192,36 @@ define java::oracle ( case $facts['os']['family'] { 'RedHat', 'Amazon' : { # Oracle Java 6 comes in a special rpmbin format - if $version == '6' { - $package_type = 'rpmbin' + if $package_type { + $_package_type = $package_type + } elsif $version == '6' { + $_package_type = 'rpmbin' } else { - $package_type = 'rpm' + $_package_type = 'rpm' + } + if $basedir { + $_basedir = $basedir + } else { + $_basedir = '/usr/java' } - $creates_path = "/usr/java/${install_path}" } 'Debian' : { - $package_type = 'tar.gz' - $creates_path = "/usr/lib/jvm/${install_path}" + if $package_type { + $_package_type = $package_type + } else { + $_package_type = 'tar.gz' + } + if $basedir { + $_basedir = $basedir + } else { + $_basedir = '/usr/lib/jvm' + } } default : { fail ("unsupported platform ${$facts['os']['name']}") } } + $creates_path = "${_basedir}/${install_path}" $os = 'linux' $destination_dir = '/tmp/' } @@ -227,7 +256,7 @@ define java::oracle ( # 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 { + case $_package_type { 'bin' : { $package_name = "${java_se}-${release_major}-${os}-${arch}.bin" } @@ -260,7 +289,7 @@ define java::oracle ( $destination = "${destination_dir}${package_name}" notice ("Destination is ${destination}") - case $package_type { + case $_package_type { 'bin' : { $install_command = "sh ${destination}" } @@ -271,7 +300,11 @@ define java::oracle ( $install_command = "rpm --force -iv ${destination}" } 'tar.gz' : { - $install_command = "tar -zxf ${destination} -C /usr/lib/jvm" + if $basedir { + $install_command = "tar -zxf ${destination} -C ${basedir}" + } else { + $install_command = "tar -zxf ${destination} -C /usr/lib/jvm" + } } default : { $install_command = "rpm -iv ${destination}" @@ -303,6 +336,11 @@ define java::oracle ( $install_requires = [Archive[$destination]] } } + + if $manage_basedir { + ensure_resource('file', $basedir, {'ensure' => 'directory', 'before' => Exec["Install Oracle java_se ${java_se} ${version} ${release_major} ${release_minor}"]}) + } + exec { "Install Oracle java_se ${java_se} ${version} ${release_major} ${release_minor}" : path => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin', command => $install_command, diff --git a/spec/defines/oracle_spec.rb b/spec/defines/oracle_spec.rb index 159c4aa..b7c3371 100644 --- a/spec/defines/oracle_spec.rb +++ b/spec/defines/oracle_spec.rb @@ -144,6 +144,37 @@ describe 'java::oracle', type: :define do is_expected.to contain_archive('/tmp/jce-6.zip').with_extract_path('/usr/java/jdk1.6.0_99-amd64/jre/lib/security') end end + + context 'when specifying package_type tar.gz and basedir' do + let(:params) do + { + ensure: 'present', + version: '6', + java_se: 'jdk', + basedir: '/usr/java', + package_type: 'tar.gz', + } + end + let(:title) { 'jdk6' } + + it { is_expected.to contain_archive('/tmp/jdk-6u45-linux-x64.tar.gz') } + it { is_expected.to contain_exec('Install Oracle java_se jdk 6').with_command('tar -zxf /tmp/jdk-6u45-linux-x64.tar.gz -C /usr/java') } + it { is_expected.to contain_exec('Install Oracle java_se jdk 6').that_requires('Archive[/tmp/jdk-6u45-linux-x64.tar.gz]') } + end + context 'when manage_basedir is set to true' do + let(:params) do + { + ensure: 'present', + version: '6', + java_se: 'jdk', + basedir: '/usr/java', + manage_basedir: true, + } + end + let(:title) { 'jdk6' } + + it { is_expected.to contain_file('/usr/java') } + end end context 'when on CentOS 32-bit' do From e247902da5e10c64b1bcf51e6a9a61118bdf2473 Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Tue, 12 Feb 2019 13:28:56 +0100 Subject: [PATCH 02/12] fix tests, refs #298 --- spec/defines/oracle_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/defines/oracle_spec.rb b/spec/defines/oracle_spec.rb index b7c3371..e2d1e12 100644 --- a/spec/defines/oracle_spec.rb +++ b/spec/defines/oracle_spec.rb @@ -158,8 +158,8 @@ describe 'java::oracle', type: :define do let(:title) { 'jdk6' } it { is_expected.to contain_archive('/tmp/jdk-6u45-linux-x64.tar.gz') } - it { is_expected.to contain_exec('Install Oracle java_se jdk 6').with_command('tar -zxf /tmp/jdk-6u45-linux-x64.tar.gz -C /usr/java') } - it { is_expected.to contain_exec('Install Oracle java_se jdk 6').that_requires('Archive[/tmp/jdk-6u45-linux-x64.tar.gz]') } + it { is_expected.to contain_exec('Install Oracle java_se jdk 6 6u45 b06').with_command('tar -zxf /tmp/jdk-6u45-linux-x64.tar.gz -C /usr/java') } + it { is_expected.to contain_exec('Install Oracle java_se jdk 6 6u45 b06').that_requires('Archive[/tmp/jdk-6u45-linux-x64.tar.gz]') } end context 'when manage_basedir is set to true' do let(:params) do From c4100556f0c61dd778498118859a8da080b75205 Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Tue, 12 Feb 2019 13:29:18 +0100 Subject: [PATCH 03/12] use variable instead of hardcoded value, refs #298 --- manifests/oracle.pp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/manifests/oracle.pp b/manifests/oracle.pp index 5aa1804..c5d2f3f 100644 --- a/manifests/oracle.pp +++ b/manifests/oracle.pp @@ -300,11 +300,7 @@ define java::oracle ( $install_command = "rpm --force -iv ${destination}" } 'tar.gz' : { - if $basedir { - $install_command = "tar -zxf ${destination} -C ${basedir}" - } else { - $install_command = "tar -zxf ${destination} -C /usr/lib/jvm" - } + $install_command = "tar -zxf ${destination} -C ${_basedir}" } default : { $install_command = "rpm -iv ${destination}" @@ -327,10 +323,10 @@ define java::oracle ( 'Linux' : { case $facts['os']['family'] { 'Debian' : { - ensure_resource('file', '/usr/lib/jvm', { + ensure_resource('file', $_basedir, { ensure => directory, }) - $install_requires = [Archive[$destination], File['/usr/lib/jvm']] + $install_requires = [Archive[$destination], File[$_basedir]] } default : { $install_requires = [Archive[$destination]] @@ -338,7 +334,7 @@ define java::oracle ( } if $manage_basedir { - ensure_resource('file', $basedir, {'ensure' => 'directory', 'before' => Exec["Install Oracle java_se ${java_se} ${version} ${release_major} ${release_minor}"]}) + ensure_resource('file', $_basedir, {'ensure' => 'directory', 'before' => Exec["Install Oracle java_se ${java_se} ${version} ${release_major} ${release_minor}"]}) } exec { "Install Oracle java_se ${java_se} ${version} ${release_major} ${release_minor}" : From 7293c4991b7382b02832936bd0d513d2a1e5da9c Mon Sep 17 00:00:00 2001 From: tphoney Date: Thu, 14 Feb 2019 13:50:04 +0000 Subject: [PATCH 04/12] (MODULES-3958) use rspec-mock and add coverage --- .puppet-lint.rc | 2 +- .sync.yml | 14 ++++++---- metadata.json | 4 +-- spec/spec_helper.rb | 5 ++++ spec/spec_helper_local.rb | 28 +++++++++++++++++++ spec/unit/facter/java_default_home_spec.rb | 10 +++---- spec/unit/facter/java_libjvm_path_spec.rb | 6 ++--- spec/unit/facter/java_major_version_spec.rb | 4 +-- spec/unit/facter/java_patch_level_spec.rb | 4 +-- spec/unit/facter/java_version_spec.rb | 30 ++++++++++----------- 10 files changed, 72 insertions(+), 35 deletions(-) create mode 100644 spec/spec_helper_local.rb diff --git a/.puppet-lint.rc b/.puppet-lint.rc index cc96ece..8b13789 100644 --- a/.puppet-lint.rc +++ b/.puppet-lint.rc @@ -1 +1 @@ ---relative + diff --git a/.sync.yml b/.sync.yml index 07ec160..0bfcbe2 100644 --- a/.sync.yml +++ b/.sync.yml @@ -1,4 +1,7 @@ --- +.gitlab-ci.yml: + unmanaged: true + .travis.yml: docker_sets: - set: docker/centos-7 @@ -9,6 +12,9 @@ branches: - release +appveyor.yml: + delete: true + Gemfile: optional: ':development': @@ -26,8 +32,6 @@ Gemfile: - mingw - x64_mingw -appveyor.yml: - delete: true - -.gitlab-ci.yml: - unmanaged: true +spec/spec_helper.rb: + mock_with: ':rspec' + coverage_report: true diff --git a/metadata.json b/metadata.json index 1c55936..edc0d24 100644 --- a/metadata.json +++ b/metadata.json @@ -79,5 +79,5 @@ ], "template-url": "https://github.com/puppetlabs/pdk-templates/", "template-ref": "1.9.0-0-g7281db5", - "pdk-version": "1.9.0" -} \ No newline at end of file + "pdk-version": "1.7.1" +} diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 0d5efc0..149ff03 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,3 +1,7 @@ +RSpec.configure do |c| + c.mock_with :rspec +end + require 'puppetlabs_spec_helper/module_spec_helper' require 'rspec-puppet-facts' @@ -34,6 +38,7 @@ RSpec.configure do |c| end c.filter_run_excluding(bolt: true) unless ENV['GEM_BOLT'] c.after(:suite) do + RSpec::Puppet::Coverage.report!(0) end end diff --git a/spec/spec_helper_local.rb b/spec/spec_helper_local.rb new file mode 100644 index 0000000..2e897cb --- /dev/null +++ b/spec/spec_helper_local.rb @@ -0,0 +1,28 @@ +if ENV['COVERAGE'] == 'yes' + require 'simplecov' + require 'simplecov-console' + require 'codecov' + + SimpleCov.formatters = [ + SimpleCov::Formatter::HTMLFormatter, + SimpleCov::Formatter::Console, + SimpleCov::Formatter::Codecov, + ] + SimpleCov.start do + track_files 'lib/**/*.rb' + + add_filter '/spec' + + # do not track vendored files + add_filter '/vendor' + add_filter '/.vendor' + + # do not track gitignored files + # this adds about 4 seconds to the coverage check + # this could definitely be optimized + add_filter do |f| + # system returns true if exit status is 0, which with git-check-ignore means file is ignored + system("git check-ignore --quiet #{f.filename}") + end + end +end diff --git a/spec/unit/facter/java_default_home_spec.rb b/spec/unit/facter/java_default_home_spec.rb index a5909c3..4d2accf 100644 --- a/spec/unit/facter/java_default_home_spec.rb +++ b/spec/unit/facter/java_default_home_spec.rb @@ -15,15 +15,15 @@ end def symlink_and_test(symlink_path, java_home) File.symlink(symlink_path, './java_test') - Facter::Util::Resolution.expects(:which).with('java').returns('./java_test') - File.expects(:realpath).with('./java_test').returns(symlink_path) + expect(Facter::Util::Resolution).to receive(:which).with('java').and_return('./java_test') + expect(File).to receive(:realpath).with('./java_test').and_return(symlink_path) expect(Facter.value(:java_default_home)).to eql java_home end describe 'java_default_home' do before(:each) do Facter.clear - Facter.fact(:kernel).stubs(:value).returns('Linux') + allow(Facter.fact(:kernel)).to receive(:value).once.and_return('Linux') end context 'when java found in PATH' do @@ -46,8 +46,8 @@ describe 'java_default_home' do context 'when java not present, return nil' do it do - Facter::Util::Resolution.stubs(:exec) - Facter::Util::Resolution.expects(:which).with('java').at_least(1).returns(false) + allow(Facter::Util::Resolution).to receive(:exec) # Catch all other calls + expect(Facter::Util::Resolution).to receive(:which).with('java').at_least(1).and_return(false) expect(Facter.value(:java_default_home)).to be_nil end end diff --git a/spec/unit/facter/java_libjvm_path_spec.rb b/spec/unit/facter/java_libjvm_path_spec.rb index 64dcb18..df2ea28 100644 --- a/spec/unit/facter/java_libjvm_path_spec.rb +++ b/spec/unit/facter/java_libjvm_path_spec.rb @@ -3,10 +3,10 @@ require 'spec_helper' describe 'java_libjvm_path' do before(:each) do Facter.clear - Facter.fact(:kernel).stubs(:value).returns('Linux') + allow(Facter.fact(:kernel)).to receive(:value).once.and_return('Linux') java_default_home = '/usr/lib/jvm/java-8-openjdk-amd64' - Facter.fact(:java_default_home).stubs(:value).returns(java_default_home) - Dir.stubs(:glob).with("#{java_default_home}/jre/lib/**/libjvm.so").returns(['/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server/libjvm.so']) + allow(Facter.fact(:java_default_home)).to receive(:value).once.and_return(java_default_home) + allow(Dir).to receive(:glob).with("#{java_default_home}/jre/lib/**/libjvm.so").and_return(['/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server/libjvm.so']) end context 'when on Linux, return libjvm path' do diff --git a/spec/unit/facter/java_major_version_spec.rb b/spec/unit/facter/java_major_version_spec.rb index b6a3a87..b9ead12 100644 --- a/spec/unit/facter/java_major_version_spec.rb +++ b/spec/unit/facter/java_major_version_spec.rb @@ -7,7 +7,7 @@ describe 'java_major_version' do context 'when java_version fact present, returns major version' do before :each do - Facter.fact(:java_version).stubs(:value).returns('1.7.0_71') + allow(Facter.fact(:java_version)).to receive(:value).and_return('1.7.0_71') end it do expect(Facter.fact(:java_major_version).value).to eq('7') @@ -16,7 +16,7 @@ describe 'java_major_version' do context 'when java not present, returns nil' do before :each do - Facter.fact(:java_version).stubs(:value).returns(nil) + allow(Facter.fact(:java_version)).to receive(:value).and_return('nil') end it do expect(Facter.fact(:java_major_version).value).to be_nil diff --git a/spec/unit/facter/java_patch_level_spec.rb b/spec/unit/facter/java_patch_level_spec.rb index 27b380a..4287b29 100644 --- a/spec/unit/facter/java_patch_level_spec.rb +++ b/spec/unit/facter/java_patch_level_spec.rb @@ -7,7 +7,7 @@ describe 'java_patch_level' do context 'when java is installed returns java patch version extracted from java_version fact' do before :each do - Facter.fact(:java_version).stubs(:value).returns('1.7.0_71') + allow(Facter.fact(:java_version)).to receive(:value).and_return('1.7.0_71') end it do expect(Facter.fact(:java_patch_level).value).to eq('71') @@ -16,7 +16,7 @@ describe 'java_patch_level' do context 'when java is not installed returns nil' do before :each do - Facter.fact(:java_version).stubs(:value).returns(nil) + allow(Facter.fact(:java_version)).to receive(:value).and_return('nil') end it do expect(Facter.fact(:java_patch_level).value).to be_nil diff --git a/spec/unit/facter/java_version_spec.rb b/spec/unit/facter/java_version_spec.rb index 029b840..20f4f52 100644 --- a/spec/unit/facter/java_version_spec.rb +++ b/spec/unit/facter/java_version_spec.rb @@ -18,37 +18,37 @@ describe 'java_version' do context 'when java present, returns java version' do context 'on OpenBSD', with_env: true do before(:each) do - Facter.fact(:operatingsystem).stubs(:value).returns('OpenBSD') + allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('OpenBSD') end let(:facts) { { operatingsystem: 'OpenBSD' } } it do - Facter::Util::Resolution.expects(:which).with('java').returns('/usr/local/jdk-1.7.0/jre/bin/java') - Facter::Util::Resolution.expects(:exec).with('java -Xmx12m -version 2>&1').returns(openjdk_7_output) + expect(Facter::Util::Resolution).to receive(:which).with('java').and_return('/usr/local/jdk-1.7.0/jre/bin/java') + expect(Facter::Util::Resolution).to receive(:exec).with('java -Xmx12m -version 2>&1').and_return(openjdk_7_output) expect(Facter.value(:java_version)).to eq('1.7.0_71') end end context 'when on Darwin' do before(:each) do - Facter.fact(:operatingsystem).stubs(:value).returns('Darwin') + allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('Darwin') end let(:facts) { { operatingsystem: 'Darwin' } } it do - Facter::Util::Resolution.expects(:exec).with('/usr/libexec/java_home --failfast 2>&1').returns('/Library/Java/JavaVirtualMachines/jdk1.7.0_71.jdk/Contents/Home') - Facter::Util::Resolution.expects(:exec).with('java -Xmx12m -version 2>&1').returns(jdk_7_hotspot_output) + expect(Facter::Util::Resolution).to receive(:exec).with('/usr/libexec/java_home --failfast 2>&1').and_return('/Library/Java/JavaVirtualMachines/jdk1.7.0_71.jdk/Contents/Home') + expect(Facter::Util::Resolution).to receive(:exec).with('java -Xmx12m -version 2>&1').and_return(jdk_7_hotspot_output) expect(Facter.value(:java_version)).to eql '1.7.0_71' end end context 'when on other systems' do before(:each) do - Facter.fact(:operatingsystem).stubs(:value).returns('MyOS') + allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('MyOS') end let(:facts) { { operatingsystem: 'MyOS' } } it do - Facter::Util::Resolution.expects(:which).with('java').returns('/path/to/java') - Facter::Util::Resolution.expects(:exec).with('java -Xmx12m -version 2>&1').returns(jdk_7_hotspot_output) + expect(Facter::Util::Resolution).to receive(:which).with('java').and_return('/path/to/java') + expect(Facter::Util::Resolution).to receive(:exec).with('java -Xmx12m -version 2>&1').and_return(jdk_7_hotspot_output) expect(Facter.value(:java_version)).to eq('1.7.0_71') end end @@ -57,34 +57,34 @@ describe 'java_version' do context 'when java not present, returns nil' do context 'on OpenBSD', with_env: true do before(:each) do - Facter.fact(:operatingsystem).stubs(:value).returns('OpenBSD') + allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('OpenBSD') end let(:facts) { { operatingsystem: 'OpenBSD' } } it do - Facter::Util::Resolution.stubs(:exec) + allow(Facter::Util::Resolution).to receive(:exec) # Catch all other calls expect(Facter.value(:java_version)).to be_nil end end context 'when on Darwin' do before(:each) do - Facter.fact(:operatingsystem).stubs(:value).returns('Darwin') + allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('Darwin') end let(:facts) { { operatingsystem: 'Darwin' } } it do - Facter::Util::Resolution.expects(:exec).at_least(1).with('/usr/libexec/java_home --failfast 2>&1').returns('Unable to find any JVMs matching version "(null)".') + expect(Facter::Util::Resolution).to receive(:exec).with('/usr/libexec/java_home --failfast 2>&1').at_least(1).and_return('Unable to find any JVMs matching version "(null)".') expect(Facter.value(:java_version)).to be_nil end end context 'when on other systems' do before(:each) do - Facter.fact(:operatingsystem).stubs(:value).returns('MyOS') + allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('MyOS') end let(:facts) { { operatingsystem: 'MyOS' } } it do - Facter::Util::Resolution.expects(:which).at_least(1).with('java').returns(false) + expect(Facter::Util::Resolution).to receive(:which).at_least(1).with('java').and_return(false) expect(Facter.value(:java_version)).to be_nil end end From 5509042cd178121cd080e9294d99c953f4f0fb3c Mon Sep 17 00:00:00 2001 From: Valentin Date: Mon, 25 Feb 2019 12:46:52 +0100 Subject: [PATCH 05/12] Update default version & java 8 version from 8u192 to 8u201 (#347) * Update default version & java 8 version from 8u192 to 8u201 --- manifests/oracle.pp | 16 +++---- spec/acceptance/install_spec.rb | 6 +-- spec/defines/oracle_spec.rb | 80 ++++++++++++++++----------------- 3 files changed, 51 insertions(+), 51 deletions(-) diff --git a/manifests/oracle.pp b/manifests/oracle.pp index c5d2f3f..d5025ac 100644 --- a/manifests/oracle.pp +++ b/manifests/oracle.pp @@ -172,16 +172,16 @@ define java::oracle ( $release_hash = undef } '8' : { - $release_major = '8u192' - $release_minor = 'b12' - $install_path = "${java_se}1.8.0_192" - $release_hash = '750e1c8617c5452694857ad95c3ee230' + $release_major = '8u201' + $release_minor = 'b09' + $install_path = "${java_se}1.8.0_201" + $release_hash = '42970487e3af4f5aa5bca3f542482c60' } default : { - $release_major = '8u192' - $release_minor = 'b12' - $install_path = "${java_se}1.8.0_192" - $release_hash = '750e1c8617c5452694857ad95c3ee230' + $release_major = '8u201' + $release_minor = 'b09' + $install_path = "${java_se}1.8.0_201" + $release_hash = '42970487e3af4f5aa5bca3f542482c60' } } } diff --git a/spec/acceptance/install_spec.rb b/spec/acceptance/install_spec.rb index 527ee58..7bfa37b 100644 --- a/spec/acceptance/install_spec.rb +++ b/spec/acceptance/install_spec.rb @@ -87,9 +87,9 @@ bogus_alternative = "class { 'java':\n"\ oracle_enabled = false oracle_version_major = '8' -oracle_version_minor = '192' -oracle_version_build = '12' -oracle_hash = '750e1c8617c5452694857ad95c3ee230' +oracle_version_minor = '201' +oracle_version_build = '09' +oracle_hash = '42970487e3af4f5aa5bca3f542482c60' install_oracle_jre = < Date: Mon, 25 Feb 2019 14:28:11 +0100 Subject: [PATCH 06/12] Add option to manage symlink --- manifests/oracle.pp | 16 ++++++++++++++++ spec/defines/oracle_spec.rb | 15 +++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/manifests/oracle.pp b/manifests/oracle.pp index c5d2f3f..1617066 100644 --- a/manifests/oracle.pp +++ b/manifests/oracle.pp @@ -99,6 +99,12 @@ # Whether to manage the basedir directory. Defaults to false. # Note: /usr/lib/jvm is managed for Debian by default, separate from this parameter. # +# [*manage_symlink*] +# Whether to manage a symlink that points to the installation directory. Defaults to false. +# +# [*symlink_name*] +# The name for the optional symlink in the installation directory. +# # ### Author # mike@marseglia.org # @@ -117,6 +123,8 @@ define java::oracle ( $basedir = undef, $manage_basedir = false, $package_type = undef, + $manage_symlink = false, + $symlink_name = undef, ) { # archive module is used to download the java package @@ -344,6 +352,14 @@ define java::oracle ( require => $install_requires } + if ($manage_symlink and $symlink_name) { + file { "${_basedir}/${symlink_name}": + ensure => link, + target => $creates_path, + require => Exec["Install Oracle java_se ${java_se} ${version} ${release_major} ${release_minor}"] + } + } + if ($jce and $jce_download != undef) { $jce_path = $java_se ? { 'jre' => "${creates_path}/lib/security", diff --git a/spec/defines/oracle_spec.rb b/spec/defines/oracle_spec.rb index e2d1e12..e2f6bfa 100644 --- a/spec/defines/oracle_spec.rb +++ b/spec/defines/oracle_spec.rb @@ -175,6 +175,21 @@ describe 'java::oracle', type: :define do it { is_expected.to contain_file('/usr/java') } end + context 'when manage_symlink is set to true' do + let(:params) do + { + ensure: 'present', + version: '6', + java_se: 'jdk', + basedir: '/usr/java', + manage_symlink: true, + symlink_name: 'java_home', + } + end + let(:title) { 'jdk6' } + + it { is_expected.to contain_file('/usr/java/java_home') } + end end context 'when on CentOS 32-bit' do From c81254a23a371acdb6c9cf6d7ff020a9c2ae073d Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Mon, 25 Feb 2019 16:14:14 +0100 Subject: [PATCH 07/12] Fix $install_path on CentOS with tar.gz package type When using tar.gz packages on CentOS, the architecture is not part of the name of the installation directory. In this case it's just "jdk1.8.0_201" instead of "jdk1.8.0_201-amd64". --- manifests/oracle.pp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/manifests/oracle.pp b/manifests/oracle.pp index d5025ac..fd0bb67 100644 --- a/manifests/oracle.pp +++ b/manifests/oracle.pp @@ -146,8 +146,9 @@ define java::oracle ( if $release_major =~ /(\d+)u(\d+)/ { # Required for CentOS systems where Java8 update number is >= 171 to ensure - # the package is visible to Puppet - if $facts['os']['family'] == 'RedHat' and $2 >= '171' { + # the package is visible to Puppet. This is only true for installations that + # don't use the tar.gz package type. + if $facts['os']['family'] == 'RedHat' and $2 >= '171' and $package_type != 'tar.gz' { $install_path = "${java_se}1.${1}.0_${2}-amd64" } else { $install_path = "${java_se}1.${1}.0_${2}" From 7cd34dd29130f4075c3afdcda242d983ea38244f Mon Sep 17 00:00:00 2001 From: Eimhin Laverty Date: Tue, 26 Feb 2019 12:22:27 +0000 Subject: [PATCH 08/12] (FM-7795) Cleanup java tests (#350) * Add idempotent_apply function * Remove unsupported OS specific code * Remove outdated comments * Improve unit test coverage * Fix typo --- spec/acceptance/install_spec.rb | 96 +++++----------------- spec/classes/java_spec.rb | 49 ++--------- spec/defines/oracle_spec.rb | 5 -- spec/spec_helper_acceptance.rb | 14 ++++ spec/unit/facter/java_default_home_spec.rb | 2 +- spec/unit/facter/java_libjvm_path_spec.rb | 14 +++- 6 files changed, 54 insertions(+), 126 deletions(-) diff --git a/spec/acceptance/install_spec.rb b/spec/acceptance/install_spec.rb index 7bfa37b..54411fb 100644 --- a/spec/acceptance/install_spec.rb +++ b/spec/acceptance/install_spec.rb @@ -2,32 +2,6 @@ require 'spec_helper_acceptance' include Unix::File -# RedHat, CentOS, Scientific, Oracle prior to 5.0 : Sun Java JDK/JRE 1.6 -# RedHat, CentOS, Scientific, Oracle 5.0 < x < 6.3 : OpenJDK Java JDK/JRE 1.6 -# RedHat, CentOS, Scientific, Oracle after 6.3 : OpenJDK Java JDK/JRE 1.7 -# Debian Jesse & Ubuntu 14.04 : OpenJDK Java JDK/JRE 1.7 or Oracle Java JDK/JRE 1.6 -# Solaris (what versions?) : Java JDK/JRE 1.7 -# OpenSuSE : OpenJDK Java JDK/JRE 1.7 -# SLES : IBM Java JDK/JRE 1.6 - -# C14677 -# C14678 -# C14679 -# C14680 -# C14681 -# C14682 -# C14684 -# C14687 -# C14692 -# C14696 -# C14697 -# C14700 check on solaris 11 -# C14701 check on sles 11 -# C14703 -# C14723 Where is oracle linux 5? -# C14724 Where is oracle linux 5? -# C14771 Where is redhat 7? Centos 7? - java_class_jre = "class { 'java':\n"\ " distribution => 'jre',\n"\ '}' @@ -56,10 +30,6 @@ oracle_jdk = "class { 'java':\n"\ " distribution => 'oracle-jdk',\n"\ '}' -incorrect_version = "class { 'java':\n"\ - " version => '14.5',\n"\ - '}' - blank_version = "class { 'java':\n"\ " version => '',\n"\ '}' @@ -91,7 +61,7 @@ oracle_version_minor = '201' oracle_version_build = '09' oracle_hash = '42970487e3af4f5aa5bca3f542482c60' -install_oracle_jre = < '#{oracle_version_major}', @@ -100,9 +70,6 @@ install_oracle_jre = < '#{oracle_hash}', java_se => 'jre', } -EOL - -install_oracle_jdk = < '#{oracle_version_major}', @@ -123,6 +90,7 @@ install_oracle_jre_jce = < 'jre', jce => true, } + EOL install_oracle_jdk_jce = < 'jdk' } } - it { is_expected.to contain_package('java').with_name('openjdk-8-jdk') } - it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64/') } + it { is_expected.to contain_package('java').with_name('openjdk-7-jdk') } + it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64/') } end - context 'when select jre for Ubuntu Vivid (15.04)' do - let(:facts) { { osfamily: 'Debian', operatingsystem: 'Ubuntu', lsbdistcodename: 'vivid', operatingsystemrelease: '15.04', architecture: 'amd64' } } + context 'when select jre for Ubuntu Trusty (14.04)' do + let(:facts) { { osfamily: 'Debian', operatingsystem: 'Ubuntu', lsbdistcodename: 'trusty', operatingsystemrelease: '14.04', architecture: 'amd64' } } let(:params) { { 'distribution' => 'jre' } } - it { is_expected.to contain_package('java').with_name('openjdk-8-jre-headless') } - it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64/') } + it { is_expected.to contain_package('java').with_name('openjdk-7-jre-headless') } + it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64/') } end context 'when select jdk for Ubuntu xenial (16.04) on ARM' do @@ -85,20 +85,6 @@ describe 'java', type: :class do it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-arm64/') } end - context 'when select openjdk for Amazon Linux' do - let(:facts) { { osfamily: 'RedHat', operatingsystem: 'Amazon', operatingsystemrelease: '3.4.43-43.43.amzn1.x86_64', 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/') } - end - - context 'when select passed value for Amazon Linux' do - let(:facts) { { osfamily: 'RedHat', operatingsystem: 'Amazon', operatingsystemrelease: '5.3.4.43-43.43.amzn1.x86_64', architecture: 'x86_64' } } - let(:params) { { 'distribution' => 'jre' } } - - it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk') } - end - context 'when select openjdk for Oracle Linux' do let(:facts) { { osfamily: 'RedHat', operatingsystem: 'OracleLinux', operatingsystemrelease: '6.4', architecture: 'x86_64' } } @@ -169,20 +155,6 @@ describe 'java', type: :class do it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib64/jvm/java-1.8.0-openjdk-1.8.0/') } end - context 'when select jdk for OpenBSD' do - let(:facts) { { osfamily: 'OpenBSD', architecture: 'x86_64' } } - - it { is_expected.to contain_package('java').with_name('jdk') } - it { is_expected.not_to contain_file_line('java-home-environment') } - end - - context 'when select jre for OpenBSD' do - let(:facts) { { osfamily: 'OpenBSD', architecture: 'x86_64' } } - let(:params) { { 'distribution' => 'jre' } } - - it { is_expected.to contain_package('java').with_name('jre') } - end - describe 'custom java package' do let(:facts) { { osfamily: 'Debian', operatingsystem: 'Debian', lsbdistcodename: 'jessie', operatingsystemrelease: '8.6', architecture: 'amd64' } } @@ -218,31 +190,26 @@ describe 'java', type: :class do describe 'incompatible OSs' do [ { - # C14706 osfamily: 'windows', operatingsystem: 'windows', operatingsystemrelease: '8.1', }, { - # C14707 osfamily: 'Darwin', operatingsystem: 'Darwin', operatingsystemrelease: '13.3.0', }, { - # C14708 osfamily: 'AIX', operatingsystem: 'AIX', operatingsystemrelease: '7100-02-00-000', }, { - # C14708 osfamily: 'AIX', operatingsystem: 'AIX', operatingsystemrelease: '6100-07-04-1216', }, { - # C14708 osfamily: 'AIX', operatingsystem: 'AIX', operatingsystemrelease: '5300-12-01-1016', diff --git a/spec/defines/oracle_spec.rb b/spec/defines/oracle_spec.rb index c9252d1..43b6d32 100644 --- a/spec/defines/oracle_spec.rb +++ b/spec/defines/oracle_spec.rb @@ -398,7 +398,6 @@ describe 'java::oracle', type: :define do describe 'incompatible OSes' do [ { - # C14706 kernel: 'Windows', os: { family: 'Windows', @@ -409,7 +408,6 @@ describe 'java::oracle', type: :define do }, }, { - # C14707 kernel: 'Darwin', os: { family: 'Darwin', @@ -420,7 +418,6 @@ describe 'java::oracle', type: :define do }, }, { - # C14708 kernel: 'AIX', os: { family: 'AIX', @@ -431,7 +428,6 @@ describe 'java::oracle', type: :define do }, }, { - # C14709 kernel: 'AIX', os: { family: 'AIX', @@ -442,7 +438,6 @@ describe 'java::oracle', type: :define do }, }, { - # C14710 kernel: 'AIX', os: { family: 'AIX', diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index 0bda578..db02d65 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -21,3 +21,17 @@ RSpec.configure do |c| # Readable test descriptions c.formatter = :documentation end + +def idempotent_apply(hosts, manifest, opts = {}, &block) + block_on hosts, opts do |host| + file_path = host.tmpfile('apply_manifest.pp') + create_remote_file(host, file_path, manifest + "\n") + + puppet_apply_opts = { :verbose => nil, 'detailed-exitcodes' => nil } + on_options = { acceptable_exit_codes: [0, 2] } + on host, puppet('apply', file_path, puppet_apply_opts), on_options, &block + puppet_apply_opts2 = { :verbose => nil, 'detailed-exitcodes' => nil } + on_options2 = { acceptable_exit_codes: [0] } + on host, puppet('apply', file_path, puppet_apply_opts2), on_options2, &block + end +end diff --git a/spec/unit/facter/java_default_home_spec.rb b/spec/unit/facter/java_default_home_spec.rb index 4d2accf..31ecd68 100644 --- a/spec/unit/facter/java_default_home_spec.rb +++ b/spec/unit/facter/java_default_home_spec.rb @@ -47,7 +47,7 @@ describe 'java_default_home' do context 'when java not present, return nil' do it do allow(Facter::Util::Resolution).to receive(:exec) # Catch all other calls - expect(Facter::Util::Resolution).to receive(:which).with('java').at_least(1).and_return(false) + expect(Facter::Util::Resolution).to receive(:which).with('java').at_least(1).and_return(nil) expect(Facter.value(:java_default_home)).to be_nil end end diff --git a/spec/unit/facter/java_libjvm_path_spec.rb b/spec/unit/facter/java_libjvm_path_spec.rb index df2ea28..b6277cf 100644 --- a/spec/unit/facter/java_libjvm_path_spec.rb +++ b/spec/unit/facter/java_libjvm_path_spec.rb @@ -1,17 +1,25 @@ require 'spec_helper' describe 'java_libjvm_path' do + let(:java_default_home) { '/usr/lib/jvm/java-8-openjdk-amd64' } + before(:each) do Facter.clear allow(Facter.fact(:kernel)).to receive(:value).once.and_return('Linux') - java_default_home = '/usr/lib/jvm/java-8-openjdk-amd64' allow(Facter.fact(:java_default_home)).to receive(:value).once.and_return(java_default_home) - allow(Dir).to receive(:glob).with("#{java_default_home}/jre/lib/**/libjvm.so").and_return(['/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server/libjvm.so']) end - context 'when on Linux, return libjvm path' do + context 'when libjvm exists' do it do + allow(Dir).to receive(:glob).with("#{java_default_home}/jre/lib/**/libjvm.so").and_return(['/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server/libjvm.so']) expect(Facter.value(:java_libjvm_path)).to eql '/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server' end end + + context 'when libjvm does not exist' do + it do + allow(Dir).to receive(:glob).with("#{java_default_home}/jre/lib/**/libjvm.so").and_return([]) + expect(Facter.value(:java_libjvm_path)).to be nil + end + end end From 881bcfabeae0a129eecf8bc5a48c466eb706d19b Mon Sep 17 00:00:00 2001 From: Eimhin Laverty Date: Thu, 7 Mar 2019 12:43:24 +0000 Subject: [PATCH 09/12] (MODULES-8728) Remove .project from .gitignore --- .gitignore | 2 ++ .pdkignore | 2 ++ .sync.yml | 4 ++++ Rakefile | 2 +- metadata.json | 8 ++++---- spec/spec_helper.rb | 2 +- 6 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 650022e..88cf7a6 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,5 @@ /convert_report.txt /update_report.txt .DS_Store +.vscode/ +.envrc diff --git a/.pdkignore b/.pdkignore index b713b3b..2ec773a 100644 --- a/.pdkignore +++ b/.pdkignore @@ -22,6 +22,8 @@ /convert_report.txt /update_report.txt .DS_Store +.vscode/ +.envrc /appveyor.yml /.fixtures.yml /Gemfile diff --git a/.sync.yml b/.sync.yml index 0bfcbe2..23bd6a2 100644 --- a/.sync.yml +++ b/.sync.yml @@ -1,4 +1,8 @@ --- +.gitignore: + required: + - ---.project + .gitlab-ci.yml: unmanaged: true diff --git a/Rakefile b/Rakefile index a6b14c5..750ef46 100644 --- a/Rakefile +++ b/Rakefile @@ -22,7 +22,7 @@ end def changelog_future_release return unless Rake.application.top_level_tasks.include? "changelog" - returnVal = JSON.load(File.read('metadata.json'))['version'] + returnVal = "v%s" % JSON.load(File.read('metadata.json'))['version'] raise "unable to find the future_release (version) in metadata.json" if returnVal.nil? puts "GitHubChangelogGenerator future_release:#{returnVal}" returnVal diff --git a/metadata.json b/metadata.json index edc0d24..c34721e 100644 --- a/metadata.json +++ b/metadata.json @@ -77,7 +77,7 @@ "version_requirement": ">= 4.7.0 < 7.0.0" } ], - "template-url": "https://github.com/puppetlabs/pdk-templates/", - "template-ref": "1.9.0-0-g7281db5", - "pdk-version": "1.7.1" -} + "template-url": "https://github.com/puppetlabs/pdk-templates", + "template-ref": "heads/master-0-gfde5699", + "pdk-version": "1.8.0" +} \ No newline at end of file diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 149ff03..1f8b6b4 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -23,7 +23,7 @@ default_fact_files.each do |f| next unless File.exist?(f) && File.readable?(f) && File.size?(f) begin - default_facts.merge!(YAML.safe_load(File.read(f))) + default_facts.merge!(YAML.safe_load(File.read(f), [], [], true)) rescue => e RSpec.configuration.reporter.message "WARNING: Unable to load #{f}: #{e}" end From 24da3741838bad86ece012630bb00cd040b8f641 Mon Sep 17 00:00:00 2001 From: David Swan Date: Wed, 10 Apr 2019 16:39:28 +0100 Subject: [PATCH 10/12] (MODULES-8444) - Raise lower Puppet bound --- metadata.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/metadata.json b/metadata.json index c34721e..61cb6e4 100644 --- a/metadata.json +++ b/metadata.json @@ -74,10 +74,10 @@ "requirements": [ { "name": "puppet", - "version_requirement": ">= 4.7.0 < 7.0.0" + "version_requirement": ">= 5.5.10 < 7.0.0" } ], "template-url": "https://github.com/puppetlabs/pdk-templates", "template-ref": "heads/master-0-gfde5699", "pdk-version": "1.8.0" -} \ No newline at end of file +} From 8abe137a8ce2611c7639b2145360dd8f1605c80e Mon Sep 17 00:00:00 2001 From: David Swan Date: Tue, 9 Apr 2019 10:18:42 +0100 Subject: [PATCH 11/12] (FM-7921) - Implement Puppet Strings --- README.markdown | 89 +-------------- REFERENCE.md | 257 ++++++++++++++++++++++++++++++++++++++++++++ manifests/config.pp | 2 +- manifests/init.pp | 27 ++--- manifests/oracle.pp | 131 ++++++++-------------- manifests/params.pp | 16 +-- 6 files changed, 319 insertions(+), 203 deletions(-) create mode 100644 REFERENCE.md diff --git a/README.markdown b/README.markdown index ee9d762..93e6dd2 100644 --- a/README.markdown +++ b/README.markdown @@ -95,94 +95,7 @@ java::oracle { 'jdk8' : ## Reference -### Classes - -#### Public classes - -* `java`: Installs and manages the Java package. - -#### Private classes - -* `java::config`: Configures the Java alternatives. - -* `java::params`: Builds a hash of jdk/jre packages for all compatible operating systems. - - -#### 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'. - -#### Public defined types - -* `java::oracle`: Installs specified version of Oracle Java SE. You may install multiple versions of Oracle Jave SE on the same node using this defined type. - -#### Parameters - -The following parameters are available in `java::oracle`: - -##### `version` -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. +For information on the classes and types, see the [REFERENCE.md](https://github.com/puppetlabs/puppetlabs-java/blob/master/REFERENCE.md). For information on the facts, see below. ### Facts diff --git a/REFERENCE.md b/REFERENCE.md new file mode 100644 index 0000000..6758ba5 --- /dev/null +++ b/REFERENCE.md @@ -0,0 +1,257 @@ +# Reference + + +## Table of Contents + +**Classes** + +_Public Classes_ + +* [`java`](#java): This module manages the Java runtime package + +_Private Classes_ + +* `java::config`: +* `java::params`: This class builds a hash of JDK/JRE packages and (for Debian) +alternatives. For wheezy/precise, we provide Oracle JDK/JRE +options, even though those are not in the package repositories. + +**Defined types** + +* [`java::oracle`](#javaoracle): Installs Oracle Java. By using this module you agree to the Oracle licensing +agreement. + +## Classes + +### java + +This module manages the Java runtime package + +#### Parameters + +The following parameters are available in the `java` class. + +##### `distribution` + +Data type: `String` + +The java distribution to install. Can be one of "jdk" or "jre", +or other platform-specific options where there are multiple +implementations available (eg: OpenJDK vs Oracle JDK). + +Default value: 'jdk' + +##### `version` + +Data type: `Pattern[/present|installed|latest|^[.+_0-9a-zA-Z:~-]+$/]` + +The version of java to install. By default, this module simply ensures +that java is present, and does not require a specific version. + +Default value: 'present' + +##### `package` + +Data type: `Optional[String]` + +The name of the java package. This is configurable in case a non-standard +java package is desired. + +Default value: `undef` + +##### `package_options` + +Data type: `Optional[Array]` + +Array of strings to pass installation options to the 'package' Puppet resource. +Options available depend on the 'package' provider for the target OS. + +Default value: `undef` + +##### `java_alternative` + +Data type: `Optional[String]` + +The name of the java alternative to use on Debian systems. +"update-java-alternatives -l" will show which choices are available. +If you specify a particular package, you will almost always also +want to specify which java_alternative to choose. If you set +this, you also need to set the path below. + +Default value: `undef` + +##### `java_alternative_path` + +Data type: `Optional[String]` + +The path to the "java" command on Debian systems. Since the +alternatives system makes it difficult to verify which +alternative is actually enabled, this is required to ensure the +correct JVM is enabled. + +Default value: `undef` + +##### `java_home` + +Data type: `Optional[String]` + +The path to where the JRE is installed. This will be set as an +environment variable. + +Default value: `undef` + +## Defined types + +### java::oracle + +Defined Type java::oracle + +Install one or more versions of Oracle Java. + +Uses the following to download the package and automatically accept +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/8u131-b11/d54c1d3a095b4ff2b6607d096fa80163/jdk-8u131-linux-x64.tar.gz" +``` + +#### Parameters + +The following parameters are available in the `java::oracle` defined type. + +##### `ensure` + +Data type: `Any` + +Install or remove the package. + +Default value: 'present' + +##### `version` + +Data type: `Any` + +Version of Java to install, e.g. '7' or '8'. Default values for major and minor versions will be used. + +Default value: '8' + +##### `version_major` + +Data type: `Any` + +Major version which should be installed, e.g. '8u101'. Must be used together with version_minor. + +Default value: `undef` + +##### `version_minor` + +Data type: `Any` + +Minor version which should be installed, e.g. 'b12'. Must be used together with version_major. + +Default value: `undef` + +##### `java_se` + +Data type: `Any` + +Type of Java Standard Edition to install, jdk or jre. + +Default value: 'jdk' + +##### `oracle_url` + +Data type: `Any` + +Official Oracle URL to download binaries from. + +Default value: 'http://download.oracle.com/otn-pub/java/jdk/' + +##### `proxy_server` + +Data type: `Any` + +Specify a proxy server, with port number if needed. ie: https://example.com:8080. (passed to archive) + +Default value: `undef` + +##### `proxy_type` + +Data type: `Any` + +Proxy server type (none|http|https|ftp). (passed to archive) + +Default value: `undef` + +##### `url` + +Data type: `Any` + +Full URL, including oracle_url, release_major, release_minor and package_name, to +download the Oracle java_se installer. Originally present but not used, activated +to workaround MODULES-5058. + +Default value: `undef` + +##### `url_hash` + +Data type: `Any` + +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. + +Default value: `undef` + +##### `jce` + +Data type: `Any` + +Install Oracles Java Cryptographic Extensions into the JRE or JDK + +Default value: `false` + +##### `basedir` + +Data type: `Any` + +Directory under which the installation will occur. If not set, defaults to +/usr/lib/jvm for Debian and /usr/java for RedHat. + +Default value: `undef` + +##### `manage_basedir` + +Data type: `Any` + +Whether to manage the basedir directory. Defaults to false. +Note: /usr/lib/jvm is managed for Debian by default, separate from this parameter. + +Default value: `false` + +##### `package_type` + +Data type: `Any` + +Type of installation package for specified version of java_se. java_se 6 comes +in a few installation package flavors and we need to account for them. +Optional forced package types: rpm, rpmbin, tar.gz + +Default value: `undef` + +##### `manage_symlink` + +Data type: `Any` + +Whether to manage a symlink that points to the installation directory. Defaults to false. + +Default value: `false` + +##### `symlink_name` + +Data type: `Any` + +The name for the optional symlink in the installation directory. + +Default value: `undef` + diff --git a/manifests/config.pp b/manifests/config.pp index 623b121..7f965f3 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -1,4 +1,4 @@ -# On Debian systems, if alternatives are set, manually assign them. +# @api private class java::config ( ) { case $::osfamily { 'Debian': { diff --git a/manifests/init.pp b/manifests/init.pp index 9b45bf3..f93f1d7 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,49 +1,40 @@ -# Class: java +# @summary +# This module manages the Java runtime package # -# This module manages the Java runtime package -# -# Parameters: -# -# [*distribution*] +# @param distribution # The java distribution to install. Can be one of "jdk" or "jre", # or other platform-specific options where there are multiple # implementations available (eg: OpenJDK vs Oracle JDK). # -# [*version*] +# @param version # The version of java to install. By default, this module simply ensures # that java is present, and does not require a specific version. # -# [*package*] +# @param package # The name of the java package. This is configurable in case a non-standard # java package is desired. # -# [*package_options*] +# @param package_options # Array of strings to pass installation options to the 'package' Puppet resource. # Options available depend on the 'package' provider for the target OS. # -# [*java_alternative*] +# @param java_alternative # The name of the java alternative to use on Debian systems. # "update-java-alternatives -l" will show which choices are available. # If you specify a particular package, you will almost always also # want to specify which java_alternative to choose. If you set # this, you also need to set the path below. # -# [*java_alternative_path*] +# @param java_alternative_path # The path to the "java" command on Debian systems. Since the # alternatives system makes it difficult to verify which # alternative is actually enabled, this is required to ensure the # correct JVM is enabled. # -# [*java_home*] +# @param java_home # The path to where the JRE is installed. This will be set as an # environment variable. # -# Actions: -# -# Requires: -# -# Sample Usage: -# class java( String $distribution = 'jdk', Pattern[/present|installed|latest|^[.+_0-9a-zA-Z:~-]+$/] $version = 'present', diff --git a/manifests/oracle.pp b/manifests/oracle.pp index 865cb52..5245c4b 100644 --- a/manifests/oracle.pp +++ b/manifests/oracle.pp @@ -1,112 +1,73 @@ # Defined Type java::oracle # -# Description -# Installs Oracle Java. By using this module you agree to the Oracle licensing -# agreement. +# @summary +# Installs Oracle Java. By using this module you agree to the Oracle licensing +# agreement. # # Install one or more versions of Oracle Java. # -# uses the following to download the package and automatically accept -# the licensing terms. +# Uses the following to download the package and automatically accept +# 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/8u131-b11/d54c1d3a095b4ff2b6607d096fa80163/jdk-8u131-linux-x64.tar.gz" +#``` # -# Parameters -# [*version*] -# Version of Java to install, e.g. '7' or '8'. Default values for major and minor -# versions will be used. +# @param ensure +# Install or remove the package. # -# [*version_major*] -# Major version which should be installed, e.g. '8u101'. Must be used together with -# version_minor. +# @param version +# Version of Java to install, e.g. '7' or '8'. Default values for major and minor versions will be used. # -# [*version_minor*] -# Minor version which should be installed, e.g. 'b12'. Must be used together with -# version_major. +# @param version_major +# Major version which should be installed, e.g. '8u101'. Must be used together with version_minor. # -# [*java_se*] -# Type of Java Standard Edition to install, jdk or jre. +# @param version_minor +# Minor version which should be installed, e.g. 'b12'. Must be used together with version_major. # -# [*ensure*] -# Install or remove the package. +# @param java_se +# Type of Java Standard Edition to install, jdk or jre. # -# [*oracle_url*] -# Official Oracle URL to download binaries from. +# @param oracle_url +# Official Oracle URL to download binaries from. # -# [*proxy_server*] -# Specify a proxy server, with port number if needed. ie: https://example.com:8080. (passed to archive) +# @param 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) +# @param proxy_type +# Proxy server type (none|http|https|ftp). (passed to archive) # -# Variables -# [*release_major*] -# Major version release number for java_se. Used to construct download URL. +# @param url +# Full URL, including oracle_url, release_major, release_minor and package_name, to +# download the Oracle java_se installer. Originally present but not used, activated +# to workaround MODULES-5058. # -# [*release_minor*] -# Minor version release number for java_se. Used to construct download URL. +# @param 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. # -# [*install_path*] -# Base install path for specified version of java_se. Used to determine if java_se -# has already been installed. +# @param jce +# Install Oracles Java Cryptographic Extensions into the JRE or JDK # -# [*package_type*] -# Type of installation package for specified version of java_se. java_se 6 comes -# in a few installation package flavors and we need to account for them. -# Optional forced package types: rpm, rpmbin, tar.gz +# @param basedir +# Directory under which the installation will occur. If not set, defaults to +# /usr/lib/jvm for Debian and /usr/java for RedHat. # -# [*os*] -# Oracle java_se OS type. +# @param manage_basedir +# Whether to manage the basedir directory. Defaults to false. +# Note: /usr/lib/jvm is managed for Debian by default, separate from this parameter. # -# [*destination*] -# Destination directory to save java_se installer to. Usually /tmp on Linux and -# C:\TEMP on Windows. +# @param package_type +# Type of installation package for specified version of java_se. java_se 6 comes +# in a few installation package flavors and we need to account for them. +# Optional forced package types: rpm, rpmbin, tar.gz # -# [*creates_path*] -# Fully qualified path to java_se after it is installed. Used to determine if -# java_se is already installed. +# @param manage_symlink +# Whether to manage a symlink that points to the installation directory. Defaults to false. # -# [*arch*] -# Oracle java_se architecture type. -# -# [*package_name*] -# Name of the java_se installation package to download from Oracle's website. -# -# [*install_command*] -# Installation command used to install Oracle java_se. Installation commands -# differ by package_type. 'bin' types are installed via shell command. 'rpmbin' -# types have the rpms extracted and then forcibly installed. 'rpm' types are -# forcibly installed. -# -# [*url*] -# Full URL, including oracle_url, release_major, release_minor and package_name, to -# 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. -# -# [*jce*] -# Install Oracles Java Cryptographic Extensions into the JRE or JDK -# -# [*basedir*] -# Directory under which the installation will occur. If not set, defaults to -# /usr/lib/jvm for Debian and /usr/java for RedHat. -# -# [*manage_basedir*] -# Whether to manage the basedir directory. Defaults to false. -# Note: /usr/lib/jvm is managed for Debian by default, separate from this parameter. -# -# [*manage_symlink*] -# Whether to manage a symlink that points to the installation directory. Defaults to false. -# -# [*symlink_name*] -# The name for the optional symlink in the installation directory. -# -# ### Author -# mike@marseglia.org +# @param symlink_name +# The name for the optional symlink in the installation directory. # define java::oracle ( $ensure = 'present', diff --git a/manifests/params.pp b/manifests/params.pp index 8da6122..29b66bc 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -1,15 +1,9 @@ -# Class: java::params +# @summary +# This class builds a hash of JDK/JRE packages and (for Debian) +# alternatives. For wheezy/precise, we provide Oracle JDK/JRE +# options, even though those are not in the package repositories. # -# This class builds a hash of JDK/JRE packages and (for Debian) -# alternatives. For wheezy/precise, we provide Oracle JDK/JRE -# options, even though those are not in the package repositories. -# -# For more info on how to package Oracle JDK/JRE, see the Debian wiki: -# http://wiki.debian.org/JavaPackage -# -# Because the alternatives system makes it very difficult to tell -# which Java alternative is enabled, we hard code the path to bin/java -# for the config class to test if it is enabled. +# @api private class java::params { case $::osfamily { From b8e54386637fb896385bd856ad803fb6b207cefe Mon Sep 17 00:00:00 2001 From: Eimhin Laverty Date: Mon, 15 Apr 2019 10:34:13 +0100 Subject: [PATCH 12/12] pdksync - (maint) Update pdk-template to f778803 --- .gitignore | 2 +- .pdkignore | 4 +++- .puppet-lint.rc | 2 +- .travis.yml | 34 +++++++++++++++++++++++----------- metadata.json | 6 +++--- 5 files changed, 31 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 88cf7a6..3f4e2e8 100644 --- a/.gitignore +++ b/.gitignore @@ -22,5 +22,5 @@ /convert_report.txt /update_report.txt .DS_Store -.vscode/ .envrc +/inventory.yaml diff --git a/.pdkignore b/.pdkignore index 2ec773a..54d2cda 100644 --- a/.pdkignore +++ b/.pdkignore @@ -22,8 +22,8 @@ /convert_report.txt /update_report.txt .DS_Store -.vscode/ .envrc +/inventory.yaml /appveyor.yml /.fixtures.yml /Gemfile @@ -32,8 +32,10 @@ /.gitlab-ci.yml /.pdkignore /Rakefile +/rakelib/ /.rspec /.rubocop.yml /.travis.yml /.yardopts /spec/ +/.vscode/ diff --git a/.puppet-lint.rc b/.puppet-lint.rc index 8b13789..cc96ece 100644 --- a/.puppet-lint.rc +++ b/.puppet-lint.rc @@ -1 +1 @@ - +--relative diff --git a/.travis.yml b/.travis.yml index cc2ac0b..9472d03 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,4 @@ --- -dist: trusty language: ruby cache: bundler before_install: @@ -12,10 +11,14 @@ script: - 'bundle exec rake $CHECK' bundler_args: --without system_tests rvm: - - 2.5.1 -env: - global: - - BEAKER_PUPPET_COLLECTION=puppet6 PUPPET_GEM_VERSION="~> 6.0" + - 2.5.3 +stages: + - static + - spec + - acceptance + - + if: tag =~ ^v\d + name: deploy matrix: fast_finish: true include: @@ -23,25 +26,34 @@ matrix: bundler_args: dist: trusty env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=docker/centos-7 BEAKER_TESTMODE=apply - rvm: 2.5.1 + rvm: 2.5.3 script: bundle exec rake beaker services: docker + stage: acceptance sudo: required - bundler_args: dist: trusty env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=docker/ubuntu-14.04 BEAKER_TESTMODE=apply - rvm: 2.5.1 + rvm: 2.5.3 script: bundle exec rake beaker services: docker + stage: acceptance sudo: required - - env: CHECK="syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop" - - - env: CHECK=parallel_spec + env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint" + stage: static - env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec - rvm: 2.4.4 + rvm: 2.4.5 + stage: spec + - + env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec + rvm: 2.5.3 + stage: spec + - + env: DEPLOY_TO_FORGE=yes + stage: deploy branches: only: - master diff --git a/metadata.json b/metadata.json index 61cb6e4..abd630f 100644 --- a/metadata.json +++ b/metadata.json @@ -77,7 +77,7 @@ "version_requirement": ">= 5.5.10 < 7.0.0" } ], - "template-url": "https://github.com/puppetlabs/pdk-templates", - "template-ref": "heads/master-0-gfde5699", - "pdk-version": "1.8.0" + "template-url": "https://github.com/puppetlabs/pdk-templates#master", + "template-ref": "heads/master-0-gf778803", + "pdk-version": "1.10.0" }