Merge pull request #254 from Esri/v3.6.0

Release v3.6.0

.gitignore

@@ -42,6 +42,8 @@ Thumbs.db
 .buildpath
 .vscode
 Servers
+.chef
+.vs
 
 *.class
 

README.md

@@ -10,6 +10,7 @@ Included cookbooks:
 * [arcgis-enterprise](cookbooks/arcgis-enterprise) - installs and configures ArcGIS Server, ArcGIS Data Store, Portal for ArcGIS, ArcGIS WebAdaptor
 * [arcgis-geoevent](cookbooks/arcgis-geoevent) - installs and configures ArcGIS GeoEvent Server
 * [arcgis-notebooks](cookbooks/arcgis-notebooks) - installs and configures ArcGIS Notebook Server
+* [arcgis-mission](cookbooks/arcgis-mission) - installs and configures ArcGIS Mission Server
 * [arcgis-insights](cookbooks/arcgis-insights) - installs and configures Insights for ArcGIS
 * [arcgis-desktop](cookbooks/arcgis-desktop) - installs and configures ArcGIS Desktop
 * [arcgis-pro](cookbooks/arcgis-pro) - installs and configures ArcGIS Pro

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.
 
+3.6.0
+-----
+- Added support for ArcGIS Desktop 10.8.1 and ArcGIS License Manager 2020.0.
+- Fixed software authorization issues with single use ArcGIS Desktop licenses.
 
 3.5.0
 -----

cookbooks/arcgis-desktop/README.md

@@ -1,35 +1,43 @@
 arcgis-desktop cookbook
 ===============
 
-This cookbook installs and configures ArcGIS Desktop.
+This cookbook installs and configures ArcGIS Desktop and ArcGIS License Manager.
 
 Requirements
 ------------
-### Supported ArcGIS versions
-* 10.4
-* 10.4.1
-* 10.5
-* 10.5.1
-* 10.6
-* 10.6.1
-* 10.7
-* 10.7.1
-* 10.8
 
 ### Supported ArcGIS software
 
 * ArcGIS Desktop (Windows only)
+   * 10.4
+   * 10.4.1
+   * 10.5
+   * 10.5.1
+   * 10.6
+   * 10.6.1
+   * 10.7
+   * 10.7.1
+   * 10.8
+   * 10.8.1
+
 * ArcGIS License Manager
+   * 2018.0
+   * 2018.1
+   * 2019.0
+   * 2019.1
+   * 2019.2
+   * 2020.0
 
 ### Platforms
 
-* Windows 7
-* Windows 8 (8.1)
 * Windows 10
-* Windows Server 2008 (R2)
 * Windows Server 2012 (R2)
 * Windows Server 2016
 * Windows Server 2019
+* Ubuntu 16.04, 18.04
+* Rhel 6.5, 7.0
+
+ArcGIS Desktop is supported only on Windows platforms.
 
 ### Dependencies
 The following cookbooks are required:
@@ -40,19 +48,20 @@ The following cookbooks are required:
 Attributes
 ----------
 
-* `node['arcgis']['version']` = ArcGIS version. Default value is `10.7`.
+* `node['arcgis']['version']` = ArcGIS Desktop version. Default value is `10.8.1`.
 * `node['arcgis']['desktop']['setup_archive']` = The location of ArcGIS Desktop setup archive. Default value depends on `node['arcgis']['version']` attribute value.
-* `node['arcgis']['desktop']['setup']` = The location of ArcGIS Desktop setup executable. Default location is `%USERPROFILE#\Documents\ArcGIS10.7\Desktop\Setup.exe`.
+* `node['arcgis']['desktop']['setup']` = The location of ArcGIS Desktop setup executable. Default location is `%USERPROFILE#\Documents\ArcGIS10.8.1\Desktop\Setup.exe`.
 * `node['arcgis']['desktop']['lp-setup']` = The location of language pack for ArcGIS Desktop. Default location is `C:\ArcGIS\DesktopLP\SetupFiles\setup.msi`.
 * `node['arcgis']['desktop']['install_dir']` = ArcGIS Desktop installation directory. By default, ArcGIS Desktop is installed to `%ProgramFiles(x86)%\ArcGIS`.
 * `node['arcgis']['desktop']['install_features']` = Comma-separated list of ArcGIS Desktop features to install. Default value is `ALL`.
 * `node['arcgis']['desktop']['authorization_file']` = ArcGIS Desktop authorization file path. Default location and file name are `C:\\Temp\\license.ecp`.
