Merge pull request #347 from Esri/4.1.0

Release  4.1.0

Author: cameronkroeker

.gitignore

@@ -64,3 +64,16 @@ cookbooks/arcgis/Berksfile.lock
 local-mode-cache
 chef_guid
 nodes
+
+# Terraform
+.terraform
+.terraform.*
+*.tfstate
+*.tfstate.*
+
+# Packer
+packer-manifest.json
+packer-manifest.json.lock
+
+# Python
+*.pyc

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.1.0
+-----
+- Added support for ArcGIS License Manager 2022.1
+
 4.0.0
 -----
 - Added support for ArcGIS License Manager 2022.0

cookbooks/arcgis-desktop/README.md

@@ -3,7 +3,7 @@ layout: default
 title: "arcgis-desktop cookbook"
 category: cookbooks
 item: arcgis-desktop
-version: 4.0.0
+version: 4.1.0
 latest: true
 ---
 
@@ -37,6 +37,7 @@ This cookbook installs and configures ArcGIS Desktop and ArcGIS License Manager.
    * 2021.0
    * 2021.1
    * 2022.0
+   * 2022.1
 
 ## Platforms
 
@@ -70,9 +71,9 @@ 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.0`.
+* `node['arcgis']['licensemanager']['version']` = ArcGIS License Manager version. Default value is `2022.1`.
 * `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.0\LicenseManager\Setup.exe` on Windows, and `/opt/arcgis/2022.0/LicenseManager_Linux/Setup` on Linux.
+* `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`.
 * `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.
 
@@ -143,8 +144,8 @@ Attributes used by the recipe:
        "setups": "C:\\Software\\Setups" 
     },
     "licensemanager": {
-      "version": "2022.0",
-      "setup": "C:\\Software\\Setups\\License Manager 2022.0\\LicenseManager\\Setup.exe",
+      "version": "2022.1",
+      "setup": "C:\\Software\\Setups\\License Manager 2022.1\\LicenseManager\\Setup.exe",
       "install_dir": "C:\\Program Files (x86)\\ArcGIS"
     }
   },

cookbooks/arcgis-desktop/attributes/default.rb

@@ -19,7 +19,7 @@
 include_attribute 'arcgis-repository'
 
 default['arcgis']['run_as_user'] = 'arcgis'
-default['arcgis']['run_as_password'] = 'Pa$$w0rdPa$$w0rd'
+default['arcgis']['run_as_password'] = nil
 default['arcgis']['version'] = '10.8.1'
 
 case node['platform']

cookbooks/arcgis-desktop/attributes/licensemanager.rb

@@ -2,7 +2,7 @@
 # Cookbook Name:: arcgis-desktop
 # Attributes:: licensemanager
 #
-# Copyright 2022 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.
@@ -17,7 +17,7 @@
 # limitations under the License.
 
 default['arcgis']['licensemanager'].tap do |licensemanager|
-  licensemanager['version'] = '2022.0'
+  licensemanager['version'] = '2022.1'
 
   case node['platform']
   when 'windows'
@@ -28,6 +28,10 @@
     licensemanager['install_dir'] = ENV['ProgramFiles(x86)'] + '\\ArcGIS'
 
     case node['arcgis']['licensemanager']['version']
+    when '2022.1'
+      licensemanager['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
+                                                    'ArcGIS_License_Manager_Windows_2022_1_184717.exe').gsub('/', '\\')
+      licensemanager['product_code'] = '{96804860-2C2F-4448-AE47-76CB160AD043}'
     when '2022.0'
       licensemanager['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
                                                     'ArcGIS_License_Manager_Windows_2022_0_182116.exe').gsub('/', '\\')
@@ -94,6 +98,9 @@
     licensemanager['install_subdir'] = 'arcgis/license' + node['arcgis']['licensemanager']['version']
 
     case node['arcgis']['licensemanager']['version']
+    when '2022.1'
+      licensemanager['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
+                                                    'ArcGIS_License_Manager_Linux_2022_1_184756.tar.gz')
     when '2022.0'
       licensemanager['setup_archive'] = ::File.join(node['arcgis']['repository']['archives'],
                                                     'ArcGIS_License_Manager_Linux_2022_0_182145.tar.gz')

cookbooks/arcgis-desktop/metadata.rb

@@ -4,10 +4,10 @@
 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.0.0'
+version          '4.1.0'
 chef_version     '>= 14.0' if defined? chef_version
 
-depends          'arcgis-repository', '~> 4.0'
+depends          'arcgis-repository', '~> 4.1'
 depends          'windows', '~> 5.3'
 depends          'limits', '~> 1.0'
 

cookbooks/arcgis-egdb/CHANGELOG.md

@@ -3,6 +3,16 @@ arcgis-egdb cookbook CHANGELOG
 
 This file is used to list changes made in each version of the arcgis-egdb cookbook.
 
+1.1.1
+-----
+
+- Don't log database passwords.
+
+1.1.0
+-----
+
+- Ported scripts to python 3.
+
 1.0.2
 -----
 -  Use SQL Server RDS endpoint instead of EGDBHOST alias.

cookbooks/arcgis-egdb/README.md

@@ -15,7 +15,6 @@ The arcgis-egdb cookbook creates enterprise geodatabases in SQL Server or Postgr
 
 * Windows 8 (8.1)
 * Windows 10
-* Windows Server 2008 (R2)
 * Windows Server 2012 (R2)
 * Windows Server 2016
 * Windows Server 2019

cookbooks/arcgis-egdb/metadata.rb

@@ -4,10 +4,10 @@
 license 'Apache 2.0'
 description 'Creates enterprise geodatabases in SQL Server or PostgreSQL DBMS and registers them with ArcGIS Server.'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version '1.1.0'
+version '1.1.1'
 chef_version '>= 14.0' if defined? chef_version
 
-depends    'arcgis-enterprise', '~> 4.0'
+depends    'arcgis-enterprise', '~> 4.1'
 
 supports   'windows'
 supports   'ubuntu'

cookbooks/arcgis-egdb/recipes/egdb_postgres.rb

@@ -69,6 +69,7 @@
 execute 'Create EGDB in PostgreSQL' do
   cwd node['arcgis']['misc']['scripts_dir']
   live_stream true
+  sensitive true
   if node['platform'] == 'windows'
     command [::File.join(node['arcgis']['misc']['scripts_dir'],'RDS_postgres.bat'),
              node['arcgis']['egdb']['endpoint'],