diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile new file mode 100644 index 00000000..12ed4ff1 --- /dev/null +++ b/.devcontainer/Dockerfile @@ -0,0 +1,6 @@ +FROM puppet/pdk:latest + +# [Optional] Uncomment this section to install additional packages. +# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ +# && apt-get -y install --no-install-recommends + diff --git a/.devcontainer/README.md b/.devcontainer/README.md new file mode 100644 index 00000000..a7193616 --- /dev/null +++ b/.devcontainer/README.md @@ -0,0 +1,38 @@ +# devcontainer + + +For format details, see https://aka.ms/devcontainer.json. + +For config options, see the README at: +https://github.com/microsoft/vscode-dev-containers/tree/v0.140.1/containers/puppet + +``` json +{ + "name": "Puppet Development Kit (Community)", + "dockerFile": "Dockerfile", + + // Set *default* container specific settings.json values on container create. + "settings": { + "terminal.integrated.profiles.linux": { + "bash": { + "path": "bash", + } + } + }, + + // Add the IDs of extensions you want installed when the container is created. + "extensions": [ + "puppet.puppet-vscode", + "rebornix.Ruby" + ], + + // Use 'forwardPorts' to make a list of ports inside the container available locally. + "forwardPorts": [], + + // Use 'postCreateCommand' to run commands after the container is created. + "postCreateCommand": "pdk --version", +} +``` + + + diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 00000000..cdd65d22 --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,17 @@ +{ + "name": "Puppet Development Kit (Community)", + "dockerFile": "Dockerfile", + + "settings": { + "terminal.integrated.profiles.linux": { + "bash": { + "path": "bash" + } + } + }, + + "extensions": [ + "puppet.puppet-vscode", + "rebornix.Ruby" + ] +} diff --git a/.fixtures.yml b/.fixtures.yml index 2f664f7e..c5ff6f25 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -1,6 +1,7 @@ fixtures: repositories: - stdlib: "git://github.com/puppetlabs/puppetlabs-stdlib.git" - archive: "git://github.com/voxpupuli/puppet-archive.git" - symlinks: - java: "#{source_dir}" + archive: "https://github.com/voxpupuli/puppet-archive.git" + facts: 'https://github.com/puppetlabs/puppetlabs-facts.git' + stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git" + puppet_agent: 'https://github.com/puppetlabs/puppetlabs-puppet_agent.git' + provision: 'https://github.com/puppetlabs/provision.git' diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 00000000..e3a97007 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,15 @@ +## Summary +Provide a detailed description of all the changes present in this pull request. + +## Additional Context +Add any additional context about the problem here. +- [ ] Root cause and the steps to reproduce. (If applicable) +- [ ] Thought process behind the implementation. + +## Related Issues (if any) +Mention any related issues or pull requests. + +## Checklist +- [ ] 🟢 Spec tests. +- [ ] 🟢 Acceptance tests. +- [ ] Manually verified. (For example `puppet apply`) \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 00000000..c236bbc2 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,19 @@ +name: "ci" + +on: + pull_request: + branches: + - "main" + workflow_dispatch: + +jobs: + Spec: + uses: "puppetlabs/cat-github-actions/.github/workflows/module_ci.yml@main" + secrets: "inherit" + + Acceptance: + needs: Spec + uses: "puppetlabs/cat-github-actions/.github/workflows/module_acceptance.yml@main" + with: + flags: "--nightly --arch-exclude arm" + secrets: "inherit" diff --git a/.github/workflows/mend.yml b/.github/workflows/mend.yml new file mode 100644 index 00000000..b4100a5a --- /dev/null +++ b/.github/workflows/mend.yml @@ -0,0 +1,15 @@ +name: "mend" + +on: + pull_request: + branches: + - "main" + schedule: + - cron: "0 0 * * *" + workflow_dispatch: + +jobs: + + mend: + uses: "puppetlabs/cat-github-actions/.github/workflows/mend_ruby.yml@main" + secrets: "inherit" diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml new file mode 100644 index 00000000..9f20eccd --- /dev/null +++ b/.github/workflows/nightly.yml @@ -0,0 +1,18 @@ +name: "nightly" + +on: + schedule: + - cron: "0 0 * * *" + workflow_dispatch: + +jobs: + Spec: + uses: "puppetlabs/cat-github-actions/.github/workflows/module_ci.yml@main" + secrets: "inherit" + + Acceptance: + needs: Spec + uses: "puppetlabs/cat-github-actions/.github/workflows/module_acceptance.yml@main" + with: + flags: "--nightly --arch-exclude arm" + secrets: "inherit" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 00000000..4b3b80fc --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,9 @@ +name: "Publish module" + +on: + workflow_dispatch: + +jobs: + release: + uses: "puppetlabs/cat-github-actions/.github/workflows/module_release.yml@main" + secrets: "inherit" diff --git a/.github/workflows/release_prep.yml b/.github/workflows/release_prep.yml new file mode 100644 index 00000000..bb0b7acc --- /dev/null +++ b/.github/workflows/release_prep.yml @@ -0,0 +1,15 @@ +name: "Release Prep" + +on: + workflow_dispatch: + inputs: + version: + description: "Module version to be released. Must be a valid semver string. (1.2.3)" + required: true + +jobs: + release_prep: + uses: "puppetlabs/cat-github-actions/.github/workflows/module_release_prep.yml@main" + with: + version: "${{ github.event.inputs.version }}" + secrets: "inherit" diff --git a/.gitignore b/.gitignore index 3f4e2e84..2803e566 100644 --- a/.gitignore +++ b/.gitignore @@ -16,11 +16,20 @@ /log/ /pkg/ /spec/fixtures/manifests/ -/spec/fixtures/modules/ +/spec/fixtures/modules/* /tmp/ /vendor/ +/.vendor/ /convert_report.txt /update_report.txt .DS_Store +.project .envrc /inventory.yaml +/spec/fixtures/litmus_inventory.yaml +.resource_types +.modules +.task_cache.json +.plan_cache.json +.rerun.json +bolt-debug.log diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile new file mode 100644 index 00000000..0814c5e6 --- /dev/null +++ b/.gitpod.Dockerfile @@ -0,0 +1,18 @@ +FROM gitpod/workspace-full +RUN sudo wget https://apt.puppet.com/puppet-tools-release-bionic.deb && \ + wget https://apt.puppetlabs.com/puppet6-release-bionic.deb && \ + sudo dpkg -i puppet6-release-bionic.deb && \ + sudo dpkg -i puppet-tools-release-bionic.deb && \ + sudo apt-get update && \ + sudo apt-get install -y pdk zsh puppet-agent && \ + sudo apt-get clean && \ + sudo rm -rf /var/lib/apt/lists/* +RUN sudo usermod -s $(which zsh) gitpod && \ + sh -c "$(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" && \ + echo "plugins=(git gitignore github gem pip bundler python ruby docker docker-compose)" >> /home/gitpod/.zshrc && \ + echo 'PATH="$PATH:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/opt/puppetlabs/bin:/opt/puppetlabs/puppet/bin"' >> /home/gitpod/.zshrc && \ + sudo /opt/puppetlabs/puppet/bin/gem install puppet-debugger hub -N && \ + mkdir -p /home/gitpod/.config/puppet && \ + /opt/puppetlabs/puppet/bin/ruby -r yaml -e "puts ({'disabled' => true}).to_yaml" > /home/gitpod/.config/puppet/analytics.yml +RUN rm -f puppet6-release-bionic.deb puppet-tools-release-bionic.deb +ENTRYPOINT /usr/bin/zsh diff --git a/.gitpod.yml b/.gitpod.yml new file mode 100644 index 00000000..9d89d9fa --- /dev/null +++ b/.gitpod.yml @@ -0,0 +1,9 @@ +image: + file: .gitpod.Dockerfile + +tasks: + - init: pdk bundle install + +vscode: + extensions: + - puppet.puppet-vscode@1.2.0:f5iEPbmOj6FoFTOV6q8LTg== diff --git a/.pdkignore b/.pdkignore index 54d2cda3..84684be6 100644 --- a/.pdkignore +++ b/.pdkignore @@ -16,26 +16,36 @@ /log/ /pkg/ /spec/fixtures/manifests/ -/spec/fixtures/modules/ +/spec/fixtures/modules/* /tmp/ /vendor/ +/.vendor/ /convert_report.txt /update_report.txt .DS_Store +.project .envrc /inventory.yaml -/appveyor.yml +/spec/fixtures/litmus_inventory.yaml +.resource_types +.modules +.task_cache.json +.plan_cache.json +.rerun.json +bolt-debug.log /.fixtures.yml /Gemfile /.gitattributes +/.github/ /.gitignore -/.gitlab-ci.yml /.pdkignore +/.puppet-lint.rc /Rakefile /rakelib/ /.rspec -/.rubocop.yml -/.travis.yml +/..yml /.yardopts /spec/ /.vscode/ +/.sync.yml +/.devcontainer/ diff --git a/.project b/.project deleted file mode 100644 index 139ecf77..00000000 --- a/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - puppetlabs-java - - - - - - com.puppetlabs.geppetto.pp.dsl.ui.modulefileBuilder - - - - - org.eclipse.xtext.ui.shared.xtextBuilder - - - - - - com.puppetlabs.geppetto.pp.dsl.ui.puppetNature - org.eclipse.xtext.ui.shared.xtextNature - - diff --git a/.puppet-lint.rc b/.puppet-lint.rc index cc96ece0..9e15c6e0 100644 --- a/.puppet-lint.rc +++ b/.puppet-lint.rc @@ -1 +1,9 @@ +--fail-on-warnings --relative +--no-80chars-check +--no-140chars-check +--no-class_inherits_from_params_class-check +--no-autoloader_layout-check +--no-documentation-check +--no-single_quote_string_with_variables-check +--ignore-paths=.vendor/**/*.pp,.bundle/**/*.pp,pkg/**/*.pp,spec/**/*.pp,tests/**/*.pp,types/**/*.pp,vendor/**/*.pp diff --git a/.rubocop.yml b/.rubocop.yml index b46c8599..47b1aadb 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,12 +1,13 @@ --- require: +- rubocop-performance - rubocop-rspec -- rubocop-i18n AllCops: + NewCops: enable DisplayCopNames: true - TargetRubyVersion: '2.1' + TargetRubyVersion: 3.1 Include: - - "./**/*.rb" + - "**/*.rb" Exclude: - bin/* - ".vendor/**/*" @@ -18,15 +19,10 @@ AllCops: - "**/Puppetfile" - "**/Vagrantfile" - "**/Guardfile" -Metrics/LineLength: +inherit_from: ".rubocop_todo.yml" +Layout/LineLength: Description: People have wide screens, use them. Max: 200 -GetText: - Enabled: false -GetText/DecorateString: - Description: We don't want to decorate test output. - Exclude: - - spec/* RSpec/BeforeAfterAll: Description: Beware of using after(:all) as it may cause state to leak between tests. A necessary evil in acceptance testing. @@ -35,6 +31,9 @@ RSpec/BeforeAfterAll: RSpec/HookArgument: Description: Prefer explicit :each argument, matching existing module's style EnforcedStyle: each +RSpec/DescribeSymbol: + Exclude: + - spec/unit/facter/**/*.rb Style/BlockDelimiters: Description: Prefer braces for chaining. Mostly an aesthetical choice. Better to be consistent then. @@ -67,7 +66,7 @@ Style/TrailingCommaInArguments: Description: Prefer always trailing comma on multiline argument lists. This makes diffs, and re-ordering nicer. EnforcedStyleForMultiline: comma -Style/TrailingCommaInLiteral: +Style/TrailingCommaInArrayLiteral: Description: Prefer always trailing comma on multiline literals. This makes diffs, and re-ordering nicer. EnforcedStyleForMultiline: comma @@ -82,20 +81,176 @@ Style/Documentation: - spec/**/* Style/WordArray: EnforcedStyle: brackets +Performance/AncestorsInclude: + Enabled: true +Performance/BigDecimalWithNumericArgument: + Enabled: true +Performance/BlockGivenWithExplicitBlock: + Enabled: true +Performance/CaseWhenSplat: + Enabled: true +Performance/ConstantRegexp: + Enabled: true +Performance/MethodObjectAsBlock: + Enabled: true +Performance/RedundantSortBlock: + Enabled: true +Performance/RedundantStringChars: + Enabled: true +Performance/ReverseFirst: + Enabled: true +Performance/SortReverse: + Enabled: true +Performance/Squeeze: + Enabled: true +Performance/StringInclude: + Enabled: true +Performance/Sum: + Enabled: true Style/CollectionMethods: Enabled: true Style/MethodCalledOnDoEndBlock: Enabled: true Style/StringMethods: Enabled: true +Bundler/GemFilename: + Enabled: false +Bundler/InsecureProtocolSource: + Enabled: false +Capybara/CurrentPathExpectation: + Enabled: false +Capybara/VisibilityMatcher: + Enabled: false +Gemspec/DuplicatedAssignment: + Enabled: false +Gemspec/OrderedDependencies: + Enabled: false +Gemspec/RequiredRubyVersion: + Enabled: false +Gemspec/RubyVersionGlobalsUsage: + Enabled: false +Layout/ArgumentAlignment: + Enabled: false +Layout/BeginEndAlignment: + Enabled: false +Layout/ClosingHeredocIndentation: + Enabled: false +Layout/EmptyComment: + Enabled: false +Layout/EmptyLineAfterGuardClause: + Enabled: false +Layout/EmptyLinesAroundArguments: + Enabled: false +Layout/EmptyLinesAroundAttributeAccessor: + Enabled: false Layout/EndOfLine: Enabled: false -Layout/IndentHeredoc: +Layout/FirstArgumentIndentation: + Enabled: false +Layout/HashAlignment: + Enabled: false +Layout/HeredocIndentation: + Enabled: false +Layout/LeadingEmptyLines: + Enabled: false +Layout/SpaceAroundMethodCallOperator: + Enabled: false +Layout/SpaceInsideArrayLiteralBrackets: + Enabled: false +Layout/SpaceInsideReferenceBrackets: + Enabled: false +Lint/BigDecimalNew: + Enabled: false +Lint/BooleanSymbol: + Enabled: false +Lint/ConstantDefinitionInBlock: + Enabled: false +Lint/DeprecatedOpenSSLConstant: + Enabled: false +Lint/DisjunctiveAssignmentInConstructor: + Enabled: false +Lint/DuplicateElsifCondition: + Enabled: false +Lint/DuplicateRequire: + Enabled: false +Lint/DuplicateRescueException: + Enabled: false +Lint/EmptyConditionalBody: + Enabled: false +Lint/EmptyFile: + Enabled: false +Lint/ErbNewArguments: + Enabled: false +Lint/FloatComparison: + Enabled: false +Lint/HashCompareByIdentity: + Enabled: false +Lint/IdentityComparison: + Enabled: false +Lint/InterpolationCheck: + Enabled: false +Lint/MissingCopEnableDirective: + Enabled: false +Lint/MixedRegexpCaptureTypes: + Enabled: false +Lint/NestedPercentLiteral: + Enabled: false +Lint/NonDeterministicRequireOrder: + Enabled: false +Lint/OrderedMagicComments: + Enabled: false +Lint/OutOfRangeRegexpRef: + Enabled: false +Lint/RaiseException: + Enabled: false +Lint/RedundantCopEnableDirective: + Enabled: false +Lint/RedundantRequireStatement: + Enabled: false +Lint/RedundantSafeNavigation: + Enabled: false +Lint/RedundantWithIndex: + Enabled: false +Lint/RedundantWithObject: + Enabled: false +Lint/RegexpAsCondition: + Enabled: false +Lint/ReturnInVoidContext: + Enabled: false +Lint/SafeNavigationConsistency: + Enabled: false +Lint/SafeNavigationWithEmpty: + Enabled: false +Lint/SelfAssignment: + Enabled: false +Lint/SendWithMixinArgument: + Enabled: false +Lint/ShadowedArgument: + Enabled: false +Lint/StructNewOverride: + Enabled: false +Lint/ToJSON: + Enabled: false +Lint/TopLevelReturnWithArgument: + Enabled: false +Lint/TrailingCommaInAttributeDeclaration: + Enabled: false +Lint/UnreachableLoop: + Enabled: false +Lint/UriEscapeUnescape: + Enabled: false +Lint/UriRegexp: + Enabled: false +Lint/UselessMethodDefinition: + Enabled: false +Lint/UselessTimes: Enabled: false Metrics/AbcSize: Enabled: false Metrics/BlockLength: Enabled: false +Metrics/BlockNesting: + Enabled: false Metrics/ClassLength: Enabled: false Metrics/CyclomaticComplexity: @@ -108,19 +263,469 @@ Metrics/ParameterLists: Enabled: false Metrics/PerceivedComplexity: Enabled: false +Migration/DepartmentName: + Enabled: false +Naming/AccessorMethodName: + Enabled: false +Naming/BlockParameterName: + Enabled: false +Naming/HeredocDelimiterCase: + Enabled: false +Naming/HeredocDelimiterNaming: + Enabled: false +Naming/MemoizedInstanceVariableName: + Enabled: false +Naming/MethodParameterName: + Enabled: false +Naming/RescuedExceptionsVariableName: + Enabled: false +Naming/VariableNumber: + Enabled: false +Performance/BindCall: + Enabled: false +Performance/DeletePrefix: + Enabled: false +Performance/DeleteSuffix: + Enabled: false +Performance/InefficientHashSearch: + Enabled: false +Performance/UnfreezeString: + Enabled: false +Performance/UriDefaultParser: + Enabled: false +RSpec/Be: + Enabled: false +RSpec/Capybara/FeatureMethods: + Enabled: false +RSpec/ContainExactly: + Enabled: false +RSpec/ContextMethod: + Enabled: false +RSpec/ContextWording: + Enabled: false RSpec/DescribeClass: Enabled: false +RSpec/EmptyHook: + Enabled: false +RSpec/EmptyLineAfterExample: + Enabled: false +RSpec/EmptyLineAfterExampleGroup: + Enabled: false +RSpec/EmptyLineAfterHook: + Enabled: false RSpec/ExampleLength: Enabled: false -RSpec/MessageExpectation: +RSpec/ExampleWithoutDescription: + Enabled: false +RSpec/ExpectChange: + Enabled: false +RSpec/ExpectInHook: + Enabled: false +RSpec/FactoryBot/AttributeDefinedStatically: + Enabled: false +RSpec/FactoryBot/CreateList: + Enabled: false +RSpec/FactoryBot/FactoryClassName: + Enabled: false +RSpec/HooksBeforeExamples: + Enabled: false +RSpec/ImplicitBlockExpectation: + Enabled: false +RSpec/ImplicitSubject: + Enabled: false +RSpec/LeakyConstantDeclaration: + Enabled: false +RSpec/LetBeforeExamples: + Enabled: false +RSpec/MatchArray: + Enabled: false +RSpec/MissingExampleGroupArgument: Enabled: false RSpec/MultipleExpectations: Enabled: false +RSpec/MultipleMemoizedHelpers: + Enabled: false +RSpec/MultipleSubjects: + Enabled: false RSpec/NestedGroups: Enabled: false -Style/AsciiComments: +RSpec/PredicateMatcher: + Enabled: false +RSpec/ReceiveCounts: + Enabled: false +RSpec/ReceiveNever: + Enabled: false +RSpec/RepeatedExampleGroupBody: + Enabled: false +RSpec/RepeatedExampleGroupDescription: + Enabled: false +RSpec/RepeatedIncludeExample: + Enabled: false +RSpec/ReturnFromStub: + Enabled: false +RSpec/SharedExamples: + Enabled: false +RSpec/StubbedMock: + Enabled: false +RSpec/UnspecifiedException: + Enabled: false +RSpec/VariableDefinition: + Enabled: false +RSpec/VoidExpect: + Enabled: false +RSpec/Yield: + Enabled: false +Security/Open: + Enabled: false +Style/AccessModifierDeclarations: + Enabled: false +Style/AccessorGrouping: + Enabled: false +Style/BisectedAttrAccessor: + Enabled: false +Style/CaseLikeIf: + Enabled: false +Style/ClassEqualityComparison: + Enabled: false +Style/ColonMethodDefinition: + Enabled: false +Style/CombinableLoops: + Enabled: false +Style/CommentedKeyword: + Enabled: false +Style/Dir: + Enabled: false +Style/DoubleCopDisableDirective: + Enabled: false +Style/EmptyBlockParameter: + Enabled: false +Style/EmptyLambdaParameter: + Enabled: false +Style/Encoding: + Enabled: false +Style/EvalWithLocation: + Enabled: false +Style/ExpandPathArguments: + Enabled: false +Style/ExplicitBlockArgument: + Enabled: false +Style/ExponentialNotation: + Enabled: false +Style/FloatDivision: + Enabled: false +Style/FrozenStringLiteralComment: + Enabled: false +Style/GlobalStdStream: + Enabled: false +Style/HashAsLastArrayItem: + Enabled: false +Style/HashLikeCase: + Enabled: false +Style/HashTransformKeys: + Enabled: false +Style/HashTransformValues: Enabled: false Style/IfUnlessModifier: Enabled: false +Style/KeywordParametersOrder: + Enabled: false +Style/MinMax: + Enabled: false +Style/MixinUsage: + Enabled: false +Style/MultilineWhenThen: + Enabled: false +Style/NegatedUnless: + Enabled: false +Style/NumericPredicate: + Enabled: false +Style/OptionalBooleanParameter: + Enabled: false +Style/OrAssignment: + Enabled: false +Style/RandomWithOffset: + Enabled: false +Style/RedundantAssignment: + Enabled: false +Style/RedundantCondition: + Enabled: false +Style/RedundantConditional: + Enabled: false +Style/RedundantFetchBlock: + Enabled: false +Style/RedundantFileExtensionInRequire: + Enabled: false +Style/RedundantRegexpCharacterClass: + Enabled: false +Style/RedundantRegexpEscape: + Enabled: false +Style/RedundantSelfAssignment: + Enabled: false +Style/RedundantSort: + Enabled: false +Style/RescueStandardError: + Enabled: false +Style/SingleArgumentDig: + Enabled: false +Style/SlicingWithRange: + Enabled: false +Style/SoleNestedConditional: + Enabled: false +Style/StderrPuts: + Enabled: false +Style/StringConcatenation: + Enabled: false +Style/Strip: + Enabled: false Style/SymbolProc: Enabled: false +Style/TrailingBodyOnClass: + Enabled: false +Style/TrailingBodyOnMethodDefinition: + Enabled: false +Style/TrailingBodyOnModule: + Enabled: false +Style/TrailingCommaInHashLiteral: + Enabled: false +Style/TrailingMethodEndStatement: + Enabled: false +Style/UnpackFirst: + Enabled: false +Capybara/MatchStyle: + Enabled: false +Capybara/NegationMatcher: + Enabled: false +Capybara/SpecificActions: + Enabled: false +Capybara/SpecificFinders: + Enabled: false +Capybara/SpecificMatcher: + Enabled: false +Gemspec/DeprecatedAttributeAssignment: + Enabled: false +Gemspec/DevelopmentDependencies: + Enabled: false +Gemspec/RequireMFA: + Enabled: false +Layout/LineContinuationLeadingSpace: + Enabled: false +Layout/LineContinuationSpacing: + Enabled: false +Layout/LineEndStringConcatenationIndentation: + Enabled: false +Layout/SpaceBeforeBrackets: + Enabled: false +Lint/AmbiguousAssignment: + Enabled: false +Lint/AmbiguousOperatorPrecedence: + Enabled: false +Lint/AmbiguousRange: + Enabled: false +Lint/ConstantOverwrittenInRescue: + Enabled: false +Lint/DeprecatedConstants: + Enabled: false +Lint/DuplicateBranch: + Enabled: false +Lint/DuplicateMagicComment: + Enabled: false +Lint/DuplicateMatchPattern: + Enabled: false +Lint/DuplicateRegexpCharacterClassElement: + Enabled: false +Lint/EmptyBlock: + Enabled: false +Lint/EmptyClass: + Enabled: false +Lint/EmptyInPattern: + Enabled: false +Lint/IncompatibleIoSelectWithFiberScheduler: + Enabled: false +Lint/LambdaWithoutLiteralBlock: + Enabled: false +Lint/NoReturnInBeginEndBlocks: + Enabled: false +Lint/NonAtomicFileOperation: + Enabled: false +Lint/NumberedParameterAssignment: + Enabled: false +Lint/OrAssignmentToConstant: + Enabled: false +Lint/RedundantDirGlobSort: + Enabled: false +Lint/RefinementImportMethods: + Enabled: false +Lint/RequireRangeParentheses: + Enabled: false +Lint/RequireRelativeSelfPath: + Enabled: false +Lint/SymbolConversion: + Enabled: false +Lint/ToEnumArguments: + Enabled: false +Lint/TripleQuotes: + Enabled: false +Lint/UnexpectedBlockArity: + Enabled: false +Lint/UnmodifiedReduceAccumulator: + Enabled: false +Lint/UselessRescue: + Enabled: false +Lint/UselessRuby2Keywords: + Enabled: false +Metrics/CollectionLiteralLength: + Enabled: false +Naming/BlockForwarding: + Enabled: false +Performance/CollectionLiteralInLoop: + Enabled: false +Performance/ConcurrentMonotonicTime: + Enabled: false +Performance/MapCompact: + Enabled: false +Performance/RedundantEqualityComparisonBlock: + Enabled: false +Performance/RedundantSplitRegexpArgument: + Enabled: false +Performance/StringIdentifierArgument: + Enabled: false +RSpec/BeEq: + Enabled: false +RSpec/BeNil: + Enabled: false +RSpec/ChangeByZero: + Enabled: false +RSpec/ClassCheck: + Enabled: false +RSpec/DuplicatedMetadata: + Enabled: false +RSpec/ExcessiveDocstringSpacing: + Enabled: false +RSpec/FactoryBot/ConsistentParenthesesStyle: + Enabled: false +RSpec/FactoryBot/FactoryNameStyle: + Enabled: false +RSpec/FactoryBot/SyntaxMethods: + Enabled: false +RSpec/IdenticalEqualityAssertion: + Enabled: false +RSpec/NoExpectationExample: + Enabled: false +RSpec/PendingWithoutReason: + Enabled: false +RSpec/Rails/AvoidSetupHook: + Enabled: false +RSpec/Rails/HaveHttpStatus: + Enabled: false +RSpec/Rails/InferredSpecType: + Enabled: false +RSpec/Rails/MinitestAssertions: + Enabled: false +RSpec/Rails/TravelAround: + Enabled: false +RSpec/RedundantAround: + Enabled: false +RSpec/SkipBlockInsideExample: + Enabled: false +RSpec/SortMetadata: + Enabled: false +RSpec/SubjectDeclaration: + Enabled: false +RSpec/VerifiedDoubleReference: + Enabled: false +Security/CompoundHash: + Enabled: false +Security/IoMethods: + Enabled: false +Style/ArgumentsForwarding: + Enabled: false +Style/ArrayIntersect: + Enabled: false +Style/CollectionCompact: + Enabled: false +Style/ComparableClamp: + Enabled: false +Style/ConcatArrayLiterals: + Enabled: false +Style/DataInheritance: + Enabled: false +Style/DirEmpty: + Enabled: false +Style/DocumentDynamicEvalDefinition: + Enabled: false +Style/EmptyHeredoc: + Enabled: false +Style/EndlessMethod: + Enabled: false +Style/EnvHome: + Enabled: false +Style/FetchEnvVar: + Enabled: false +Style/FileEmpty: + Enabled: false +Style/FileRead: + Enabled: false +Style/FileWrite: + Enabled: false +Style/HashConversion: + Enabled: false +Style/HashExcept: + Enabled: false +Style/IfWithBooleanLiteralBranches: + Enabled: false +Style/InPatternThen: + Enabled: false +Style/MagicCommentFormat: + Enabled: false +Style/MapCompactWithConditionalBlock: + Enabled: false +Style/MapToHash: + Enabled: false +Style/MapToSet: + Enabled: false +Style/MinMaxComparison: + Enabled: false +Style/MultilineInPatternThen: + Enabled: false +Style/NegatedIfElseCondition: + Enabled: false +Style/NestedFileDirname: + Enabled: false +Style/NilLambda: + Enabled: false +Style/NumberedParameters: + Enabled: false +Style/NumberedParametersLimit: + Enabled: false +Style/ObjectThen: + Enabled: false +Style/OpenStructUse: + Enabled: false +Style/OperatorMethodCall: + Enabled: false +Style/QuotedSymbols: + Enabled: false +Style/RedundantArgument: + Enabled: false +Style/RedundantConstantBase: + Enabled: false +Style/RedundantDoubleSplatHashBraces: + Enabled: false +Style/RedundantEach: + Enabled: false +Style/RedundantHeredocDelimiterQuotes: + Enabled: false +Style/RedundantInitialize: + Enabled: false +Style/RedundantLineContinuation: + Enabled: false +Style/RedundantSelfAssignmentBranch: + Enabled: false +Style/RedundantStringEscape: + Enabled: false +Style/SelectByRegexp: + Enabled: false +Style/StringChars: + Enabled: false +Style/SwapValues: + Enabled: false diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index e69de29b..32286ea0 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -0,0 +1,14 @@ +# This configuration was generated by +# `rubocop --auto-gen-config` +# on 2023-11-28 05:16:01 UTC using RuboCop version 1.48.1. +# The point is for the user to remove these configuration records +# one by one as the offenses are removed from the code base. +# Note that changes in the inspected code, or installation of new +# versions of RuboCop, may require this file to be generated again. + +# Offense count: 2 +# Configuration parameters: EnforcedStyle, IgnoreSharedExamples. +# SupportedStyles: always, named_only +RSpec/NamedSubject: + Exclude: + - 'spec/defines/download_spec.rb' diff --git a/.sync.yml b/.sync.yml index 23bd6a2b..afecd940 100644 --- a/.sync.yml +++ b/.sync.yml @@ -1,41 +1,24 @@ --- -.gitignore: - required: - - ---.project - -.gitlab-ci.yml: - unmanaged: true - -.travis.yml: - docker_sets: - - set: docker/centos-7 - - set: docker/ubuntu-14.04 - docker_defaults: - bundler_args: "" - secure: "" - branches: - - release - +".gitlab-ci.yml": + delete: true appveyor.yml: delete: true - -Gemfile: - optional: - ':development': - - gem: 'github_changelog_generator' - git: 'https://github.com/skywinder/github-changelog-generator' - ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' - condition: "Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')" - required: - ':system_tests': - - gem: 'puppet-module-posix-system-r#{minor_version}' - platforms: ruby - - gem: 'puppet-module-win-system-r#{minor_version}' - platforms: - - mswin - - mingw - - x64_mingw - +.rubocop.yml: + include_todos: true spec/spec_helper.rb: - mock_with: ':rspec' + mock_with: ":rspec" coverage_report: true +.gitpod.Dockerfile: + unmanaged: false +.gitpod.yml: + unmanaged: false +.github/workflows/auto_release.yml: + unmanaged: false +.github/workflows/ci.yml: + unmanaged: false +.github/workflows/nightly.yml: + unmanaged: false +.github/workflows/release.yml: + unmanaged: false +.travis.yml: + delete: true diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index bf22cd04..00000000 --- a/.travis.yml +++ /dev/null @@ -1,63 +0,0 @@ ---- -language: ruby -cache: bundler -before_install: - - bundle -v - - rm -f Gemfile.lock - - gem update --system $RUBYGEMS_VERSION - - gem --version - - bundle -v -script: - - 'bundle exec rake $CHECK' -bundler_args: --without system_tests -rvm: - - 2.5.3 -stages: - - static - - spec - - acceptance - - - if: tag =~ ^v\d - name: deploy -matrix: - fast_finish: true - include: - - - 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.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.3 - script: bundle exec rake beaker - services: docker - stage: acceptance - sudo: required - - - 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.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 - - /^v\d/ - - release -notifications: - email: false diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 61777827..6da8d472 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,6 +1,6 @@ { "recommendations": [ - "jpogran.puppet-vscode", - "rebornix.Ruby" + "puppet.puppet-vscode", + "Shopify.ruby-lsp" ] } diff --git a/.whitesource b/.whitesource new file mode 100644 index 00000000..04109aad --- /dev/null +++ b/.whitesource @@ -0,0 +1,45 @@ +{ + "scanSettings": { + "configMode": "AUTO", + "configExternalURL": "", + "projectToken": "", + "baseBranches": [] + }, + "scanSettingsSAST": { + "enableScan": true, + "scanPullRequests": true, + "incrementalScan": true, + "baseBranches": [], + "snippetSize": 10 + }, + "checkRunSettings": { + "vulnerableCheckRunConclusionLevel": "failure", + "displayMode": "diff", + "useMendCheckNames": true + }, + "checkRunSettingsSAST": { + "checkRunConclusionLevel": "failure", + "severityThreshold": "high" + }, + "issueSettings": { + "minSeverityLevel": "LOW", + "issueType": "DEPENDENCY" + }, + "issueSettingsSAST": { + "minSeverityLevel": "high", + "issueType": "repo" + }, + "remediateSettings": { + "workflowRules": { + "enabled": true + } + }, + "imageSettings":{ + "imageTracing":{ + "enableImageTracingPR": false, + "addRepositoryCoordinate": false, + "addDockerfilePath": false, + "addMendIdentifier": false + } + } +} \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 31d148e7..c92ee508 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,383 +1,629 @@ -# Change log + +# Changelog -All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org). +All notable changes to this project will be documented in this file. -## [v4.1.0](https://github.com/puppetlabs/puppetlabs-java/tree/v4.1.0) (2019-05-29) +The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org). + +## [v11.2.0](https://github.com/puppetlabs/puppetlabs-java/tree/v11.2.0) - 2025-07-18 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v11.1.0...v11.2.0) + +### Other + +- puppet/archive: Allow 8.x [#611](https://github.com/puppetlabs/puppetlabs-java/pull/611) ([evgeni](https://github.com/evgeni)) +- (CAT-2296) Update github runner image to ubuntu-24.04 [#610](https://github.com/puppetlabs/puppetlabs-java/pull/610) ([shubhamshinde360](https://github.com/shubhamshinde360)) + +## [v11.1.0](https://github.com/puppetlabs/puppetlabs-java/tree/v11.1.0) - 2024-12-17 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v11.0.1...v11.1.0) + +### Fixed + +- (CAT-2158) Upgrade rexml to address CVE-2024-49761 [#605](https://github.com/puppetlabs/puppetlabs-java/pull/605) ([amitkarsale](https://github.com/amitkarsale)) + +### Other + +- Add support for Ubuntu 24.04 [#600](https://github.com/puppetlabs/puppetlabs-java/pull/600) ([choffee](https://github.com/choffee)) + +## [v11.0.1](https://github.com/puppetlabs/puppetlabs-java/tree/v11.0.1) - 2024-10-07 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v11.0.0...v11.0.1) + +### Fixed + +- (CAT-2051): Fixed SUSEConnect command so that java installation succeeds on SLES-15 [#601](https://github.com/puppetlabs/puppetlabs-java/pull/601) ([span786](https://github.com/span786)) + +## [v11.0.0](https://github.com/puppetlabs/puppetlabs-java/tree/v11.0.0) - 2024-04-16 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v10.1.2...v11.0.0) + +### Changed + +- [CAT-1427] : Removing RedHat/Scientific/OracleLinux 6 [#576](https://github.com/puppetlabs/puppetlabs-java/pull/576) ([rajat-puppet](https://github.com/rajat-puppet)) + +### Added + +- Support Debian 12 and refactor to make that easier [#585](https://github.com/puppetlabs/puppetlabs-java/pull/585) ([ekohl](https://github.com/ekohl)) + +## [v10.1.2](https://github.com/puppetlabs/puppetlabs-java/tree/v10.1.2) - 2023-07-27 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v10.1.1...v10.1.2) + +### Fixed + +- (CAT-1250)-updating legacy SUSE repo name [#570](https://github.com/puppetlabs/puppetlabs-java/pull/570) ([praj1001](https://github.com/praj1001)) + +## [v10.1.1](https://github.com/puppetlabs/puppetlabs-java/tree/v10.1.1) - 2023-07-03 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v10.1.0...v10.1.1) + +## [v10.1.0](https://github.com/puppetlabs/puppetlabs-java/tree/v10.1.0) - 2023-06-20 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v10.0.0...v10.1.0) + +### Added + +- puppet/archive: Allow 7.x [#559](https://github.com/puppetlabs/puppetlabs-java/pull/559) ([bastelfreak](https://github.com/bastelfreak)) +- pdksync - (MAINT) - Allow Stdlib 9.x [#557](https://github.com/puppetlabs/puppetlabs-java/pull/557) ([LukasAud](https://github.com/LukasAud)) + +## [v10.0.0](https://github.com/puppetlabs/puppetlabs-java/tree/v10.0.0) - 2023-04-17 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v9.0.1...v10.0.0) + +### Changed + +- (CONT-784) Add Support for Puppet 8 / Drop Support for Puppet 6 [#548](https://github.com/puppetlabs/puppetlabs-java/pull/548) ([david22swan](https://github.com/david22swan)) + +### Added + +- (CONT-356) Syntax update [#543](https://github.com/puppetlabs/puppetlabs-java/pull/543) ([LukasAud](https://github.com/LukasAud)) + +### Fixed + +- Fix shell_escape of unless command [#550](https://github.com/puppetlabs/puppetlabs-java/pull/550) ([traylenator](https://github.com/traylenator)) + +## [v9.0.1](https://github.com/puppetlabs/puppetlabs-java/tree/v9.0.1) - 2022-11-29 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v9.0.0...v9.0.1) + +### Fixed + +- 538-unresolved-fact-fix [#540](https://github.com/puppetlabs/puppetlabs-java/pull/540) ([jordanbreen28](https://github.com/jordanbreen28)) +- Unresolved fact fix [#539](https://github.com/puppetlabs/puppetlabs-java/pull/539) ([jordanbreen28](https://github.com/jordanbreen28)) + +## [v9.0.0](https://github.com/puppetlabs/puppetlabs-java/tree/v9.0.0) - 2022-11-23 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v8.2.0...v9.0.0) + +### Changed + +- (CONT-263) Update minimum required puppet version [#535](https://github.com/puppetlabs/puppetlabs-java/pull/535) ([LukasAud](https://github.com/LukasAud)) + +### Fixed + +- Update package naming to differentiate between minor versions [#534](https://github.com/puppetlabs/puppetlabs-java/pull/534) ([sd-z](https://github.com/sd-z)) +- (CONT-173) - Updating deprecated facter instances [#531](https://github.com/puppetlabs/puppetlabs-java/pull/531) ([jordanbreen28](https://github.com/jordanbreen28)) +- pdksync - (CONT-189) Remove support for RedHat6 / OracleLinux6 / Scientific6 [#530](https://github.com/puppetlabs/puppetlabs-java/pull/530) ([david22swan](https://github.com/david22swan)) +- pdksync - (CONT-130) - Dropping Support for Debian 9 [#527](https://github.com/puppetlabs/puppetlabs-java/pull/527) ([jordanbreen28](https://github.com/jordanbreen28)) +- Hardening manifests [#525](https://github.com/puppetlabs/puppetlabs-java/pull/525) ([LukasAud](https://github.com/LukasAud)) + +## [v8.2.0](https://github.com/puppetlabs/puppetlabs-java/tree/v8.2.0) - 2022-08-09 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v8.1.0...v8.2.0) + +### Added + +- pdksync - (GH-cat-11) Certify Support for Ubuntu 22.04 [#522](https://github.com/puppetlabs/puppetlabs-java/pull/522) ([david22swan](https://github.com/david22swan)) +- Make ubuntu 22.04 also default to openjdk-11 [#519](https://github.com/puppetlabs/puppetlabs-java/pull/519) ([rswarts](https://github.com/rswarts)) +- pdksync - (GH-cat-12) Add Support for Redhat 9 [#518](https://github.com/puppetlabs/puppetlabs-java/pull/518) ([david22swan](https://github.com/david22swan)) + +## [v8.1.0](https://github.com/puppetlabs/puppetlabs-java/tree/v8.1.0) - 2022-05-30 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v8.0.0...v8.1.0) + +### Added + +- feat: added support for aarch64 architecture download [#516](https://github.com/puppetlabs/puppetlabs-java/pull/516) ([0Rick0](https://github.com/0Rick0)) + +## [v8.0.0](https://github.com/puppetlabs/puppetlabs-java/tree/v8.0.0) - 2022-04-05 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v7.3.0...v8.0.0) + +### Changed + +- (GH-C&T-7) Remove code specific to unsupported OSs [#507](https://github.com/puppetlabs/puppetlabs-java/pull/507) ([david22swan](https://github.com/david22swan)) + +### Added + +- (MODULES-11234) Support Adoptium Temurin [#502](https://github.com/puppetlabs/puppetlabs-java/pull/502) ([dploeger](https://github.com/dploeger)) + +### Fixed + +- pdksync - (GH-iac-334) Remove Support for Ubuntu 14.04/16.04 [#505](https://github.com/puppetlabs/puppetlabs-java/pull/505) ([david22swan](https://github.com/david22swan)) +- pdksync - (IAC-1787) Remove Support for CentOS 6 [#503](https://github.com/puppetlabs/puppetlabs-java/pull/503) ([david22swan](https://github.com/david22swan)) + +## [v7.3.0](https://github.com/puppetlabs/puppetlabs-java/tree/v7.3.0) - 2021-10-11 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v7.2.0...v7.3.0) + +### Added + +- pdksync - (IAC-1753) - Add Support for AlmaLinux 8 [#500](https://github.com/puppetlabs/puppetlabs-java/pull/500) ([david22swan](https://github.com/david22swan)) +- pdksync - (IAC-1751) - Add Support for Rocky 8 [#499](https://github.com/puppetlabs/puppetlabs-java/pull/499) ([david22swan](https://github.com/david22swan)) + +### Fixed + +- pdksync - (IAC-1598) - Remove Support for Debian 8 [#498](https://github.com/puppetlabs/puppetlabs-java/pull/498) ([david22swan](https://github.com/david22swan)) + +## [v7.2.0](https://github.com/puppetlabs/puppetlabs-java/tree/v7.2.0) - 2021-09-20 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v7.1.1...v7.2.0) + +### Added + +- Enabling Rocky Linux for Install [#488](https://github.com/puppetlabs/puppetlabs-java/pull/488) ([pmjensen](https://github.com/pmjensen)) + +### Fixed + +- Allow archive 6.x [#493](https://github.com/puppetlabs/puppetlabs-java/pull/493) ([smortex](https://github.com/smortex)) + +## [v7.1.1](https://github.com/puppetlabs/puppetlabs-java/tree/v7.1.1) - 2021-08-26 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v7.1.0...v7.1.1) + +### Fixed + +- (IAC-1741) Allow stdlib v8.0.0 [#491](https://github.com/puppetlabs/puppetlabs-java/pull/491) ([david22swan](https://github.com/david22swan)) + +## [v7.1.0](https://github.com/puppetlabs/puppetlabs-java/tree/v7.1.0) - 2021-08-12 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v7.0.2...v7.1.0) + +### Added + +- pdksync - (IAC-1709) - Add Support for Debian 11 [#489](https://github.com/puppetlabs/puppetlabs-java/pull/489) ([david22swan](https://github.com/david22swan)) + +## [v7.0.2](https://github.com/puppetlabs/puppetlabs-java/tree/v7.0.2) - 2021-04-26 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v7.0.1...v7.0.2) + +### Fixed + +- add url parameter for adoptopenjdk [#473](https://github.com/puppetlabs/puppetlabs-java/pull/473) ([cbobinec](https://github.com/cbobinec)) + +## [v7.0.1](https://github.com/puppetlabs/puppetlabs-java/tree/v7.0.1) - 2021-04-19 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v7.0.0...v7.0.1) + +### Fixed + +- allow v5.x of puppet/archive [#476](https://github.com/puppetlabs/puppetlabs-java/pull/476) ([bastelfreak](https://github.com/bastelfreak)) + +## [v7.0.0](https://github.com/puppetlabs/puppetlabs-java/tree/v7.0.0) - 2021-03-01 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v6.5.0...v7.0.0) + +### Changed + +- pdksync - Remove Puppet 5 from testing and bump minimal version to 6.0.0 [#463](https://github.com/puppetlabs/puppetlabs-java/pull/463) ([carabasdaniel](https://github.com/carabasdaniel)) + +### Fixed + +- (MODULES-10935) - Switch legacy operatingsystem fact to modern kernel one [#461](https://github.com/puppetlabs/puppetlabs-java/pull/461) ([rjd1](https://github.com/rjd1)) + +## [v6.5.0](https://github.com/puppetlabs/puppetlabs-java/tree/v6.5.0) - 2020-12-16 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v6.4.0...v6.5.0) + +### Added + +- pdksync - (feat) Add support for Puppet 7 [#454](https://github.com/puppetlabs/puppetlabs-java/pull/454) ([daianamezdrea](https://github.com/daianamezdrea)) + +## [v6.4.0](https://github.com/puppetlabs/puppetlabs-java/tree/v6.4.0) - 2020-11-09 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v6.3.0...v6.4.0) + +### Added + +- Add support for SAP Java (sapjvm / sapmachine) [#433](https://github.com/puppetlabs/puppetlabs-java/pull/433) ([timdeluxe](https://github.com/timdeluxe)) + +### Fixed + +- [IAC-1208] - Add the good links for solving the 404 error and exclude sles [#443](https://github.com/puppetlabs/puppetlabs-java/pull/443) ([daianamezdrea](https://github.com/daianamezdrea)) +- (IAC-993) - Removal of inappropriate terminology [#439](https://github.com/puppetlabs/puppetlabs-java/pull/439) ([david22swan](https://github.com/david22swan)) + +## [v6.3.0](https://github.com/puppetlabs/puppetlabs-java/tree/v6.3.0) - 2020-05-28 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v6.2.0...v6.3.0) + +### Added + +- (MODULES-10681) Add option to manage symlink to java::adopt [#429](https://github.com/puppetlabs/puppetlabs-java/pull/429) ([fraenki](https://github.com/fraenki)) +- (IAC-746) - Add ubuntu 20.04 support [#428](https://github.com/puppetlabs/puppetlabs-java/pull/428) ([david22swan](https://github.com/david22swan)) + +## [v6.2.0](https://github.com/puppetlabs/puppetlabs-java/tree/v6.2.0) - 2020-02-19 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v6.1.0...v6.2.0) + +### Added + +- Support AdoptOpenJDK [#370](https://github.com/puppetlabs/puppetlabs-java/pull/370) ([timdeluxe](https://github.com/timdeluxe)) + +### Fixed + +- Replace legacy facts by modern facts [#406](https://github.com/puppetlabs/puppetlabs-java/pull/406) ([hdeheer](https://github.com/hdeheer)) + +## [v6.1.0](https://github.com/puppetlabs/puppetlabs-java/tree/v6.1.0) - 2020-02-03 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v6.0.0...v6.1.0) + +## [v6.0.0](https://github.com/puppetlabs/puppetlabs-java/tree/v6.0.0) - 2019-11-11 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v5.0.1...v6.0.0) + +### Added + +- (FM-8676) Add CentOS 8 to supported OS list [#399](https://github.com/puppetlabs/puppetlabs-java/pull/399) ([david22swan](https://github.com/david22swan)) +- FM-8403 - add support Debain10 [#387](https://github.com/puppetlabs/puppetlabs-java/pull/387) ([lionce](https://github.com/lionce)) + +### Fixed + +- we need to check if java_default_home has a value before we attempt t… [#391](https://github.com/puppetlabs/puppetlabs-java/pull/391) ([robmbrooks](https://github.com/robmbrooks)) +- Add support for java 11, the default in debian buster 10 [#386](https://github.com/puppetlabs/puppetlabs-java/pull/386) ([jhooyberghs](https://github.com/jhooyberghs)) + +## [v5.0.1](https://github.com/puppetlabs/puppetlabs-java/tree/v5.0.1) - 2019-08-05 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v5.0.0...v5.0.1) + +## [v5.0.0](https://github.com/puppetlabs/puppetlabs-java/tree/v5.0.0) - 2019-08-05 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v4.1.0...v5.0.0) + +### Changed + +- [FM-8320] Remove Oracle download [#372](https://github.com/puppetlabs/puppetlabs-java/pull/372) ([carabasdaniel](https://github.com/carabasdaniel)) + +### Added + +- (FM-8223) converted to use litmus [#376](https://github.com/puppetlabs/puppetlabs-java/pull/376) ([tphoney](https://github.com/tphoney)) +- Add buster support, default to 11 [#369](https://github.com/puppetlabs/puppetlabs-java/pull/369) ([mhjacks](https://github.com/mhjacks)) +- Add support for debian buster [#364](https://github.com/puppetlabs/puppetlabs-java/pull/364) ([TomRitserveldt](https://github.com/TomRitserveldt)) + +### Fixed + +- (FM-8343) use release numbers not lsbdistcodename [#375](https://github.com/puppetlabs/puppetlabs-java/pull/375) ([tphoney](https://github.com/tphoney)) +- Revert "Add support for debian buster" [#374](https://github.com/puppetlabs/puppetlabs-java/pull/374) ([tphoney](https://github.com/tphoney)) + +## [v4.1.0](https://github.com/puppetlabs/puppetlabs-java/tree/v4.1.0) - 2019-05-29 [Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v4.0.0...v4.1.0) ### Added -- \(FM-8028\) Add RedHat 8 support [\#363](https://github.com/puppetlabs/puppetlabs-java/pull/363) ([eimlav](https://github.com/eimlav)) +- (FM-8028) Add RedHat 8 support [#363](https://github.com/puppetlabs/puppetlabs-java/pull/363) ([eimlav](https://github.com/eimlav)) -## [v4.0.0](https://github.com/puppetlabs/puppetlabs-java/tree/v4.0.0) (2019-05-20) +## [v4.0.0](https://github.com/puppetlabs/puppetlabs-java/tree/v4.0.0) - 2019-05-20 [Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/3.3.0...v4.0.0) ### Changed -- pdksync - \(MODULES-8444\) - Raise lower Puppet bound [\#356](https://github.com/puppetlabs/puppetlabs-java/pull/356) ([david22swan](https://github.com/david22swan)) +- pdksync - (MODULES-8444) - Raise lower Puppet bound [#356](https://github.com/puppetlabs/puppetlabs-java/pull/356) ([david22swan](https://github.com/david22swan)) ### Added -- \(FM-7921\) - Implement Puppet Strings [\#353](https://github.com/puppetlabs/puppetlabs-java/pull/353) ([david22swan](https://github.com/david22swan)) -- Update default version & java 8 version from 8u192 to 8u201 [\#347](https://github.com/puppetlabs/puppetlabs-java/pull/347) ([valentinsavenko](https://github.com/valentinsavenko)) -- Add ability to override basedir and package type for oracle java [\#345](https://github.com/puppetlabs/puppetlabs-java/pull/345) ([fraenki](https://github.com/fraenki)) -- MODULES-8613: Add option to set a custom JCE download URL [\#344](https://github.com/puppetlabs/puppetlabs-java/pull/344) ([HielkeJ](https://github.com/HielkeJ)) +- (FM-7921) - Implement Puppet Strings [#353](https://github.com/puppetlabs/puppetlabs-java/pull/353) ([david22swan](https://github.com/david22swan)) +- Update default version & java 8 version from 8u192 to 8u201 [#347](https://github.com/puppetlabs/puppetlabs-java/pull/347) ([valentinsavenko](https://github.com/valentinsavenko)) +- Add ability to override basedir and package type for oracle java [#345](https://github.com/puppetlabs/puppetlabs-java/pull/345) ([fraenki](https://github.com/fraenki)) +- MODULES-8613: Add option to set a custom JCE download URL [#344](https://github.com/puppetlabs/puppetlabs-java/pull/344) ([HielkeJ](https://github.com/HielkeJ)) ### Fixed -- MODULES-8698: Fix $install\_path on CentOS with tar.gz package type [\#349](https://github.com/puppetlabs/puppetlabs-java/pull/349) ([fraenki](https://github.com/fraenki)) +- MODULES-8698: Fix $install_path on CentOS with tar.gz package type [#349](https://github.com/puppetlabs/puppetlabs-java/pull/349) ([fraenki](https://github.com/fraenki)) -## [3.3.0](https://github.com/puppetlabs/puppetlabs-java/tree/3.3.0) (2019-01-17) +## [3.3.0](https://github.com/puppetlabs/puppetlabs-java/tree/3.3.0) - 2019-01-18 [Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/3.2.0...3.3.0) ### Added -- \(MODULES-8234\) - Add SLES 15 support [\#336](https://github.com/puppetlabs/puppetlabs-java/pull/336) ([eimlav](https://github.com/eimlav)) -- \(MODULES-8234\) - Upgrade Oracle Java version to 8u192 [\#334](https://github.com/puppetlabs/puppetlabs-java/pull/334) ([eimlav](https://github.com/eimlav)) -- Support for installing JCE. Fixes MODULES-1681 [\#326](https://github.com/puppetlabs/puppetlabs-java/pull/326) ([dploeger](https://github.com/dploeger)) -- MODULES-8044: upgrade Oracle Java 8 to 181, make it the default release [\#314](https://github.com/puppetlabs/puppetlabs-java/pull/314) ([ojongerius](https://github.com/ojongerius)) +- (MODULES-8234) - Add SLES 15 support [#336](https://github.com/puppetlabs/puppetlabs-java/pull/336) ([eimlav](https://github.com/eimlav)) +- (MODULES-8234) - Upgrade Oracle Java version to 8u192 [#334](https://github.com/puppetlabs/puppetlabs-java/pull/334) ([eimlav](https://github.com/eimlav)) +- Support for installing JCE. Fixes MODULES-1681 [#326](https://github.com/puppetlabs/puppetlabs-java/pull/326) ([dploeger](https://github.com/dploeger)) +- MODULES-8044: upgrade Oracle Java 8 to 181, make it the default release [#314](https://github.com/puppetlabs/puppetlabs-java/pull/314) ([ojongerius](https://github.com/ojongerius)) ### Fixed -- pdksync - \(FM-7655\) Fix rubygems-update for ruby \< 2.3 [\#338](https://github.com/puppetlabs/puppetlabs-java/pull/338) ([tphoney](https://github.com/tphoney)) -- \(FM-7520\) - Removing Solaris from the support matrix [\#335](https://github.com/puppetlabs/puppetlabs-java/pull/335) ([pmcmaw](https://github.com/pmcmaw)) -- Optimized code for making java::oracle atomic. Fixes MODULES-8085 [\#330](https://github.com/puppetlabs/puppetlabs-java/pull/330) ([dploeger](https://github.com/dploeger)) -- Fix OpenJDK paths on Debian based OS with ARM [\#329](https://github.com/puppetlabs/puppetlabs-java/pull/329) ([mmoll](https://github.com/mmoll)) -- \(MODULES-7050\) - Fix OracleJDK reinstalling on Puppet runs [\#323](https://github.com/puppetlabs/puppetlabs-java/pull/323) ([eimlav](https://github.com/eimlav)) -- \(MODULES-8025\) Switch default for Ubuntu 18.04 to 11 [\#322](https://github.com/puppetlabs/puppetlabs-java/pull/322) ([baurmatt](https://github.com/baurmatt)) -- MODULES-7819 fix set JAVA\_HOME environments on FreeBSD platform [\#315](https://github.com/puppetlabs/puppetlabs-java/pull/315) ([olevole](https://github.com/olevole)) +- pdksync - (FM-7655) Fix rubygems-update for ruby < 2.3 [#338](https://github.com/puppetlabs/puppetlabs-java/pull/338) ([tphoney](https://github.com/tphoney)) +- (FM-7520) - Removing Solaris from the support matrix [#335](https://github.com/puppetlabs/puppetlabs-java/pull/335) ([pmcmaw](https://github.com/pmcmaw)) +- Optimized code for making java::oracle atomic. Fixes MODULES-8085 [#330](https://github.com/puppetlabs/puppetlabs-java/pull/330) ([dploeger](https://github.com/dploeger)) +- Fix OpenJDK paths on Debian based OS with ARM [#329](https://github.com/puppetlabs/puppetlabs-java/pull/329) ([mmoll](https://github.com/mmoll)) +- (MODULES-7050) - Fix OracleJDK reinstalling on Puppet runs [#323](https://github.com/puppetlabs/puppetlabs-java/pull/323) ([eimlav](https://github.com/eimlav)) +- (MODULES-8025) Switch default for Ubuntu 18.04 to 11 [#322](https://github.com/puppetlabs/puppetlabs-java/pull/322) ([baurmatt](https://github.com/baurmatt)) +- MODULES-7819 fix set JAVA_HOME environments on FreeBSD platform [#315](https://github.com/puppetlabs/puppetlabs-java/pull/315) ([olevole](https://github.com/olevole)) -## [3.2.0](https://github.com/puppetlabs/puppetlabs-java/tree/3.2.0) (2018-09-27) +## [3.2.0](https://github.com/puppetlabs/puppetlabs-java/tree/3.2.0) - 2018-09-27 [Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/3.1.0...3.2.0) ### Added -- pdksync - \(MODULES-6805\) metadata.json shows support for puppet 6 [\#317](https://github.com/puppetlabs/puppetlabs-java/pull/317) ([tphoney](https://github.com/tphoney)) +- pdksync - (MODULES-6805) metadata.json shows support for puppet 6 [#317](https://github.com/puppetlabs/puppetlabs-java/pull/317) ([tphoney](https://github.com/tphoney)) -## [3.1.0](https://github.com/puppetlabs/puppetlabs-java/tree/3.1.0) (2018-09-06) +## [3.1.0](https://github.com/puppetlabs/puppetlabs-java/tree/3.1.0) - 2018-09-10 [Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/3.0.0...3.1.0) ### Added -- pdksync - \(MODULES-7705\) - Bumping stdlib dependency from \< 5.0.0 to \< 6.0.0 [\#310](https://github.com/puppetlabs/puppetlabs-java/pull/310) ([pmcmaw](https://github.com/pmcmaw)) +- pdksync - (MODULES-7705) - Bumping stdlib dependency from < 5.0.0 to < 6.0.0 [#310](https://github.com/puppetlabs/puppetlabs-java/pull/310) ([pmcmaw](https://github.com/pmcmaw)) -## [3.0.0](https://github.com/puppetlabs/puppetlabs-java/tree/3.0.0) (2018-08-13) +## [3.0.0](https://github.com/puppetlabs/puppetlabs-java/tree/3.0.0) - 2018-08-14 [Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/2.4.0...3.0.0) ### Changed -- \[FM-6963\] Removal of unsupported OS from java [\#295](https://github.com/puppetlabs/puppetlabs-java/pull/295) ([david22swan](https://github.com/david22swan)) +- [FM-6963] Removal of unsupported OS from java [#295](https://github.com/puppetlabs/puppetlabs-java/pull/295) ([david22swan](https://github.com/david22swan)) + +### Added + +- (MODULES-7561) - Addition of support for Ubuntu 18.04 to java [#299](https://github.com/puppetlabs/puppetlabs-java/pull/299) ([david22swan](https://github.com/david22swan)) + +### Fixed + +- Remove ensure_resource to avoid potential conflict [#287](https://github.com/puppetlabs/puppetlabs-java/pull/287) ([sevencastles](https://github.com/sevencastles)) + +## [2.4.0](https://github.com/puppetlabs/puppetlabs-java/tree/2.4.0) - 2018-01-23 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/2.3.0...2.4.0) + +### Fixed + +- Fixes java_home for SLES 11.4 and relevant tests [#283](https://github.com/puppetlabs/puppetlabs-java/pull/283) ([HelenCampbell](https://github.com/HelenCampbell)) +- FM-6634 rubocop fixes [#279](https://github.com/puppetlabs/puppetlabs-java/pull/279) ([tphoney](https://github.com/tphoney)) + +## [2.3.0](https://github.com/puppetlabs/puppetlabs-java/tree/2.3.0) - 2017-12-01 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/2.2.0...2.3.0) + +### Added + +- Add support for Ubuntu artful (17.10) and bionic (18.04 to be) [#270](https://github.com/puppetlabs/puppetlabs-java/pull/270) ([mhjacks](https://github.com/mhjacks)) + +## [2.2.0](https://github.com/puppetlabs/puppetlabs-java/tree/2.2.0) - 2017-11-20 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/2.1.1...2.2.0) ### Added -- \(MODULES-7561\) - Addition of support for Ubuntu 18.04 to java [\#299](https://github.com/puppetlabs/puppetlabs-java/pull/299) ([david22swan](https://github.com/david22swan)) +- Adding support for Ubuntu [#243](https://github.com/puppetlabs/puppetlabs-java/pull/243) ([elmobp](https://github.com/elmobp)) ### Fixed -- Remove ensure\_resource to avoid potential conflict [\#287](https://github.com/puppetlabs/puppetlabs-java/pull/287) ([sevencastles](https://github.com/sevencastles)) +- Realpath test fix [#265](https://github.com/puppetlabs/puppetlabs-java/pull/265) ([willmeek](https://github.com/willmeek)) + +## [2.1.1](https://github.com/puppetlabs/puppetlabs-java/tree/2.1.1) - 2017-11-09 -## 2.4.0 -### Summary -This release uses the PDK convert functionality which in return makes the module PDK compliant. Also includes a clean up from Rubocop. +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/2.1.0...2.1.1) + +### Added -#### Changed -- 1.3.2 PDK convert has been applied [MODULES-6456](https://tickets.puppetlabs.com/browse/MODULES-6456) -- The modules has undergone a Rubocop cleanup. +- Add support for CloudLinux [#251](https://github.com/puppetlabs/puppetlabs-java/pull/251) ([shaleenx](https://github.com/shaleenx)) -#### Fixed -- $java_home for SLES 11.4 has been updated to the correct location. +### Fixed -## Supported Release [2.3.0] -### Summary -This release is in order to implement Rubocop changes into the module. +- (FACT-1754) search for matching line with java version [#257](https://github.com/puppetlabs/puppetlabs-java/pull/257) ([shuebnersr](https://github.com/shuebnersr)) -#### Added -- Several Modulesync changes have been made. -- Rubocop has been implemented in the module. -- CentOS 7 is now supported. -- Red Hat Enterprise Linux (RHEL) 7 is now supported. -- Ubuntu artful 1710 now supported. -- Bionic 1804 now supported. +## [2.1.0](https://github.com/puppetlabs/puppetlabs-java/tree/2.1.0) - 2017-06-22 -## Supported Release [2.2.0] -### Summary -This release is a maintenance release that includes a roll up of minor changes. +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/2.0.0...2.1.0) -#### Added -- Addition of Ubuntu for Oracle Java. -- Addition of Debian 9 in supported versions. -- Addition of OpenBSD case and use `realpath` rather than `readlink` in Java Default Home Facter fact. +### Added -#### Removed -- Removal of OpenBSD as a special case and deprecated `with_env` in Java Version Facter Facter fact. +- Add support for Archlinux [#244](https://github.com/puppetlabs/puppetlabs-java/pull/244) ([kBite](https://github.com/kBite)) -## Supported Release 2.1.1 -### Summary -This release is a maintenance release that includes a roll up of minor changes. +### Fixed -#### Added -- Basic Arch Linux, Cloud Linux and Ubuntu 17.04 compatibility. -- Metadata bump for Puppet 5. -- Search for matching line with java version. -- ([MODULES-4069](https://tickets.puppet.com/browse/MODULES-4069)) Fail when required params are not available in params. -- A test for java version when java not installed. -- Allow latest archive version as dependency. +- replace validate_* calls with datatypes & minor fixes [#223](https://github.com/puppetlabs/puppetlabs-java/pull/223) ([bastelfreak](https://github.com/bastelfreak)) +- Bugfix/modules 4368 java default home invalid fact [#215](https://github.com/puppetlabs/puppetlabs-java/pull/215) ([vStone](https://github.com/vStone)) -#### Changed -- CONTRIBUTING.md document includes updates. -- Removal of Ubuntu 10.04 ad 12.04, Debian 6 in supported versions. +## [2.0.0](https://github.com/puppetlabs/puppetlabs-java/tree/2.0.0) - 2017-05-30 -## 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. +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/1.6.0...2.0.0) ### Added -- java::oracle parameter `url` -- java::oracle parameter `url_hash` + +- add 'Amazon Linux AMI' supports [#209](https://github.com/puppetlabs/puppetlabs-java/pull/209) ([hedzr](https://github.com/hedzr)) +- Add proxy options for Oracle Java [#188](https://github.com/puppetlabs/puppetlabs-java/pull/188) ([edestecd](https://github.com/edestecd)) +- Add support for Oracle Linux [#185](https://github.com/puppetlabs/puppetlabs-java/pull/185) ([LightAxe](https://github.com/LightAxe)) +- (MODULES-2971) Add java_home to all operating systems [#184](https://github.com/puppetlabs/puppetlabs-java/pull/184) ([ntpttr](https://github.com/ntpttr)) ### Fixed -- Let `java_default_home` fact work when /usr/bin/java does not 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 +- (MODULES-4751) Fix Archive Order of Operations [#225](https://github.com/puppetlabs/puppetlabs-java/pull/225) ([bstopp](https://github.com/bstopp)) +- Fix naming of version_major and version_minor parameters [#196](https://github.com/puppetlabs/puppetlabs-java/pull/196) ([gzurowski](https://github.com/gzurowski)) -This is a major release including some bug fixes, new parameters, and general module updates. +## [1.6.0](https://github.com/puppetlabs/puppetlabs-java/tree/1.6.0) - 2016-06-13 -**This release drops Puppet 3 support** +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/1.5.0...1.6.0) -#### Added -- Debian Stretch, Yakkety Yak, Amazon Linux, Oracle Linux, Scientific Linux CERN compatibility -- `version_major` and `version_minor` parameters for specifying Java SE version to install -- `$JAVA_HOME` now set by the module on compatible systems. The `java_home` parameter is also provided for manual setting. [MODULES-2971](https://tickets.puppetlabs.com/browse/MODULES-2971) -- `proxy_server` and `proxy_type` for choosing a proxy server to get Java from +### Fixed -#### Changed -- Moved lower Puppet version requirement to 4.7.0 +- Fix typo in documentation for class oracle [#170](https://github.com/puppetlabs/puppetlabs-java/pull/170) ([gerhardsam](https://github.com/gerhardsam)) +- Fix up rspec deprecation warnings. [#166](https://github.com/puppetlabs/puppetlabs-java/pull/166) ([alex-harvey-z3q](https://github.com/alex-harvey-z3q)) -#### Fixed -- Module no longer downloads the Java archive on Puppet runs if Java is already installed. -- java_default_home fact is not always correct on oracle packages [MODULES-4050](https://tickets.puppetlabs.com/browse/MODULES-4050) -- Order of operations for archives [MODULES-4751](https://tickets.puppetlabs.com/browse/https://tickets.puppetlabs.com/browse/MODULES-4751) -- Increase Xmx setting for `java_version` fact [MODULES-4736](https://tickets.puppetlabs.com/browse/MODULES-4736) +## [1.5.0](https://github.com/puppetlabs/puppetlabs-java/tree/1.5.0) - 2016-04-12 -## Supported Release 1.6.0 -### Summary +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/1.4.3...1.5.0) -Addition of a new supported OS, along with several other features and bugfixes. +### Added -#### Features -- Ubuntu 16.04 support. -- Addition example for installing Java 8. -- Update to newest modulesync_configs. -- Addition of RedHat for Oracle Java. +- Add Ubuntu 16.04 [#164](https://github.com/puppetlabs/puppetlabs-java/pull/164) ([s12v](https://github.com/s12v)) +- Add an example for installing java 8 [#162](https://github.com/puppetlabs/puppetlabs-java/pull/162) ([npwalker](https://github.com/npwalker)) +- Add support for official Oracle Java SE jdk and jre packages for CentOS [#159](https://github.com/puppetlabs/puppetlabs-java/pull/159) ([mmarseglia](https://github.com/mmarseglia)) +- (MODULES-2928) Adds FreeBSD Support [#153](https://github.com/puppetlabs/puppetlabs-java/pull/153) ([petems](https://github.com/petems)) +- Added support for oracle-j2re1.8 and oracle-j2sdk1.8 [#152](https://github.com/puppetlabs/puppetlabs-java/pull/152) ([thomasodus](https://github.com/thomasodus)) -#### Bugfixes -- Custom archive type now given extract_path. -- Fix for rspec deprectation warnings. -- Typo fixes for readme. -- Fixed tests to run under strict variables. -- Updated Java package for SLES 11.4. +### Fixed -## Supported Release 1.5.0 -### Summary +- Fix typo in README.markdown [#165](https://github.com/puppetlabs/puppetlabs-java/pull/165) ([alex-harvey-z3q](https://github.com/alex-harvey-z3q)) -A release which has several support additions for different OSes. Also a couple of additional features and a few bug fixes. +## [1.4.3](https://github.com/puppetlabs/puppetlabs-java/tree/1.4.3) - 2015-12-07 -#### Features -- Added Ubuntu 15.10 compatibility. -- Addition of two facts: java_libjvm_path and java_default_home. -- Added support for oracle-j2re1.8 and oracle-j2sdk1.8. -- Adds FreeBSD Support. -- Exposed the Puppet package resources install_options parameter via a new class parameter named package_options. -- Debian 8 support. -- Add support for official Oracle Java SE jdk and jre packages for CentOS. -- Use java 8 as the default on RHEL > 7.0. +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/1.4.2...1.4.3) -#### Bugfixes -- Updated fixtures.yml to use git instead of http for stdlib. -- Updates to current msync configs. -- Small README updates and syntax error fixes. +### Added -## Supported Release 1.4.3 -### Summary +- Add support for Ubuntu 15.10 [#147](https://github.com/puppetlabs/puppetlabs-java/pull/147) ([oc243](https://github.com/oc243)) +- add two facts: libjvm and java executable paths [#117](https://github.com/puppetlabs/puppetlabs-java/pull/117) ([faxm0dem](https://github.com/faxm0dem)) -Small release for support of newer PE versions. This increments the version of PE in the metadata.json file. +## [1.4.2](https://github.com/puppetlabs/puppetlabs-java/tree/1.4.2) - 2015-10-07 -## 2015-10-07 - Supported Release 1.4.2 -### Summary -This release fixes the fact to not trigger java every time on OS X when it is not available. +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/1.4.1...1.4.2) -#### Bugfixes -- Causes java\_version fact to not run `java` when java is not installed on OS X +### Fixed -## 2015-07-16 - Supported Release 1.4.1 -### Summary -This release updates the metadata for the upcoming release of PE and update params for OEL to match metadata +- Fix rspec deprecation warnings. .should -> expect().to [#141](https://github.com/puppetlabs/puppetlabs-java/pull/141) ([vStone](https://github.com/vStone)) -#### Bugfixes: -- Add missing OEL to params +## [1.4.1](https://github.com/puppetlabs/puppetlabs-java/tree/1.4.1) - 2015-07-15 -## 2015-07-07 - Supported Release 1.4.0 -### Summary -This release adds several new features, bugfixes, documentation updates, and test improvements. +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/1.4.0...1.4.1) -#### Features: -- Puppet 4 support and testing -- Adds support for several Operating Systems - - Ubuntu 15.04 - - OpenBSD 5.6, 5.7 - - Fedora 20, 21, 22 +### Added -#### Bugfixes: -- Fixes java_version fact to work on large systems. (MODULES-1749) -- Improves maintainability of java_version fact. -- Fixes java package names on Fedora 21+. -- Fixes java install problems on Puppet 3.7.5 - 3.8.1 (PUP-4520) -- Fixes create-java-alternatives commands on RedHat distros. -- Fixes bug with Debian systems missing java-common package. +- Add OEL operatingsystem to java::params [#135](https://github.com/puppetlabs/puppetlabs-java/pull/135) ([zreichert](https://github.com/zreichert)) -## 2015-01-20 - Supported Release 1.3.0 -### Summary -This release adds 3 new facts for determining Java version, adds RHEL alternatives support, adds utopic support, and fixes the flag for `update-java-alternatives` when installed from a headless pacakge. +## [1.4.0](https://github.com/puppetlabs/puppetlabs-java/tree/1.4.0) - 2015-07-08 -#### Features -- Added RHEL support for alternatives -- New facts - - java_major_version - - java_patch_level - - java_version -- Add support for utopic +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/1.3.0...1.4.0) -#### Bugfixes -- Use `--jre-headless` in the `update-java-alternatives` command when installed from a `headless` package +### Added -## 2014-11-11 - Supported Version 1.2.0 +- (MODULES-2068) add fedora to metadata.json operatingsystem_support list [#129](https://github.com/puppetlabs/puppetlabs-java/pull/129) ([bmjen](https://github.com/bmjen)) +- Add helper to install puppet/pe/puppet-agent [#123](https://github.com/puppetlabs/puppetlabs-java/pull/123) ([hunner](https://github.com/hunner)) +- (BKR-147) add Gemfile setting for BEAKER_VERSION for puppet... [#115](https://github.com/puppetlabs/puppetlabs-java/pull/115) ([anodelman](https://github.com/anodelman)) -### Summary: -This release adds SLES 12 support and is tested for Future Parser Support +### Fixed -#### Bugfixes: -- Several readme updates -- Testcase flexability increased +- Fix incorrect metadata [#133](https://github.com/puppetlabs/puppetlabs-java/pull/133) ([hunner](https://github.com/hunner)) +- (MODULES-2095) fixes create-java-alternatives command [#128](https://github.com/puppetlabs/puppetlabs-java/pull/128) ([bmjen](https://github.com/bmjen)) +- Fix Fedora 21+ package name [#104](https://github.com/puppetlabs/puppetlabs-java/pull/104) ([cottsay](https://github.com/cottsay)) -#### Features: -- Add SLES 12 support -- Future Parser tested -- Validated against PE 3.7 +## [1.3.0](https://github.com/puppetlabs/puppetlabs-java/tree/1.3.0) - 2015-01-20 -## 2014-08-25 - Supported Version 1.1.2 +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/1.2.0...1.3.0) -### Summary: -This release begins the support coverage of the puppetlabs-java module. +### Added -### Bugfixes: -- Update java alternative values from deprecated names -- Readme updated -- Testing updated +- FM-1523: Added module summary to metadata.json [#90](https://github.com/puppetlabs/puppetlabs-java/pull/90) ([jbondpdx](https://github.com/jbondpdx)) +- Add Java alternatives for RHEL based distros. [#89](https://github.com/puppetlabs/puppetlabs-java/pull/89) ([rdrgmnzs](https://github.com/rdrgmnzs)) +- add utopic support [#88](https://github.com/puppetlabs/puppetlabs-java/pull/88) ([pherjung](https://github.com/pherjung)) +- Revert "Add alternative support for RedHat" [#87](https://github.com/puppetlabs/puppetlabs-java/pull/87) ([underscorgan](https://github.com/underscorgan)) +- cosmetic change to add missing space to bullet point in markdown so it r... [#80](https://github.com/puppetlabs/puppetlabs-java/pull/80) ([stevenalexander](https://github.com/stevenalexander)) +- Add alternative support for RedHat [#61](https://github.com/puppetlabs/puppetlabs-java/pull/61) ([rdrgmnzs](https://github.com/rdrgmnzs)) -## 2014-05-02 - Version 1.1.1 +### Fixed -### Summary: +- Acceptance test fix for wheezy [#96](https://github.com/puppetlabs/puppetlabs-java/pull/96) ([underscorgan](https://github.com/underscorgan)) +- Test fix for RHEL with alternatives [#94](https://github.com/puppetlabs/puppetlabs-java/pull/94) ([underscorgan](https://github.com/underscorgan)) -Add support for new versions of Debian and Ubuntu! +## [1.2.0](https://github.com/puppetlabs/puppetlabs-java/tree/1.2.0) - 2014-11-10 -#### Features: -- Add support for Ubuntu Trusty (14.04) -- Add support for Debian Jessie (8.x) +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/1.1.2...1.2.0) -## 2014-01-06 - Version 1.1.0 +### Fixed -### Summary: +- Fix syntax [#77](https://github.com/puppetlabs/puppetlabs-java/pull/77) ([PierreR](https://github.com/PierreR)) -Primarily a release for Ubuntu users! +## [1.1.2](https://github.com/puppetlabs/puppetlabs-java/tree/1.1.2) - 2014-09-03 -#### Features: -- Add support for Ubuntu Saucy (13.10) -- Add `java_home` parameter for centralized setting of JAVA_HOME. -- Add Scientific Linux +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/1.1.1...1.1.2) -#### Bugfixes: -- Plus signs are valid in debian/ubuntu package names. +### Added -## 2013-08-01 - Version 1.0.1 +- Add metadata.json and remove Modulefile [#65](https://github.com/puppetlabs/puppetlabs-java/pull/65) ([hunner](https://github.com/hunner)) -Matthaus Owens -* Update java packages for Fedora systems +## [1.1.1](https://github.com/puppetlabs/puppetlabs-java/tree/1.1.1) - 2014-05-02 -## 2013-07-29 - Version 1.0.0 +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/1.1.0...1.1.1) -#### Detailed Changes +### Added -Krzysztof Suszyński -* Adding support for Oracle Enterprise Linux +- Added jessie as a supported realese [#56](https://github.com/puppetlabs/puppetlabs-java/pull/56) ([3h4x](https://github.com/3h4x)) +- add support for ubuntu 14.04 trusty [#55](https://github.com/puppetlabs/puppetlabs-java/pull/55) ([atta](https://github.com/atta)) -Peter Drake -* Add support for natty +## [1.1.0](https://github.com/puppetlabs/puppetlabs-java/tree/1.1.0) - 2014-01-06 -Robert Munteanu -* Add support for OpenSUSE +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/1.0.1...1.1.0) -Martin Jackson -* Added support Amazon Linux using facter >= 1.7.x +### Added -Gareth Rushgrove -Brett Porter -* Fixes for older versions of CentOS -* Improvements to module build and tests +- Add $java_home variable [#47](https://github.com/puppetlabs/puppetlabs-java/pull/47) ([liwo](https://github.com/liwo)) +- adding support for ubuntu saucy [#46](https://github.com/puppetlabs/puppetlabs-java/pull/46) ([ppouliot](https://github.com/ppouliot)) -Nathan R Valentine -* Add support for Ubuntu quantal and raring +### Fixed -Sharif Nassar -* Add support for Debian alternatives, and more than one JDK/JRE per platform. +- Fix travis script. [#36](https://github.com/puppetlabs/puppetlabs-java/pull/36) ([apenney](https://github.com/apenney)) -## 2013-04-04 - Version 0.3.0 -Reid Vandewiele - -* Refactor, introduce params pattern +## [1.0.1](https://github.com/puppetlabs/puppetlabs-java/tree/1.0.1) - 2013-08-01 -## 2012-11-15 - Version 0.2.0 -Scott Schneider -* Add Solaris support +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/0.3.0...1.0.1) -## 2011-06-16 - Version 0.1.5 -Jeff McCune -* Add Debian based distro (Lucid) support +### Added + +- Add a .travis.yml file. [#32](https://github.com/puppetlabs/puppetlabs-java/pull/32) ([apenney](https://github.com/apenney)) +- Added support for Amazon linux [#29](https://github.com/puppetlabs/puppetlabs-java/pull/29) ([actionjack](https://github.com/actionjack)) +- Add support for OpenSUSE [#27](https://github.com/puppetlabs/puppetlabs-java/pull/27) ([rombert](https://github.com/rombert)) +- add support for Ubuntu quantal and raring [#26](https://github.com/puppetlabs/puppetlabs-java/pull/26) ([nrvale0](https://github.com/nrvale0)) + +### Fixed -## 2011-06-02 - Version 0.1.4 -Jeff McCune -* Fix class composition ordering problems +- Fixes for centos versions [#24](https://github.com/puppetlabs/puppetlabs-java/pull/24) ([garethr](https://github.com/garethr)) -## 2011-05-28 - Version 0.1.3 -Jeff McCune -* Remove stages +## [0.3.0](https://github.com/puppetlabs/puppetlabs-java/tree/0.3.0) - 2013-05-08 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/0.2.0...0.3.0) + +### Added -## 2011-05-26 - Version 0.1.2 -Jeff McCune -* Changes JRE/JDK selection class parameter to $distribution +- Add special case for fedora operating systems, where java is installable... [#23](https://github.com/puppetlabs/puppetlabs-java/pull/23) ([haus](https://github.com/haus)) +- Adding java::package_suse class [#22](https://github.com/puppetlabs/puppetlabs-java/pull/22) ([sschneid](https://github.com/sschneid)) -## 2011-05-25 - Version 0.1.1 -Jeff McCune -* Re-did versioning to follow semantic versioning -* Add validation of class parameters +## [0.2.0](https://github.com/puppetlabs/puppetlabs-java/tree/0.2.0) - 2012-11-15 -## 2011-05-24 - Version 0.1.0 -Jeff McCune -* Default to JDK version 6u25 +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v0.1.5...0.2.0) -## 2011-05-24 - Version 0.0.1 -Jeff McCune -* Initial release +### Added + +- Add Solaris support [#18](https://github.com/puppetlabs/puppetlabs-java/pull/18) ([sschneid](https://github.com/sschneid)) +- 4 - Add license file. [#8](https://github.com/puppetlabs/puppetlabs-java/pull/8) ([kbarber](https://github.com/kbarber)) + +## [v0.1.5](https://github.com/puppetlabs/puppetlabs-java/tree/v0.1.5) - 2011-06-16 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/0.1.4...v0.1.5) + +## [0.1.4](https://github.com/puppetlabs/puppetlabs-java/tree/0.1.4) - 2011-06-02 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/0.1.3...0.1.4) + +## [0.1.3](https://github.com/puppetlabs/puppetlabs-java/tree/0.1.3) - 2011-05-28 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/0.1.2...0.1.3) + +## [0.1.2](https://github.com/puppetlabs/puppetlabs-java/tree/0.1.2) - 2011-05-26 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/0.1.1...0.1.2) + +## [0.1.1](https://github.com/puppetlabs/puppetlabs-java/tree/0.1.1) - 2011-05-25 + +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/0.0.1...0.1.1) + +### Added -[2.3.0]:https://github.com/puppetlabs/puppetlabs-java/compare/2.2.0...2.3.0 -[2.2.0]:https://github.com/puppetlabs/puppetlabs-java/compare/2.1.1...2.2.0 +- Add basic validation to class parameters [#1](https://github.com/puppetlabs/puppetlabs-java/pull/1) ([jeffmccune](https://github.com/jeffmccune)) +## [0.0.1](https://github.com/puppetlabs/puppetlabs-java/tree/0.0.1) - 2011-05-24 -\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)* +[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/55a2ab8b198b806e2e8866fc46165e4a10ebe043...0.0.1) diff --git a/CODEOWNERS b/CODEOWNERS new file mode 100644 index 00000000..13360c54 --- /dev/null +++ b/CODEOWNERS @@ -0,0 +1,3 @@ +# Setting ownership to the modules team +# include Trusted Contributors +* @puppetlabs/modules @bastelfreak diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1a9fb3a5..25bf5ebc 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,271 +1,3 @@ # Contributing to Puppet modules -So you want to contribute to a Puppet module: Great! Below are some instructions to get you started doing -that very thing while setting expectations around code quality as well as a few tips for making the -process as easy as possible. - -### Table of Contents - -1. [Getting Started](#getting-started) -1. [Commit Checklist](#commit-checklist) -1. [Submission](#submission) -1. [More about commits](#more-about-commits) -1. [Testing](#testing) - - [Running Tests](#running-tests) - - [Writing Tests](#writing-tests) -1. [Get Help](#get-help) - -## Getting Started - -- Fork the module repository on GitHub and clone to your workspace - -- Make your changes! - -## Commit Checklist - -### The Basics - -- [x] my commit is a single logical unit of work - -- [x] I have checked for unnecessary whitespace with "git diff --check" - -- [x] my commit does not include commented out code or unneeded files - -### The Content - -- [x] my commit includes tests for the bug I fixed or feature I added - -- [x] my commit includes appropriate documentation changes if it is introducing a new feature or changing existing functionality - -- [x] my code passes existing test suites - -### The Commit Message - -- [x] the first line of my commit message includes: - - - [x] an issue number (if applicable), e.g. "(MODULES-xxxx) This is the first line" - - - [x] a short description (50 characters is the soft limit, excluding ticket number(s)) - -- [x] the body of my commit message: - - - [x] is meaningful - - - [x] uses the imperative, present tense: "change", not "changed" or "changes" - - - [x] includes motivation for the change, and contrasts its implementation with the previous behavior - -## Submission - -### Pre-requisites - -- Make sure you have a [GitHub account](https://github.com/join) - -- [Create a ticket](https://tickets.puppet.com/secure/CreateIssue!default.jspa), or [watch the ticket](https://tickets.puppet.com/browse/) you are patching for. - -### Push and PR - -- Push your changes to your fork - -- [Open a Pull Request](https://help.github.com/articles/creating-a-pull-request-from-a-fork/) against the repository in the puppetlabs organization - -## More about commits - - 1. Make separate commits for logically separate changes. - - Please break your commits down into logically consistent units - which include new or changed tests relevant to the rest of the - change. The goal of doing this is to make the diff easier to - read for whoever is reviewing your code. In general, the easier - your diff is to read, the more likely someone will be happy to - review it and get it into the code base. - - If you are going to refactor a piece of code, please do so as a - separate commit from your feature or bug fix changes. - - We also really appreciate changes that include tests to make - sure the bug is not re-introduced, and that the feature is not - accidentally broken. - - Describe the technical detail of the change(s). If your - description starts to get too long, that is a good sign that you - probably need to split up your commit into more finely grained - pieces. - - Commits which plainly describe the things which help - reviewers check the patch and future developers understand the - code are much more likely to be merged in with a minimum of - bike-shedding or requested changes. Ideally, the commit message - would include information, and be in a form suitable for - inclusion in the release notes for the version of Puppet that - includes them. - - Please also check that you are not introducing any trailing - whitespace or other "whitespace errors". You can do this by - running "git diff --check" on your changes before you commit. - - 2. Sending your patches - - To submit your changes via a GitHub pull request, we _highly_ - recommend that you have them on a topic branch, instead of - directly on "master". - It makes things much easier to keep track of, especially if - you decide to work on another thing before your first change - is merged in. - - GitHub has some pretty good - [general documentation](http://help.github.com/) on using - their site. They also have documentation on - [creating pull requests](https://help.github.com/articles/creating-a-pull-request-from-a-fork/). - - In general, after pushing your topic branch up to your - repository on GitHub, you can switch to the branch in the - GitHub UI and click "Pull Request" towards the top of the page - in order to open a pull request. - - 3. Update the related JIRA issue. - - If there is a JIRA issue associated with the change you - submitted, then you should update the ticket to include the - location of your branch, along with any other commentary you - may wish to make. - -# Testing - -## Getting Started - -Our Puppet modules provide [`Gemfile`](./Gemfile)s, which can tell a Ruby package manager such as [bundler](http://bundler.io/) what Ruby packages, -or Gems, are required to build, develop, and test this software. - -Please make sure you have [bundler installed](http://bundler.io/#getting-started) on your system, and then use it to -install all dependencies needed for this project in the project root by running - -```shell -% bundle install --path .bundle/gems -Fetching gem metadata from https://rubygems.org/........ -Fetching gem metadata from https://rubygems.org/.. -Using rake (10.1.0) -Using builder (3.2.2) --- 8><-- many more --><8 -- -Using rspec-system-puppet (2.2.0) -Using serverspec (0.6.3) -Using rspec-system-serverspec (1.0.0) -Using bundler (1.3.5) -Your bundle is complete! -Use `bundle show [gemname]` to see where a bundled gem is installed. -``` - -NOTE: some systems may require you to run this command with sudo. - -If you already have those gems installed, make sure they are up-to-date: - -```shell -% bundle update -``` - -## Running Tests - -With all dependencies in place and up-to-date, run the tests: - -### Unit Tests - -```shell -% bundle exec rake spec -``` - -This executes all the [rspec tests](http://rspec-puppet.com/) in the directories defined [here](https://github.com/puppetlabs/puppetlabs_spec_helper/blob/699d9fbca1d2489bff1736bb254bb7b7edb32c74/lib/puppetlabs_spec_helper/rake_tasks.rb#L17) and so on. -rspec tests may have the same kind of dependencies as the module they are testing. Although the module defines these dependencies in its [metadata.json](./metadata.json), -rspec tests define them in [.fixtures.yml](./fixtures.yml). - -### Acceptance Tests - -Some Puppet modules also come with acceptance tests, which use [beaker][]. These tests spin up a virtual machine under -[VirtualBox](https://www.virtualbox.org/), controlled with [Vagrant](http://www.vagrantup.com/), to simulate scripted test -scenarios. In order to run these, you need both Virtualbox and Vagrant installed on your system. - -Run the tests by issuing the following command - -```shell -% bundle exec rake spec_clean -% bundle exec rspec spec/acceptance -``` - -This will now download a pre-fabricated image configured in the [default node-set](./spec/acceptance/nodesets/default.yml), -install Puppet, copy this module, and install its dependencies per [spec/spec_helper_acceptance.rb](./spec/spec_helper_acceptance.rb) -and then run all the tests under [spec/acceptance](./spec/acceptance). - -## Writing Tests - -### Unit Tests - -When writing unit tests for Puppet, [rspec-puppet][] is your best friend. It provides tons of helper methods for testing your manifests against a -catalog (e.g. contain_file, contain_package, with_params, etc). It would be ridiculous to try and top rspec-puppet's [documentation][rspec-puppet_docs] -but here's a tiny sample: - -Sample manifest: - -```puppet -file { "a test file": - ensure => present, - path => "/etc/sample", -} -``` - -Sample test: - -```ruby -it 'does a thing' do - expect(subject).to contain_file("a test file").with({:path => "/etc/sample"}) -end -``` - -### Acceptance Tests - -Writing acceptance tests for Puppet involves [beaker][] and its cousin [beaker-rspec][]. A common pattern for acceptance tests is to create a test manifest, apply it -twice to check for idempotency or errors, then run expectations. - -```ruby -it 'does an end-to-end thing' do - pp = <<-EOF - file { 'a test file': - ensure => present, - path => "/etc/sample", - content => "test string", - } - - apply_manifest(pp, :catch_failures => true) - apply_manifest(pp, :catch_changes => true) - -end - -describe file("/etc/sample") do - it { is_expected.to contain "test string" } -end - -``` - -# If you have commit access to the repository - -Even if you have commit access to the repository, you still need to go through the process above, and have someone else review and merge -in your changes. The rule is that **all changes must be reviewed by a project developer that did not write the code to ensure that -all changes go through a code review process.** - -The record of someone performing the merge is the record that they performed the code review. Again, this should be someone other than the author of the topic branch. - -# Get Help - -### On the web -* [Puppet help messageboard](http://puppet.com/community/get-help) -* [Writing tests](https://docs.puppet.com/guides/module_guides/bgtm.html#step-three-module-testing) -* [General GitHub documentation](http://help.github.com/) -* [GitHub pull request documentation](http://help.github.com/send-pull-requests/) - -### On chat -* Slack (slack.puppet.com) #forge-modules, #puppet-dev, #windows, #voxpupuli -* IRC (freenode) #puppet-dev, #voxpupuli - - -[rspec-puppet]: http://rspec-puppet.com/ -[rspec-puppet_docs]: http://rspec-puppet.com/documentation/ -[beaker]: https://github.com/puppetlabs/beaker -[beaker-rspec]: https://github.com/puppetlabs/beaker-rspec +Check out our [Contributing to Puppet modules docs](https://help.puppet.com/core//current/Content/PuppetCore/contributing.htm) to find all the information that you will need. diff --git a/Gemfile b/Gemfile index 60f245f4..4e7de031 100644 --- a/Gemfile +++ b/Gemfile @@ -1,63 +1,86 @@ -source ENV['GEM_SOURCE'] || 'https://rubygems.org' +# frozen_string_literal: true -def location_for(place_or_version, fake_version = nil) - git_url_regex = %r{\A(?(https?|git)[:@][^#]*)(#(?.*))?} - file_url_regex = %r{\Afile:\/\/(?.*)} +# For puppetcore, set GEM_SOURCE_PUPPETCORE = 'https://rubygems-puppetcore.puppet.com' +gemsource_default = ENV['GEM_SOURCE'] || 'https://rubygems.org' +gemsource_puppetcore = if ENV['PUPPET_FORGE_TOKEN'] + 'https://rubygems-puppetcore.puppet.com' +else + ENV['GEM_SOURCE_PUPPETCORE'] || gemsource_default +end +source gemsource_default + +def location_for(place_or_constraint, fake_constraint = nil, opts = {}) + git_url_regex = /\A(?(?:https?|git)[:@][^#]*)(?:#(?.*))?/ + file_url_regex = %r{\Afile://(?.*)} + + if place_or_constraint && (git_url = place_or_constraint.match(git_url_regex)) + # Git source → ignore :source, keep fake_constraint + [fake_constraint, { git: git_url[:url], branch: git_url[:branch], require: false }].compact + + elsif place_or_constraint && (file_url = place_or_constraint.match(file_url_regex)) + # File source → ignore :source, keep fake_constraint or default >= 0 + [fake_constraint || '>= 0', { path: File.expand_path(file_url[:path]), require: false }] - if place_or_version && (git_url = place_or_version.match(git_url_regex)) - [fake_version, { git: git_url[:url], branch: git_url[:branch], require: false }].compact - elsif place_or_version && (file_url = place_or_version.match(file_url_regex)) - ['>= 0', { path: File.expand_path(file_url[:path]), require: false }] else - [place_or_version, { require: false }] + # Plain version constraint → merge opts (including :source if provided) + [place_or_constraint, { require: false }.merge(opts)] end end -ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments -minor_version = ruby_version_segments[0..1].join('.') +# Print debug information if DEBUG_GEMS or VERBOSE is set +def print_gem_statement_for(gems) + puts 'DEBUG: Gem definitions that will be generated:' + gems.each do |gem_name, gem_params| + puts "DEBUG: gem #{([gem_name.inspect] + gem_params.map(&:inspect)).join(', ')}" + end +end group :development do - gem "fast_gettext", '1.1.0', require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0') - gem "fast_gettext", require: false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0') - gem "json_pure", '<= 2.0.1', require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0') - gem "json", '= 1.8.1', require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.1.9') - gem "json", '= 2.0.4', require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) - gem "json", '= 2.1.0', require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) - gem "puppet-module-posix-default-r#{minor_version}", '~> 0.3', require: false, platforms: [:ruby] - gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.3', require: false, platforms: [:ruby] - gem "puppet-module-win-default-r#{minor_version}", '~> 0.3', require: false, platforms: [:mswin, :mingw, :x64_mingw] - gem "puppet-module-win-dev-r#{minor_version}", '~> 0.3', require: false, platforms: [:mswin, :mingw, :x64_mingw] - gem "github_changelog_generator", require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2') + gem "json", '= 2.6.1', require: false if Gem::Requirement.create(['>= 3.1.0', '< 3.1.3']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) + gem "json", '= 2.6.3', require: false if Gem::Requirement.create(['>= 3.2.0', '< 4.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) + gem "racc", '~> 1.4.0', require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) + gem "deep_merge", '~> 1.2.2', require: false + gem "voxpupuli-puppet-lint-plugins", '~> 5.0', require: false + gem "facterdb", '~> 2.1', require: false if Gem::Requirement.create(['< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) + gem "facterdb", '~> 3.0', require: false if Gem::Requirement.create(['>= 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) + gem "metadata-json-lint", '~> 4.0', require: false + gem "json-schema", '< 5.1.1', require: false + gem "rspec-puppet-facts", '~> 4.0', require: false if Gem::Requirement.create(['< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) + gem "rspec-puppet-facts", '~> 5.0', require: false if Gem::Requirement.create(['>= 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) + gem "dependency_checker", '~> 1.0.0', require: false + gem "parallel_tests", '= 3.12.1', require: false + gem "pry", '~> 0.10', require: false + gem "simplecov-console", '~> 0.9', require: false + gem "puppet-debugger", '~> 1.6', require: false + gem "rubocop", '~> 1.50.0', require: false + gem "rubocop-performance", '= 1.16.0', require: false + gem "rubocop-rspec", '= 2.19.0', require: false + gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw] + gem "bigdecimal", '< 3.2.2', require: false, platforms: [:mswin, :mingw, :x64_mingw] +end +group :development, :release_prep do + gem "puppet-strings", '~> 4.0', require: false + gem "puppetlabs_spec_helper", '~> 8.0', require: false + gem "puppet-blacksmith", '~> 7.0', require: false end group :system_tests do - gem "puppet-module-posix-system-r#{minor_version}", require: false, platforms: [:ruby] - gem "puppet-module-win-system-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw] + gem "puppet_litmus", '~> 2.0', require: false, platforms: [:ruby, :x64_mingw] if !ENV['PUPPET_FORGE_TOKEN'].to_s.empty? + gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw] if ENV['PUPPET_FORGE_TOKEN'].to_s.empty? + gem "CFPropertyList", '< 3.0.7', require: false, platforms: [:mswin, :mingw, :x64_mingw] + gem "serverspec", '~> 2.41', require: false end -puppet_version = ENV['PUPPET_GEM_VERSION'] -facter_version = ENV['FACTER_GEM_VERSION'] -hiera_version = ENV['HIERA_GEM_VERSION'] - gems = {} +puppet_version = ENV.fetch('PUPPET_GEM_VERSION', nil) +facter_version = ENV.fetch('FACTER_GEM_VERSION', nil) +hiera_version = ENV.fetch('HIERA_GEM_VERSION', nil) -gems['puppet'] = location_for(puppet_version) - -# If facter or hiera versions have been specified via the environment -# variables - -gems['facter'] = location_for(facter_version) if facter_version -gems['hiera'] = location_for(hiera_version) if hiera_version - -if Gem.win_platform? && puppet_version =~ %r{^(file:///|git://)} - # If we're using a Puppet gem on Windows which handles its own win32-xxx gem - # dependencies (>= 3.5.0), set the maximum versions (see PUP-6445). - gems['win32-dir'] = ['<= 0.4.9', require: false] - gems['win32-eventlog'] = ['<= 0.6.5', require: false] - gems['win32-process'] = ['<= 0.7.5', require: false] - gems['win32-security'] = ['<= 0.2.5', require: false] - gems['win32-service'] = ['0.8.8', require: false] -end +gems['puppet'] = location_for(puppet_version, nil, { source: gemsource_puppetcore }) +gems['facter'] = location_for(facter_version, nil, { source: gemsource_puppetcore }) +gems['hiera'] = location_for(hiera_version, nil, {}) if hiera_version +# Generate the gem definitions +print_gem_statement_for(gems) if ENV['DEBUG'] gems.each do |gem_name, gem_params| gem gem_name, *gem_params end @@ -65,12 +88,14 @@ end # Evaluate Gemfile.local and ~/.gemfile if they exist extra_gemfiles = [ "#{__FILE__}.local", - File.join(Dir.home, '.gemfile'), + File.join(Dir.home, '.gemfile') ] extra_gemfiles.each do |gemfile| - if File.file?(gemfile) && File.readable?(gemfile) - eval(File.read(gemfile), binding) - end + next unless File.file?(gemfile) && File.readable?(gemfile) + + # rubocop:disable Security/Eval + eval(File.read(gemfile), binding) + # rubocop:enable Security/Eval end # vim: syntax=ruby diff --git a/MAINTAINERS.md b/MAINTAINERS.md deleted file mode 100644 index 179f45bd..00000000 --- a/MAINTAINERS.md +++ /dev/null @@ -1,6 +0,0 @@ -## Maintenance - -Maintainers: - - Puppet Forge Modules Team `forge-modules |at| puppet |dot| com` - -Tickets: https://tickets.puppet.com/browse/MODULES. Make sure to set component to `java`. diff --git a/README.markdown b/README.markdown deleted file mode 100644 index 93e6dd29..00000000 --- a/README.markdown +++ /dev/null @@ -1,174 +0,0 @@ -# java - -#### Table of Contents - -1. [Overview](#overview) -2. [Module Description - What the module does and why it is useful](#module-description) -3. [Setup - The basics of getting started with the java module](#setup) - * [Beginning with the java module](#beginning-with-the-java-module) -4. [Usage - Configuration options and additional functionality](#usage) -5. [Reference - An under-the-hood peek at what the module is doing and how](#reference) -6. [Limitations - OS compatibility, etc.](#limitations) -7. [Development - Guide for contributing to the module](#development) - -## Overview - -Installs the correct Java package on various platforms. - -## Module Description - -The java module can automatically install Java jdk or jre on a wide variety of systems. Java is a base component for many software platforms, but Java system packages don't always follow packaging conventions. The java module simplifies the Java installation process. - -## 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', - java_se => 'jdk', -} - -java::oracle { 'jdk8' : - ensure => 'present', - 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', -} -``` - -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 - -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 - -The java module includes a few facts to describe the version of Java installed on the system: - -* `java_major_version`: The major version of Java. -* `java_patch_level`: The patch level of Java. -* `java_version`: The full Java version string. -* `java_default_home`: The absolute path to the java system home directory (only available on Linux). For instance, the `java` executable's path would be `${::java_default_home}/jre/bin/java`. This is slightly different from the "standard" JAVA_HOME environment variable. -* `java_libjvm_path`: The absolute path to the directory containing the shared library `libjvm.so` (only available on Linux). Useful for setting `LD_LIBRARY_PATH` or configuring the dynamic linker. - -**Note:** The facts return `nil` if Java is not installed on the system. - -## Limitations - -For an extensive list of supported operating systems, see [metadata.json](https://github.com/puppetlabs/puppetlabs-java/blob/master/metadata.json) - -This module cannot guarantee installation of Java versions that are not available on platform repositories. - -This module only manages a singular installation of Java, meaning it is not possible to manage e.g. OpenJDK 7, Oracle Java 7 and Oracle Java 8 in parallel on the same system. - -Oracle Java packages are not included in Debian 7 and Ubuntu 12.04/14.04 repositories. To install Java on those systems, you'll need to package Oracle JDK/JRE, and then the module can install the package. For more information on how to package Oracle JDK/JRE, see the [Debian wiki](http://wiki.debian.org/JavaPackage). - -This module is officially [supported](https://forge.puppetlabs.com/supported) for the following Java versions and platforms: - -OpenJDK is supported on: - -* Red Hat Enterprise Linux (RHEL) 5, 6, 7 -* CentOS 5, 6, 7 -* Oracle Linux 6, 7 -* Scientific Linux 6 -* Debian 8, 9 -* Ubuntu 14.04, 16.04, 18.04 -* Solaris 11 -* SLES 11, 12 - -Sun Java is supported on: - -* Debian 6 - -Oracle Java is supported on: - -* CentOS 6 -* CentOS 7 -* Red Hat Enterprise Linux (RHEL) 7 - -### 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 -the binaries to a standard directory. Because of that, the path to this location -is hardcoded in the `java_version` fact. Whenever you upgrade Java to a newer -version, you have to update the path in this fact. - -#### FreeBSD - -By default on FreeBSD, Puppet versions prior to 4.0 throw an error saying `pkgng` is not the default provider. To fix this, install the [zleslie/pkgng module](https://forge.puppetlabs.com/zleslie/pkgng) and set it as the default package provider: - -```puppet -Package { - provider => 'pkgng', -} -``` - -On Puppet 4.0 and later, `pkgng` is included within Puppet and is the default package provider. - -## Development - -Puppet modules on the Puppet Forge are open projects, and community contributions are essential for keeping them great. To contribute to Puppet projects, see our [module contribution guide.](https://docs.puppetlabs.com/forge/contributing.html) - -## Contributors - -The list of contributors can be found at [https://github.com/puppetlabs/puppetlabs-java/graphs/contributors](https://github.com/puppetlabs/puppetlabs-java/graphs/contributors). diff --git a/README.md b/README.md new file mode 100644 index 00000000..d06d6518 --- /dev/null +++ b/README.md @@ -0,0 +1,302 @@ +# java + +#### Table of Contents + +1. [Overview](#overview) +2. [Module Description - What the module does and why it is useful](#module-description) +3. [Setup - The basics of getting started with the java module](#setup) + * [Beginning with the java module](#beginning-with-the-java-module) +4. [Usage - Configuration options and additional functionality](#usage) +5. [Reference - An under-the-hood peek at what the module is doing and how](#reference) +6. [Limitations - OS compatibility, etc.](#limitations) +7. [License](#license) +8. [Development - Guide for contributing to the module](#development) + +## Overview + +Installs the correct Java package on various platforms. + +## Module Description + +The java module can automatically install Java jdk or jre on a wide variety of systems. Java is a base component for many software platforms, but Java system packages don't always follow packaging conventions. The java module simplifies the Java installation process. + +## 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::download` installs one or more versions of Java SE from a remote url. `java::download` depends on [puppet/archive](https://github.com/voxpupuli/puppet-archive). + +To install Java to a non-default basedir (defaults: /usr/lib/jvm for Debian; /usr/java for RedHat): +```puppet +java::download { 'jdk8' : + ensure => 'present', + java_se => 'jdk', + url => 'http://myjava.repository/java.tgz", + basedir => '/custom/java', +} +``` + +## AdoptOpenJDK + +The defined type `java::adopt` installs one or more versions of AdoptOpenJDK Java. `java::adopt` depends on [puppet/archive](https://github.com/voxpupuli/puppet-archive). + +```puppet +java::adopt { 'jdk8' : + ensure => 'present', + version => '8', + java => 'jdk', +} + +java::adopt { 'jdk11' : + ensure => 'present', + version => '11', + java => 'jdk', +} +``` + +To install a specific release of a AdoptOpenJDK Java version, e.g. 8u202-b08, provide both parameters `version_major` and `version_minor` as follows: + +```puppet +java::adopt { 'jdk8' : + ensure => 'present', + version_major => '8u202', + version_minor => 'b08', + java => 'jdk', +} +``` + +To install AdoptOpenJDK Java to a non-default basedir (defaults: /usr/lib/jvm for Debian; /usr/java for RedHat): +```puppet +java::adopt { 'jdk8' : + ensure => 'present', + version_major => '8u202', + version_minor => 'b08', + java => 'jdk', + basedir => '/custom/java', +} +``` + +To ensure that a custom basedir is a directory before AdoptOpenJDK Java is installed (note: manage separately for custom ownership or perms): +```puppet +java::adopt { 'jdk8' : + ensure => 'present', + version_major => '8u202', + version_minor => 'b08', + java => 'jdk', + manage_basedir => true, + basedir => '/custom/java', +} +``` + +## Adoptium Temurin + +Adoptium Temurin is the successor of AdoptOpenJDK and is supported using the defined type `java::adoptium`. It depends on [puppet/archive](https://github.com/voxpupuli/puppet-archive). + +The `java::adoptium` defined type expects a major, minor, patch and build version to download the specific release. It doesn't support jre downloads as the other distributions. + +```puppet +java::adoptium { 'jdk16' : + ensure => 'present', + version_major => '16', + version_minor => '0', + version_patch => '2', + version_build => '7', +} +java::adoptium { 'jdk17' : + ensure => 'present', + version_major => '17', + version_minor => '0', + version_patch => '1', + version_build => '12', +} +``` + +To install Adoptium to a non-default basedir (defaults: /usr/lib/jvm for Debian; /usr/java for RedHat): + +```puppet +java::adoptium { 'jdk7' : + ensure => 'present', + version_major => '17', + version_minor => '0', + version_patch => '1', + version_build => '12', + basedir => '/custom/java', +} +``` + +To ensure that a custom basedir is a directory before Adoptium is installed (note: manage separately for custom ownership or perms): + +```puppet +java::adoptium { 'jdk8' : + ensure => 'present', + version_major => '17', + version_minor => '0', + version_patch => '1', + version_build => '12', + manage_basedir => true, + basedir => '/custom/java', +} +``` + +## SAP Java (sapjvm / sapmachine) + +SAP also offers JVM distributions. They are mostly required for their SAP products. In earlier versions it is called "sapjvm", in newer versions they call it "sapmachine". + +The defined type `java::sap` installs one or more versions of sapjvm (if version 7 or 8) or sapmachine (if version > 8) Java. `java::sap` depends on [puppet/archive](https://github.com/voxpupuli/puppet-archive). +By using this defined type with versions 7 or 8 you agree with the EULA presented at https://tools.hana.ondemand.com/developer-license-3_1.txt! + +```puppet +java::sap { 'sapjvm8' : + ensure => 'present', + version => '8', + java => 'jdk', +} + +java::sap { 'sapmachine11' : + ensure => 'present', + version => '11', + java => 'jdk', +} +``` + +To install a specific release of a SAP Java version, e.g. sapjvm 8.1.063, provide parameter `version_full`: + +```puppet +java::sap { 'jdk8' : + ensure => 'present', + version_full => '8.1.063', + java => 'jdk', +} +``` + +To install SAP Java to a non-default basedir (defaults: /usr/lib/jvm for Debian; /usr/java for RedHat): +```puppet +java::adopt { 'sapjvm8' : + ensure => 'present', + version_full => '8.1.063', + java => 'jdk', + basedir => '/custom/java', +} +``` + +To ensure that a custom basedir is a directory before SAP Java is installed (note: manage separately for custom ownership or perms): +```puppet +java::adopt { 'sapjvm8' : + ensure => 'present', + version_full => '8.1.063', + java => 'jdk', + manage_basedir => true, + basedir => '/custom/java', +} +``` + +## Reference + +For information on the classes and types, see the [REFERENCE.md](https://github.com/puppetlabs/puppetlabs-java/blob/main/REFERENCE.md). For information on the facts, see below. + +### Facts + +The java module includes a few facts to describe the version of Java installed on the system: + +* `java_major_version`: The major version of Java. +* `java_patch_level`: The patch level of Java. +* `java_version`: The full Java version string. +* `java_default_home`: The absolute path to the java system home directory (only available on Linux). For instance, the `java` executable's path would be `${::java_default_home}/jre/bin/java`. This is slightly different from the "standard" JAVA_HOME environment variable. +* `java_libjvm_path`: The absolute path to the directory containing the shared library `libjvm.so` (only available on Linux). Useful for setting `LD_LIBRARY_PATH` or configuring the dynamic linker. + +**Note:** The facts return `nil` if Java is not installed on the system. + +## Limitations + +For an extensive list of supported operating systems, see [metadata.json](https://github.com/puppetlabs/puppetlabs-java/blob/main/metadata.json) + +This module cannot guarantee installation of Java versions that are not available on platform repositories. + +This module only manages a singular installation of Java, meaning it is not possible to manage e.g. OpenJDK 7, Oracle Java 7 and Oracle Java 8 in parallel on the same system. + +Oracle Java packages are not included in Debian 7 and Ubuntu 12.04/14.04 repositories. To install Java on those systems, you'll need to package Oracle JDK/JRE, and then the module can install the package. For more information on how to package Oracle JDK/JRE, see the [Debian wiki](http://wiki.debian.org/JavaPackage). + +This module is officially [supported](https://forge.puppetlabs.com/supported) for the following Java versions and platforms: + +OpenJDK is supported on: + +* Red Hat Enterprise Linux (RHEL) 7, 8, 9 +* CentOS 7, 8 +* Oracle Linux 7 +* Debian 10, 11 +* Ubuntu 18.04, 20.04, 22.04 +* Solaris 11 +* SLES 12, 15 + +Oracle Java is supported on: + +* CentOS 7 +* CentOS 8 +* Red Hat Enterprise Linux (RHEL) 7 + +AdoptOpenJDK Java is supported on: + +* CentOS +* Red Hat Enterprise Linux (RHEL) +* Amazon Linux +* Debian + +Adoptium Temurin Java is supported on: + +* CentOS +* Red Hat Enterprise Linux (RHEL) +* Amazon Linux +* Debian + +SAP Java 7 and 8 (=sapjvm) are supported (by SAP) on: + +* SLES 12, 15 +* Oracle Linux 7, 8 +* Red Hat Enterprise Linux (RHEL) 7, 8 + +(however installations on other distributions mostly also work well) + +For SAP Java > 8 (=sapmachine) please refer to the OpenJDK list as it is based on OpenJDK and has no special requirements. + +### 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 +the binaries to a standard directory. Because of that, the path to this location +is hardcoded in the `java_version` fact. Whenever you upgrade Java to a newer +version, you have to update the path in this fact. + +## License + +This codebase is licensed under the Apache2.0 licensing, however due to the nature of the codebase the open source dependencies may also use a combination of [AGPL](https://opensource.org/license/agpl-v3/), [BSD-2](https://opensource.org/license/bsd-2-clause/), [BSD-3](https://opensource.org/license/bsd-3-clause/), [GPL2.0](https://opensource.org/license/gpl-2-0/), [LGPL](https://opensource.org/license/lgpl-3-0/), [MIT](https://opensource.org/license/mit/) and [MPL](https://opensource.org/license/mpl-2-0/) Licensing. + +## Development + +Puppet modules on the Puppet Forge are open projects, and community contributions are essential for keeping them great. To contribute to Puppet projects, see our [module contribution guide.](https://docs.puppetlabs.com/forge/contributing.html) + +## Contributors + +The list of contributors can be found at [https://github.com/puppetlabs/puppetlabs-java/graphs/contributors](https://github.com/puppetlabs/puppetlabs-java/graphs/contributors). diff --git a/REFERENCE.md b/REFERENCE.md index 6758ba5d..f8064267 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -1,37 +1,48 @@ # Reference + ## Table of Contents -**Classes** +### Classes -_Public Classes_ +#### Public Classes * [`java`](#java): This module manages the Java runtime package -_Private Classes_ +#### Private Classes -* `java::config`: +* `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** +### Defined types -* [`java::oracle`](#javaoracle): Installs Oracle Java. By using this module you agree to the Oracle licensing -agreement. +* [`java::adopt`](#java--adopt): Install one or more versions of AdoptOpenJDK Java. +* [`java::adoptium`](#java--adoptium): Install one or more versions of Adoptium Temurin OpenJDK (former AdoptOpenJDK). +* [`java::download`](#java--download): Installs Java from a url location. +* [`java::sap`](#java--sap): Install one or more versions of SAPJVM or Sapmachine ## Classes -### java +### `java` This module manages the Java runtime package #### Parameters -The following parameters are available in the `java` class. +The following parameters are available in the `java` class: + +* [`distribution`](#-java--distribution) +* [`version`](#-java--version) +* [`package`](#-java--package) +* [`package_options`](#-java--package_options) +* [`java_alternative`](#-java--java_alternative) +* [`java_alternative_path`](#-java--java_alternative_path) +* [`java_home`](#-java--java_home) -##### `distribution` +##### `distribution` Data type: `String` @@ -39,18 +50,18 @@ 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' +Default value: `'jdk'` -##### `version` +##### `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' +Default value: `'present'` -##### `package` +##### `package` Data type: `Optional[String]` @@ -59,7 +70,7 @@ java package is desired. Default value: `undef` -##### `package_options` +##### `package_options` Data type: `Optional[Array]` @@ -68,7 +79,7 @@ Options available depend on the 'package' provider for the target OS. Default value: `undef` -##### `java_alternative` +##### `java_alternative` Data type: `Optional[String]` @@ -80,7 +91,7 @@ this, you also need to set the path below. Default value: `undef` -##### `java_alternative_path` +##### `java_alternative_path` Data type: `Optional[String]` @@ -91,7 +102,7 @@ correct JVM is enabled. Default value: `undef` -##### `java_home` +##### `java_home` Data type: `Optional[String]` @@ -102,136 +113,381 @@ Default value: `undef` ## Defined types -### java::oracle - -Defined Type java::oracle - -Install one or more versions of Oracle Java. +### `java::adopt` -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" -``` +Defined Type java::adopt #### Parameters -The following parameters are available in the `java::oracle` defined type. +The following parameters are available in the `java::adopt` defined type: -##### `ensure` +* [`ensure`](#-java--adopt--ensure) +* [`version`](#-java--adopt--version) +* [`version_major`](#-java--adopt--version_major) +* [`version_minor`](#-java--adopt--version_minor) +* [`java`](#-java--adopt--java) +* [`proxy_server`](#-java--adopt--proxy_server) +* [`proxy_type`](#-java--adopt--proxy_type) +* [`url`](#-java--adopt--url) +* [`basedir`](#-java--adopt--basedir) +* [`manage_basedir`](#-java--adopt--manage_basedir) +* [`package_type`](#-java--adopt--package_type) +* [`manage_symlink`](#-java--adopt--manage_symlink) +* [`symlink_name`](#-java--adopt--symlink_name) -Data type: `Any` +##### `ensure` + +Data type: `Enum['present']` Install or remove the package. -Default value: 'present' +Default value: `'present'` -##### `version` +##### `version` -Data type: `Any` +Data type: `String[1]` -Version of Java to install, e.g. '7' or '8'. Default values for major and minor versions will be used. +Version of Java to install, e.g. '8' or '9'. Default values for major and minor versions will be used. -Default value: '8' +Default value: `'8'` -##### `version_major` +##### `version_major` -Data type: `Any` +Data type: `Optional[String]` -Major version which should be installed, e.g. '8u101'. Must be used together with version_minor. +Major version which should be installed, e.g. '8u101' or '9.0.4'. Must be used together with version_minor. Default value: `undef` -##### `version_minor` +##### `version_minor` -Data type: `Any` +Data type: `Optional[String]` -Minor version which should be installed, e.g. 'b12'. Must be used together with version_major. +Minor version which should be installed, e.g. 'b12' (for version = '8') or '11' (for version != '8'). +Must be used together with version_major. Default value: `undef` -##### `java_se` +##### `java` -Data type: `Any` +Data type: `String[1]` Type of Java Standard Edition to install, jdk or jre. -Default value: 'jdk' +Default value: `'jdk'` + +##### `proxy_server` + +Data type: `Optional[String]` + +Specify a proxy server, with port number if needed. ie: https://example.com:8080. (passed to archive) + +Default value: `undef` + +##### `proxy_type` + +Data type: `Optional[String]` + +Proxy server type (none|http|https|ftp). (passed to archive) + +Default value: `undef` + +##### `url` + +Data type: `Optional[String]` + +Full URL + +Default value: `undef` + +##### `basedir` + +Data type: `Optional[String]` + +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: `Boolean` + +Whether to manage the basedir directory. +Note: /usr/lib/jvm is managed for Debian by default, separate from this parameter. + +Default value: `true` + +##### `package_type` + +Data type: `Optional[String]` + +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: `Boolean` + +Whether to manage a symlink that points to the installation directory. Defaults to false. + +Default value: `false` + +##### `symlink_name` + +Data type: `Optional[String]` + +The name for the optional symlink in the installation directory. + +Default value: `undef` + +### `java::adoptium` + +Defined Type java::adoptium + +#### Parameters + +The following parameters are available in the `java::adoptium` defined type: + +* [`ensure`](#-java--adoptium--ensure) +* [`version_major`](#-java--adoptium--version_major) +* [`version_minor`](#-java--adoptium--version_minor) +* [`version_patch`](#-java--adoptium--version_patch) +* [`version_build`](#-java--adoptium--version_build) +* [`proxy_server`](#-java--adoptium--proxy_server) +* [`proxy_type`](#-java--adoptium--proxy_type) +* [`url`](#-java--adoptium--url) +* [`basedir`](#-java--adoptium--basedir) +* [`manage_basedir`](#-java--adoptium--manage_basedir) +* [`manage_symlink`](#-java--adoptium--manage_symlink) +* [`symlink_name`](#-java--adoptium--symlink_name) + +##### `ensure` + +Data type: `Enum['present']` + +Install or remove the package. + +Default value: `'present'` + +##### `version_major` + +Data type: `Optional[String]` + +Major version which should be installed, e.g. '16' or '17' + +Default value: `undef` + +##### `version_minor` + +Data type: `Optional[String]` + +Minor version which should be installed, e.g. '0' + +Default value: `undef` + +##### `version_patch` + +Data type: `Optional[String]` + +Minor version which should be installed, e.g. '2' + +Default value: `undef` -##### `oracle_url` +##### `version_build` -Data type: `Any` +Data type: `Optional[String]` -Official Oracle URL to download binaries from. +Build version which should be installed, e.g. '07' -Default value: 'http://download.oracle.com/otn-pub/java/jdk/' +Default value: `undef` -##### `proxy_server` +##### `proxy_server` -Data type: `Any` +Data type: `Optional[String]` Specify a proxy server, with port number if needed. ie: https://example.com:8080. (passed to archive) Default value: `undef` -##### `proxy_type` +##### `proxy_type` -Data type: `Any` +Data type: `Optional[Enum['none', 'http', 'https', 'ftp']]` Proxy server type (none|http|https|ftp). (passed to archive) Default value: `undef` -##### `url` +##### `url` -Data type: `Any` +Data type: `Optional[String]` -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. +Full URL Default value: `undef` -##### `url_hash` +##### `basedir` -Data type: `Any` +Data type: `Optional[String]` -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. +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` -##### `jce` +##### `manage_basedir` + +Data type: `Boolean` + +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: `true` + +##### `manage_symlink` + +Data type: `Boolean` + +Whether to manage a symlink that points to the installation directory. Defaults to false. + +Default value: `false` + +##### `symlink_name` + +Data type: `Optional[String]` + +The name for the optional symlink in the installation directory. + +Default value: `undef` + +### `java::download` + +Defined Type java::download + +#### Parameters + +The following parameters are available in the `java::download` defined type: -Data type: `Any` +* [`ensure`](#-java--download--ensure) +* [`version`](#-java--download--version) +* [`version_major`](#-java--download--version_major) +* [`version_minor`](#-java--download--version_minor) +* [`java_se`](#-java--download--java_se) +* [`proxy_server`](#-java--download--proxy_server) +* [`proxy_type`](#-java--download--proxy_type) +* [`url`](#-java--download--url) +* [`jce`](#-java--download--jce) +* [`jce_url`](#-java--download--jce_url) +* [`basedir`](#-java--download--basedir) +* [`manage_basedir`](#-java--download--manage_basedir) +* [`package_type`](#-java--download--package_type) +* [`manage_symlink`](#-java--download--manage_symlink) +* [`symlink_name`](#-java--download--symlink_name) + +##### `ensure` + +Data type: `Enum['present']` + +Install or remove the package. + +Default value: `'present'` + +##### `version` + +Data type: `String[1]` + +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: `Optional[String]` + +Major version which should be installed, e.g. '8u101'. Must be used together with version_minor. + +Default value: `undef` + +##### `version_minor` + +Data type: `Optional[String]` + +Minor version which should be installed, e.g. 'b12'. Must be used together with version_major. + +Default value: `undef` + +##### `java_se` + +Data type: `String[1]` + +Type of Java Standard Edition to install, jdk or jre. + +Default value: `'jdk'` + +##### `proxy_server` + +Data type: `Optional[String]` + +Specify a proxy server, with port number if needed. ie: https://example.com:8080. (passed to archive) + +Default value: `undef` + +##### `proxy_type` + +Data type: `Optional[Enum['none', 'http', 'https', 'ftp']]` + +Proxy server type (none|http|https|ftp). (passed to archive) + +Default value: `undef` + +##### `url` + +Data type: `Optional[String]` + +Full URL + +Default value: `undef` + +##### `jce` + +Data type: `Boolean` Install Oracles Java Cryptographic Extensions into the JRE or JDK Default value: `false` -##### `basedir` +##### `jce_url` + +Data type: `Optional[String]` + +Full URL to the jce zip file + +Default value: `undef` -Data type: `Any` +##### `basedir` + +Data type: `Optional[String]` 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` +##### `manage_basedir` -Data type: `Any` +Data type: `Boolean` 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` +##### `package_type` -Data type: `Any` +Data type: `Optional[String]` 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. @@ -239,17 +495,118 @@ Optional forced package types: rpm, rpmbin, tar.gz Default value: `undef` -##### `manage_symlink` +##### `manage_symlink` -Data type: `Any` +Data type: `Boolean` Whether to manage a symlink that points to the installation directory. Defaults to false. Default value: `false` -##### `symlink_name` +##### `symlink_name` + +Data type: `Optional[String]` + +The name for the optional symlink in the installation directory. -Data type: `Any` +Default value: `undef` + +### `java::sap` + +Defined Type java::sap + +#### Parameters + +The following parameters are available in the `java::sap` defined type: + +* [`ensure`](#-java--sap--ensure) +* [`version`](#-java--sap--version) +* [`version_full`](#-java--sap--version_full) +* [`java`](#-java--sap--java) +* [`proxy_server`](#-java--sap--proxy_server) +* [`proxy_type`](#-java--sap--proxy_type) +* [`basedir`](#-java--sap--basedir) +* [`manage_basedir`](#-java--sap--manage_basedir) +* [`manage_symlink`](#-java--sap--manage_symlink) +* [`symlink_name`](#-java--sap--symlink_name) + +##### `ensure` + +Data type: `Enum['present']` + +Install or remove the package. + +Default value: `'present'` + +##### `version` + +Data type: `String[1]` + +Version of Java to install, e.g. '8' or '9'. Default values for full versions will be used. + +Default value: `'8'` + +##### `version_full` + +Data type: `Optional[String]` + +Major version which should be installed, e.g. '8.1.063' or '11.0.7'. If used, "version" parameter is ignored. + +Default value: `undef` + +##### `java` + +Data type: `String[1]` + +Type of Java Edition to install, jdk or jre. + +Default value: `'jdk'` + +##### `proxy_server` + +Data type: `Optional[String]` + +Specify a proxy server, with port number if needed. ie: https://example.com:8080. (passed to archive) + +Default value: `undef` + +##### `proxy_type` + +Data type: `Optional[Enum['none', 'http', 'https', 'ftp']]` + +Proxy server type (none|http|https|ftp). (passed to archive) + +Default value: `undef` + +##### `basedir` + +Data type: `Optional[String]` + +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: `Boolean` + +Whether to manage the basedir directory. +Note: /usr/lib/jvm is managed for Debian by default, separate from this parameter. + +Default value: `true` + +##### `manage_symlink` + +Data type: `Boolean` + +Whether to manage a symlink that points to the installation directory. Defaults to false. + +Default value: `false` + +##### `symlink_name` + +Data type: `Optional[String]` The name for the optional symlink in the installation directory. diff --git a/Rakefile b/Rakefile index 597f494c..31b59305 100644 --- a/Rakefile +++ b/Rakefile @@ -1,76 +1,18 @@ +# frozen_string_literal: true + +require 'bundler' +require 'puppet_litmus/rake_tasks' if Gem.loaded_specs.key? 'puppet_litmus' require 'puppetlabs_spec_helper/rake_tasks' require 'puppet-syntax/tasks/puppet-syntax' -require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any? -require 'github_changelog_generator/task' if Bundler.rubygems.find_name('github_changelog_generator').any? -require 'puppet-strings/tasks' if Bundler.rubygems.find_name('puppet-strings').any? - -def changelog_user - return unless Rake.application.top_level_tasks.include? "changelog" - returnVal = nil || JSON.load(File.read('metadata.json'))['author'] - raise "unable to find the changelog_user in .sync.yml, or the author in metadata.json" if returnVal.nil? - puts "GitHubChangelogGenerator user:#{returnVal}" - returnVal -end - -def changelog_project - return unless Rake.application.top_level_tasks.include? "changelog" - returnVal = nil || JSON.load(File.read('metadata.json'))['source'].match(%r{.*/([^/]*)})[1] - raise "unable to find the changelog_project in .sync.yml or the name in metadata.json" if returnVal.nil? - puts "GitHubChangelogGenerator project:#{returnVal}" - returnVal -end - -def changelog_future_release - return unless Rake.application.top_level_tasks.include? "changelog" - 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 -end +require 'puppet-strings/tasks' if Gem.loaded_specs.key? 'puppet-strings' PuppetLint.configuration.send('disable_relative') - -if Bundler.rubygems.find_name('github_changelog_generator').any? - GitHubChangelogGenerator::RakeTask.new :changelog do |config| - raise "Set CHANGELOG_GITHUB_TOKEN environment variable eg 'export CHANGELOG_GITHUB_TOKEN=valid_token_here'" if Rake.application.top_level_tasks.include? "changelog" and ENV['CHANGELOG_GITHUB_TOKEN'].nil? - config.user = "#{changelog_user}" - config.project = "#{changelog_project}" - config.future_release = "#{changelog_future_release}" - config.exclude_labels = ['maintenance'] - config.header = "# Change log\n\nAll notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org)." - config.add_pr_wo_labels = true - config.issues = false - config.merge_prefix = "### UNCATEGORIZED PRS; GO LABEL THEM" - config.configure_sections = { - "Changed" => { - "prefix" => "### Changed", - "labels" => ["backwards-incompatible"], - }, - "Added" => { - "prefix" => "### Added", - "labels" => ["feature", "enhancement"], - }, - "Fixed" => { - "prefix" => "### Fixed", - "labels" => ["bugfix"], - }, - } - end -else - desc 'Generate a Changelog from GitHub' - task :changelog do - raise <= Gem::Version.new('2.2.2')" -EOM - end -end +PuppetLint.configuration.send('disable_80chars') +PuppetLint.configuration.send('disable_140chars') +PuppetLint.configuration.send('disable_class_inherits_from_params_class') +PuppetLint.configuration.send('disable_autoloader_layout') +PuppetLint.configuration.send('disable_documentation') +PuppetLint.configuration.send('disable_single_quote_string_with_variables') +PuppetLint.configuration.fail_on_warnings = true +PuppetLint.configuration.ignore_paths = [".vendor/**/*.pp", ".bundle/**/*.pp", "pkg/**/*.pp", "spec/**/*.pp", "tests/**/*.pp", "types/**/*.pp", "vendor/**/*.pp"] diff --git a/data/common.yaml b/data/common.yaml new file mode 100644 index 00000000..2fbf0ffd --- /dev/null +++ b/data/common.yaml @@ -0,0 +1 @@ +--- {} diff --git a/examples/alternative.pp b/examples/alternative.pp index f361db6c..0d0dee87 100644 --- a/examples/alternative.pp +++ b/examples/alternative.pp @@ -1,5 +1,5 @@ class { 'java': package => 'jdk-8u25-linux-x64', java_alternative => 'jdk1.8.0_25', - java_alternative_path => '/usr/java/jdk1.8.0_25/jre/bin/java' + java_alternative_path => '/usr/java/jdk1.8.0_25/jre/bin/java', } diff --git a/hiera.yaml b/hiera.yaml new file mode 100644 index 00000000..545fff32 --- /dev/null +++ b/hiera.yaml @@ -0,0 +1,21 @@ +--- +version: 5 + +defaults: # Used for any hierarchy level that omits these keys. + datadir: data # This path is relative to hiera.yaml's directory. + data_hash: yaml_data # Use the built-in YAML backend. + +hierarchy: + - name: "osfamily/major release" + paths: + # Used to distinguish between Debian and Ubuntu + - "os/%{facts.os.name}/%{facts.os.release.major}.yaml" + - "os/%{facts.os.family}/%{facts.os.release.major}.yaml" + # Used for Solaris + - "os/%{facts.os.family}/%{facts.kernelrelease}.yaml" + - name: "osfamily" + paths: + - "os/%{facts.os.name}.yaml" + - "os/%{facts.os.family}.yaml" + - name: 'common' + path: 'common.yaml' diff --git a/lib/facter/java_default_home.rb b/lib/facter/java_default_home.rb index 0f4d58ed..a93a13ae 100644 --- a/lib/facter/java_default_home.rb +++ b/lib/facter/java_default_home.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # Fact: java_default_home # # Purpose: get absolute path of java system home @@ -14,12 +16,12 @@ confine kernel: ['Linux', 'OpenBSD'] java_default_home = nil setcode do - java_bin = Facter::Util::Resolution.which('java').to_s.strip + java_bin = Facter::Core::Execution.which('java').to_s.strip if java_bin.empty? nil else java_path = File.realpath(java_bin) - java_default_home = if java_path =~ %r{/jre/} + java_default_home = if java_path.include?('/jre/') File.dirname(File.dirname(File.dirname(java_path))) else File.dirname(File.dirname(java_path)) diff --git a/lib/facter/java_libjvm_path.rb b/lib/facter/java_libjvm_path.rb index 698a8f03..cc3085bd 100644 --- a/lib/facter/java_libjvm_path.rb +++ b/lib/facter/java_libjvm_path.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # Fact: java_libjvm_path # # Purpose: get path to libjvm.so @@ -7,6 +9,7 @@ # # Caveats: # Needs to list files recursively. Returns the first match +# Needs working java_major_version fact # # Notes: # None @@ -14,11 +17,18 @@ confine kernel: ['Linux', 'OpenBSD'] setcode do java_default_home = Facter.value(:java_default_home) - java_libjvm_file = Dir.glob("#{java_default_home}/jre/lib/**/libjvm.so") - if java_libjvm_file.nil? || java_libjvm_file.empty? - nil - else - File.dirname(java_libjvm_file[0]) + java_major_version = Facter.value(:java_major_version) + unless java_major_version.nil? + java_libjvm_file = if java_major_version.to_i >= 11 + Dir.glob("#{java_default_home}/lib/**/libjvm.so") + else + Dir.glob("#{java_default_home}/jre/lib/**/libjvm.so") + end + if java_libjvm_file.nil? || java_libjvm_file.empty? + nil + else + File.dirname(java_libjvm_file[0]) + end end end end diff --git a/lib/facter/java_major_version.rb b/lib/facter/java_major_version.rb index 8fc04e2a..6ba4ec18 100644 --- a/lib/facter/java_major_version.rb +++ b/lib/facter/java_major_version.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # Fact: java_major_version # # Purpose: get Java's major version @@ -16,7 +18,13 @@ java_major_version = nil setcode do java_version = Facter.value(:java_version) - java_major_version = java_version.strip.split('_')[0].split('.')[1] unless java_version.nil? + unless java_version.nil? + java_major_version = if java_version.strip[0..1] == '1.' + java_version.strip.split('_')[0].split('.')[1] + else + java_version.strip.split('.')[0] + end + end end java_major_version end diff --git a/lib/facter/java_patch_level.rb b/lib/facter/java_patch_level.rb index 0c952ec1..d6451551 100644 --- a/lib/facter/java_patch_level.rb +++ b/lib/facter/java_patch_level.rb @@ -1,9 +1,11 @@ +# frozen_string_literal: true + # Fact: java_patch_level # # Purpose: get Java's patch level # # Resolution: -# Uses java_version fact splits on the patch number (after _) +# Uses java_version fact splits on the patch number (after _ for 1.x and patch number for semver'ed javas) # # Caveats: # none @@ -14,7 +16,13 @@ java_patch_level = nil setcode do java_version = Facter.value(:java_version) - java_patch_level = java_version.strip.split('_')[1] unless java_version.nil? + unless java_version.nil? + if java_version.strip[0..1] == '1.' + java_patch_level = java_version.strip.split('_')[1] unless java_version.nil? + else + java_patch_level = java_version.strip.split('.')[2] unless java_version.nil? + end + end end java_patch_level end diff --git a/lib/facter/java_version.rb b/lib/facter/java_version.rb index f717f69c..241d8760 100644 --- a/lib/facter/java_version.rb +++ b/lib/facter/java_version.rb @@ -1,10 +1,12 @@ +# frozen_string_literal: true + # Fact: java_version # # Purpose: get full java version string # # Resolution: # Tests for presence of java, returns nil if not present -# returns output of "java -version" and splits on \n + '"' +# returns output of "java -version" and splits on '"' # # Caveats: # none @@ -12,33 +14,14 @@ # Notes: # None Facter.add(:java_version) do - # the OS-specific overrides need to be able to return nil, - # to indicate "no java available". Usually returning nil - # would mean that facter falls back to a lower priority - # resolution, which would then trigger MODULES-2637. To - # avoid that, we confine the "default" here to not run - # on those OS. - # Additionally, facter versions prior to 2.0.1 only support - # positive matches, so this needs to be done manually in setcode. setcode do - unless ['darwin'].include? Facter.value(:operatingsystem).downcase - version = nil - if Facter::Util::Resolution.which('java') - Facter::Util::Resolution.exec('java -Xmx12m -version 2>&1').lines.each { |line| version = $LAST_MATCH_INFO[1] if %r{^.+ version \"(.+)\"$} =~ line } + if ['darwin'].include? Facter.value(:kernel).downcase + if Facter::Core::Execution.execute('/usr/libexec/java_home --failfast', { on_fail: false }) + version = Facter::Core::Execution.execute('java -Xmx12m -version 2>&1').lines.find { |line| line.include?('version') } end - version - end - end -end - -Facter.add(:java_version) do - confine operatingsystem: 'Darwin' - has_weight 100 - setcode do - unless %r{Unable to find any JVMs matching version} =~ Facter::Util::Resolution.exec('/usr/libexec/java_home --failfast 2>&1') - version = nil - Facter::Util::Resolution.exec('java -Xmx12m -version 2>&1').lines.each { |line| version = $LAST_MATCH_INFO[1] if %r{^.+ version \"(.+)\"$} =~ line } - version + elsif Facter::Core::Execution.which('java') + version = Facter::Core::Execution.execute('java -Xmx12m -version 2>&1').lines.find { |line| line.include?('version') } end + version[%r{"(.*?)"}, 1] if version end end diff --git a/locales/config.yaml b/locales/config.yaml deleted file mode 100644 index 15a2d5eb..00000000 --- a/locales/config.yaml +++ /dev/null @@ -1,26 +0,0 @@ ---- -# This is the project-specific configuration file for setting up -# fast_gettext for your project. -gettext: - # This is used for the name of the .pot and .po files; they will be - # called .pot? - project_name: puppetlabs-java - # This is used in comments in the .pot and .po files to indicate what - # project the files belong to and should bea little more desctiptive than - # - package_name: puppetlabs-java - # The locale that the default messages in the .pot file are in - default_locale: en - # The email used for sending bug reports. - bugs_address: docs@puppet.com - # The holder of the copyright. - copyright_holder: Puppet, Inc. - # This determines which comments in code should be eligible for translation. - # Any comments that start with this string will be externalized. (Leave - # empty to include all.) - comments_tag: TRANSLATOR - # Patterns for +Dir.glob+ used to find all files that might contain - # translatable content, relative to the project root directory - source_files: - - './lib/**/*.rb' - diff --git a/manifests/adopt.pp b/manifests/adopt.pp new file mode 100644 index 00000000..957a7f03 --- /dev/null +++ b/manifests/adopt.pp @@ -0,0 +1,315 @@ +# Defined Type java::adopt +# +# @summary +# Install one or more versions of AdoptOpenJDK Java. +# +# @param ensure +# Install or remove the package. +# +# @param version +# Version of Java to install, e.g. '8' or '9'. Default values for major and minor versions will be used. +# +# @param version_major +# Major version which should be installed, e.g. '8u101' or '9.0.4'. Must be used together with version_minor. +# +# @param version_minor +# Minor version which should be installed, e.g. 'b12' (for version = '8') or '11' (for version != '8'). +# Must be used together with version_major. +# +# @param java +# Type of Java Standard Edition to install, jdk or jre. +# +# @param proxy_server +# Specify a proxy server, with port number if needed. ie: https://example.com:8080. (passed to archive) +# +# @param proxy_type +# Proxy server type (none|http|https|ftp). (passed to archive) +# +# @param url +# Full URL +# +# @param basedir +# Directory under which the installation will occur. If not set, defaults to +# /usr/lib/jvm for Debian and /usr/java for RedHat. +# +# @param manage_basedir +# Whether to manage the basedir directory. +# Note: /usr/lib/jvm is managed for Debian by default, separate from this parameter. +# +# @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 +# +# @param manage_symlink +# Whether to manage a symlink that points to the installation directory. Defaults to false. +# +# @param symlink_name +# The name for the optional symlink in the installation directory. +# +define java::adopt ( + Enum['present'] $ensure = 'present', + String[1] $version = '8', + Optional[String] $version_major = undef, + Optional[String] $version_minor = undef, + String[1] $java = 'jdk', + Optional[String] $proxy_server = undef, + Optional[String] $proxy_type = undef, + Optional[String] $url = undef, + Optional[String] $basedir = undef, + Boolean $manage_basedir = true, + Optional[String] $package_type = undef, + Boolean $manage_symlink = false, + Optional[String] $symlink_name = undef, +) { + # archive module is used to download the java package + include archive + + # validate java Standard Edition to download + if $java !~ /(jre|jdk)/ { + fail('java must be either jre or jdk.') + } + + # determine AdoptOpenJDK Java major and minor version, and installation path + if $version_major and $version_minor { + $release_major = $version_major + $release_minor = $version_minor + + if ( $version_major[0] == '8' or $version_major[0] == '9' ) { + $_version = $version_major[0] + } else { + $_version = $version_major[0,2] + } + + $_version_int = Numeric($_version) + + if ( $java == 'jre' ) { + $_append_jre = '-jre' + } else { + $_append_jre = '' + } + + # extracted folders look like this: + # jdk8u202-b08 + # jdk-9.0.4+11 + # jdk-10.0.2+13 + # jdk-11.0.2+9 + # jdk-12.0.1+12 + # jdk8u202-b08-jre + # jdk-9.0.4+11-jre + # hence we need to check for the major version and build the install path according to it + if ( $_version_int == 8 ) { + $install_path = "jdk${release_major}-${release_minor}${_append_jre}" + } elsif ( $_version_int > 8 ) { + $install_path = "jdk-${release_major}+${release_minor}${_append_jre}" + } else { + fail ("unsupported version ${_version}") + } + } else { + $_version = $version + $_version_int = Numeric($_version) + # use default versions if no specific major and minor version parameters are provided + case $version { + '8' : { + $release_major = '8u202' + $release_minor = 'b08' + $install_path = "${java}8u202-b08" + } + '9' : { + $release_major = '9.0.4' + $release_minor = '11' + $install_path = "${java}-9.0.4+11" + } + # minor release is given with +, however package etc. works with underscore, so we use underscore here + '10' : { + $release_major = '10.0.2' + $release_minor = '13' + $install_path = "${java}-10.0.2+13" + } + '11' : { + $release_major = '11.0.2' + $release_minor = '9' + $install_path = "${java}-11.0.2+9" + } + # minor release is given with +, however package etc. works with underscore, so we use underscore here + '12' : { + $release_major = '12.0.1' + $release_minor = '12' + $install_path = "${java}-12.0.1+12" + } + default : { + $release_major = '8u202' + $release_minor = 'b08' + $install_path = "${java}8u202-b08" + } + } + } + + # determine package type (exe/tar/rpm), destination directory based on OS + case $facts['kernel'] { + 'Linux' : { + case $facts['os']['family'] { + 'RedHat', 'Amazon' : { + if $package_type { + $_package_type = $package_type + } else { + $_package_type = 'tar.gz' + } + if $basedir { + $_basedir = $basedir + } else { + $_basedir = '/usr/java' + } + } + 'Debian' : { + 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/' + } + default : { + fail ( "unsupported platform ${$facts['kernel']}" ) + } + } + + # set java architecture nomenclature + $os_architecture = $facts['os']['architecture'] ? { + default => $facts['os']['architecture'] + } + + case $os_architecture { + 'i386' : { $arch = 'x86-32' } + 'x86_64' : { $arch = 'x64' } + 'amd64' : { $arch = 'x64' } + default : { + fail ("unsupported platform ${$os_architecture}") + } + } + + # package name and path for download from github + # + # following are build based on this real life example full URLs: + # + # https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u202-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u202b08.tar.gz + # https://github.com/AdoptOpenJDK/openjdk9-binaries/releases/download/jdk-9.0.4%2B11/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz + # https://github.com/AdoptOpenJDK/openjdk10-binaries/releases/download/jdk-10.0.2%2B13/OpenJDK10U-jdk_x64_linux_hotspot_10.0.2_13.tar.gz + # https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.2%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_9.tar.gz + # https://github.com/AdoptOpenJDK/openjdk12-binaries/releases/download/jdk-12.0.1%2B12/OpenJDK12U-jdk_x64_linux_hotspot_12.0.1_12.tar.gz + # jre just replaces jdk with jre in the archive name, but not in the path name! + # https://github.com/AdoptOpenJDK/openjdk9-binaries/releases/download/jdk-9.0.4%2B11/OpenJDK9U-jre_x64_linux_hotspot_9.0.4_11.tar.gz + + if ( $_version_int == 8 ) { + $_release_minor_package_name = $release_minor + } else { + $_release_minor_package_name = "_${release_minor}" + } + + case $_package_type { + 'tar.gz': { + $package_name = "OpenJDK${_version}U-${java}_${arch}_${os}_hotspot_${release_major}${_release_minor_package_name}.tar.gz" + } + default: { + $package_name = "OpenJDK${_version}U-${java}_${arch}_${os}_hotspot_${release_major}${_release_minor_package_name}.tar.gz" + } + } + + # naming convention changed after major version 8, setting variables to consider that + # download_folder_prefix always begins with "jdk", even for jre! see comments for package_name above + if ( $_version_int == 8 ) { + $spacer = '-' + $download_folder_prefix = 'jdk' + } else { + $spacer = '%2B' + $download_folder_prefix = 'jdk-' + } + + # if complete URL is provided, use this value for source in archive resource + if $url { + $source = $url + } + else { + $source = "https://github.com/AdoptOpenJDK/openjdk${_version}-binaries/releases/download/${download_folder_prefix}${release_major}${spacer}${release_minor}/${package_name}" + notice ("Default source url : ${source}") + } + + # full path to the installer + $destination = "${destination_dir}${package_name}" + notice ("Destination is ${destination}") + + $install_command = ['tar', '-zxf', $destination, '-C', $_basedir] + + case $ensure { + 'present' : { + archive { $destination : + ensure => present, + source => $source, + extract_path => '/tmp', + cleanup => false, + creates => $creates_path, + proxy_server => $proxy_server, + proxy_type => $proxy_type, + } + case $facts['kernel'] { + 'Linux' : { + case $facts['os']['family'] { + 'Debian' : { + ensure_resource('file', $_basedir, { + ensure => directory, + } + ) + $install_requires = [Archive[$destination], File[$_basedir]] + } + default : { + $install_requires = [Archive[$destination]] + } + } + + if $manage_basedir { + if (!defined(File[$_basedir])) { + file { $_basedir: + ensure => 'directory', + before => Exec["Install AdoptOpenJDK java ${java} ${_version} ${release_major} ${release_minor}"], + } + } + } + + exec { "Install AdoptOpenJDK java ${java} ${_version} ${release_major} ${release_minor}" : + path => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin', + command => $install_command, + creates => $creates_path, + require => $install_requires, + } + + if ($manage_symlink and $symlink_name) { + file { "${_basedir}/${symlink_name}": + ensure => link, + target => $creates_path, + require => Exec["Install AdoptOpenJDK java ${java} ${_version} ${release_major} ${release_minor}"], + } + } + } + default : { + fail ("unsupported platform ${$facts['kernel']}") + } + } + } + default : { + notice ("Action ${ensure} not supported.") + } + } +} diff --git a/manifests/adoptium.pp b/manifests/adoptium.pp new file mode 100644 index 00000000..c39d36b5 --- /dev/null +++ b/manifests/adoptium.pp @@ -0,0 +1,191 @@ +# Defined Type java::adoptium +# +# @summary +# Install one or more versions of Adoptium Temurin OpenJDK (former AdoptOpenJDK). +# +# @param ensure +# Install or remove the package. +# +# @param version_major +# Major version which should be installed, e.g. '16' or '17' +# +# @param version_minor +# Minor version which should be installed, e.g. '0' +# +# @param version_patch +# Minor version which should be installed, e.g. '2' +# +# @param version_build +# Build version which should be installed, e.g. '07' +# +# @param proxy_server +# Specify a proxy server, with port number if needed. ie: https://example.com:8080. (passed to archive) +# +# @param proxy_type +# Proxy server type (none|http|https|ftp). (passed to archive) +# +# @param url +# Full URL +# +# @param basedir +# Directory under which the installation will occur. If not set, defaults to +# /usr/lib/jvm for Debian and /usr/java for RedHat. +# +# @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. +# +# @param manage_symlink +# Whether to manage a symlink that points to the installation directory. Defaults to false. +# +# @param symlink_name +# The name for the optional symlink in the installation directory. +# +define java::adoptium ( + Enum['present'] $ensure = 'present', + Optional[String] $version_major = undef, + Optional[String] $version_minor = undef, + Optional[String] $version_patch = undef, + Optional[String] $version_build = undef, + Optional[String] $proxy_server = undef, + Optional[Enum['none', 'http', 'https', 'ftp']] $proxy_type = undef, + Optional[String] $url = undef, + Optional[String] $basedir = undef, + Boolean $manage_basedir = true, + Boolean $manage_symlink = false, + Optional[String] $symlink_name = undef, +) { + # archive module is used to download the java package + include archive + + $install_path = "jdk-${version_major}.${version_minor}.${version_patch}+${version_build}" + + # determine package type (exe/tar/rpm), destination directory based on OS + case $facts['kernel'] { + 'Linux' : { + case $facts['os']['family'] { + 'RedHat', 'Amazon' : { + if $basedir { + $_basedir = $basedir + } else { + $_basedir = '/usr/java' + } + } + 'Debian' : { + if $basedir { + $_basedir = $basedir + } else { + $_basedir = '/usr/lib/jvm' + } + } + default : { + fail ("unsupported platform ${$facts['os']['name']}") + } + } + + $creates_path = "${_basedir}/${install_path}" + $os = 'linux_hotspot' + } + default : { + fail ( "unsupported platform ${$facts['kernel']}" ) + } + } + + # set java architecture nomenclature + $os_architecture = $facts['os']['architecture'] ? { + default => $facts['os']['architecture'] + } + + case $os_architecture { + 'i386' : { $arch = 'x86-32' } + 'x86_64' : { $arch = 'x64' } + 'amd64' : { $arch = 'x64' } + default : { + fail ("unsupported platform ${$os_architecture}") + } + } + + # package name and path for download from github + # + # following are build based on this real life example full URLs: + # + # https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.1%2B12/OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz + # https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_alpine-linux_hotspot_16.0.2_7.tar.gz + + $package_name = "OpenJDK${version_major}U-jdk_${arch}_${os}_${version_major}.${version_minor}.${version_patch}_${version_build}.tar.gz" + + # if complete URL is provided, use this value for source in archive resource + if $url { + $source = $url + } + else { + $source = "https://github.com/adoptium/temurin${version_major}-binaries/releases/download/jdk-${version_major}.${version_minor}.${version_patch}%2B${version_build}/${package_name}" + notice ("Default source url : ${source}") + } + + # full path to the installer + $destination = "/tmp/${package_name}" + notice ("Destination is ${destination}") + + case $ensure { + 'present' : { + archive { $destination : + ensure => present, + source => $source, + extract_path => '/tmp', + cleanup => false, + creates => $creates_path, + proxy_server => $proxy_server, + proxy_type => $proxy_type, + } + case $facts['kernel'] { + 'Linux' : { + case $facts['os']['family'] { + 'Debian' : { + ensure_resource('file', $_basedir, { + ensure => directory, + } + ) + $install_requires = [Archive[$destination], File[$_basedir]] + } + default : { + $install_requires = [Archive[$destination]] + } + } + + if $manage_basedir { + if (!defined(File[$_basedir])) { + file { $_basedir: + ensure => 'directory', + before => Exec["Install Adoptium Temurin java ${version_major} ${version_minor} ${version_patch} ${version_build}"], + } + } + } + + $install_adoptium = ['tar', '-zxf', $destination, '-C', $_basedir] + + exec { "Install Adoptium Temurin java ${version_major} ${version_minor} ${version_patch} ${version_build}" : + path => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin', + command => $install_adoptium, + creates => $creates_path, + require => $install_requires, + } + + if ($manage_symlink and $symlink_name) { + file { "${_basedir}/${symlink_name}": + ensure => link, + target => $creates_path, + require => Exec["Install Adoptium Temurin java ${version_major} ${version_minor} ${version_patch} ${version_build}"], + } + } + } + default : { + fail ("unsupported platform ${$facts['kernel']}") + } + } + } + default : { + notice ("Action ${ensure} not supported.") + } + } +} diff --git a/manifests/config.pp b/manifests/config.pp index 7f965f37..b096b6a3 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -1,12 +1,15 @@ # @api private class java::config ( ) { - case $::osfamily { + case $facts['os']['family'] { 'Debian': { if $java::use_java_alternative != undef and $java::use_java_alternative_path != undef { + $command_debian = ['update-java-alternatives', '--set', $java::use_java_alternative, $java::jre_flag] + $unless_debian = [['test', '/etc/alternatives/java', '-ef', $java::use_java_alternative_path]] + exec { 'update-java-alternatives': path => '/usr/bin:/usr/sbin:/bin:/sbin', - command => "update-java-alternatives --set ${java::use_java_alternative} ${java::jre_flag}", - unless => "test /etc/alternatives/java -ef '${java::use_java_alternative_path}'", + command => $command_debian, + unless => $unless_debian, } } if $java::use_java_home != undef { @@ -22,18 +25,23 @@ # The standard packages install alternatives, custom packages do not # For the stanard packages java::params needs these added. if $java::use_java_package_name != $java::default_package_name { + $command_redhat = ['alternatives', '--install', '/usr/bin/java', 'java', $java::use_java_alternative_path, '20000'] + $unless_redhat = "alternatives --display java | grep -q ${shell_escape($java::use_java_alternative_path)}" + exec { 'create-java-alternatives': path => '/usr/bin:/usr/sbin:/bin:/sbin', - command => "alternatives --install /usr/bin/java java ${$java::use_java_alternative_path} 20000" , - unless => "alternatives --display java | grep -q ${$java::use_java_alternative_path}", - before => Exec['update-java-alternatives'] + command => $command_redhat, + unless => $unless_redhat, + before => Exec['update-java-alternatives'], } } + $command_default = ['alternatives', '--set', 'java', $java::use_java_alternative_path] + $unless_default = [['test', '/etc/alternatives/java', '-ef', $java::use_java_alternative_path]] exec { 'update-java-alternatives': path => '/usr/bin:/usr/sbin', - command => "alternatives --set java ${$java::use_java_alternative_path}" , - unless => "test /etc/alternatives/java -ef '${java::use_java_alternative_path}'", + command => $command_default, + unless => $unless_default, } } if $java::use_java_home != undef { diff --git a/manifests/oracle.pp b/manifests/download.pp similarity index 66% rename from manifests/oracle.pp rename to manifests/download.pp index f9580a14..4d451ffc 100644 --- a/manifests/oracle.pp +++ b/manifests/download.pp @@ -1,18 +1,8 @@ -# Defined Type java::oracle +# Defined Type java::download # # @summary -# Installs Oracle Java. By using this module you agree to the Oracle licensing -# agreement. +# Installs Java from a url location. # -# 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" -#``` # # @param ensure # Install or remove the package. @@ -29,9 +19,6 @@ # @param java_se # Type of Java Standard Edition to install, jdk or jre. # -# @param oracle_url -# Official Oracle URL to download binaries from. -# # @param proxy_server # Specify a proxy server, with port number if needed. ie: https://example.com:8080. (passed to archive) # @@ -39,19 +26,25 @@ # Proxy server type (none|http|https|ftp). (passed to archive) # # @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. +# Full URL +# +# @param username +# Username for the 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. +# @param password +# Password for the URL # # @param jce # Install Oracles Java Cryptographic Extensions into the JRE or JDK # # @param jce_url # Full URL to the jce zip file +# +# @param jce_username +# Username for the JCE URL +# +# @param jce_password +# Password for the JCE URL # # @param basedir # Directory under which the installation will occur. If not set, defaults to @@ -72,28 +65,29 @@ # @param symlink_name # The name for the optional symlink in the installation directory. # -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, - $jce_url = undef, - $basedir = undef, - $manage_basedir = false, - $package_type = undef, - $manage_symlink = false, - $symlink_name = undef, +define java::download ( + Enum['present'] $ensure = 'present', + String[1] $version = '8', + Optional[String] $version_major = undef, + Optional[String] $version_minor = undef, + String[1] $java_se = 'jdk', + Optional[String] $proxy_server = undef, + Optional[Enum['none', 'http', 'https', 'ftp']] $proxy_type = undef, + Optional[String] $url = undef, + Optional[String] $username = undef, + Optional[String] $password = undef, + Boolean $jce = false, + Optional[String] $jce_url = undef, + Optional[String] $jce_username = undef, + Optional[String] $jce_password = undef, + Optional[String] $basedir = undef, + Boolean $manage_basedir = false, + Optional[String] $package_type = undef, + Boolean $manage_symlink = false, + Optional[String] $symlink_name = undef, ) { - # archive module is used to download the java package - include ::archive + include archive # validate java Standard Edition to download if $java_se !~ /(jre|jdk)/ { @@ -103,31 +97,22 @@ if $jce { if $jce_url { $jce_download = $jce_url - $cookie = undef } else { - $jce_download = $version ? { - '8' => 'http://download.oracle.com/otn-pub/java/jce/8/jce_policy-8.zip', - '7' => 'http://download.oracle.com/otn-pub/java/jce/7/UnlimitedJCEPolicyJDK7.zip', - '6' => 'http://download.oracle.com/otn-pub/java/jce_policy/6/jce_policy-6.zip', - default => undef - } - $cookie = 'gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie' + fail('JCE URL must be specified') } } - # determine Oracle Java major and minor version, and installation path + # determine 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 if $release_major =~ /(\d+)u(\d+)/ { # Required for CentOS systems where Java8 update number is >= 171 to ensure # 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' { + if $facts['os']['family'] == 'RedHat' and Numeric($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}" @@ -143,25 +128,21 @@ $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 = '8u201' $release_minor = 'b09' $install_path = "${java_se}1.8.0_201" - $release_hash = '42970487e3af4f5aa5bca3f542482c60' } default : { $release_major = '8u201' $release_minor = 'b09' $install_path = "${java_se}1.8.0_201" - $release_hash = '42970487e3af4f5aa5bca3f542482c60' } } } @@ -198,7 +179,8 @@ } } default : { - fail ("unsupported platform ${$facts['os']['name']}") } + fail ("unsupported platform ${$facts['os']['name']}") + } } $creates_path = "${_basedir}/${install_path}" @@ -206,7 +188,8 @@ $destination_dir = '/tmp/' } default : { - fail ( "unsupported platform ${$facts['kernel']}" ) } + fail ( "unsupported platform ${$facts['kernel']}" ) + } } # Install required unzip packages for jce @@ -216,7 +199,7 @@ # set java architecture nomenclature $os_architecture = $facts['os']['architecture'] ? { - undef => $facts['architecture'], + undef => $facts['os']['architecture'], default => $facts['os']['architecture'] } @@ -224,6 +207,8 @@ 'i386' : { $arch = 'i586' } 'x86_64' : { $arch = 'x64' } 'amd64' : { $arch = 'x64' } + 'aarch64' : { $arch = 'aarch64' } + 'arm64' : { $arch = 'aarch64' } default : { fail ("unsupported platform ${$os_architecture}") } @@ -235,22 +220,22 @@ # JaveSE 6 distributed in .bin format # 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 + # package name to use in destination directory for the installer case $_package_type { 'bin' : { - $package_name = "${java_se}-${release_major}-${os}-${arch}.bin" + $package_name = "${java_se}-${version}-${release_major}-${release_minor}-${os}-${arch}.bin" } 'rpmbin' : { - $package_name = "${java_se}-${release_major}-${os}-${arch}-rpm.bin" + $package_name = "${java_se}-${version}-${release_major}-${release_minor}-${os}-${arch}-rpm.bin" } 'rpm' : { - $package_name = "${java_se}-${release_major}-${os}-${arch}.rpm" + $package_name = "${java_se}-${version}-${release_major}-${release_minor}-${os}-${arch}.rpm" } 'tar.gz' : { - $package_name = "${java_se}-${release_major}-${os}-${arch}.tar.gz" + $package_name = "${java_se}-${version}-${release_major}-${release_minor}-${os}-${arch}.tar.gz" } default : { - $package_name = "${java_se}-${release_major}-${os}-${arch}.rpm" + $package_name = "${java_se}-${version}-${release_major}-${release_minor}-${os}-${arch}.rpm" } } @@ -258,11 +243,8 @@ 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}" + fail('Url must be specified') } # full path to the installer @@ -271,19 +253,19 @@ case $_package_type { 'bin' : { - $install_command = "sh ${destination}" + $install_command = ['sh', $destination] } 'rpmbin' : { - $install_command = "sh ${destination} -x; rpm --force -iv sun*.rpm; rpm --force -iv ${java_se}*.rpm" + $install_command = ['sh', $destination, '-x;', 'rpm', '--force', '-iv', 'sun*.rpm;', 'rpm', '--force', '-iv', "${java_se}*.rpm"] } 'rpm' : { - $install_command = "rpm --force -iv ${destination}" + $install_command = ['rpm', '--force', '-iv', $destination] } 'tar.gz' : { - $install_command = "tar -zxf ${destination} -C ${_basedir}" + $install_command = ['tar', '-zxf', $destination, '-C', $_basedir] } default : { - $install_command = "rpm -iv ${destination}" + $install_command = ['rpm', '-iv', $destination] } } @@ -292,7 +274,8 @@ archive { $destination : ensure => present, source => $source, - cookie => 'gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie', + username => $username, + password => $password, extract_path => '/tmp', cleanup => false, creates => $creates_path, @@ -304,8 +287,9 @@ case $facts['os']['family'] { 'Debian' : { ensure_resource('file', $_basedir, { - ensure => directory, - }) + ensure => directory, + } + ) $install_requires = [Archive[$destination], File[$_basedir]] } default : { @@ -314,21 +298,21 @@ } 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}" : path => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin', command => $install_command, creates => $creates_path, - require => $install_requires + 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}"] + require => Exec["Install Oracle java_se ${java_se} ${version} ${release_major} ${release_minor}"], } } @@ -339,18 +323,19 @@ } archive { "/tmp/jce-${version}.zip": source => $jce_download, - cookie => $cookie, extract => true, extract_path => $jce_path, extract_flags => '-oj', creates => "${jce_path}/US_export_policy.jar", + username => $jce_username, + password => $jce_password, cleanup => false, proxy_server => $proxy_server, proxy_type => $proxy_type, require => [ Package['unzip'], Exec["Install Oracle java_se ${java_se} ${version} ${release_major} ${release_minor}"] - ] + ], } } } @@ -363,4 +348,4 @@ notice ("Action ${ensure} not supported.") } } -} \ No newline at end of file +} diff --git a/manifests/init.pp b/manifests/init.pp index f93f1d73..ce5dcb9a 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -35,18 +35,18 @@ # The path to where the JRE is installed. This will be set as an # environment variable. # -class java( - 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 +class java ( + 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 + contain java::params - $default_package_name = has_key($java::params::java, $distribution) ? { + $default_package_name = $distribution in $java::params::java ? { false => undef, default => $java::params::java[$distribution]['package'], } @@ -56,14 +56,13 @@ default => $package, } - ## Weird logic........ ## If $java_alternative is set, use that. ## Elsif the DEFAULT package is being used, then use $default_alternative. ## Else undef $use_java_alternative = $java_alternative ? { undef => $use_java_package_name ? { - $default_package_name => has_key($java::params::java, $distribution) ? { + $default_package_name => $distribution in $java::params::java ? { default => $java::params::java[$distribution]['alternative'], false => undef, }, @@ -75,9 +74,9 @@ ## Same logic as $java_alternative above. $use_java_alternative_path = $java_alternative_path ? { undef => $use_java_package_name ? { - $default_package_name => has_key($java::params::java, $distribution) ? { - default => $java::params::java[$distribution]['alternative_path'], - false => undef, + $default_package_name => $distribution in $java::params::java ? { + default => $java::params::java[$distribution]['alternative_path'], + false => undef, }, default => undef, }, @@ -86,7 +85,7 @@ $use_java_home = $java_home ? { undef => $use_java_package_name ? { - $default_package_name => has_key($java::params::java, $distribution) ? { + $default_package_name => $distribution in $java::params::java ? { default => $java::params::java[$distribution]['java_home'], false => undef, }, @@ -101,8 +100,8 @@ $use_java_package_name == undef or $use_java_alternative == undef or $use_java_alternative_path == undef or $use_java_home == undef ) and ( - ! has_key($::java::params::java, $distribution) - )) { + !($distribution in $java::params::java) + )) { fail("Java distribution ${distribution} is not supported. Missing default values.") } @@ -111,7 +110,20 @@ default => '--jre' } - if $::osfamily == 'Debian' { + # TEMPORARY FIX: If no repos are configured on SLES, add openSUSE Leap as fallback + # This workaround is needed because GCP-provisioned SLES images are unregistered BYOS + # without any package repositories configured. Remove this once proper PAYG images are used. + if ($facts['os']['family'] in ['SLES', 'SUSE']) { + exec { 'Configure zypper repo for SLES': + path => '/bin:/usr/bin:/sbin:/usr/sbin', + command => 'zypper --non-interactive --gpg-auto-import-keys ar http://download.opensuse.org/distribution/leap/15.6/repo/oss/ opensuse-leap-fallback && zypper --non-interactive --gpg-auto-import-keys refresh', + unless => "zypper lr 2>/dev/null | grep -q 'opensuse-leap-fallback\\|http'", + logoutput => true, + } + -> Package['java'] + } + + if $facts['os']['family'] == 'Debian' { # Needed for update-java-alternatives package { 'java-common': ensure => present, @@ -119,13 +131,10 @@ } } - anchor { 'java::begin:': } - -> package { 'java': + package { 'java': ensure => $version, install_options => $package_options, name => $use_java_package_name, } -> class { 'java::config': } - -> anchor { 'java::end': } - } diff --git a/manifests/params.pp b/manifests/params.pp index dd19a0ba..708d3e6f 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -5,52 +5,36 @@ # # @api private class java::params { - - case $::osfamily { + case $facts['os']['family'] { 'RedHat': { - case $::operatingsystem { - 'RedHat', 'CentOS', 'OracleLinux', 'Scientific', 'OEL', 'SLC', 'CloudLinux': { - if (versioncmp($::operatingsystemrelease, '5.0') < 0) { - $jdk_package = 'java-1.6.0-sun-devel' - $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/' - } + case $facts['os']['name'] { + 'AlmaLinux', 'Rocky', 'RedHat', 'CentOS', 'OracleLinux', 'Scientific', 'OEL', 'SLC', 'CloudLinux': { # 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/' - } - 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/' + if (versioncmp($facts['os']['release']['full'], '7.1') < 0) { + $openjdk = '1.7.0' + } else { + $openjdk = '1.8.0' } + $jdk_package = "java-${openjdk}-openjdk-devel" + $jre_package = "java-${openjdk}-openjdk" + $java_home = "/usr/lib/jvm/java-${openjdk}/" } 'Fedora': { - if (versioncmp($::operatingsystemrelease, '21') < 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}/" - } - 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}/" + if (versioncmp($facts['os']['release']['full'], '21') < 0) { + $openjdk = '1.7.0' + } else { + $openjdk = '1.8.0' } + $jdk_package = "java-${openjdk}-openjdk-devel" + $jre_package = "java-${openjdk}-openjdk" + $java_home = "/usr/lib/jvm/java-${openjdk}-openjdk-${facts['os']['architecture']}/" } 'Amazon': { $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-openjdk-${facts['os']['architecture']}/" } - default: { fail("unsupported os ${::operatingsystem}") } + default: { fail("unsupported os ${facts['os']['name']}") } } $java = { 'jdk' => { @@ -64,129 +48,37 @@ } } 'Debian': { - $oracle_architecture = $::architecture ? { + $oracle_architecture = $facts['os']['architecture'] ? { 'amd64' => 'x64', - default => $::architecture + default => $facts['os']['architecture'] } - $openjdk_architecture = $::architecture ? { + $openjdk_architecture = $facts['os']['architecture'] ? { 'aarch64' => 'arm64', 'armv7l' => 'armhf', - default => $::architecture + default => $facts['os']['architecture'] } - case $::lsbdistcodename { - 'lenny', 'squeeze', 'lucid', 'natty': { - $java = { - 'jdk' => { - 'package' => 'openjdk-6-jdk', - 'alternative' => "java-6-openjdk-${openjdk_architecture}", - 'alternative_path' => '/usr/lib/jvm/java-6-openjdk/jre/bin/java', - 'java_home' => '/usr/lib/jvm/java-6-openjdk/jre/', - }, - 'jre' => { - 'package' => 'openjdk-6-jre-headless', - 'alternative' => "java-6-openjdk-${openjdk_architecture}", - 'alternative_path' => '/usr/lib/jvm/java-6-openjdk/jre/bin/java', - 'java_home' => '/usr/lib/jvm/java-6-openjdk/jre/', - }, - 'sun-jre' => { - 'package' => 'sun-java6-jre', - 'alternative' => 'java-6-sun', - 'alternative_path' => '/usr/lib/jvm/java-6-sun/jre/bin/java', - 'java_home' => '/usr/lib/jvm/java-6-sun/jre/', - }, - 'sun-jdk' => { - 'package' => 'sun-java6-jdk', - 'alternative' => 'java-6-sun', - 'alternative_path' => '/usr/lib/jvm/java-6-sun/jre/bin/java', - 'java_home' => '/usr/lib/jvm/java-6-sun/jre/', - }, - } - } - 'wheezy', 'jessie', 'precise', 'quantal', 'raring', 'saucy', 'trusty', 'utopic': { - $java = { - 'jdk' => { - 'package' => 'openjdk-7-jdk', - 'alternative' => "java-1.7.0-openjdk-${openjdk_architecture}", - 'alternative_path' => "/usr/lib/jvm/java-1.7.0-openjdk-${openjdk_architecture}/bin/java", - 'java_home' => "/usr/lib/jvm/java-1.7.0-openjdk-${openjdk_architecture}/", - }, - 'jre' => { - 'package' => 'openjdk-7-jre-headless', - 'alternative' => "java-1.7.0-openjdk-${::architecture}", - 'alternative_path' => "/usr/lib/jvm/java-1.7.0-openjdk-${openjdk_architecture}/bin/java", - 'java_home' => "/usr/lib/jvm/java-1.7.0-openjdk-${openjdk_architecture}/", - }, - 'oracle-jre' => { - 'package' => 'oracle-j2re1.7', - 'alternative' => 'j2re1.7-oracle', - 'alternative_path' => '/usr/lib/jvm/j2re1.7-oracle/bin/java', - 'java_home' => '/usr/lib/jvm/j2re1.7-oracle/', - }, - 'oracle-jdk' => { - 'package' => 'oracle-j2sdk1.7', - 'alternative' => 'j2sdk1.7-oracle', - 'alternative_path' => '/usr/lib/jvm/j2sdk1.7-oracle/jre/bin/java', - 'java_home' => '/usr/lib/jvm/j2sdk1.7-oracle/jre/', - }, - 'oracle-j2re' => { - 'package' => 'oracle-j2re1.8', - 'alternative' => 'j2re1.8-oracle', - 'alternative_path' => '/usr/lib/jvm/j2re1.8-oracle/bin/java', - 'java_home' => '/usr/lib/jvm/j2re1.8-oracle/', - }, - 'oracle-j2sdk' => { - 'package' => 'oracle-j2sdk1.8', - 'alternative' => 'j2sdk1.8-oracle', - 'alternative_path' => '/usr/lib/jvm/j2sdk1.8-oracle/bin/java', - 'java_home' => '/usr/lib/jvm/j2sdk1.8-oracle/', - }, - 'oracle-java8-jre' => { - 'package' => 'oracle-java8-jre', - 'alternative' => "jre-8-oracle-${oracle_architecture}", - 'alternative_path' => "/usr/lib/jvm/jre-8-oracle-${oracle_architecture}/bin/java", - 'java_home' => "/usr/lib/jvm/jre-8-oracle-${oracle_architecture}/", - }, - 'oracle-java8-jdk' => { - 'package' => 'oracle-java8-jdk', - 'alternative' => "jdk-8-oracle-${oracle_architecture}", - 'alternative_path' => "/usr/lib/jvm/jdk-8-oracle-${oracle_architecture}/bin/java", - 'java_home' => "/usr/lib/jvm/jdk-8-oracle-${oracle_architecture}/", - }, - } + case $facts['os']['release']['major'] { + '12', '24.04': { + $openjdk = 17 } - 'stretch', 'vivid', 'wily', 'xenial', 'yakkety', 'zesty', 'artful': { - $java = { - 'jdk' => { - 'package' => 'openjdk-8-jdk', - 'alternative' => "java-1.8.0-openjdk-${openjdk_architecture}", - 'alternative_path' => "/usr/lib/jvm/java-1.8.0-openjdk-${openjdk_architecture}/bin/java", - 'java_home' => "/usr/lib/jvm/java-1.8.0-openjdk-${openjdk_architecture}/", - }, - 'jre' => { - 'package' => 'openjdk-8-jre-headless', - 'alternative' => "java-1.8.0-openjdk-${openjdk_architecture}", - 'alternative_path' => "/usr/lib/jvm/java-1.8.0-openjdk-${openjdk_architecture}/bin/java", - 'java_home' => "/usr/lib/jvm/java-1.8.0-openjdk-${openjdk_architecture}/", - } - } - } - 'bionic', 'cosmic', 'disco', 'eoan': { - $java = { - 'jdk' => { - 'package' => 'openjdk-11-jdk', - 'alternative' => "java-1.11.0-openjdk-${openjdk_architecture}", - 'alternative_path' => "/usr/lib/jvm/java-1.11.0-openjdk-${openjdk_architecture}/bin/java", - 'java_home' => "/usr/lib/jvm/java-1.11.0-openjdk-${openjdk_architecture}/", - }, - 'jre' => { - 'package' => 'openjdk-11-jre-headless', - 'alternative' => "java-1.11.0-openjdk-${openjdk_architecture}", - 'alternative_path' => "/usr/lib/jvm/java-1.11.0-openjdk-${openjdk_architecture}/bin/java", - 'java_home' => "/usr/lib/jvm/java-1.11.0-openjdk-${openjdk_architecture}/", - } - } + '10', '11', '18.04', '18.10', '19.04', '19.10', '20.04', '22.04': { + $openjdk = 11 } - default: { fail("unsupported release ${::lsbdistcodename}") } + default: { fail("unsupported release ${facts['os']['release']['major']}") } + } + $java = { + 'jdk' => { + 'package' => "openjdk-${openjdk}-jdk", + 'alternative' => "java-1.${openjdk}.0-openjdk-${openjdk_architecture}", + 'alternative_path' => "/usr/lib/jvm/java-1.${openjdk}.0-openjdk-${openjdk_architecture}/bin/java", + 'java_home' => "/usr/lib/jvm/java-1.${openjdk}.0-openjdk-${openjdk_architecture}/", + }, + 'jre' => { + 'package' => "openjdk-${openjdk}-jre-headless", + 'alternative' => "java-1.${openjdk}.0-openjdk-${openjdk_architecture}", + 'alternative_path' => "/usr/lib/jvm/java-1.${openjdk}.0-openjdk-${openjdk_architecture}/bin/java", + 'java_home' => "/usr/lib/jvm/java-1.${openjdk}.0-openjdk-${openjdk_architecture}/", + }, } } 'OpenBSD': { @@ -226,17 +118,17 @@ } } 'Suse': { - case $::operatingsystem { + case $facts['os']['name'] { 'SLES': { - if (versioncmp($::operatingsystemrelease, '12.1') >= 0) { + if (versioncmp($facts['os']['release']['full'], '12.1') >= 0) { $jdk_package = 'java-1_8_0-openjdk-devel' $jre_package = 'java-1_8_0-openjdk' $java_home = '/usr/lib64/jvm/java-1.8.0-openjdk-1.8.0/' - } elsif (versioncmp($::operatingsystemrelease, '12') >= 0) { + } elsif (versioncmp($facts['os']['release']['full'], '12') >= 0) { $jdk_package = 'java-1_7_0-openjdk-devel' $jre_package = 'java-1_7_0-openjdk' $java_home = '/usr/lib64/jvm/java-1.7.0-openjdk-1.7.0/' - } elsif (versioncmp($::operatingsystemrelease, '11.4') >= 0) { + } elsif (versioncmp($facts['os']['release']['full'], '11.4') >= 0) { $jdk_package = 'java-1_7_1-ibm-devel' $jre_package = 'java-1_7_1-ibm' $java_home = '/usr/lib64/jvm/java-1.7.1-ibm-1.7.1/' @@ -283,6 +175,6 @@ }, } } - default: { fail("unsupported platform ${::osfamily}") } + default: { fail("unsupported platform ${facts['os']['family']}") } } } diff --git a/manifests/sap.pp b/manifests/sap.pp new file mode 100644 index 00000000..05618be4 --- /dev/null +++ b/manifests/sap.pp @@ -0,0 +1,221 @@ +# Defined Type java::sap +# +# @summary +# Install one or more versions of SAPJVM or Sapmachine +# +# @param ensure +# Install or remove the package. +# +# @param version +# Version of Java to install, e.g. '8' or '9'. Default values for full versions will be used. +# +# @param version_full +# Major version which should be installed, e.g. '8.1.063' or '11.0.7'. If used, "version" parameter is ignored. +# +# @param java +# Type of Java Edition to install, jdk or jre. +# +# @param proxy_server +# Specify a proxy server, with port number if needed. ie: https://example.com:8080. (passed to archive) +# +# @param proxy_type +# Proxy server type (none|http|https|ftp). (passed to archive) +# +# @param basedir +# Directory under which the installation will occur. If not set, defaults to +# /usr/lib/jvm for Debian and /usr/java for RedHat. +# +# @param manage_basedir +# Whether to manage the basedir directory. +# Note: /usr/lib/jvm is managed for Debian by default, separate from this parameter. +# +# @param manage_symlink +# Whether to manage a symlink that points to the installation directory. Defaults to false. +# +# @param symlink_name +# The name for the optional symlink in the installation directory. +# +define java::sap ( + Enum['present'] $ensure = 'present', + String[1] $version = '8', + Optional[String] $version_full = undef, + String[1] $java = 'jdk', + Optional[String] $proxy_server = undef, + Optional[Enum['none', 'http', 'https', 'ftp']] $proxy_type = undef, + Optional[String] $basedir = undef, + Boolean $manage_basedir = true, + Boolean $manage_symlink = false, + Optional[String] $symlink_name = undef, +) { + # archive module is used to download the java package + include archive + + # validate java edition to download + if $java !~ /(jre|jdk)/ { + fail('java must be either jre or jdk.') + } + + # determine version and installation path + if $version_full { + $_version_array = $version_full.scanf('%i') + $_version_int = $_version_array[0] + $_version_full = $version_full + } else { + $_version = $version + $_version_int = Numeric($_version) + # use default versions if full version parameter is not provided + case $version { + '7' : { + $_version_full = '7.1.072' + if ($java != 'jdk') { + fail('java parameter is not jdk. jre is not supported on version 7') + } + } + '8' : { + $_version_full = '8.1.065' + if ($java != 'jdk') { + fail('java parameter is not jdk. jre is not supported on version 8') + } + } + '11' : { + $_version_full = '11.0.7' + } + '14' : { + $_version_full = '14.0.1' + } + default : { + fail("${version} not yet supported by module") + } + } + } + + # extracted folders look like this: + # sapjvm_8 + # sapmachine-jdk-11.0.7 + if ($_version_int == 7 or $_version_int == 8) { + $_creates_folder = "sapjvm_${_version_int}" + } else { + $_creates_folder = "sapmachine-${java}-${_version_full}" + } + + # determine destination directory based on OS + case $facts['kernel'] { + 'Linux' : { + case $facts['os']['family'] { + 'RedHat', 'Amazon' : { + if $basedir { + $_basedir = $basedir + } else { + $_basedir = '/usr/java' + } + } + 'Debian' : { + if $basedir { + $_basedir = $basedir + } else { + $_basedir = '/usr/lib/jvm' + } + } + default : { + fail ("unsupported os family ${$facts['os']['name']}") + } + } + $creates_path = "${_basedir}/${_creates_folder}" + } + default : { + fail ( "unsupported platform ${$facts['kernel']}" ) + } + } + + $_os_architecture = $facts['os']['architecture'] ? { + default => $facts['os']['architecture'] + } + + if ($_os_architecture != 'x86_64' and $_os_architecture != 'amd64') { + fail ("unsupported platform ${_os_architecture}") + } + + # download links look like this (examples): + # https://tools.hana.ondemand.com/additional/sapjvm-8.1.065-linux-x64.zip + # https://github.com/SAP/SapMachine/releases/download/sapmachine-11.0.7/sapmachine-jre-11.0.7_linux-x64_bin.tar.gz + # https://github.com/SAP/SapMachine/releases/download/sapmachine-11.0.7/sapmachine-jdk-11.0.7_linux-x64_bin.tar.gz + # https://github.com/SAP/SapMachine/releases/download/sapmachine-14.0.1/sapmachine-jdk-14.0.1_linux-x64_bin.tar.gz + + # cookie is currently at version 3.1, but may be changed one day. It is only required for download at SAP. + # by using this module you agree with the EULA presented at tools.hana.ondemand.com download page! + # Github does not require it + + if ( $_version_int == 7 or $_version_int == 8 ) { + # sapjvm download + $archive_filename = "sapjvm-${_version_full}-linux-x64.zip" + $source = "https://tools.hana.ondemand.com/additional/${archive_filename}" + $cookie = 'eula_3_1_agreed=tools.hana.ondemand.com/developer-license-3_1.txt' + + if (!defined(Package['unzip'])) { + package { 'unzip': + ensure => 'present', + before => Archive["/tmp/${archive_filename}"], + } + } + } else { + $archive_filename = "sapmachine-${java}-${_version_full}_linux-x64_bin.tar.gz" + $source = "https://github.com/SAP/SapMachine/releases/download/sapmachine-${_version_full}/${archive_filename}" + $cookie = undef + + if (!defined(Package['tar'])) { + package { 'tar': + ensure => 'present', + before => Archive["/tmp/${archive_filename}"], + } + } + if (!defined(Package['gzip'])) { + package { 'gzip': + ensure => 'present', + before => Archive["/tmp/${archive_filename}"], + } + } + } + + case $ensure { + 'present' : { + case $facts['kernel'] { + 'Linux' : { + if ($manage_basedir or $facts['os']['family'] == 'Debian') { + if (!defined(File[$_basedir])) { + file { $_basedir: + ensure => 'directory', + before => Archive["/tmp/${archive_filename}"], + } + } + } + + archive { "/tmp/${archive_filename}" : + ensure => present, + source => $source, + extract => true, + extract_path => $_basedir, + cleanup => false, + creates => $creates_path, + cookie => $cookie, + proxy_server => $proxy_server, + proxy_type => $proxy_type, + } + + if ($manage_symlink and $symlink_name) { + file { "${_basedir}/${symlink_name}": + ensure => link, + target => $creates_path, + require => Archive["/tmp/${archive_filename}"], + } + } + } + default : { + fail ("unsupported platform ${$facts['kernel']}") + } + } + } + default : { + notice ("Action ${ensure} not supported.") + } + } +} diff --git a/metadata.json b/metadata.json index 9a526cc5..81a4315e 100644 --- a/metadata.json +++ b/metadata.json @@ -1,84 +1,89 @@ { "name": "puppetlabs-java", - "version": "4.1.0", + "version": "11.2.0", "author": "puppetlabs", "summary": "Installs the correct Java package on various platforms.", "license": "Apache-2.0", "source": "git://github.com/puppetlabs/puppetlabs-java", "project_page": "https://github.com/puppetlabs/puppetlabs-java", - "issues_url": "https://tickets.puppet.com/CreateIssueDetails!init.jspa?pid=10707&issuetype=1&team=Modules&customfield_14200=14302&labels=triage&customfield_10005=2147&summary=Issue+found+with+module%3A+puppetlabs-java", + "issues_url": "https://github.com/puppetlabs/puppetlabs-java/issues", "dependencies": [ { "name": "puppetlabs/stdlib", - "version_requirement": ">= 4.13.1 < 7.0.0" + "version_requirement": ">= 4.13.1 < 10.0.0" }, { "name": "puppet/archive", - "version_requirement": ">= 1.1.0 < 5.0.0" + "version_requirement": ">= 1.1.0 < 9.0.0" } ], "operatingsystem_support": [ { "operatingsystem": "RedHat", "operatingsystemrelease": [ - "5", - "6", "7", - "8" + "8", + "9" ] }, { "operatingsystem": "CentOS", "operatingsystemrelease": [ - "5", - "6", - "7" + "7", + "8", + "9" ] }, { "operatingsystem": "OracleLinux", "operatingsystemrelease": [ - "6", "7" ] }, - { - "operatingsystem": "Scientific", - "operatingsystemrelease": [ - "6" - ] - }, { "operatingsystem": "Debian", "operatingsystemrelease": [ - "8", - "9" + "10", + "11", + "12" ] }, { "operatingsystem": "Ubuntu", "operatingsystemrelease": [ - "14.04", - "16.04", - "18.04" + "18.04", + "20.04", + "22.04", + "24.04" ] }, { "operatingsystem": "SLES", "operatingsystemrelease": [ - "11", "12", "15" ] + }, + { + "operatingsystem": "Rocky", + "operatingsystemrelease": [ + "8" + ] + }, + { + "operatingsystem": "AlmaLinux", + "operatingsystemrelease": [ + "8" + ] } ], "requirements": [ { "name": "puppet", - "version_requirement": ">= 5.5.10 < 7.0.0" + "version_requirement": ">= 8.0.0 < 9.0.0" } ], - "template-url": "https://github.com/puppetlabs/pdk-templates#master", - "template-ref": "heads/master-0-g7827fc2", - "pdk-version": "1.10.0" + "template-url": "https://github.com/puppetlabs/pdk-templates.git#main", + "template-ref": "tags/3.5.1-0-g9d5b193", + "pdk-version": "3.5.0" } diff --git a/pdk.yaml b/pdk.yaml new file mode 100644 index 00000000..4bef4bd0 --- /dev/null +++ b/pdk.yaml @@ -0,0 +1,2 @@ +--- +ignore: [] diff --git a/provision.yaml b/provision.yaml new file mode 100644 index 00000000..3c152f17 --- /dev/null +++ b/provision.yaml @@ -0,0 +1,63 @@ +--- +default: + provisioner: docker + images: + - litmusimage/debian:8 +vagrant: + provisioner: vagrant + images: + - centos/7 + - generic/ubuntu1804 +docker_deb: + provisioner: docker + images: + - litmusimage/debian:9 + - litmusimage/debian:10 +docker_ub_6: + provisioner: docker + images: + - litmusimage/ubuntu:18.04 + - litmusimage/ubuntu:20.04 +docker_el7: + provisioner: docker + images: + - litmusimage/centos:7 + - litmusimage/oraclelinux:7 + - litmusimage/scientificlinux:7 +docker_el8: + provisioner: docker + images: + - litmusimage/centos:8 +release_checks_6: + provisioner: abs + images: + - redhat-6-x86_64 + - redhat-7-x86_64 + - redhat-8-x86_64 + - centos-6-x86_64 + - centos-7-x86_64 + - centos-8-x86_64 + - oracle-6-x86_64 + - oracle-7-x86_64 + - scientific-6-x86_64 + - scientific-7-x86_64 + - debian-9-x86_64 + - debian-10-x86_64 + - ubuntu-1804-x86_64 + - ubuntu-2004-x86_64 + - sles-12-x86_64 + - sles-15-x86_64 +release_checks_7: + provisioner: abs + images: + - redhat-7-x86_64 + - redhat-8-x86_64 + - centos-7-x86_64 + - centos-8-x86_64 + - oracle-7-x86_64 + - debian-9-x86_64 + - debian-10-x86_64 + - ubuntu-1804-x86_64 + - ubuntu-2004-x86_64 + - sles-12-x86_64 + - sles-15-x86_64 diff --git a/spec/acceptance/install_spec.rb b/spec/acceptance/install_spec.rb index 54411fb0..6e3a1d3f 100644 --- a/spec/acceptance/install_spec.rb +++ b/spec/acceptance/install_spec.rb @@ -1,54 +1,47 @@ -require 'spec_helper_acceptance' +# frozen_string_literal: true -include Unix::File +require 'spec_helper_acceptance' +require 'pry' -java_class_jre = "class { 'java':\n"\ - " distribution => 'jre',\n"\ +java_class_jre = "class { 'java':\n " \ + "distribution => 'jre',\n" \ '}' java_class = "class { 'java': }" -_sources = "file_line { 'non-free source':\n"\ - " path => '/etc/apt/sources.list',\n"\ - " match => \"deb http://osmirror.delivery.puppetlabs.net/debian/ ${::lsbdistcodename} main\",\n"\ - " line => \"deb http://osmirror.delivery.puppetlabs.net/debian/ ${::lsbdistcodename} main non-free\",\n"\ - '}' - -_sun_jre = "class { 'java':\n"\ - " distribution => 'sun-jre',\n"\ - '}' - -_sun_jdk = "class { 'java':\n"\ - " distribution => 'sun-jdk',\n"\ - '}' +_sources = "file_line { 'non-free source':\n " \ + "path => '/etc/apt/sources.list',\n " \ + "match => \"deb http://osmirror.delivery.puppetlabs.net/debian/ ${::lsbdistcodename} main\",\n " \ + "line => \"deb http://osmirror.delivery.puppetlabs.net/debian/ ${::lsbdistcodename} main non-free\",\n" \ + '}' -oracle_jre = "class { 'java':\n"\ - " distribution => 'oracle-jre',\n"\ - '}' +_sun_jre = "class { 'java':\n " \ + "distribution => 'sun-jre',\n" \ + '}' -oracle_jdk = "class { 'java':\n"\ - " distribution => 'oracle-jdk',\n"\ - '}' +_sun_jdk = "class { 'java':\n " \ + "distribution => 'sun-jdk',\n" \ + '}' -blank_version = "class { 'java':\n"\ - " version => '',\n"\ +blank_version = "class { 'java':\n " \ + "version => '',\n" \ '}' -incorrect_distro = "class { 'java':\n"\ - " distribution => 'xyz',\n"\ +incorrect_distro = "class { 'java':\n " \ + "distribution => 'xyz',\n" \ '}' -blank_distro = "class { 'java':\n"\ - " distribution => '',\n"\ +blank_distro = "class { 'java':\n " \ + "distribution => '',\n" \ '}' -incorrect_package = "class { 'java':\n"\ - " package => 'xyz',\n"\ +incorrect_package = "class { 'java':\n " \ + "package => 'xyz',\n" \ '}' -bogus_alternative = "class { 'java':\n"\ - " java_alternative => 'whatever',\n"\ - " java_alternative_path => '/whatever',\n"\ +bogus_alternative = "class { 'java':\n " \ + "java_alternative => 'whatever',\n " \ + "java_alternative_path => '/whatever',\n" \ '}' # Oracle installs are disabled by default, because the links to valid oracle installations @@ -61,7 +54,7 @@ oracle_version_build = '09' oracle_hash = '42970487e3af4f5aa5bca3f542482c60' -install_oracle_jdk_jre = < '#{oracle_version_major}', @@ -78,9 +71,9 @@ url_hash => '#{oracle_hash}', java_se => 'jdk', } -EOL +MANIFEST -install_oracle_jre_jce = < '#{oracle_version_major}', @@ -91,9 +84,9 @@ jce => true, } -EOL +MANIFEST -install_oracle_jdk_jce = < '#{oracle_version_major}', @@ -103,91 +96,224 @@ java_se => 'jdk', jce => true, } -EOL +MANIFEST + +# AdoptOpenJDK URLs are quite generic, so tests are enabled by default +# We need to test version 8 and >8 (here we use 9), because namings are different after version 8 + +adopt_enabled = true unless os[:family].casecmp('SLES').zero? +adopt_version8_major = '8' +adopt_version8_minor = '202' +adopt_version8_build = '08' +adopt_version9_major = '9' +adopt_version9_full = '9.0.4' +adopt_version9_build = '11' + +install_adopt_jdk_jre = < '#{adopt_version8_major}', + version_major => '#{adopt_version8_major}u#{adopt_version8_minor}', + version_minor => 'b#{adopt_version8_build}', + java => 'jre', + } + java::adopt { + 'test_adopt_jdk_version8': + version => '#{adopt_version8_major}', + version_major => '#{adopt_version8_major}u#{adopt_version8_minor}', + version_minor => 'b#{adopt_version8_build}', + java => 'jdk', + } + java::adopt { + 'test_adopt_jre_version9': + version => '#{adopt_version9_major}', + version_major => '#{adopt_version9_full}', + version_minor => '#{adopt_version9_build}', + java => 'jre', + } + java::adopt { + 'test_adopt_jdk_version9': + version => '#{adopt_version9_major}', + version_major => '#{adopt_version9_full}', + version_minor => '#{adopt_version9_build}', + java => 'jdk', + } +MANIFEST -context 'installing java jre', unless: UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do - it 'installs jre' do - idempotent_apply(default, java_class_jre) - end -end +# Adoptium -context 'installing java jdk', unless: UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do - it 'installs jdk' do - idempotent_apply(default, java_class) - end -end +adoptium_enabled = true unless os[:family].casecmp('SLES').zero? -context 'oracle', if: ( - (fact('operatingsystem') == 'Ubuntu') && fact('operatingsystemrelease').match(%r{^14\.04}) -) do - # not supported - # The package is not available from any sources, but if a customer - # custom-builds the package using java-package and adds it to a local - # repository, that is the intention of this version ability - describe 'jre' do - it 'installs oracle-jre' do - apply_manifest(oracle_jre, expect_failures: true) +install_adoptium_jdk = < '16', + version_minor => '0', + version_patch => '2', + version_build => '7', + } + java::adoptium { + 'test_adoptium_jdk_version17': + version_major => '17', + version_minor => '0', + version_patch => '1', + version_build => '12', + } +MANIFEST + +sap_enabled = true +sap_version7 = '7' +sap_version7_full = '7.1.072' +sap_version8 = '8' +sap_version8_full = '8.1.065' +sap_version11 = '11' +sap_version11_full = '11.0.7' +sap_version14 = '14' +sap_version14_full = '14.0.1' + +install_sap_jdk_jre = < '#{sap_version7}', + version_full => '#{sap_version7_full}', + java => 'jdk', + } + java::sap { + 'test_sap_jdk_version8': + version => '#{sap_version8}', + version_full => '#{sap_version8_full}', + java => 'jdk', + } + java::sap { + 'test_sap_jre_version11': + version => '#{sap_version11}', + version_full => '#{sap_version11_full}', + java => 'jre', + } + java::sap { + 'test_sap_jdk_version11': + version => '#{sap_version11}', + version_full => '#{sap_version11_full}', + java => 'jdk', + } + java::sap { + 'test_sap_jre_version14': + version => '#{sap_version14}', + version_full => '#{sap_version14_full}', + java => 'jre', + } + java::sap { + 'test_sap_jdk_version14': + version => '#{sap_version14}', + version_full => '#{sap_version14_full}', + java => 'jdk', + } +MANIFEST + +describe 'installing' do + context 'when installing java jre' do + it 'installs jre' do + idempotent_apply(java_class_jre) end end - describe 'jdk' do - it 'installs oracle-jdk' do - apply_manifest(oracle_jdk, expect_failures: true) + + context 'when installing java jdk' do + it 'installs jdk' do + idempotent_apply(java_class) end end -end -context 'with failure cases' do - it 'fails to install java with a blank version' do - apply_manifest(blank_version, expect_failures: true) - end + context 'when with failure cases' do + it 'fails to install java with a blank version' do + apply_manifest(blank_version, expect_failures: true) + end - it 'fails to install java with an incorrect distribution' do - apply_manifest(incorrect_distro, expect_failures: true) - end + it 'fails to install java with an incorrect distribution' do + apply_manifest(incorrect_distro, expect_failures: true) + end - it 'fails to install java with a blank distribution' do - apply_manifest(blank_distro, expect_failures: true) - end + it 'fails to install java with a blank distribution' do + apply_manifest(blank_distro, expect_failures: true) + end - it 'fails to install java with an incorrect package' do - apply_manifest(incorrect_package, expect_failures: true) - end + it 'fails to install java with an incorrect package' do + apply_manifest(incorrect_package, expect_failures: true) + end - it 'fails on debian or RHEL when passed fake java_alternative and path' do - if fact('osfamily') == 'Debian' || fact('osfamily') == 'RedHat' - apply_manifest(bogus_alternative, expect_failures: true) - else - apply_manifest(bogus_alternative, catch_failures: true) + it 'fails on debian or RHEL when passed fake java_alternative and path' do + if os[:family] == 'sles' + apply_manifest(bogus_alternative, catch_failures: true) + else + apply_manifest(bogus_alternative, expect_failures: true) + end end end -end -context 'java::oracle', if: oracle_enabled, unless: UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do - let(:install_path) do - (fact('osfamily') == 'RedHat') ? '/usr/java' : '/usr/lib/jvm' - end + context 'when java::oracle', if: oracle_enabled, unless: UNSUPPORTED_PLATFORMS.include?(os[:family]) do + let(:install_path) do + (os[:family] == 'redhat') ? '/usr/java' : '/usr/lib/jvm' + end - let(:version_suffix) do - (fact('osfamily') == 'RedHat') ? '-amd64' : '' + let(:version_suffix) do + (os[:family] == 'redhat') ? '-amd64' : '' + end + + it 'installs oracle jdk and jre' do + idempotent_apply(install_oracle_jdk_jre) + jdk_result = shell("test ! -e #{install_path}/jdk1.#{oracle_version_major}.0_#{oracle_version_minor}#{version_suffix}/jre/lib/security/local_policy.jar") + jre_result = shell("test ! -e #{install_path}/jre1.#{oracle_version_major}.0_#{oracle_version_minor}#{version_suffix}/lib/security/local_policy.jar") + expect(jdk_result.exit_code).to eq(0) + expect(jre_result.exit_code).to eq(0) + end + + it 'installs oracle jdk with jce' do + idempotent_apply(install_oracle_jdk_jce) + result = shell("test -e #{install_path}/jdk1.#{oracle_version_major}.0_#{oracle_version_minor}#{version_suffix}/jre/lib/security/local_policy.jar") + expect(result.exit_code).to eq(0) + end + + it 'installs oracle jre with jce' do + idempotent_apply(install_oracle_jre_jce) + result = shell("test -e #{install_path}/jre1.#{oracle_version_major}.0_#{oracle_version_minor}#{version_suffix}/lib/security/local_policy.jar") + expect(result.exit_code).to eq(0) + end end - it 'installs oracle jdk and jre' do - idempotent_apply(default, install_oracle_jdk_jre) - jdk_result = shell("test ! -e #{install_path}/jdk1.#{oracle_version_major}.0_#{oracle_version_minor}#{version_suffix}/jre/lib/security/local_policy.jar") - jre_result = shell("test ! -e #{install_path}/jre1.#{oracle_version_major}.0_#{oracle_version_minor}#{version_suffix}/lib/security/local_policy.jar") - expect(jdk_result.exit_code).to eq(0) - expect(jre_result.exit_code).to eq(0) + context 'when java::adopt', if: adopt_enabled, unless: UNSUPPORTED_PLATFORMS.include?(os[:family]) do + let(:install_path) do + (os[:family] == 'redhat') ? '/usr/java' : '/usr/lib/jvm' + end + + let(:version_suffix) do + (os[:family] == 'redhat') ? '-amd64' : '' + end + + it 'installs adopt jdk and jre' do + idempotent_apply(install_adopt_jdk_jre) + end end - it 'installs oracle jdk with jce' do - idempotent_apply(default, install_oracle_jdk_jce) - result = shell("test -e #{install_path}/jdk1.#{oracle_version_major}.0_#{oracle_version_minor}#{version_suffix}/jre/lib/security/local_policy.jar") - expect(result.exit_code).to eq(0) + context 'when java::adoptium', if: adoptium_enabled, unless: UNSUPPORTED_PLATFORMS.include?(os[:family]) do + let(:install_path) do + (os[:family] == 'redhat') ? '/usr/java' : '/usr/lib/jvm' + end + + let(:version_suffix) do + (os[:family] == 'redhat') ? '-amd64' : '' + end + + it 'installs adopt jdk and jre' do + idempotent_apply(install_adoptium_jdk) + end end - it 'installs oracle jre with jce' do - idempotent_apply(default, install_oracle_jre_jce) - result = shell("test -e #{install_path}/jre1.#{oracle_version_major}.0_#{oracle_version_minor}#{version_suffix}/lib/security/local_policy.jar") - expect(result.exit_code).to eq(0) + context 'when java::sap', if: sap_enabled && ['Sles'].include?(os[:family]), unless: UNSUPPORTED_PLATFORMS.include?(os[:family]) do + let(:install_path) do + (os[:family] == 'redhat') ? '/usr/java' : '/usr/lib/jvm' + end + + it 'installs adopt jdk and jre' do + idempotent_apply(install_sap_jdk_jre) + end end end diff --git a/spec/acceptance/nodesets/centos-7-x64.yml b/spec/acceptance/nodesets/centos-7-x64.yml deleted file mode 100644 index 5eebdefb..00000000 --- a/spec/acceptance/nodesets/centos-7-x64.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - centos-7-x64: - roles: - - agent - - default - platform: el-7-x86_64 - hypervisor: vagrant - box: puppetlabs/centos-7.2-64-nocm -CONFIG: - type: foss diff --git a/spec/acceptance/nodesets/debian-8-x64.yml b/spec/acceptance/nodesets/debian-8-x64.yml deleted file mode 100644 index fef6e63c..00000000 --- a/spec/acceptance/nodesets/debian-8-x64.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - debian-8-x64: - roles: - - agent - - default - platform: debian-8-amd64 - hypervisor: vagrant - box: puppetlabs/debian-8.2-64-nocm -CONFIG: - type: foss diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml deleted file mode 100644 index dba339c4..00000000 --- a/spec/acceptance/nodesets/default.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - ubuntu-1404-x64: - roles: - - agent - - default - platform: ubuntu-14.04-amd64 - hypervisor: vagrant - box: puppetlabs/ubuntu-14.04-64-nocm -CONFIG: - type: foss diff --git a/spec/acceptance/nodesets/docker/centos-7.yml b/spec/acceptance/nodesets/docker/centos-7.yml deleted file mode 100644 index a3333aac..00000000 --- a/spec/acceptance/nodesets/docker/centos-7.yml +++ /dev/null @@ -1,12 +0,0 @@ -HOSTS: - centos-7-x64: - platform: el-7-x86_64 - hypervisor: docker - image: centos:7 - docker_preserve_image: true - docker_cmd: '["/usr/sbin/init"]' - # install various tools required to get the image up to usable levels - docker_image_commands: - - 'yum install -y crontabs tar wget openssl sysvinit-tools iproute which initscripts' -CONFIG: - trace_limit: 200 diff --git a/spec/acceptance/nodesets/docker/debian-8.yml b/spec/acceptance/nodesets/docker/debian-8.yml deleted file mode 100644 index df5c3194..00000000 --- a/spec/acceptance/nodesets/docker/debian-8.yml +++ /dev/null @@ -1,11 +0,0 @@ -HOSTS: - debian-8-x64: - platform: debian-8-amd64 - hypervisor: docker - image: debian:8 - docker_preserve_image: true - docker_cmd: '["/sbin/init"]' - docker_image_commands: - - 'apt-get update && apt-get install -y net-tools wget locales strace lsof && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen' -CONFIG: - trace_limit: 200 diff --git a/spec/acceptance/nodesets/docker/ubuntu-14.04.yml b/spec/acceptance/nodesets/docker/ubuntu-14.04.yml deleted file mode 100644 index b1efa583..00000000 --- a/spec/acceptance/nodesets/docker/ubuntu-14.04.yml +++ /dev/null @@ -1,12 +0,0 @@ -HOSTS: - ubuntu-1404-x64: - platform: ubuntu-14.04-amd64 - hypervisor: docker - image: ubuntu:14.04 - docker_preserve_image: true - docker_cmd: '["/sbin/init"]' - docker_image_commands: - # ensure that upstart is booting correctly in the container - - 'rm /usr/sbin/policy-rc.d && rm /sbin/initctl && dpkg-divert --rename --remove /sbin/initctl && apt-get update && apt-get install -y net-tools wget && locale-gen en_US.UTF-8' -CONFIG: - trace_limit: 200 diff --git a/spec/classes/java_spec.rb b/spec/classes/java_spec.rb index 8befd55f..90efa9f5 100644 --- a/spec/classes/java_spec.rb +++ b/spec/classes/java_spec.rb @@ -1,183 +1,158 @@ +# frozen_string_literal: true + require 'spec_helper' describe 'java', type: :class do - context 'when 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/') } - end - - context 'when 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/') } - end - - context 'when select openjdk for Centos 7.1.1503' do - let(:facts) { { osfamily: 'RedHat', operatingsystem: 'Centos', operatingsystemrelease: '7.1.1503', architecture: 'x86_64' } } + context 'when selecting openjdk for CentOS 7.1.1503' do + let(:facts) { { os: { family: 'RedHat', name: 'CentOS', release: { full: '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/') } end - context 'when select openjdk for Centos 6.2' do - let(:facts) { { osfamily: 'RedHat', operatingsystem: 'Centos', operatingsystemrelease: '6.2', architecture: 'x86_64' } } - - it { is_expected.to contain_package('java').with_name('java-1.6.0-openjdk-devel') } - it { is_expected.not_to contain_exec('update-java-alternatives') } - end + context 'on Debian Buster (10.0)' do + let(:facts) { { os: { family: 'Debian', name: 'Debian', lsb: { distcodename: 'buster' }, release: { major: '10' }, architecture: 'amd64' } } } - context 'when select Oracle JRE with alternatives for Centos 6.3' do - let(:facts) { { osfamily: 'RedHat', operatingsystem: 'Centos', operatingsystemrelease: '6.3', architecture: 'x86_64' } } - let(:params) { { 'package' => 'jre', 'java_alternative' => '/usr/bin/java', 'java_alternative_path' => '/usr/java/jre1.7.0_67/bin/java' } } + context 'when selecting jdk' do + let(:params) { { 'distribution' => 'jdk' } } - it { is_expected.to contain_package('java').with_name('jre') } - it { is_expected.to contain_exec('create-java-alternatives').with_command('alternatives --install /usr/bin/java java /usr/java/jre1.7.0_67/bin/java 20000') } - it { is_expected.to contain_exec('update-java-alternatives').with_command('alternatives --set java /usr/java/jre1.7.0_67/bin/java') } - end + it { is_expected.to contain_package('java').with_name('openjdk-11-jdk') } + it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.11.0-openjdk-amd64/') } + end - context 'when select passed value for Centos 5.3' do - let(:facts) { { osfamily: 'RedHat', operatingsystem: 'Centos', operatingsystemrelease: '5.3', architecture: 'x86_64' } } - let(:params) { { 'package' => 'jdk', 'java_home' => '/usr/local/lib/jre' } } + context 'when selecting jre' do + let(:params) { { 'distribution' => 'jre' } } - it { is_expected.to contain_package('java').with_name('jdk') } - it { is_expected.not_to contain_exec('update-java-alternatives') } + it { is_expected.to contain_package('java').with_name('openjdk-11-jre-headless') } + it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.11.0-openjdk-amd64/') } + end end - context 'when select default for Centos 5.3' do - let(:facts) { { osfamily: 'RedHat', operatingsystem: 'Centos', operatingsystemrelease: '5.3', architecture: 'x86_64' } } - - it { is_expected.to contain_package('java').with_name('java-1.6.0-openjdk-devel') } - it { is_expected.not_to contain_exec('update-java-alternatives') } - end + context 'on Debian Bookworm (12)' do + let(:facts) { { os: { family: 'Debian', name: 'Debian', lsb: { distcodename: 'bookworm' }, release: { major: '12' }, architecture: 'amd64' } } } - context 'when select jdk for Ubuntu Trusty (14.04)' do - let(:facts) { { osfamily: 'Debian', operatingsystem: 'Ubuntu', lsbdistcodename: 'trusty', operatingsystemrelease: '14.04', architecture: 'amd64' } } - let(:params) { { 'distribution' => 'jdk' } } + context 'when selecting jdk' do + let(:params) { { 'distribution' => 'jdk' } } - 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 + it { is_expected.to contain_package('java').with_name('openjdk-17-jdk') } + it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.17.0-openjdk-amd64/') } + end - 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' } } + context 'when selecting jre' do + let(:params) { { 'distribution' => 'jre' } } - 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/') } + it { is_expected.to contain_package('java').with_name('openjdk-17-jre-headless') } + it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.17.0-openjdk-amd64/') } + end end - context 'when select jdk for Ubuntu xenial (16.04) on ARM' do - let(:facts) { { osfamily: 'Debian', operatingsystem: 'Ubuntu', lsbdistcodename: 'xenial', operatingsystemrelease: '16.04', architecture: 'armv7l' } } - let(:params) { { 'distribution' => 'jdk' } } + context 'on Ubuntu Bionic (18.04)' do + let(:facts) { { os: { family: 'Debian', name: 'Ubuntu', lsb: { distcodename: 'bionic' }, release: { major: '18.04' }, architecture: 'amd64' } } } - 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-armhf/') } - end - - context 'when select jdk for Ubuntu xenial (16.04) on ARM64' do - let(:facts) { { osfamily: 'Debian', operatingsystem: 'Ubuntu', lsbdistcodename: 'xenial', operatingsystemrelease: '16.04', architecture: 'aarch64' } } - let(:params) { { 'distribution' => 'jdk' } } + context 'when selecting jdk' do + let(:params) { { 'distribution' => '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-arm64/') } - end + it { is_expected.to contain_package('java').with_name('openjdk-11-jdk') } + it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.11.0-openjdk-amd64/') } + end - context 'when select openjdk for Oracle Linux' do - let(:facts) { { osfamily: 'RedHat', operatingsystem: 'OracleLinux', operatingsystemrelease: '6.4', architecture: 'x86_64' } } + context 'when selecting jre' do + let(:params) { { 'distribution' => 'jre' } } - it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk-devel') } + it { is_expected.to contain_package('java').with_name('openjdk-11-jre-headless') } + it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.11.0-openjdk-amd64/') } + end end - context 'when select openjdk for Oracle Linux 6.2' do - let(:facts) { { osfamily: 'RedHat', operatingsystem: 'OracleLinux', operatingsystemrelease: '6.2', architecture: 'x86_64' } } + context 'on Oracle Linux 7.0' do + let(:facts) { { os: { family: 'RedHat', name: 'OracleLinux', release: { full: '7.0' }, architecture: 'x86_64' } } } - it { is_expected.to contain_package('java').with_name('java-1.6.0-openjdk-devel') } - end + context 'when selecting openjdk' do + it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk-devel') } + end - context 'when select passed value for Oracle Linux' do - let(:facts) { { osfamily: 'RedHat', operatingsystem: 'OracleLinux', operatingsystemrelease: '6.3', architecture: 'x86_64' } } - let(:params) { { 'distribution' => 'jre' } } + context 'when selecting passed value for Oracle Linux' do + let(:params) { { 'distribution' => 'jre' } } - it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk') } + it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk') } + end end - context 'when select passed value for Scientific Linux' do - let(:facts) { { osfamily: 'RedHat', operatingsystem: 'Scientific', operatingsystemrelease: '6.4', architecture: 'x86_64' } } + context 'when selecting passed value for Scientific Linux' do + let(:facts) { { os: { family: 'RedHat', name: 'Scientific', release: { full: '7.0' }, 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/') } end - context 'when select passed value for Scientific Linux CERN (SLC)' do - let(:facts) { { osfamily: 'RedHat', operatingsystem: 'SLC', operatingsystemrelease: '6.4', architecture: 'x86_64' } } + context 'when selecting passed value for Scientific Linux CERN (SLC)' do + let(:facts) { { os: { family: 'RedHat', name: 'SLC', release: { full: '7.0' }, 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/') } end - context 'when select default for OpenSUSE 12.3' do - let(:facts) { { osfamily: 'Suse', operatingsystem: 'OpenSUSE', operatingsystemrelease: '12.3', architecture: 'x86_64' } } + context 'when selecting default for OpenSUSE 12.3' do + let(:facts) { { os: { family: 'Suse', name: 'OpenSUSE', release: { full: '12.3', major: '12', minor: '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/lib64/jvm/java-1.7.0-openjdk-1.7.0/') } end - context 'when select default for SLES 11.3' do - let(:facts) { { osfamily: 'Suse', operatingsystem: 'SLES', operatingsystemrelease: '11.3', architecture: 'x86_64' } } + context 'when selecting default for SLES 11.3' do + let(:facts) { { os: { family: 'Suse', name: 'SLES', release: { full: '11.3', major: '11', minor: '3' }, architecture: 'x86_64' } } } it { is_expected.to contain_package('java').with_name('java-1_6_0-ibm-devel') } it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib64/jvm/java-1.6.0-ibm-1.6.0/') } end - context 'when select default for SLES 11.4' do - let(:facts) { { osfamily: 'Suse', operatingsystem: 'SLES', operatingsystemrelease: '11.4', architecture: 'x86_64' } } + context 'when selecting default for SLES 11.4' do + let(:facts) { { os: { family: 'Suse', name: 'SLES', release: { full: '11.4', major: '11', minor: '4' }, architecture: 'x86_64' } } } it { is_expected.to contain_package('java').with_name('java-1_7_1-ibm-devel') } it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib64/jvm/java-1.7.1-ibm-1.7.1/') } end - context 'when select default for SLES 12.0' do - let(:facts) { { osfamily: 'Suse', operatingsystem: 'SLES', operatingsystemrelease: '12.0', operatingsystemmajrelease: '12', architecture: 'x86_64' } } + context 'when selecting default for SLES 12.0' do + let(:facts) { { os: { family: 'Suse', name: 'SLES', release: { full: '12.0', major: '12' }, 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/lib64/jvm/java-1.7.0-openjdk-1.7.0/') } end - context 'when select default for SLES 12.1' do - let(:facts) { { osfamily: 'Suse', operatingsystem: 'SLES', operatingsystemrelease: '12.1', operatingsystemmajrelease: '12', architecture: 'x86_64' } } + context 'when selecting default for SLES 12.1' do + let(:facts) { { os: { family: 'Suse', name: 'SLES', release: { full: '12.1', major: '12' }, 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/lib64/jvm/java-1.8.0-openjdk-1.8.0/') } end describe 'custom java package' do - let(:facts) { { osfamily: 'Debian', operatingsystem: 'Debian', lsbdistcodename: 'jessie', operatingsystemrelease: '8.6', architecture: 'amd64' } } + let(:facts) { { os: { family: 'Debian', name: 'Debian', lsb: { distcodename: 'bullseye' }, release: { major: '11' }, architecture: 'amd64' } } } context 'when all params provided' do let(:params) do { 'distribution' => 'custom', - 'package' => 'custom_jdk', - 'java_alternative' => 'java-custom_jdk', + 'package' => 'custom_jdk', + 'java_alternative' => 'java-custom_jdk', 'java_alternative_path' => '/opt/custom_jdk/bin/java', - 'java_home' => '/opt/custom_jdk', + 'java_home' => '/opt/custom_jdk' } end it { is_expected.to contain_package('java').with_name('custom_jdk') } it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/opt/custom_jdk') } - it { is_expected.to contain_exec('update-java-alternatives').with_command('update-java-alternatives --set java-custom_jdk --jre') } + it { is_expected.to contain_exec('update-java-alternatives').with_command(['update-java-alternatives', '--set', 'java-custom_jdk', '--jre']) } end + context 'with missing parameters' do let(:params) do { 'distribution' => 'custom', - 'package' => 'custom_jdk', + 'package' => 'custom_jdk' } end @@ -190,34 +165,44 @@ describe 'incompatible OSs' do [ { - osfamily: 'windows', - operatingsystem: 'windows', - operatingsystemrelease: '8.1', + os: { + family: 'windows', + name: 'windows', + release: { full: '8.1' } + } }, { - osfamily: 'Darwin', - operatingsystem: 'Darwin', - operatingsystemrelease: '13.3.0', + os: { + family: 'Darwin', + name: 'Darwin', + release: { full: '13.3.0' } + } }, { - osfamily: 'AIX', - operatingsystem: 'AIX', - operatingsystemrelease: '7100-02-00-000', + os: { + family: 'AIX', + name: 'AIX', + release: { full: '7100-02-00-000' } + } }, { - osfamily: 'AIX', - operatingsystem: 'AIX', - operatingsystemrelease: '6100-07-04-1216', + os: { + family: 'AIX', + name: 'AIX', + release: { full: '6100-07-04-1216' } + } }, { - osfamily: 'AIX', - operatingsystem: 'AIX', - operatingsystemrelease: '5300-12-01-1016', + os: { + family: 'AIX', + name: 'AIX', + release: { full: '5300-12-01-1016' } + } }, ].each do |facts| let(:facts) { facts } - it "is_expected.to fail on #{facts[:operatingsystem]} #{facts[:operatingsystemrelease]}" do + it "is_expected.to fail on #{facts[:os][:name]} #{facts[:os][:release][:full]}" do expect { catalogue }.to raise_error Puppet::Error, %r{unsupported platform} end end diff --git a/spec/default_facts.yml b/spec/default_facts.yml index ea1e4808..3346c394 100644 --- a/spec/default_facts.yml +++ b/spec/default_facts.yml @@ -2,6 +2,8 @@ # # Facts specified here will override the values provided by rspec-puppet-facts. --- -ipaddress: "172.16.254.254" +networking: + ip: "172.16.254.254" + ip6: "FE80:0000:0000:0000:AAAA:AAAA:AAAA" + mac: "AA:AA:AA:AA:AA:AA" is_pe: false -macaddress: "AA:AA:AA:AA:AA:AA" diff --git a/spec/defines/adopt_spec.rb b/spec/defines/adopt_spec.rb new file mode 100644 index 00000000..c56fc48a --- /dev/null +++ b/spec/defines/adopt_spec.rb @@ -0,0 +1,362 @@ +# frozen_string_literal: true + +require 'spec_helper' + +describe 'java::adopt', type: :define do + context 'with CentOS 64-bit' do + let(:facts) { { kernel: 'Linux', os: { family: 'RedHat', architecture: 'x86_64', name: 'CentOS', release: { full: '7.0' } } } } + + context 'when manage_symlink is set to true' do + let(:params) do + { + ensure: 'present', + version: '11', + java: 'jdk', + basedir: '/usr/java', + manage_symlink: true, + symlink_name: 'java_home' + } + end + let(:title) { 'jdk11_symlink' } + + it { is_expected.to contain_file('/usr/java/java_home') } + end + + context 'when manage_symlink is not set' do + let(:params) { { ensure: 'present', version: '11', java: 'jdk' } } + let(:title) { 'jdk11_nosymlink' } + + it { is_expected.not_to contain_file('/usr/java/java_home') } + end + + context 'when AdoptOpenJDK Java 8 JDK' do + let(:params) { { ensure: 'present', version: '8', java: 'jdk' } } + let(:title) { 'jdk8' } + + it { is_expected.to contain_archive('/tmp/OpenJDK8U-jdk_x64_linux_hotspot_8u202b08.tar.gz') } + it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 8 8u202 b08').with_command(['tar', '-zxf', '/tmp/OpenJDK8U-jdk_x64_linux_hotspot_8u202b08.tar.gz', '-C', '/usr/java']) } + it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 8 8u202 b08').that_requires('Archive[/tmp/OpenJDK8U-jdk_x64_linux_hotspot_8u202b08.tar.gz]') } + end + + context 'when AdoptOpenJDK Java 9 JDK' do + let(:params) { { ensure: 'present', version: '9', java: 'jdk' } } + let(:title) { 'jdk9' } + + it { is_expected.to contain_archive('/tmp/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz') } + it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 9 9.0.4 11').with_command(['tar', '-zxf', '/tmp/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz', '-C', '/usr/java']) } + it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 9 9.0.4 11').that_requires('Archive[/tmp/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz]') } + end + + context 'when AdoptOpenJDK Java 10 JDK' do + let(:params) { { ensure: 'present', version: '10', java: 'jdk' } } + let(:title) { 'jdk10' } + + it { is_expected.to contain_archive('/tmp/OpenJDK10U-jdk_x64_linux_hotspot_10.0.2_13.tar.gz') } + it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 10 10.0.2 13').with_command(['tar', '-zxf', '/tmp/OpenJDK10U-jdk_x64_linux_hotspot_10.0.2_13.tar.gz', '-C', '/usr/java']) } + it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 10 10.0.2 13').that_requires('Archive[/tmp/OpenJDK10U-jdk_x64_linux_hotspot_10.0.2_13.tar.gz]') } + end + + context 'when AdoptOpenJDK Java 11 JDK' do + let(:params) { { ensure: 'present', version: '11', java: 'jdk' } } + let(:title) { 'jdk11' } + + it { is_expected.to contain_archive('/tmp/OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_9.tar.gz') } + it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 11 11.0.2 9').with_command(['tar', '-zxf', '/tmp/OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_9.tar.gz', '-C', '/usr/java']) } + it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 11 11.0.2 9').that_requires('Archive[/tmp/OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_9.tar.gz]') } + end + + context 'when AdoptOpenJDK Java 12 JDK' do + let(:params) { { ensure: 'present', version: '12', java: 'jdk' } } + let(:title) { 'jdk12' } + + it { is_expected.to contain_archive('/tmp/OpenJDK12U-jdk_x64_linux_hotspot_12.0.1_12.tar.gz') } + it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 12 12.0.1 12').with_command(['tar', '-zxf', '/tmp/OpenJDK12U-jdk_x64_linux_hotspot_12.0.1_12.tar.gz', '-C', '/usr/java']) } + it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 12 12.0.1 12').that_requires('Archive[/tmp/OpenJDK12U-jdk_x64_linux_hotspot_12.0.1_12.tar.gz]') } + end + + context 'when AdoptOpenJDK Java 8 JRE' do + let(:params) { { ensure: 'present', version: '8', java: 'jre' } } + let(:title) { 'jre8' } + + it { is_expected.to contain_archive('/tmp/OpenJDK8U-jre_x64_linux_hotspot_8u202b08.tar.gz') } + it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 8 8u202 b08').with_command(['tar', '-zxf', '/tmp/OpenJDK8U-jre_x64_linux_hotspot_8u202b08.tar.gz', '-C', '/usr/java']) } + it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 8 8u202 b08').that_requires('Archive[/tmp/OpenJDK8U-jre_x64_linux_hotspot_8u202b08.tar.gz]') } + end + + context 'when AdoptOpenJDK Java 9 JRE' do + let(:params) { { ensure: 'present', version: '9', java: 'jre' } } + let(:title) { 'jre9' } + + it { is_expected.to contain_archive('/tmp/OpenJDK9U-jre_x64_linux_hotspot_9.0.4_11.tar.gz') } + it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 9 9.0.4 11').with_command(['tar', '-zxf', '/tmp/OpenJDK9U-jre_x64_linux_hotspot_9.0.4_11.tar.gz', '-C', '/usr/java']) } + it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 9 9.0.4 11').that_requires('Archive[/tmp/OpenJDK9U-jre_x64_linux_hotspot_9.0.4_11.tar.gz]') } + end + + context 'when AdoptOpenJDK Java 10 JRE' do + let(:params) { { ensure: 'present', version: '10', java: 'jre' } } + let(:title) { 'jre11' } + + it { is_expected.to contain_archive('/tmp/OpenJDK10U-jre_x64_linux_hotspot_10.0.2_13.tar.gz') } + it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 10 10.0.2 13').with_command(['tar', '-zxf', '/tmp/OpenJDK10U-jre_x64_linux_hotspot_10.0.2_13.tar.gz', '-C', '/usr/java']) } + it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 10 10.0.2 13').that_requires('Archive[/tmp/OpenJDK10U-jre_x64_linux_hotspot_10.0.2_13.tar.gz]') } + end + + context 'when AdoptOpenJDK Java 11 JRE' do + let(:params) { { ensure: 'present', version: '11', java: 'jre' } } + let(:title) { 'jre11' } + + it { is_expected.to contain_archive('/tmp/OpenJDK11U-jre_x64_linux_hotspot_11.0.2_9.tar.gz') } + it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 11 11.0.2 9').with_command(['tar', '-zxf', '/tmp/OpenJDK11U-jre_x64_linux_hotspot_11.0.2_9.tar.gz', '-C', '/usr/java']) } + it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 11 11.0.2 9').that_requires('Archive[/tmp/OpenJDK11U-jre_x64_linux_hotspot_11.0.2_9.tar.gz]') } + end + + context 'when AdoptOpenJDK Java 12 JRE' do + let(:params) { { ensure: 'present', version: '12', java: 'jre' } } + let(:title) { 'jre12' } + + it { is_expected.to contain_archive('/tmp/OpenJDK12U-jre_x64_linux_hotspot_12.0.1_12.tar.gz') } + it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 12 12.0.1 12').with_command(['tar', '-zxf', '/tmp/OpenJDK12U-jre_x64_linux_hotspot_12.0.1_12.tar.gz', '-C', '/usr/java']) } + it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 12 12.0.1 12').that_requires('Archive[/tmp/OpenJDK12U-jre_x64_linux_hotspot_12.0.1_12.tar.gz]') } + end + + context 'when installing multiple versions' do + let(:params) do + { + ensure: 'present', + version_major: '8u202', + version_minor: 'b08', + java: 'jdk' + } + end + let(:title) { 'jdk8' } + + let(:pre_condition) do + <<-MANIFEST + java::adopt { + 'jdk8172': + ensure => 'present', + version_major => '8u172', + version_minor => 'b11', + java => 'jdk', + } + MANIFEST + end + + it { is_expected.to compile } + end + + context 'when specifying package_type tar.gz and basedir' do + let(:params) do + { + ensure: 'present', + version: '8', + java: 'jdk', + basedir: '/usr/java', + package_type: 'tar.gz' + } + end + let(:title) { 'jdk8' } + + it { is_expected.to contain_archive('/tmp/OpenJDK8U-jdk_x64_linux_hotspot_8u202b08.tar.gz') } + it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 8 8u202 b08').with_command(['tar', '-zxf', '/tmp/OpenJDK8U-jdk_x64_linux_hotspot_8u202b08.tar.gz', '-C', '/usr/java']) } + it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 8 8u202 b08').that_requires('Archive[/tmp/OpenJDK8U-jdk_x64_linux_hotspot_8u202b08.tar.gz]') } + end + + context 'when manage_basedir is set to true' do + let(:params) do + { + ensure: 'present', + version: '8', + java: 'jdk', + basedir: '/usr/java', + manage_basedir: true + } + end + let(:title) { 'jdk8' } + + it { is_expected.to contain_file('/usr/java') } + end + end + + context 'with Ubuntu 64-bit' do + let(:facts) { { kernel: 'Linux', os: { family: 'Debian', architecture: 'amd64', name: 'Ubuntu', release: { full: '18.04' } } } } + + context 'when AdoptOpenJDK Java 8 JDK' do + let(:params) { { ensure: 'present', version: '8', java: 'jdk' } } + let(:title) { 'jdk8' } + + it { is_expected.to contain_archive('/tmp/OpenJDK8U-jdk_x64_linux_hotspot_8u202b08.tar.gz') } + it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 8 8u202 b08').with_command(['tar', '-zxf', '/tmp/OpenJDK8U-jdk_x64_linux_hotspot_8u202b08.tar.gz', '-C', '/usr/lib/jvm']) } + it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 8 8u202 b08').that_requires('Archive[/tmp/OpenJDK8U-jdk_x64_linux_hotspot_8u202b08.tar.gz]') } + end + + context 'when AdoptOpenJDK Java 9 JDK' do + let(:params) { { ensure: 'present', version: '9', java: 'jdk' } } + let(:title) { 'jdk9' } + + it { is_expected.to contain_archive('/tmp/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz') } + it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 9 9.0.4 11').with_command(['tar', '-zxf', '/tmp/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz', '-C', '/usr/lib/jvm']) } + it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 9 9.0.4 11').that_requires('Archive[/tmp/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz]') } + end + + context 'when AdoptOpenJDK Java 10 JDK' do + let(:params) { { ensure: 'present', version: '10', java: 'jdk' } } + let(:title) { 'jdk10' } + + it { is_expected.to contain_archive('/tmp/OpenJDK10U-jdk_x64_linux_hotspot_10.0.2_13.tar.gz') } + it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 10 10.0.2 13').with_command(['tar', '-zxf', '/tmp/OpenJDK10U-jdk_x64_linux_hotspot_10.0.2_13.tar.gz', '-C', '/usr/lib/jvm']) } + it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 10 10.0.2 13').that_requires('Archive[/tmp/OpenJDK10U-jdk_x64_linux_hotspot_10.0.2_13.tar.gz]') } + end + + context 'when AdoptOpenJDK Java 11 JDK' do + let(:params) { { ensure: 'present', version: '11', java: 'jdk' } } + let(:title) { 'jdk11' } + + it { is_expected.to contain_archive('/tmp/OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_9.tar.gz') } + it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 11 11.0.2 9').with_command(['tar', '-zxf', '/tmp/OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_9.tar.gz', '-C', '/usr/lib/jvm']) } + it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 11 11.0.2 9').that_requires('Archive[/tmp/OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_9.tar.gz]') } + end + + context 'when AdoptOpenJDK Java 12 JDK' do + let(:params) { { ensure: 'present', version: '12', java: 'jdk' } } + let(:title) { 'jdk12' } + + it { is_expected.to contain_archive('/tmp/OpenJDK12U-jdk_x64_linux_hotspot_12.0.1_12.tar.gz') } + it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 12 12.0.1 12').with_command(['tar', '-zxf', '/tmp/OpenJDK12U-jdk_x64_linux_hotspot_12.0.1_12.tar.gz', '-C', '/usr/lib/jvm']) } + it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 12 12.0.1 12').that_requires('Archive[/tmp/OpenJDK12U-jdk_x64_linux_hotspot_12.0.1_12.tar.gz]') } + end + + context 'when AdoptOpenJDK Java 8 JRE' do + let(:params) { { ensure: 'present', version: '8', java: 'jre' } } + let(:title) { 'jre8' } + + it { is_expected.to contain_archive('/tmp/OpenJDK8U-jre_x64_linux_hotspot_8u202b08.tar.gz') } + it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 8 8u202 b08').with_command(['tar', '-zxf', '/tmp/OpenJDK8U-jre_x64_linux_hotspot_8u202b08.tar.gz', '-C', '/usr/lib/jvm']) } + it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 8 8u202 b08').that_requires('Archive[/tmp/OpenJDK8U-jre_x64_linux_hotspot_8u202b08.tar.gz]') } + end + + context 'when AdoptOpenJDK Java 9 JRE' do + let(:params) { { ensure: 'present', version: '9', java: 'jre' } } + let(:title) { 'jre9' } + + it { is_expected.to contain_archive('/tmp/OpenJDK9U-jre_x64_linux_hotspot_9.0.4_11.tar.gz') } + it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 9 9.0.4 11').with_command(['tar', '-zxf', '/tmp/OpenJDK9U-jre_x64_linux_hotspot_9.0.4_11.tar.gz', '-C', '/usr/lib/jvm']) } + it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 9 9.0.4 11').that_requires('Archive[/tmp/OpenJDK9U-jre_x64_linux_hotspot_9.0.4_11.tar.gz]') } + end + + context 'when AdoptOpenJDK Java 10 JRE' do + let(:params) { { ensure: 'present', version: '10', java: 'jre' } } + let(:title) { 'jre11' } + + it { is_expected.to contain_archive('/tmp/OpenJDK10U-jre_x64_linux_hotspot_10.0.2_13.tar.gz') } + it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 10 10.0.2 13').with_command(['tar', '-zxf', '/tmp/OpenJDK10U-jre_x64_linux_hotspot_10.0.2_13.tar.gz', '-C', '/usr/lib/jvm']) } + it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 10 10.0.2 13').that_requires('Archive[/tmp/OpenJDK10U-jre_x64_linux_hotspot_10.0.2_13.tar.gz]') } + end + + context 'when AdoptOpenJDK Java 11 JRE' do + let(:params) { { ensure: 'present', version: '11', java: 'jre' } } + let(:title) { 'jre11' } + + it { is_expected.to contain_archive('/tmp/OpenJDK11U-jre_x64_linux_hotspot_11.0.2_9.tar.gz') } + it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 11 11.0.2 9').with_command(['tar', '-zxf', '/tmp/OpenJDK11U-jre_x64_linux_hotspot_11.0.2_9.tar.gz', '-C', '/usr/lib/jvm']) } + it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 11 11.0.2 9').that_requires('Archive[/tmp/OpenJDK11U-jre_x64_linux_hotspot_11.0.2_9.tar.gz]') } + end + + context 'when AdoptOpenJDK Java 12 JRE' do + let(:params) { { ensure: 'present', version: '12', java: 'jre' } } + let(:title) { 'jre12' } + + it { is_expected.to contain_archive('/tmp/OpenJDK12U-jre_x64_linux_hotspot_12.0.1_12.tar.gz') } + it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 12 12.0.1 12').with_command(['tar', '-zxf', '/tmp/OpenJDK12U-jre_x64_linux_hotspot_12.0.1_12.tar.gz', '-C', '/usr/lib/jvm']) } + it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 12 12.0.1 12').that_requires('Archive[/tmp/OpenJDK12U-jre_x64_linux_hotspot_12.0.1_12.tar.gz]') } + end + + context 'when installing multiple versions' do + let(:params) do + { + ensure: 'present', + version_major: '8u202', + version_minor: 'b08', + java: 'jdk' + } + end + let(:title) { 'jdk8' } + + let(:pre_condition) do + <<-MANIFEST + java::adopt { + 'jdk8172': + ensure => 'present', + version_major => '8u172', + version_minor => 'b11', + java => 'jdk', + } + MANIFEST + end + + it { is_expected.to compile } + end + end + + describe 'incompatible OSes' do + [ + { + kernel: 'Windows', + os: { + family: 'Windows', + name: 'Windows', + release: { + full: '8.1' + } + } + }, + { + kernel: 'Darwin', + os: { + family: 'Darwin', + name: 'Darwin', + release: { + full: '13.3.0' + } + } + }, + { + kernel: 'AIX', + os: { + family: 'AIX', + name: 'AIX', + release: { + full: '7100-02-00-000' + } + } + }, + { + kernel: 'AIX', + os: { + family: 'AIX', + name: 'AIX', + release: { + full: '6100-07-04-1216' + } + } + }, + { + kernel: 'AIX', + os: { + family: 'AIX', + name: 'AIX', + release: { + full: '5300-12-01-1016' + } + } + }, + ].each do |facts| + let(:facts) { facts } + let(:title) { 'jdk' } + + it "is_expected.to fail on #{facts[:os][:name]} #{facts[:os][:release][:full]}" do + expect { catalogue }.to raise_error Puppet::Error, %r{unsupported platform} + end + end + end +end diff --git a/spec/defines/adoptium_spec.rb b/spec/defines/adoptium_spec.rb new file mode 100644 index 00000000..94fb2ca3 --- /dev/null +++ b/spec/defines/adoptium_spec.rb @@ -0,0 +1,310 @@ +# frozen_string_literal: true + +require 'spec_helper' + +describe 'java::adoptium', type: :define do + context 'with CentOS 64-bit' do + let(:facts) { { kernel: 'Linux', os: { family: 'RedHat', architecture: 'x86_64', name: 'CentOS', release: { full: '7.0' } } } } + + context 'when manage_symlink is set to true' do + let(:params) do + { + ensure: 'present', + version_major: '16', + version_minor: '0', + version_patch: '2', + version_build: '7', + basedir: '/usr/java', + manage_symlink: true, + symlink_name: 'java_home' + } + end + let(:title) { 'jdk16_symlink' } + + it { is_expected.to contain_file('/usr/java/java_home') } + end + + context 'when manage_symlink is not set' do + let(:params) do + { + ensure: 'present', + version_major: '16', + version_minor: '0', + version_patch: '2', + version_build: '7', + basedir: '/usr/java', + symlink_name: 'java_home' + } + end + let(:title) { 'jdk16_nosymlink' } + + it { is_expected.not_to contain_file('/usr/java/java_home') } + end + + context 'when Adoptium Temurin Java 16 JDK' do + let(:params) do + { + ensure: 'present', + version_major: '16', + version_minor: '0', + version_patch: '2', + version_build: '7', + basedir: '/usr/java', + symlink_name: 'java_home' + } + end + let(:title) { 'jdk16' } + + it { is_expected.to contain_archive('/tmp/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz') } + it { is_expected.to contain_exec('Install Adoptium Temurin java 16 0 2 7').with_command(['tar', '-zxf', '/tmp/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz', '-C', '/usr/java']) } + it { is_expected.to contain_exec('Install Adoptium Temurin java 16 0 2 7').that_requires('Archive[/tmp/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz]') } + end + + context 'when Adoptium Temurin Java 17 JDK' do + let(:params) do + { + ensure: 'present', + version_major: '17', + version_minor: '0', + version_patch: '1', + version_build: '12', + basedir: '/usr/java', + symlink_name: 'java_home' + } + end + let(:title) { 'jdk17' } + + it { is_expected.to contain_archive('/tmp/OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz') } + it { is_expected.to contain_exec('Install Adoptium Temurin java 17 0 1 12').with_command(['tar', '-zxf', '/tmp/OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz', '-C', '/usr/java']) } + it { is_expected.to contain_exec('Install Adoptium Temurin java 17 0 1 12').that_requires('Archive[/tmp/OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz]') } + end + + context 'when installing multiple versions' do + let(:params) do + { + ensure: 'present', + version_major: '16', + version_minor: '0', + version_patch: '2', + version_build: '7' + } + end + let(:title) { 'jdk16' } + + let(:pre_condition) do + <<-MANIFEST + java::adoptium { + 'jdk17': + ensure => 'present', + version_major => '17', + version_minor => '0', + version_patch => '1', + version_build => '12', + } + MANIFEST + end + + it { is_expected.to compile } + end + + context 'when specifying package_type tar.gz and basedir' do + let(:params) do + { + ensure: 'present', + version_major: '16', + version_minor: '0', + version_patch: '2', + version_build: '7', + basedir: '/usr/java' + } + end + let(:title) { 'jdk16' } + + it { is_expected.to contain_archive('/tmp/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz') } + it { is_expected.to contain_exec('Install Adoptium Temurin java 16 0 2 7').with_command(['tar', '-zxf', '/tmp/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz', '-C', '/usr/java']) } + it { is_expected.to contain_exec('Install Adoptium Temurin java 16 0 2 7').that_requires('Archive[/tmp/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz]') } + end + + context 'when manage_basedir is set to true' do + let(:params) do + { + ensure: 'present', + version_major: '16', + version_minor: '0', + version_patch: '2', + version_build: '7', + basedir: '/usr/java', + manage_basedir: true + } + end + let(:title) { 'jdk16' } + + it { is_expected.to contain_file('/usr/java') } + end + end + + context 'with Ubuntu 64-bit' do + let(:facts) { { kernel: 'Linux', os: { family: 'Debian', architecture: 'amd64', name: 'Ubuntu', release: { full: '18.04' } } } } + + context 'when Adoptium Temurin Java 16 JDK' do + let(:params) do + { + ensure: 'present', + version_major: '16', + version_minor: '0', + version_patch: '2', + version_build: '7', + symlink_name: 'java_home' + } + end + let(:title) { 'jdk16' } + + it { is_expected.to contain_archive('/tmp/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz') } + it { is_expected.to contain_exec('Install Adoptium Temurin java 16 0 2 7').with_command(['tar', '-zxf', '/tmp/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz', '-C', '/usr/lib/jvm']) } + it { is_expected.to contain_exec('Install Adoptium Temurin java 16 0 2 7').that_requires('Archive[/tmp/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz]') } + end + + context 'when Adoptium Temurin Java 17 JDK' do + let(:params) do + { + ensure: 'present', + version_major: '17', + version_minor: '0', + version_patch: '1', + version_build: '12', + symlink_name: 'java_home' + } + end + let(:title) { 'jdk17' } + + it { is_expected.to contain_archive('/tmp/OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz') } + it { is_expected.to contain_exec('Install Adoptium Temurin java 17 0 1 12').with_command(['tar', '-zxf', '/tmp/OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz', '-C', '/usr/lib/jvm']) } + it { is_expected.to contain_exec('Install Adoptium Temurin java 17 0 1 12').that_requires('Archive[/tmp/OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz]') } + end + + context 'when installing multiple versions' do + let(:params) do + { + ensure: 'present', + version_major: '16', + version_minor: '0', + version_patch: '2', + version_build: '7' + } + end + let(:title) { 'jdk16' } + + let(:pre_condition) do + <<-MANIFEST + java::adoptium { + 'jdk17': + ensure => 'present', + version_major => '17', + version_minor => '0', + version_patch => '1', + version_build => '12', + } + MANIFEST + end + + it { is_expected.to compile } + end + + context 'when specifying package_type tar.gz and basedir' do + let(:params) do + { + ensure: 'present', + version_major: '16', + version_minor: '0', + version_patch: '2', + version_build: '7', + basedir: '/usr/lib/jvm' + } + end + let(:title) { 'jdk16' } + + it { is_expected.to contain_archive('/tmp/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz') } + it { is_expected.to contain_exec('Install Adoptium Temurin java 16 0 2 7').with_command(['tar', '-zxf', '/tmp/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz', '-C', '/usr/lib/jvm']) } + it { is_expected.to contain_exec('Install Adoptium Temurin java 16 0 2 7').that_requires('Archive[/tmp/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz]') } + end + + context 'when manage_basedir is set to true' do + let(:params) do + { + ensure: 'present', + version_major: '16', + version_minor: '0', + version_patch: '2', + version_build: '7', + basedir: '/usr/lib/jvm', + manage_basedir: true + } + end + let(:title) { 'jdk16' } + + it { is_expected.to contain_file('/usr/lib/jvm') } + end + end + + describe 'incompatible OSes' do + [ + { + kernel: 'Windows', + os: { + family: 'Windows', + name: 'Windows', + release: { + full: '8.1' + } + } + }, + { + kernel: 'Darwin', + os: { + family: 'Darwin', + name: 'Darwin', + release: { + full: '13.3.0' + } + } + }, + { + kernel: 'AIX', + os: { + family: 'AIX', + name: 'AIX', + release: { + full: '7100-02-00-000' + } + } + }, + { + kernel: 'AIX', + os: { + family: 'AIX', + name: 'AIX', + release: { + full: '6100-07-04-1216' + } + } + }, + { + kernel: 'AIX', + os: { + family: 'AIX', + name: 'AIX', + release: { + full: '5300-12-01-1016' + } + } + }, + ].each do |facts| + let(:facts) { facts } + let(:title) { 'jdk' } + + it "is_expected.to fail on #{facts[:os][:name]} #{facts[:os][:release][:full]}" do + expect { catalogue }.to raise_error Puppet::Error, %r{unsupported platform} + end + end + end +end diff --git a/spec/defines/download_spec.rb b/spec/defines/download_spec.rb new file mode 100644 index 00000000..b7b288bd --- /dev/null +++ b/spec/defines/download_spec.rb @@ -0,0 +1,160 @@ +# frozen_string_literal: true + +require 'spec_helper' + +describe 'java::download', type: :define do + let(:url) { 'http://download.oracle.com/otn-pub/java/jdk/8u201-b09/42970487e3af4f5aa5bca3f542482c60/jdk-8u201-linux-x64.tar.gz' } + + context 'with CentOS 64-bit' do + let(:facts) { { kernel: 'Linux', os: { family: 'RedHat', architecture: 'x86_64', name: 'CentOS', release: { full: '7.0' } } } } + + context 'when passing URL to url parameter' do + let(:params) do + { + ensure: 'present', + version_major: '8u201', + version_minor: 'b09', + java_se: 'jdk', + url: + } + end + let(:title) { 'jdk8' } + + it { + expect(subject).to contain_archive('/tmp/jdk-8-8u201-b09-linux-x64.rpm') + } + end + + context 'when no url provided' do + let(:params) do + { + ensure: 'present', + version_major: '8u201', + version_minor: 'b09', + java_se: 'jdk' + } + end + let(:title) { 'jdk8' } + + it { + expect(subject).to raise_error Puppet::Error + } + 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', + url: + } + end + let(:title) { 'jdk6' } + + it { is_expected.to contain_file('/usr/java/java_home') } + end + + context 'when manage_symlink is not set' do + let(:params) do + { + ensure: 'present', + version: '6', + java_se: 'jdk', + basedir: '/usr/java', + url: + } + end + let(:title) { 'jdk6_nosymlink' } + + it { is_expected.not_to contain_file('/usr/java/java_home') } + end + end + + context 'with Ubuntu 64-bit' do + let(:facts) { { kernel: 'Linux', os: { family: 'Debian', architecture: 'amd64', name: 'Ubuntu', release: { full: '18.04' } } } } + + context 'when passing URL to url parameter' do + let(:params) { { ensure: 'present', version_major: '8u201', version_minor: 'b09', java_se: 'jdk', url: } } + let(:title) { 'jdk8' } + + it { is_expected.to contain_archive('/tmp/jdk-8-8u201-b09-linux-x64.tar.gz') } + end + end + + context 'with Debian 64-bit' do + let(:facts) { { kernel: 'Linux', os: { family: 'Debian', architecture: 'amd64', name: 'Debian', release: { full: '10.0' } } } } + + context 'when passing URL to url parameter' do + let(:params) { { ensure: 'present', version_major: '8u201', version_minor: 'b09', java_se: 'jdk', url: } } + let(:title) { 'jdk8' } + + it { is_expected.to contain_archive('/tmp/jdk-8-8u201-b09-linux-x64.tar.gz') } + end + end + + describe 'incompatible OSes' do + [ + { + kernel: 'Windows', + os: { + family: 'Windows', + name: 'Windows', + release: { + full: '8.1' + } + } + }, + { + kernel: 'Darwin', + os: { + family: 'Darwin', + name: 'Darwin', + release: { + full: '13.3.0' + } + } + }, + { + kernel: 'AIX', + os: { + family: 'AIX', + name: 'AIX', + release: { + full: '7100-02-00-000' + } + } + }, + { + kernel: 'AIX', + os: { + family: 'AIX', + name: 'AIX', + release: { + full: '6100-07-04-1216' + } + } + }, + { + kernel: 'AIX', + os: { + family: 'AIX', + name: 'AIX', + release: { + full: '5300-12-01-1016' + } + } + }, + ].each do |facts| + let(:facts) { facts } + let(:title) { 'jdk' } + + it "is_expected.to fail on #{facts[:os][:name]} #{facts[:os][:release][:full]}" do + expect { catalogue }.to raise_error Puppet::Error, %r{unsupported platform} + end + end + end +end diff --git a/spec/defines/oracle_spec.rb b/spec/defines/oracle_spec.rb deleted file mode 100644 index 9ecb7896..00000000 --- a/spec/defines/oracle_spec.rb +++ /dev/null @@ -1,474 +0,0 @@ -require 'spec_helper' - -oracle_url = 'http://download.oracle.com/otn-pub/java/jdk/8u201-b09/42970487e3af4f5aa5bca3f542482c60/jdk-8u201-linux-x64.tar.gz' - -describe 'java::oracle', type: :define do - context 'with CentOS 64-bit' do - let(:facts) { { kernel: 'Linux', os: { family: 'RedHat', architecture: 'x86_64', name: 'CentOS', release: { full: '6.0' } } } } - - context 'when Oracle Java SE 6 JDK' do - let(:params) { { ensure: 'present', version: '6', java_se: 'jdk' } } - let(:title) { 'jdk6' } - - it { is_expected.to contain_archive('/tmp/jdk-6u45-linux-x64-rpm.bin') } - it { is_expected.to contain_exec('Install Oracle java_se jdk 6 6u45 b06').with_command('sh /tmp/jdk-6u45-linux-x64-rpm.bin -x; rpm --force -iv sun*.rpm; rpm --force -iv jdk*.rpm') } - it { is_expected.to contain_exec('Install Oracle java_se jdk 6 6u45 b06').that_requires('Archive[/tmp/jdk-6u45-linux-x64-rpm.bin]') } - end - - context 'when Oracle Java SE 7 JDK' do - let(:params) { { ensure: 'present', version: '7', java_se: 'jdk' } } - let(:title) { 'jdk7' } - - it { is_expected.to contain_archive('/tmp/jdk-7u80-linux-x64.rpm') } - it { is_expected.to contain_exec('Install Oracle java_se jdk 7 7u80 b15').with_command('rpm --force -iv /tmp/jdk-7u80-linux-x64.rpm') } - it { is_expected.to contain_exec('Install Oracle java_se jdk 7 7u80 b15').that_requires('Archive[/tmp/jdk-7u80-linux-x64.rpm]') } - end - - context 'when Oracle Java SE 8 JDK' do - let(:params) { { ensure: 'present', version: '8', java_se: 'jdk' } } - let(:title) { 'jdk8' } - - it { is_expected.to contain_archive('/tmp/jdk-8u201-linux-x64.rpm') } - it { is_expected.to contain_exec('Install Oracle java_se jdk 8 8u201 b09').with_command('rpm --force -iv /tmp/jdk-8u201-linux-x64.rpm') } - it { is_expected.to contain_exec('Install Oracle java_se jdk 8 8u201 b09').that_requires('Archive[/tmp/jdk-8u201-linux-x64.rpm]') } - end - - context 'when Oracle Java SE 6 JRE' do - let(:params) { { ensure: 'present', version: '6', java_se: 'jre' } } - let(:title) { 'jre6' } - - it { is_expected.to contain_archive('/tmp/jre-6u45-linux-x64-rpm.bin') } - it { is_expected.to contain_exec('Install Oracle java_se jre 6 6u45 b06').with_command('sh /tmp/jre-6u45-linux-x64-rpm.bin -x; rpm --force -iv sun*.rpm; rpm --force -iv jre*.rpm') } - it { is_expected.to contain_exec('Install Oracle java_se jre 6 6u45 b06').that_requires('Archive[/tmp/jre-6u45-linux-x64-rpm.bin]') } - end - - context 'when Oracle Java SE 7 JRE' do - let(:params) { { ensure: 'present', version: '7', java_se: 'jre' } } - let(:title) { 'jre7' } - - it { is_expected.to contain_archive('/tmp/jre-7u80-linux-x64.rpm') } - it { is_expected.to contain_exec('Install Oracle java_se jre 7 7u80 b15').with_command('rpm --force -iv /tmp/jre-7u80-linux-x64.rpm') } - it { is_expected.to contain_exec('Install Oracle java_se jre 7 7u80 b15').that_requires('Archive[/tmp/jre-7u80-linux-x64.rpm]') } - end - - context 'when select Oracle Java SE 8 JRE' do - let(:params) { { ensure: 'present', version: '8', java_se: 'jre' } } - let(:title) { 'jre8' } - - it { is_expected.to contain_archive('/tmp/jre-8u201-linux-x64.rpm') } - it { is_expected.to contain_exec('Install Oracle java_se jre 8 8u201 b09').with_command('rpm --force -iv /tmp/jre-8u201-linux-x64.rpm') } - it { is_expected.to contain_exec('Install Oracle java_se jre 8 8u201 b09').that_requires('Archive[/tmp/jre-8u201-linux-x64.rpm]') } - end - - context 'when passing URL to url parameter' do - let(:params) do - { - ensure: 'present', - version_major: '8u201', - version_minor: 'b09', - java_se: 'jdk', - url: 'http://download.oracle.com/otn-pub/java/jdk/8u201-b09/42970487e3af4f5aa5bca3f542482c60/jdk-8u201-linux-x64.rpm', - url_hash: 'ignored', - } - end - let(:title) { 'jdk8' } - - it { - is_expected.to contain_archive('/tmp/jdk-8u201-linux-x64.rpm') - .with_source('http://download.oracle.com/otn-pub/java/jdk/8u201-b09/42970487e3af4f5aa5bca3f542482c60/jdk-8u201-linux-x64.rpm') - } - end - - context 'when passing a hash to url_hash parameter' do - let(:params) do - { - ensure: 'present', - version_major: '8u201', - version_minor: 'b09', - java_se: 'jdk', - url_hash: '42970487e3af4f5aa5bca3f542482c60', - } - end - let(:title) { 'jdk8' } - - it { - is_expected.to contain_archive('/tmp/jdk-8u201-linux-x64.rpm') - .with_source('http://download.oracle.com/otn-pub/java/jdk//8u201-b09/42970487e3af4f5aa5bca3f542482c60/jdk-8u201-linux-x64.rpm') - } - end - - context 'when installing multiple versions' do - let(:params) do - { - ensure: 'present', - version_major: '8u201', - version_minor: 'b09', - java_se: 'jdk', - url_hash: '42970487e3af4f5aa5bca3f542482c60', - } - end - let(:title) { 'jdk8' } - - let(:pre_condition) do - <<-EOL - java::oracle { - 'jdk8121': - ensure => 'present', - version_major => '8u121', - version_minor => 'b13', - java_se => 'jdk', - url_hash => 'abcdef01234567890', - } - EOL - end - - it { is_expected.to compile } - end - - context 'when installing Oracle Java SE 6 JRE with JCE' do - let(:params) { { ensure: 'present', jce: true, version: '6', version_major: '6u99', version_minor: '99', java_se: 'jre' } } - let(:title) { 'jre6jce' } - - it do - is_expected.to contain_archive('/tmp/jce-6.zip').with_source('http://download.oracle.com/otn-pub/java/jce_policy/6/jce_policy-6.zip') - is_expected.to contain_archive('/tmp/jce-6.zip').with_extract_path('/usr/java/jre1.6.0_99-amd64/lib/security') - end - end - - context 'when installing Oracle Java SE 6 JDK with JCE' do - let(:params) { { ensure: 'present', jce: true, version: '6', version_major: '6u99', version_minor: '99', java_se: 'jdk' } } - let(:title) { 'jre6jce' } - - it do - is_expected.to contain_archive('/tmp/jce-6.zip').with_source('http://download.oracle.com/otn-pub/java/jce_policy/6/jce_policy-6.zip') - 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 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 - { - 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 - 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 - let(:facts) { { kernel: 'Linux', os: { family: 'RedHat', architecture: 'i386', name: 'CentOS', release: { full: '6.6' } } } } - - context 'when selecting Oracle Java SE 6 JDK on RedHat family, 32-bit' do - let(:params) { { ensure: 'present', version: '6', java_se: 'jdk' } } - let(:title) { 'jdk6' } - - it { is_expected.to contain_archive('/tmp/jdk-6u45-linux-i586-rpm.bin') } - it { is_expected.to contain_exec('Install Oracle java_se jdk 6 6u45 b06').with_command('sh /tmp/jdk-6u45-linux-i586-rpm.bin -x; rpm --force -iv sun*.rpm; rpm --force -iv jdk*.rpm') } - it { is_expected.to contain_exec('Install Oracle java_se jdk 6 6u45 b06').that_requires('Archive[/tmp/jdk-6u45-linux-i586-rpm.bin]') } - end - - context 'when selecting Oracle Java SE 7 JDK on RedHat family, 32-bit' do - let(:params) { { ensure: 'present', version: '7', java_se: 'jdk' } } - let(:title) { 'jdk7' } - - it { is_expected.to contain_archive('/tmp/jdk-7u80-linux-i586.rpm') } - it { is_expected.to contain_exec('Install Oracle java_se jdk 7 7u80 b15').with_command('rpm --force -iv /tmp/jdk-7u80-linux-i586.rpm') } - it { is_expected.to contain_exec('Install Oracle java_se jdk 7 7u80 b15').that_requires('Archive[/tmp/jdk-7u80-linux-i586.rpm]') } - end - - context 'when selecting Oracle Java SE 8 JDK on RedHat family, 32-bit' do - let(:params) { { ensure: 'present', version: '8', java_se: 'jdk' } } - let(:title) { 'jdk8' } - - it { is_expected.to contain_archive('/tmp/jdk-8u201-linux-i586.rpm') } - it { is_expected.to contain_exec('Install Oracle java_se jdk 8 8u201 b09').with_command('rpm --force -iv /tmp/jdk-8u201-linux-i586.rpm') } - it { is_expected.to contain_exec('Install Oracle java_se jdk 8 8u201 b09').that_requires('Archive[/tmp/jdk-8u201-linux-i586.rpm]') } - end - - context 'when selecting Oracle Java SE 6 JRE on RedHat family, 32-bit' do - let(:params) { { ensure: 'present', version: '6', java_se: 'jre' } } - let(:title) { 'jdk6' } - - it { is_expected.to contain_archive('/tmp/jre-6u45-linux-i586-rpm.bin') } - it { is_expected.to contain_exec('Install Oracle java_se jre 6 6u45 b06').with_command('sh /tmp/jre-6u45-linux-i586-rpm.bin -x; rpm --force -iv sun*.rpm; rpm --force -iv jre*.rpm') } - it { is_expected.to contain_exec('Install Oracle java_se jre 6 6u45 b06').that_requires('Archive[/tmp/jre-6u45-linux-i586-rpm.bin]') } - end - - context 'when select Oracle Java SE 7 JRE on RedHat family, 32-bit' do - let(:params) { { ensure: 'present', version: '7', java_se: 'jre' } } - let(:title) { 'jdk7' } - - it { is_expected.to contain_archive('/tmp/jre-7u80-linux-i586.rpm') } - it { is_expected.to contain_exec('Install Oracle java_se jre 7 7u80 b15').with_command('rpm --force -iv /tmp/jre-7u80-linux-i586.rpm') } - it { is_expected.to contain_exec('Install Oracle java_se jre 7 7u80 b15').that_requires('Archive[/tmp/jre-7u80-linux-i586.rpm]') } - end - - context 'when select Oracle Java SE 8 JRE on RedHat family, 32-bit' do - let(:params) { { ensure: 'present', version: '8', java_se: 'jre' } } - let(:title) { 'jdk8' } - - it { is_expected.to contain_archive('/tmp/jre-8u201-linux-i586.rpm') } - it { is_expected.to contain_exec('Install Oracle java_se jre 8 8u201 b09').with_command('rpm --force -iv /tmp/jre-8u201-linux-i586.rpm') } - it { is_expected.to contain_exec('Install Oracle java_se jre 8 8u201 b09').that_requires('Archive[/tmp/jre-8u201-linux-i586.rpm]') } - end - - context 'when installing multiple versions' do - let(:params) do - { - ensure: 'present', - version_major: '8u201', - version_minor: 'b09', - java_se: 'jdk', - url_hash: '42970487e3af4f5aa5bca3f542482c60', - } - end - let(:title) { 'jdk8' } - - let(:pre_condition) do - <<-EOL - java::oracle { - 'jdk8121': - ensure => 'present', - version_major => '8u121', - version_minor => 'b13', - java_se => 'jdk', - url_hash => 'abcdef01234567890', - } - EOL - end - - it { is_expected.to compile } - end - - context 'when installing Oracle Java SE 6 JRE with JCE' do - let(:params) { { ensure: 'present', jce: true, version: '6', version_major: '6u99', version_minor: '99', java_se: 'jre' } } - let(:title) { 'jre6jce' } - - it do - is_expected.to contain_archive('/tmp/jce-6.zip').with_source('http://download.oracle.com/otn-pub/java/jce_policy/6/jce_policy-6.zip') - is_expected.to contain_archive('/tmp/jce-6.zip').with_extract_path('/usr/java/jre1.6.0_99-amd64/lib/security') - end - end - - context 'when installing Oracle Java SE 6 JDK with JCE' do - let(:params) { { ensure: 'present', jce: true, version: '6', version_major: '6u99', version_minor: '99', java_se: 'jdk' } } - let(:title) { 'jre6jce' } - - it do - is_expected.to contain_archive('/tmp/jce-6.zip').with_source('http://download.oracle.com/otn-pub/java/jce_policy/6/jce_policy-6.zip') - is_expected.to contain_archive('/tmp/jce-6.zip').with_extract_path('/usr/java/jdk1.6.0_99-amd64/jre/lib/security') - end - end - end - - context 'with Ubuntu 64-bit' do - let(:facts) { { kernel: 'Linux', os: { family: 'Debian', architecture: 'amd64', name: 'Ubuntu', release: { full: '16.04' } } } } - - context 'when Oracle Java SE 6 JDK' do - let(:params) { { ensure: 'present', version: '6', java_se: 'jdk' } } - 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 6u45 b06').with_command('tar -zxf /tmp/jdk-6u45-linux-x64.tar.gz -C /usr/lib/jvm') } - 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 'with Oracle Java SE 7 JDK' do - let(:params) { { ensure: 'present', version: '7', java_se: 'jdk' } } - let(:title) { 'jdk7' } - - it { is_expected.to contain_archive('/tmp/jdk-7u80-linux-x64.tar.gz') } - it { is_expected.to contain_exec('Install Oracle java_se jdk 7 7u80 b15').with_command('tar -zxf /tmp/jdk-7u80-linux-x64.tar.gz -C /usr/lib/jvm') } - it { is_expected.to contain_exec('Install Oracle java_se jdk 7 7u80 b15').that_requires('Archive[/tmp/jdk-7u80-linux-x64.tar.gz]') } - end - - context 'with Oracle Java SE 8 JDK' do - let(:params) { { ensure: 'present', version: '8', java_se: 'jdk' } } - let(:title) { 'jdk8' } - - it { is_expected.to contain_archive('/tmp/jdk-8u201-linux-x64.tar.gz') } - it { is_expected.to contain_exec('Install Oracle java_se jdk 8 8u201 b09').with_command('tar -zxf /tmp/jdk-8u201-linux-x64.tar.gz -C /usr/lib/jvm') } - it { is_expected.to contain_exec('Install Oracle java_se jdk 8 8u201 b09').that_requires('Archive[/tmp/jdk-8u201-linux-x64.tar.gz]') } - end - - context 'with Oracle Java SE 6 JRE' do - let(:params) { { ensure: 'present', version: '6', java_se: 'jre' } } - let(:title) { 'jre6' } - - it { is_expected.to contain_archive('/tmp/jre-6u45-linux-x64.tar.gz') } - it { is_expected.to contain_exec('Install Oracle java_se jre 6 6u45 b06').with_command('tar -zxf /tmp/jre-6u45-linux-x64.tar.gz -C /usr/lib/jvm') } - it { is_expected.to contain_exec('Install Oracle java_se jre 6 6u45 b06').that_requires('Archive[/tmp/jre-6u45-linux-x64.tar.gz]') } - end - - context 'when Oracle Java SE 7 JRE' do - let(:params) { { ensure: 'present', version: '7', java_se: 'jre' } } - let(:title) { 'jre7' } - - it { is_expected.to contain_archive('/tmp/jre-7u80-linux-x64.tar.gz') } - it { is_expected.to contain_exec('Install Oracle java_se jre 7 7u80 b15').with_command('tar -zxf /tmp/jre-7u80-linux-x64.tar.gz -C /usr/lib/jvm') } - it { is_expected.to contain_exec('Install Oracle java_se jre 7 7u80 b15').that_requires('Archive[/tmp/jre-7u80-linux-x64.tar.gz]') } - end - - context 'when Oracle Java SE 8 JRE' do - let(:params) { { ensure: 'present', version: '8', java_se: 'jre' } } - let(:title) { 'jre8' } - - it { is_expected.to contain_archive('/tmp/jre-8u201-linux-x64.tar.gz') } - it { is_expected.to contain_exec('Install Oracle java_se jre 8 8u201 b09').with_command('tar -zxf /tmp/jre-8u201-linux-x64.tar.gz -C /usr/lib/jvm') } - it { is_expected.to contain_exec('Install Oracle java_se jre 8 8u201 b09').that_requires('Archive[/tmp/jre-8u201-linux-x64.tar.gz]') } - end - - context 'when passing URL to url parameter' do - let(:params) { { ensure: 'present', version_major: '8u201', version_minor: 'b09', java_se: 'jdk', url: oracle_url.to_s } } - let(:title) { 'jdk8' } - - it { is_expected.to contain_archive('/tmp/jdk-8u201-linux-x64.tar.gz') } - end - - context 'when installing multiple versions' do - let(:params) do - { - ensure: 'present', - version_major: '8u201', - version_minor: 'b09', - java_se: 'jdk', - url_hash: '42970487e3af4f5aa5bca3f542482c60', - } - end - let(:title) { 'jdk8' } - - let(:pre_condition) do - <<-EOL - java::oracle { - 'jdk8121': - ensure => 'present', - version_major => '8u121', - version_minor => 'b13', - java_se => 'jdk', - url_hash => 'abcdef01234567890', - } - EOL - end - - it { is_expected.to compile } - end - - context 'when installing Oracle Java SE 6 JRE with JCE' do - let(:params) { { ensure: 'present', jce: true, version: '6', version_major: '6u99', version_minor: '99', java_se: 'jre' } } - let(:title) { 'jre6jce' } - - it do - is_expected.to contain_archive('/tmp/jce-6.zip').with_source('http://download.oracle.com/otn-pub/java/jce_policy/6/jce_policy-6.zip') - is_expected.to contain_archive('/tmp/jce-6.zip').with_extract_path('/usr/lib/jvm/jre1.6.0_99/lib/security') - end - end - - context 'when installing Oracle Java SE 6 JDK with JCE' do - let(:params) { { ensure: 'present', jce: true, version: '6', version_major: '6u99', version_minor: '99', java_se: 'jdk' } } - let(:title) { 'jre6jce' } - - it do - is_expected.to contain_archive('/tmp/jce-6.zip').with_source('http://download.oracle.com/otn-pub/java/jce_policy/6/jce_policy-6.zip') - is_expected.to contain_archive('/tmp/jce-6.zip').with_extract_path('/usr/lib/jvm/jdk1.6.0_99/jre/lib/security') - end - end - end - describe 'incompatible OSes' do - [ - { - kernel: 'Windows', - os: { - family: 'Windows', - name: 'Windows', - release: { - full: '8.1', - }, - }, - }, - { - kernel: 'Darwin', - os: { - family: 'Darwin', - name: 'Darwin', - release: { - full: '13.3.0', - }, - }, - }, - { - kernel: 'AIX', - os: { - family: 'AIX', - name: 'AIX', - release: { - full: '7100-02-00-000', - }, - }, - }, - { - kernel: 'AIX', - os: { - family: 'AIX', - name: 'AIX', - release: { - full: '6100-07-04-1216', - }, - }, - }, - { - kernel: 'AIX', - os: { - family: 'AIX', - name: 'AIX', - release: { - full: '5300-12-01-1016', - }, - }, - }, - ].each do |facts| - let(:facts) { facts } - let(:title) { 'jdk' } - - it "is_expected.to fail on #{facts[:os][:name]} #{facts[:os][:release][:full]}" do - expect { catalogue }.to raise_error Puppet::Error, %r{unsupported platform} - end - end - end -end diff --git a/spec/defines/sap_spec.rb b/spec/defines/sap_spec.rb new file mode 100644 index 00000000..5f4f9945 --- /dev/null +++ b/spec/defines/sap_spec.rb @@ -0,0 +1,259 @@ +# frozen_string_literal: true + +require 'spec_helper' + +describe 'java::sap', type: :define do + context 'with CentOS 64-bit' do + let(:facts) { { kernel: 'Linux', os: { family: 'RedHat', architecture: 'x86_64', name: 'CentOS', release: { full: '7.0' } } } } + + context 'when manage_symlink is set to true' do + let(:params) do + { + ensure: 'present', + version: '11', + java: 'jdk', + basedir: '/usr/java', + manage_symlink: true, + symlink_name: 'java_home' + } + end + let(:title) { 'jdk11_symlink' } + + it { is_expected.to contain_file('/usr/java/java_home') } + end + + context 'when manage_symlink is not set' do + let(:params) { { ensure: 'present', version: '11', java: 'jdk' } } + let(:title) { 'jdk11_nosymlink' } + + it { is_expected.not_to contain_file('/usr/java/java_home') } + end + + context 'when sapjvm 7' do + let(:params) { { ensure: 'present', version: '7', java: 'jdk' } } + let(:title) { 'jdk7' } + + it { is_expected.to contain_archive('/tmp/sapjvm-7.1.072-linux-x64.zip') } + end + + context 'when sapjvm 8' do + let(:params) { { ensure: 'present', version: '8', java: 'jdk' } } + let(:title) { 'jdk8' } + + it { is_expected.to contain_archive('/tmp/sapjvm-8.1.065-linux-x64.zip') } + end + + context 'when sapmachine 11 jdk' do + let(:params) { { ensure: 'present', version: '11', java: 'jdk' } } + let(:title) { 'jdk11' } + + it { is_expected.to contain_archive('/tmp/sapmachine-jdk-11.0.7_linux-x64_bin.tar.gz') } + end + + context 'when sapmachine 11 jre' do + let(:params) { { ensure: 'present', version: '11', java: 'jre' } } + let(:title) { 'jre11' } + + it { is_expected.to contain_archive('/tmp/sapmachine-jre-11.0.7_linux-x64_bin.tar.gz') } + end + + context 'when sapmachine 14 jdk' do + let(:params) { { ensure: 'present', version: '14', java: 'jdk' } } + let(:title) { 'jdk14' } + + it { is_expected.to contain_archive('/tmp/sapmachine-jdk-14.0.1_linux-x64_bin.tar.gz') } + end + + context 'when sapmachine 14 jre' do + let(:params) { { ensure: 'present', version: '14', java: 'jre' } } + let(:title) { 'jre14' } + + it { is_expected.to contain_archive('/tmp/sapmachine-jre-14.0.1_linux-x64_bin.tar.gz') } + end + + context 'when installing multiple versions' do + let(:params) do + { + ensure: 'present', + version_full: '11.0.7', + java: 'jdk' + } + end + let(:title) { 'jdk1107' } + + let(:pre_condition) do + <<-MANIFEST + java::sap { + 'jdk1106': + ensure => 'present', + version_full => '11.0.6', + java => 'jdk', + } + MANIFEST + end + + it { is_expected.to compile } + end + + context 'when specifying basedir' do + let(:params) do + { + ensure: 'present', + version: '8', + java: 'jdk', + basedir: '/usr/java' + } + end + let(:title) { 'jdk8' } + + it { is_expected.to contain_archive('/tmp/sapjvm-8.1.065-linux-x64.zip') } + end + + context 'when manage_basedir is set to true' do + let(:params) do + { + ensure: 'present', + version: '8', + java: 'jdk', + basedir: '/usr/java', + manage_basedir: true + } + end + let(:title) { 'jdk8' } + + it { is_expected.to contain_file('/usr/java') } + end + end + + context 'with Ubuntu 64-bit' do + let(:facts) { { kernel: 'Linux', os: { family: 'Debian', architecture: 'amd64', name: 'Ubuntu', release: { full: '18.04' } } } } + + context 'when sapjvm 7' do + let(:params) { { ensure: 'present', version: '7', java: 'jdk' } } + let(:title) { 'jdk7' } + + it { is_expected.to contain_archive('/tmp/sapjvm-7.1.072-linux-x64.zip') } + end + + context 'when sapjvm 8' do + let(:params) { { ensure: 'present', version: '8', java: 'jdk' } } + let(:title) { 'jdk8' } + + it { is_expected.to contain_archive('/tmp/sapjvm-8.1.065-linux-x64.zip') } + end + + context 'when sapmachine 11 jdk' do + let(:params) { { ensure: 'present', version: '11', java: 'jdk' } } + let(:title) { 'jdk11' } + + it { is_expected.to contain_archive('/tmp/sapmachine-jdk-11.0.7_linux-x64_bin.tar.gz') } + end + + context 'when sapmachine 11 jre' do + let(:params) { { ensure: 'present', version: '11', java: 'jre' } } + let(:title) { 'jre11' } + + it { is_expected.to contain_archive('/tmp/sapmachine-jre-11.0.7_linux-x64_bin.tar.gz') } + end + + context 'when sapmachine 14 jdk' do + let(:params) { { ensure: 'present', version: '14', java: 'jdk' } } + let(:title) { 'jdk14' } + + it { is_expected.to contain_archive('/tmp/sapmachine-jdk-14.0.1_linux-x64_bin.tar.gz') } + end + + context 'when sapmachine 14 jre' do + let(:params) { { ensure: 'present', version: '14', java: 'jre' } } + let(:title) { 'jre14' } + + it { is_expected.to contain_archive('/tmp/sapmachine-jre-14.0.1_linux-x64_bin.tar.gz') } + end + + context 'when installing multiple versions' do + let(:params) do + { + ensure: 'present', + version_full: '11.0.7', + java: 'jdk' + } + end + let(:title) { 'jdk1107' } + + let(:pre_condition) do + <<-MANIFEST + java::sap { + 'jdk1106': + ensure => 'present', + version_full => '11.0.6', + java => 'jdk', + } + MANIFEST + end + + it { is_expected.to compile } + end + end + + describe 'incompatible OSes' do + [ + { + kernel: 'Windows', + os: { + family: 'Windows', + name: 'Windows', + release: { + full: '8.1' + } + } + }, + { + kernel: 'Darwin', + os: { + family: 'Darwin', + name: 'Darwin', + release: { + full: '13.3.0' + } + } + }, + { + kernel: 'AIX', + os: { + family: 'AIX', + name: 'AIX', + release: { + full: '7100-02-00-000' + } + } + }, + { + kernel: 'AIX', + os: { + family: 'AIX', + name: 'AIX', + release: { + full: '6100-07-04-1216' + } + } + }, + { + kernel: 'AIX', + os: { + family: 'AIX', + name: 'AIX', + release: { + full: '5300-12-01-1016' + } + } + }, + ].each do |facts| + let(:facts) { facts } + let(:title) { 'jdk' } + + it "is_expected.to fail on #{facts[:os][:name]} #{facts[:os][:release][:full]}" do + expect { catalogue }.to raise_error Puppet::Error, %r{unsupported platform} + end + end + end +end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 9ee43737..ae7c1f68 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + RSpec.configure do |c| c.mock_with :rspec end @@ -23,23 +25,42 @@ next unless File.exist?(f) && File.readable?(f) && File.size?(f) begin - default_facts.merge!(YAML.safe_load(File.read(f), [], [], true)) - rescue => e + require 'deep_merge' + default_facts.deep_merge!(YAML.safe_load(File.read(f), permitted_classes: [], permitted_symbols: [], aliases: true)) + rescue StandardError => e RSpec.configuration.reporter.message "WARNING: Unable to load #{f}: #{e}" end end +# read default_facts and merge them over what is provided by facterdb +default_facts.each do |fact, value| + add_custom_fact fact, value, merge_facts: true +end + RSpec.configure do |c| c.default_facts = default_facts c.before :each do # set to strictest setting for testing # by default Puppet runs at warning level Puppet.settings[:strict] = :warning + Puppet.settings[:strict_variables] = true end c.filter_run_excluding(bolt: true) unless ENV['GEM_BOLT'] c.after(:suite) do RSpec::Puppet::Coverage.report!(0) end + + # Filter backtrace noise + backtrace_exclusion_patterns = [ + %r{spec_helper}, + %r{gems}, + ] + + if c.respond_to?(:backtrace_exclusion_patterns) + c.backtrace_exclusion_patterns = backtrace_exclusion_patterns + elsif c.respond_to?(:backtrace_clean_patterns) + c.backtrace_clean_patterns = backtrace_exclusion_patterns + end end # Ensures that a module is defined diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index db02d651..4ac8d7e0 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -1,37 +1,6 @@ -require 'beaker-pe' -require 'beaker-puppet' -require 'beaker-rspec' -require 'beaker/puppet_install_helper' -require 'beaker/module_install_helper' +# frozen_string_literal: true -run_puppet_install_helper -configure_type_defaults_on(hosts) -install_module_on(hosts) -install_module_dependencies_on(hosts) +require 'puppet_litmus' +require 'spec_helper_acceptance_local' if File.file?(File.join(File.dirname(__FILE__), 'spec_helper_acceptance_local.rb')) -UNSUPPORTED_PLATFORMS = ['Darwin', 'windows'].freeze - -unless ENV['RS_PROVISION'] == 'no' || ENV['BEAKER_provision'] == 'no' - hosts.each do |host| - install_puppet_module_via_pmt_on(host, module_name: 'puppetlabs-apt') - end -end - -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 +PuppetLitmus.configure! diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb new file mode 100644 index 00000000..664fc0e7 --- /dev/null +++ b/spec/spec_helper_acceptance_local.rb @@ -0,0 +1,3 @@ +# frozen_string_literal: true + +UNSUPPORTED_PLATFORMS = ['darwin', 'windows'].freeze diff --git a/spec/spec_helper_local.rb b/spec/spec_helper_local.rb index 2e897cb5..ce4d0623 100644 --- a/spec/spec_helper_local.rb +++ b/spec/spec_helper_local.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + if ENV['COVERAGE'] == 'yes' require 'simplecov' require 'simplecov-console' diff --git a/spec/unit/facter/java_default_home_spec.rb b/spec/unit/facter/java_default_home_spec.rb index 31ecd68b..480fec9d 100644 --- a/spec/unit/facter/java_default_home_spec.rb +++ b/spec/unit/facter/java_default_home_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' java_7_path = '/usr/lib/jvm/java-7-openjdk-amd64/jre/bin/java' @@ -6,17 +8,16 @@ java_8_home = '/usr/lib/jvm/oracle-java8-jre-amd64' def unlink_and_delete(filename) - if File.symlink?(filename) - File.unlink(filename) - end + File.unlink(filename) if File.symlink?(filename) return unless File.exist?(filename) + File.delete(filename) end def symlink_and_test(symlink_path, java_home) File.symlink(symlink_path, './java_test') - 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) + allow(Facter::Core::Execution).to receive(:which).with('java').and_return('./java_test') + allow(File).to receive(:realpath).with('./java_test').and_return(symlink_path) expect(Facter.value(:java_default_home)).to eql java_home end @@ -46,8 +47,8 @@ def symlink_and_test(symlink_path, java_home) 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(nil) + allow(Facter::Core::Execution).to receive(:execute) # Catch all other calls + expect(Facter::Core::Execution).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 b6277cf9..585dafa4 100644 --- a/spec/unit/facter/java_libjvm_path_spec.rb +++ b/spec/unit/facter/java_libjvm_path_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' describe 'java_libjvm_path' do @@ -5,12 +7,13 @@ before(:each) do Facter.clear - allow(Facter.fact(:kernel)).to receive(:value).once.and_return('Linux') - allow(Facter.fact(:java_default_home)).to receive(:value).once.and_return(java_default_home) + allow(Facter.fact(:kernel)).to receive(:value).and_return('Linux') + allow(Facter.fact(:java_default_home)).to receive(:value).and_return(java_default_home) end context 'when libjvm exists' do it do + allow(Facter.fact(:java_major_version)).to receive(:value).and_return(8) 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 @@ -18,8 +21,8 @@ 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 + allow(Dir).to receive(:glob).with("#{java_default_home}/lib/**/libjvm.so").and_return([]) + expect(Facter.value(:java_libjvm_path)).to be_nil end end end diff --git a/spec/unit/facter/java_major_version_spec.rb b/spec/unit/facter/java_major_version_spec.rb index b9ead125..2260f41f 100644 --- a/spec/unit/facter/java_major_version_spec.rb +++ b/spec/unit/facter/java_major_version_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' describe 'java_major_version' do @@ -9,6 +11,7 @@ before :each do 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') end @@ -16,8 +19,9 @@ context 'when java not present, returns nil' do before :each do - allow(Facter.fact(:java_version)).to receive(:value).and_return('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 end diff --git a/spec/unit/facter/java_patch_level_spec.rb b/spec/unit/facter/java_patch_level_spec.rb index 4287b297..a8d66ca9 100644 --- a/spec/unit/facter/java_patch_level_spec.rb +++ b/spec/unit/facter/java_patch_level_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' describe 'java_patch_level' do @@ -9,6 +11,7 @@ before :each do 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') end @@ -18,6 +21,7 @@ before :each do allow(Facter.fact(:java_version)).to receive(:value).and_return('nil') end + it do expect(Facter.fact(:java_patch_level).value).to be_nil end diff --git a/spec/unit/facter/java_version_spec.rb b/spec/unit/facter/java_version_spec.rb index 20f4f523..821f940d 100644 --- a/spec/unit/facter/java_version_spec.rb +++ b/spec/unit/facter/java_version_spec.rb @@ -1,13 +1,15 @@ +# frozen_string_literal: true + require 'spec_helper' -openjdk_7_output = "Picked up JAVA_TOOL_OPTIONS: -Djava.net.preferIPv4Stack=true\n"\ - "openjdk version \"1.7.0_71\"\n"\ - "OpenJDK Runtime Environment (build 1.7.0_71-b14)\n"\ +openjdk_7_output = "Picked up JAVA_TOOL_OPTIONS: -Djava.net.preferIPv4Stack=true\n" \ + "openjdk version \"1.7.0_71\"\n" \ + "OpenJDK Runtime Environment (build 1.7.0_71-b14)\n" \ "OpenJDK 64-Bit Server VM (build 24.71-b01, mixed mode)\n" -jdk_7_hotspot_output = "Picked up JAVA_TOOL_OPTIONS: -Djava.net.preferIPv4Stack=true\n"\ - "java version \"1.7.0_71\"\n"\ - "Java(TM) SE Runtime Environment (build 1.7.0_71-b14)\n"\ +jdk_7_hotspot_output = "Picked up JAVA_TOOL_OPTIONS: -Djava.net.preferIPv4Stack=true\n" \ + "java version \"1.7.0_71\"\n" \ + "Java(TM) SE Runtime Environment (build 1.7.0_71-b14)\n" \ "Java HotSpot(TM) 64-Bit Server VM (build 24.71-b01, mixed mode)\n" describe 'java_version' do @@ -16,75 +18,90 @@ end context 'when java present, returns java version' do - context 'on OpenBSD', with_env: true do + context 'when on OpenBSD', with_env: true do before(:each) do allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('OpenBSD') + allow(Facter.fact(:kernel)).to receive(:value).and_return('Linux') end + let(:facts) { { operatingsystem: 'OpenBSD' } } it do - 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) + allow(Facter::Core::Execution).to receive(:which).with('java').and_return('/usr/local/jdk-1.7.0/jre/bin/java') + allow(Facter::Core::Execution).to receive(:execute).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 - allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('Darwin') + allow(Facter.fact(:kernel)).to receive(:value).and_return('Darwin') end - let(:facts) { { operatingsystem: 'Darwin' } } + + let(:facts) { { kernel: 'Darwin' } } it do - 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' + allow(Facter::Core::Execution).to receive(:execute).with('/usr/libexec/java_home --failfast', { on_fail: false }).and_return('/Library/Java/JavaVirtualMachines/jdk1.7.0_71.jdk/Contents/Home') + allow(Facter::Core::Execution).to receive(:execute).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 + context 'when on other systems' do before(:each) do allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('MyOS') + allow(Facter.fact(:kernel)).to receive(:value).and_return('Linux') end + let(:facts) { { operatingsystem: 'MyOS' } } it do - 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) + allow(Facter::Core::Execution).to receive(:which).with('java').and_return('/path/to/java') + allow(Facter::Core::Execution).to receive(:execute).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 end context 'when java not present, returns nil' do - context 'on OpenBSD', with_env: true do + context 'when on OpenBSD', with_env: true do before(:each) do allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('OpenBSD') + allow(Facter.fact(:kernel)).to receive(:value).and_return('Linux') end + let(:facts) { { operatingsystem: 'OpenBSD' } } it do - allow(Facter::Util::Resolution).to receive(:exec) # Catch all other calls + allow(Facter::Core::Execution).to receive(:execute) # Catch all other calls + allow(Facter::Core::Execution).to receive(:which).and_return(nil) expect(Facter.value(:java_version)).to be_nil end end + context 'when on Darwin' do before(:each) do - allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('Darwin') + allow(Facter.fact(:kernel)).to receive(:value).and_return('Darwin') end - let(:facts) { { operatingsystem: 'Darwin' } } + + let(:facts) { { kernel: 'Darwin' } } it do - 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::Core::Execution).to receive(:execute).with('/usr/libexec/java_home --failfast', { on_fail: false }).at_least(1).and_return(false) expect(Facter.value(:java_version)).to be_nil end end + context 'when on other systems' do before(:each) do allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('MyOS') + allow(Facter.fact(:kernel)).to receive(:value).and_return('Linux') end + let(:facts) { { operatingsystem: 'MyOS' } } it do - expect(Facter::Util::Resolution).to receive(:which).at_least(1).with('java').and_return(false) + expect(Facter::Core::Execution).to receive(:which).at_least(1).with('java').and_return(false) expect(Facter.value(:java_version)).to be_nil end end