-* `node['arcgis']['desktop']['authorization_file_version']` = ArcGIS Desktop authorization file version. Default value is `10.4`.
+* `node['arcgis']['desktop']['authorization_file_version']` = ArcGIS Desktop authorization file version. Default value is `10.8`.
 * `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 `2020.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\ArcGIS10.7\LicenseManager\Setup.exe` on Windows, and `/opt/arcgis/10.7/licensemanager/Setup` on Linux.
+* `node['arcgis']['licensemanager']['setup']` = The location of ArcGIS License Manager setup executable. Default location is `%USERPROFILE#\Documents\License Manager 2020.0\LicenseManager\Setup.exe` on Windows, and `/opt/arcgis/2020.0/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`.
 * `node['arcgis']['licensemanager']['install_dir']` = ArcGIS License Manager installation directory. By default, the license manager is installed to `%ProgramFiles(x86)%\ArcGIS` on Windows and `/` on Linux.
 
@@ -85,7 +94,7 @@ Esri welcomes contributions from anyone and everyone. Please see our [guidelines
 Licensing
 ---------
 
-Copyright 2019 Esri
+Copyright 2020 Esri
 
 Licensed under the Apache License, Version 2.0 (the "License");
 You may not use this file except in compliance with the License.

cookbooks/arcgis-desktop/attributes/default.rb

@@ -20,7 +20,7 @@
 
 default['arcgis']['run_as_user'] = 'arcgis'
 default['arcgis']['run_as_password'] = 'Pa$$w0rdPa$$w0rd'
-default['arcgis']['version'] = '10.8'
+default['arcgis']['version'] = '10.8.1'
 
 case node['platform']
 when 'windows'

cookbooks/arcgis-desktop/attributes/desktop.rb

@@ -38,6 +38,10 @@
     desktop['authorization_file_version'] = node['arcgis']['version'].to_f.to_s
 
     case node['arcgis']['version']
+    when '10.8.1'
+      desktop['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
+                                             'ArcGIS_Desktop_1081_175110.exe').gsub('/', '\\')
+      desktop['product_code'] = '{7C4FF945-CE6A-415E-8EB9-2B61B0B35DCD}'
     when '10.8'
       desktop['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
                                              'ArcGIS_Desktop_108_172737.exe').gsub('/', '\\')

cookbooks/arcgis-desktop/attributes/licensemanager.rb

@@ -17,48 +17,72 @@
 # limitations under the License.
 
 default['arcgis']['licensemanager'].tap do |licensemanager|
+  licensemanager['version'] = '2020.0'
+
   case node['platform']
   when 'windows'
     licensemanager['setup'] = ::File.join(node['arcgis']['repository']['setups'],
-                                  'ArcGIS ' + node['arcgis']['version'],
+                                  'License Manager ' + node['arcgis']['licensemanager']['version'],
                                   'LicenseManager', 'Setup.exe')
     licensemanager['lp-setup'] = 'C:\\ArcGIS\\LicenseManager\\SetupFiles\\setup.msi'
     licensemanager['install_dir'] = ENV['ProgramFiles(x86)'] + '\\ArcGIS'
 
-    case node['arcgis']['version']
-    when '10.8'
+    case node['arcgis']['licensemanager']['version']
+    when '2020.0'
+      licensemanager['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
+                                                    'ArcGIS_License_Manager_Windows_2020_0_175435.exe').gsub('/', '\\')
+      licensemanager['product_code'] = '{F89EA66A-6AC2-401C-B8A0-E3ABDB5EDC10}'
+    when '2019.2'
       licensemanager['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
                                                     'ArcGIS_License_Manager_Windows_2019_2_173083.exe').gsub('/', '\\')
       licensemanager['product_code'] = '{77F1D4EB-0225-4626-BB9E-7FCB4B0309E5}'
-    when '10.7'
+    when '2019.1'
+      licensemanager['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
+                                                    'ArcGIS_License_Manager_Windows_2019_1_172308.exe').gsub('/', '\\')
+      licensemanager['product_code'] = '{BA3C546E-6FAC-405C-B2C9-30BC6E26A7A9}'
+    when '2019.0'
+      licensemanager['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
+                                                    'ArcGIS_License_Manager_Windows_2019_0_169344.exe').gsub('/', '\\')
+      licensemanager['product_code'] = '{CB1E78B5-9914-45C6-8227-D55F4CD5EA6F}'
+    when '2018.1'
       licensemanager['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
                                                     'ArcGIS_License_Manager_Windows_2018_1_167080.exe').gsub('/', '\\')
       licensemanager['product_code'] = '{E1C26E47-C6AB-4120-A3DE-2FA0F723C876}'
-    when '10.6.1'
+    when '2018.0'
       licensemanager['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
                                                     'ArcGIS_License_Manager_Windows_2018_0_163304.exe').gsub('/', '\\')
-      licensemanager['product_code'] = '{1914B5D6-02C2-4CA3-9CAB-EE76358228CF}'
-    when '10.6'
-      licensemanager['product_code'] = '{D6AF20B5-825F-44A9-915D-C2868CBD59F3}'
-    when '10.5.1'
-      licensemanager['product_code'] = '{DF06C3DC-54B5-49A1-9756-B68FD65A0AD0}'
-    when '10.5'
-      licensemanager['product_code'] = '{3A024FEA-3E14-4257-87D0-8FCA03257560}'
-    when '10.4.1'
-      licensemanager['product_code'] = '{D71379AF-A72B-4B10-A7BA-64BC6AF6841B}'
-    when '10.4'
-      licensemanager['product_code'] = '{E1393226-725C-42F8-A672-4E5AC55EFBDE}'
+      licensemanager['product_code'] = '{CFF43ACB-9B0C-4725-B489-7F969F5B90AB}'
     else
-      Chef::Log.warn 'Unsupported ArcGIS version'
+      Chef::Log.warn 'Unsupported ArcGIS License Manager version'
     end
   else # node['platform'] == 'linux'
     licensemanager['setup'] = ::File.join(node['arcgis']['repository']['setups'],
-                                          node['arcgis']['version'],
-                                          'licensemanager', 'Setup')
+                                          node['arcgis']['licensemanager']['version'],
+                                          'LicenseManager_Linux', 'Setup')
     licensemanager['install_dir'] = '/'
