Merge pull request #373 from Esri/4.2.0

Release v4.2.0

cookbooks/arcgis-desktop/CHANGELOG.md

@@ -3,6 +3,10 @@ arcgis-desktop cookbook CHANGELOG
 
 This file is used to list changes made in each version of the arcgis-desktop cookbook.
 
+4.2.0
+-----
+- Added support for ArcGIS License Manager 2023.0
+
 4.1.0
 -----
 - Added support for ArcGIS License Manager 2022.1

cookbooks/arcgis-desktop/README.md

@@ -3,7 +3,7 @@ layout: default
 title: "arcgis-desktop cookbook"
 category: cookbooks
 item: arcgis-desktop
-version: 4.1.0
+version: 4.2.0
 latest: true
 ---
 
@@ -38,6 +38,7 @@ This cookbook installs and configures ArcGIS Desktop and ArcGIS License Manager.
    * 2021.1
    * 2022.0
    * 2022.1
+   * 2023.0
 
 ## Platforms
 
@@ -71,7 +72,7 @@ The following cookbooks are required:
 * `node['arcgis']['desktop']['esri_license_host']` = Hostname of ArcGIS License Manager. Default hostname is `%COMPUTERNAME%`.
 * `node['arcgis']['desktop']['software_class']` = ArcGIS Desktop software class `<Viewer|Editor|Professional>`. Default value is `Viewer`.
 * `node['arcgis']['desktop']['seat_preference']` = ArcGIS Desktop license seat preference `<Fixed|Float>`. Default value is `Fixed`.
-* `node['arcgis']['licensemanager']['version']` = ArcGIS License Manager version. Default value is `2022.1`.
+* `node['arcgis']['licensemanager']['version']` = ArcGIS License Manager version. Default value is `2023.0`.
 * `node['arcgis']['licensemanager']['setup_archive']` = The location of ArcGIS License Manager setup archive. Default value depends on `node['arcgis']['version']` attribute value.
 * `node['arcgis']['licensemanager']['setup']` = The location of ArcGIS License Manager setup executable. Default location is `%USERPROFILE%\Documents\ArcGIS License Manager 2022.1\LicenseManager\Setup.exe` on Windows, and `/opt/arcgis/2022.1/LicenseManager_Linux/Setup` on Linux.
 * `node['arcgis']['licensemanager']['lp-setup']` = The location of language pack for ArcGIS License Manager. Default location is `C:\ArcGIS\LicenseManager\SetupFiles\setup.msi`.
@@ -144,8 +145,8 @@ Attributes used by the recipe:
        "setups": "C:\\Software\\Setups" 
     },
     "licensemanager": {
-      "version": "2022.1",
-      "setup": "C:\\Software\\Setups\\License Manager 2022.1\\LicenseManager\\Setup.exe",
+      "version": "2023.0",
+      "setup": "C:\\Software\\Setups\\License Manager 2023.0\\LicenseManager\\Setup.exe",
       "install_dir": "C:\\Program Files (x86)\\ArcGIS"
     }
   },

cookbooks/arcgis-desktop/attributes/licensemanager.rb

@@ -17,7 +17,7 @@
 # limitations under the License.
 
 default['arcgis']['licensemanager'].tap do |licensemanager|
-  licensemanager['version'] = '2022.1'
+  licensemanager['version'] = '2023.0'
 
   case node['platform']
   when 'windows'
@@ -28,6 +28,10 @@
     licensemanager['install_dir'] = ENV['ProgramFiles(x86)'] + '\\ArcGIS'
 
     case node['arcgis']['licensemanager']['version']
+    when '2023.0'
+      licensemanager['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
+                                                    'ArcGIS_License_Manager_Windows_2023_0_187870.exe').gsub('/', '\\')
+      licensemanager['product_code'] = 'C5E546F7-5E07-4AAB-A367-15FF52D0C683'
     when '2022.1'
       licensemanager['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
                                                     'ArcGIS_License_Manager_Windows_2022_1_184717.exe').gsub('/', '\\')
@@ -98,6 +102,12 @@
     licensemanager['install_subdir'] = 'arcgis/license' + node['arcgis']['licensemanager']['version']
 
     case node['arcgis']['licensemanager']['version']
+    when '2023.0'
+      licensemanager['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
+                                                    'ArcGIS_License_Manager_Linux_2023_0_187909.tar.gz')
+      licensemanager['setup'] = ::File.join(node['arcgis']['repository']['setups'],
+                                            node['arcgis']['licensemanager']['version'],
+                                            'Setup')
     when '2022.1'
       licensemanager['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
                                                     'ArcGIS_License_Manager_Linux_2022_1_184756.tar.gz')

