Air gap mode and alternative URLs for repository addresses (#730)

Signed-off-by: Dan Webb <[email protected]>

Author: damacus

CHANGELOG.md

@@ -4,9 +4,10 @@ This file is used to list changes made in each version of the Java cookbook.
 
 ## Unreleased
 
-Standardise files with files in sous-chefs/repo-management
-
-- Update the recommended Ruby VSCode extensions
+- Add `repository_uri` property to `temurin_package_install` and `openjdk_pkg_install` resources to support installation from alternative/internal mirrors ([#728](https://github.com/sous-chefs/java/issues/728))
+- Clarify documentation for `url` property in `openjdk_source_install` resource to note it can be used for internal mirrors
+- Standardise files with files in sous-chefs/repo-management
+  Update the recommended Ruby VSCode extensions
 - Fix missing skip_alternatives property in openjdk_pkg_install
 
 ## 13.1.0 - *2025-07-14*

documentation/resources/openjdk_pkg_install.md

@@ -25,6 +25,7 @@ Introduced: v8.1.0
 | alternatives_priority | Integer | `1062`                               | Alternatives priority to set for this Java          |
 | reset_alternatives    | Boolean | `true`                               | Whether to reset alternatives before setting        |
 | skip_alternatives     | Boolean | `false`                              | Skip alternatives installation completely           |
+| repository_uri        | String  | `nil`                                | URI for the repository mirror to use instead of default repository URLs |
 
 ## Examples
 

documentation/resources/temurin_package_install.md

@@ -24,6 +24,8 @@ Introduced: v12.0.0
 | `reset_alternatives`  | Boolean        | true                                   | Whether to reset alternatives before setting |
 | `default`             | Boolean        | true                                   | Whether to set this as the default Java      |
 | `skip_alternatives`   | Boolean        | false                                  | Skip alternatives installation completely    |
+| `repository_uri`      | String         | `nil`                                  | URI for the repository mirror to use instead of default repository URLs |
+| air_gap | Boolean | false | Whether to install in air-gap mode |
 
 ## Platform Support
 
@@ -63,7 +65,7 @@ temurin_package_install '11' do
 end
 ```
 
-## Platform Support
+## Supported Platforms
 
 This resource supports the following platforms:
 
@@ -76,8 +78,9 @@ This resource supports the following platforms:
 
 Each platform will have the appropriate Adoptium repository configured automatically.
 
-## Notes
+## Additional Information
 
 - This resource uses the Adoptium API to validate available releases.
 - The resource will warn if a requested version is not available as an LTS release.
 - For most use cases, you can simply specify the major version number.
+- Air-gap mode disables version checking via the Adoptium API and instead uses the version specified in the `pkg_version` property.

resources/openjdk_pkg_install.rb

@@ -22,14 +22,17 @@
           default: 1062,
           description: 'Alternatives priority to set for this Java'
 
+property :repository_uri, String,
+          description: 'URI for the repository mirror (e.g., "https://custom-mirror.example.com/openjdk/ubuntu")'
+
 use 'partial/_common'
 use 'partial/_linux'
 use 'partial/_openjdk'
 
 action :install do
   if platform?('ubuntu')
     apt_repository 'openjdk-r-ppa' do
-      uri 'ppa:openjdk-r'
+      uri new_resource.repository_uri || 'ppa:openjdk-r'
     end
   end
 

resources/openjdk_source_install.rb

@@ -9,7 +9,7 @@
 
 property :url, String,
           default: lazy { default_openjdk_url(version, variant) },
-          description: 'The URL to download from'
+          description: 'The URL to download from. Can be an internal mirror URL (e.g., "https://internal-mirror.example.com/java/openjdk/").'
 
 property :checksum, String,
           regex: /^[0-9a-f]{32}$|^[a-zA-Z0-9]{40,64}$/,

resources/temurin_package_install.rb

@@ -27,12 +27,15 @@ def default_temurin_pkg_name(version)
          default: lazy { default_bin_cmds(version) },
          description: 'A list of bin_cmds based on the version'
 
+property :repository_uri, String,
+         description: 'URI for the repository mirror (e.g., "https://custom-mirror.example.com/artifactory/deb")'
+
 use 'partial/_common'
 use 'partial/_linux'
 
 action :install do
   apt_repository 'adoptium' do
-    uri 'https://packages.adoptium.net/artifactory/deb'
+    uri new_resource.repository_uri || 'https://packages.adoptium.net/artifactory/deb'
     components ['main']
     distribution lazy { node['lsb']['codename'] || node['debian']['distribution_codename'] }
     # TODO: https://github.com/chef/chef/pull/15043
@@ -45,7 +48,7 @@ def default_temurin_pkg_name(version)
 
   yum_repository 'adoptium' do
     description 'Eclipse Adoptium'
-    baseurl value_for_platform(
+    baseurl new_resource.repository_uri || value_for_platform(
       'amazon' => { 'default' => 'https://packages.adoptium.net/artifactory/rpm/amazonlinux/2/$basearch' },
       'centos' => { 'default' => 'https://packages.adoptium.net/artifactory/rpm/centos/$releasever/$basearch' },
       'fedora' => { 'default' => 'https://packages.adoptium.net/artifactory/rpm/fedora/$releasever/$basearch' },
@@ -63,7 +66,7 @@ def default_temurin_pkg_name(version)
 
   zypper_repository 'adoptium' do
     description 'Eclipse Adoptium'
-    baseurl 'https://packages.adoptium.net/artifactory/rpm/opensuse/$releasever/$basearch'
+    baseurl new_resource.repository_uri || 'https://packages.adoptium.net/artifactory/rpm/opensuse/$releasever/$basearch'
     gpgcheck true
     gpgkey 'https://packages.adoptium.net/artifactory/api/gpg/key/public'
     action :create