-    licensemanager['install_subdir'] = 'arcgis/license' + node['arcgis']['version']
+    licensemanager['install_subdir'] = 'arcgis/license' + node['arcgis']['licensemanager']['version']
 
-    licensemanager['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
-                                                  'ArcGIS_License_Manager_Linux_2018_1_167092.tar.gz')
+    case node['arcgis']['licensemanager']['version']
+    when '2020.0'
+      licensemanager['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
+                                                    'ArcGIS_License_Manager_Linux_2020_0_174031.tar.gz')
+    when '2019.2'
+      licensemanager['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
+                                                    'ArcGIS_License_Manager_Linux_2019_2_173095.tar.gz')
+    when '2019.1'
+      licensemanager['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
+                                                    'ArcGIS_License_Manager_Linux_2019_1_172320.tar.gz')
+    when '2019.0'
+      licensemanager['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
+                                                    'ArcGIS_License_Manager_Linux_2019_0_169356.tar.gz')
+    when '2018.1'
+      licensemanager['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
+                                                    'ArcGIS_License_Manager_Linux_2018_1_167092.tar.gz')
+    when '2018.0'
+      licensemanager['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
+                                                    'ArcGIS_License_Manager_Linux_2018_0_163516.tar.gz')
+    else
+      Chef::Log.warn 'Unsupported ArcGIS License Manager version'
+    end
   end
 end

cookbooks/arcgis-desktop/metadata.rb

@@ -2,15 +2,16 @@
 maintainer       'Esri'
 maintainer_email 'contracts@esri.com'
 license          'Apache 2.0'