cookbooks/arcgis-desktop/libraries/esri_properties.rb

@@ -0,0 +1,58 @@
+#
+# Copyright 2018 Esri
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'java-properties'
+
+# Utilities for reading '~/.ESRI.properties.<hostname>.<ArcGIS version>' file
+
+module EsriProperties
+
+  def self.esri_properties(user, hostname, arcgis_version)
+    properties_file_path = "/home/#{user}/.ESRI.properties.*.#{arcgis_version}"
+
+    cmd = Mixlib::ShellOut.new("cat #{properties_file_path}", { :user => user })
+    cmd.run_command
+    return {} if cmd.error?
+
+    esri_properties = ::JavaProperties.parse(cmd.stdout)
+  end
+
+  # Returns installation directory for the specified ArcGIS product.
+  # Valid product names are :ArcGISGeoEvent, :ArcGISServer, :ArcGISPortal, :ArcGISDataStore
+  def self.product_install_dir(user, hostname, arcgis_version, product_name)
+    esri_properties = self.esri_properties(user, hostname, arcgis_version)
+
+    esri_properties["Z_#{product_name}_INSTALL_DIR".to_sym]
+  end
+
+  # Returns true if the the specified ArcGIS product is installed.
+  # Valid product names are :ArcGISGeoEvent, :ArcGISServer, :ArcGISPortal, ArcGISDataStore
+  def self.product_installed?(user, hostname, arcgis_version, product_name)
+    !self.product_install_dir(user, hostname, arcgis_version, product_name).nil?
+  end
+
+  def self.real_version(user, hostname, arcgis_version) 
+    esri_properties = self.esri_properties(user, hostname, arcgis_version)
+
+    esri_properties[:Z_REAL_VERSION]
+  end
+
+  def self.license_home(user, hostname, arcgis_version) 
+    esri_properties = self.esri_properties(user, hostname, arcgis_version)
+
+    esri_properties[:ARCLICENSEHOME]
+  end
+
+end

cookbooks/arcgis-desktop/metadata.rb

@@ -4,12 +4,13 @@
 license          'Apache 2.0'
 description      'Installs and configures ArcGIS Desktop and ArcGIS License Manager'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '4.1.0'
+version          '4.2.0'
 chef_version     '>= 14.0' if defined? chef_version
 
-depends          'arcgis-repository', '~> 4.1'
+depends          'arcgis-repository', '~> 4.2'
 depends          'windows', '~> 5.3'
 depends          'limits', '~> 1.0'
+depends          'java_properties', '~> 0.1'
 
 supports         'windows'
 supports         'ubuntu'

cookbooks/arcgis-desktop/recipes/licensemanager.rb

@@ -2,7 +2,7 @@
 # Cookbook Name:: arcgis-desktop
 # Recipe:: licensemanager
 #
-# Copyright 2015 Esri
+# Copyright 2023 Esri
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -40,11 +40,10 @@
   if node['platform'] == 'windows'
     not_if { Utils.product_installed?(node['arcgis']['licensemanager']['product_code']) }
   else
-    not_if { 
-      subdir = ::File.join(node['arcgis']['licensemanager']['install_dir'],
-                           node['arcgis']['licensemanager']['install_subdir'])
-      !::Dir.glob("#{subdir}/License*").empty? 
-    }
+    not_if { EsriProperties.product_installed?(node['arcgis']['run_as_user'],
+                                               node['hostname'],
+                                               node['arcgis']['licensemanager']['version'],
+                                               :LicenseManager) }
   end
   action :install
 end

cookbooks/arcgis-egdb/README.md

@@ -3,7 +3,7 @@ layout: default
 title: "arcgis-egdb cookbook"
 category: cookbooks
 item: arcgis-egdb
-version: 1.1.0
+version: 1.1.1
 latest: true
 ---
 

cookbooks/arcgis-egdb/metadata.rb

@@ -7,7 +7,7 @@
 version '1.1.1'
 chef_version '>= 14.0' if defined? chef_version
 
-depends    'arcgis-enterprise', '~> 4.1'
+depends    'arcgis-enterprise', '~> 4.2'
 
 supports   'windows'
 supports   'ubuntu'

cookbooks/arcgis-enterprise/CHANGELOG.md

@@ -3,6 +3,11 @@ arcgis-enterprise cookbook CHANGELOG
 
 This file is used to list changes made in each version of the arcgis-enterprise cookbook.
 
+4.2.0
+-----
+- Added support for ArcGIS Enterprise 11.2
+- Added support for Rocky Linux and AlmaLinux platforms
+
 4.1.0
 -----
 - Added support for ArcGIS Enterprise 11.1