-description      'Installs and configures ArcGIS Desktop'
+description      'Installs and configures ArcGIS Desktop and ArcGIS License Manager'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '3.5.0'
+version          '3.6.0'
 
-depends          'arcgis-repository', '~> 3.5'
+depends          'arcgis-repository', '~> 3.6'
 depends          'windows', '~> 5.3'
 depends          'limits', '~> 1.0'
 
 supports         'windows'
+supports         'ubuntu'
 
 recipe           'arcgis-desktop::default', 'Installs ArcGIS Desktop'
 recipe           'arcgis-desktop::licensemanager', 'Installs ArcGIS License Manager'

cookbooks/arcgis-desktop/providers/desktop.rb

@@ -37,11 +37,15 @@
 end
 
 action :install do
+  unless ::File.exists?(@new_resource.setup)
+    raise "File '#{@new_resource.setup}' not found."
+  end
+
   cmd = @new_resource.setup
   if @new_resource.seat_preference == 'Fixed'
-    args = "/qb ADDLOCAL=\"#{@new_resource.install_features}\" INSTALLDIR=\"#{@new_resource.install_dir}\" INSTALLDIR1=\"#{@new_resource.python_dir}\" DESKTOP_CONFIG=\"#{@new_resource.desktop_config}\" MODIFYFLEXDACL=\"#{@new_resource.modifyflexdacl}\""
+    args = "/qn ADDLOCAL=\"#{@new_resource.install_features}\" INSTALLDIR=\"#{@new_resource.install_dir}\" INSTALLDIR1=\"#{@new_resource.python_dir}\" DESKTOP_CONFIG=\"#{@new_resource.desktop_config}\" MODIFYFLEXDACL=\"#{@new_resource.modifyflexdacl}\""
   else
-    args = "/qb ADDLOCAL=\"#{@new_resource.install_features}\" INSTALLDIR=\"#{@new_resource.install_dir}\" INSTALLDIR1=\"#{@new_resource.python_dir}\" ESRI_LICENSE_HOST=\"#{@new_resource.esri_license_host}\" SOFTWARE_CLASS=\"#{@new_resource.software_class}\" SEAT_PREFERENCE=\"#{@new_resource.seat_preference}\" DESKTOP_CONFIG=\"#{@new_resource.desktop_config}\" MODIFYFLEXDACL=\"#{@new_resource.modifyflexdacl}\""
+    args = "/qn ADDLOCAL=\"#{@new_resource.install_features}\" INSTALLDIR=\"#{@new_resource.install_dir}\" INSTALLDIR1=\"#{@new_resource.python_dir}\" ESRI_LICENSE_HOST=\"#{@new_resource.esri_license_host}\" SOFTWARE_CLASS=\"#{@new_resource.software_class}\" SEAT_PREFERENCE=\"#{@new_resource.seat_preference}\" DESKTOP_CONFIG=\"#{@new_resource.desktop_config}\" MODIFYFLEXDACL=\"#{@new_resource.modifyflexdacl}\""
   end
 
   cmd = Mixlib::ShellOut.new("\"#{cmd}\" #{args}", { :timeout => 3600 })
@@ -54,7 +58,7 @@
 action :uninstall do
   if node['platform'] == 'windows'
     cmd = 'msiexec'
-    args = "/qb /x #{@new_resource.product_code}"
+    args = "/qn /x #{@new_resource.product_code}"
 
     cmd = Mixlib::ShellOut.new("\"#{cmd}\" #{args}", { :timeout => 3600 })
     cmd.run_command
@@ -66,6 +70,10 @@
 
 action :authorize do
   if @new_resource.seat_preference == 'Fixed'
+    unless ::File.exists?(@new_resource.authorization_file)
+      raise "File '#{@new_resource.authorization_file}' not found."
+    end
+
     cmd = node['arcgis']['desktop']['authorization_tool']
     args = "/S /VER \"#{@new_resource.authorization_file_version}\" /LIF \"#{@new_resource.authorization_file}\""
 

cookbooks/arcgis-desktop/providers/licensemanager.rb

@@ -54,7 +54,7 @@
   else
     cmd = 'tar'
     args = "xzvf \"#{@new_resource.setup_archive}\""
-    repo = ::File.join(@new_resource.setups_repo, node['arcgis']['version'])
+    repo = ::File.join(@new_resource.setups_repo, node['arcgis']['licensemanager']['version'])
     FileUtils.mkdir_p(repo) unless ::File.directory?(repo)
     cmd = Mixlib::ShellOut.new("\"#{cmd}\" #{args}", { :timeout => 3600, :cwd => repo })
     cmd.run_command
@@ -67,9 +67,13 @@
 end
 
 action :install do
+  unless ::File.exists?(@new_resource.setup)
+    raise "File '#{@new_resource.setup}' not found."
+  end
+
   if node['platform'] == 'windows'
     cmd = @new_resource.setup
-    args = "/qb ADDLOCAL=ALL INSTALLDIR=\"#{@new_resource.install_dir}\" INSTALLDIR1=\"#{@new_resource.python_dir}\""
+    args = "/qn ADDLOCAL=ALL INSTALLDIR=\"#{@new_resource.install_dir}\" INSTALLDIR1=\"#{@new_resource.python_dir}\""
 
     cmd = Mixlib::ShellOut.new("\"#{cmd}\" #{args}")
     cmd.run_command
@@ -107,7 +111,7 @@
 action :uninstall do
   if node['platform'] == 'windows'
     cmd = 'msiexec'
-    args = "/qb /x #{product_code}"
+    args = "/qn /x #{product_code}"
 
     cmd = Mixlib::ShellOut.new("\"#{cmd}\" #{args}")
     cmd.run_command

cookbooks/arcgis-desktop/recipes/default.rb

@@ -48,5 +48,6 @@
 arcgis_desktop_desktop 'Authorize ArcGIS Desktop' do
   authorization_file node['arcgis']['desktop']['authorization_file']
   authorization_file_version node['arcgis']['desktop']['authorization_file_version']
+  seat_preference node['arcgis']['desktop']['seat_preference']
   action :authorize
 end

cookbooks/arcgis-desktop/recipes/licensemanager.rb

@@ -26,7 +26,9 @@
   setups_repo node['arcgis']['repository']['setups']
   only_if { ::File.exist?(node['arcgis']['licensemanager']['setup_archive']) &&
             !::File.exist?(node['arcgis']['licensemanager']['setup']) }
-  not_if { Utils.product_installed?(node['arcgis']['licensemanager']['product_code']) }
+  if node['platform'] == 'windows'
+    not_if { Utils.product_installed?(node['arcgis']['licensemanager']['product_code']) }
+  end
   action :unpack
 end
 

cookbooks/arcgis-desktop/resources/licensemanager.rb

@@ -20,7 +20,7 @@
 actions :system, :unpack, :install, :uninstall
 
 attribute :setup_archive, :kind_of => String
-attribute :setup_repo, :kind_of => String
+attribute :setups_repo, :kind_of => String
 attribute :setup, :kind_of => String
 attribute :product_code, :kind_of => String
 attribute :install_dir, :kind_of => String

cookbooks/arcgis-egdb/README.md

@@ -48,7 +48,7 @@ ArcPy does not support creating databases in Amazon RDS database servers. The co
   [{
     "database" : "egdb",
     "data_item_path" : "/enterpriseDatabases/registeredDatabase",
-    "connection_file": "C:\\chef\\msic_scripts\\connection_files\\RDS_egdb.sde",
+    "connection_file": "C:\\chef\\misc_scripts\\connection_files\\RDS_egdb.sde",
     "is_managed" : true,
     "connection_type" : "shared"
   }]
@@ -135,7 +135,7 @@ Esri welcomes contributions from anyone and everyone. Please see our [guidelines
 
 ## Licensing
 
-Copyright 2019 Esri
+Copyright 2020 Esri
 
 Licensed under the Apache License, Version 2.0 (the "License");
 You may not use this file except in compliance with the License.

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.
 
+3.6.0
+-----
+- Added support for ArcGIS Enterprise 10.8.1.
+- Added support for importing root SSL certificate into ArcGIS Server.
+
 3.5.0
 -----
 - Added support for ArcGIS Enterprise 10.8.