Merge pull request #155 from Esri/issue153_2

pbobov · web-flow · commit f0703501b457 · 2025-01-07T13:40:42.000-08:00
#153 Renamed deprecated webgisdr properties
diff --git a/aws/arcgis-enterprise-base-linux/backup/main.tf b/aws/arcgis-enterprise-base-linux/backup/main.tf
@@ -102,8 +102,12 @@ module "arcgis_enterprise_webgisdr_export" {
           S3_BUCKET                       = module.site_core_info.s3_backup
           S3_CREDENTIALTYPE               = "IAMRole"
           S3_REGION                       = module.site_core_info.s3_region
+          # In 11.4 PORTAL_BACKUP_S3_BUCKET property was renamed to BACKUP_S3_BUCKET
+          # Keeping both properties for backward compatibility
           BACKUP_S3_BUCKET                = module.site_core_info.s3_backup
           BACKUP_S3_REGION                = module.site_core_info.s3_region
+          PORTAL_BACKUP_S3_BUCKET         = module.site_core_info.s3_backup
+          PORTAL_BACKUP_S3_REGION         = module.site_core_info.s3_region
         }
       }
     }
diff --git a/aws/arcgis-enterprise-base-linux/restore/main.tf b/aws/arcgis-enterprise-base-linux/restore/main.tf
@@ -102,8 +102,12 @@ module "arcgis_enterprise_webgisdr_import" {
           S3_CREDENTIALTYPE               = "IAMRole"
           S3_REGION                       = module.site_core_info.s3_region
           #S3_BACKUP_NAME                 = "<backup file name>"
+          # In 11.4 PORTAL_BACKUP_S3_BUCKET property was renamed to BACKUP_S3_BUCKET
+          # Keeping both properties for backward compatibility
           BACKUP_S3_BUCKET                = module.site_core_info.s3_backup
           BACKUP_S3_REGION                = module.site_core_info.s3_region
+          PORTAL_BACKUP_S3_BUCKET         = module.site_core_info.s3_backup
+          PORTAL_BACKUP_S3_REGION         = module.site_core_info.s3_region
         }
       }
     }
diff --git a/aws/arcgis-enterprise-base-windows/backup/main.tf b/aws/arcgis-enterprise-base-windows/backup/main.tf
@@ -103,8 +103,12 @@ module "arcgis_enterprise_webgisdr_export" {
           S3_BUCKET                       = module.site_core_info.s3_backup
           S3_CREDENTIALTYPE               = "IAMRole"
           S3_REGION                       = module.site_core_info.s3_region
+          # In 11.4 PORTAL_BACKUP_S3_BUCKET property was renamed to BACKUP_S3_BUCKET
+          # Keeping both properties for backward compatibility
           BACKUP_S3_BUCKET                = module.site_core_info.s3_backup
           BACKUP_S3_REGION                = module.site_core_info.s3_region
+          PORTAL_BACKUP_S3_BUCKET         = module.site_core_info.s3_backup
+          PORTAL_BACKUP_S3_REGION         = module.site_core_info.s3_region
         }
       }
     }
diff --git a/aws/arcgis-enterprise-base-windows/restore/main.tf b/aws/arcgis-enterprise-base-windows/restore/main.tf
@@ -103,8 +103,12 @@ module "arcgis_enterprise_webgisdr_import" {
           S3_CREDENTIALTYPE               = "IAMRole"
           S3_REGION                       = module.site_core_info.s3_region
           #S3_BACKUP_NAME                 = "<backup file name>"
+          # In 11.4 PORTAL_BACKUP_S3_BUCKET property was renamed to BACKUP_S3_BUCKET
+          # Keeping both properties for backward compatibility
           BACKUP_S3_BUCKET                = module.site_core_info.s3_backup
           BACKUP_S3_REGION                = module.site_core_info.s3_region
+          PORTAL_BACKUP_S3_BUCKET         = module.site_core_info.s3_backup
+          PORTAL_BACKUP_S3_REGION         = module.site_core_info.s3_region
         }
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -102,8 +102,12 @@ module "arcgis_enterprise_webgisdr_export" {`
`102`	`102`	`S3_BUCKET = module.site_core_info.s3_backup`
`103`	`103`	`S3_CREDENTIALTYPE = "IAMRole"`
`104`	`104`	`S3_REGION = module.site_core_info.s3_region`
	`105`	`+ # In 11.4 PORTAL_BACKUP_S3_BUCKET property was renamed to BACKUP_S3_BUCKET`
	`106`	`+ # Keeping both properties for backward compatibility`
`105`	`107`	`BACKUP_S3_BUCKET = module.site_core_info.s3_backup`
`106`	`108`	`BACKUP_S3_REGION = module.site_core_info.s3_region`
	`109`	`+ PORTAL_BACKUP_S3_BUCKET = module.site_core_info.s3_backup`
	`110`	`+ PORTAL_BACKUP_S3_REGION = module.site_core_info.s3_region`
`107`	`111`	`}`
`108`	`112`	`}`
`109`	`113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -103,8 +103,12 @@ module "arcgis_enterprise_webgisdr_export" {`
`103`	`103`	`S3_BUCKET = module.site_core_info.s3_backup`
`104`	`104`	`S3_CREDENTIALTYPE = "IAMRole"`
`105`	`105`	`S3_REGION = module.site_core_info.s3_region`
	`106`	`+ # In 11.4 PORTAL_BACKUP_S3_BUCKET property was renamed to BACKUP_S3_BUCKET`
	`107`	`+ # Keeping both properties for backward compatibility`
`106`	`108`	`BACKUP_S3_BUCKET = module.site_core_info.s3_backup`
`107`	`109`	`BACKUP_S3_REGION = module.site_core_info.s3_region`
	`110`	`+ PORTAL_BACKUP_S3_BUCKET = module.site_core_info.s3_backup`
	`111`	`+ PORTAL_BACKUP_S3_REGION = module.site_core_info.s3_region`
`108`	`112`	`}`
`109`	`113`	`}`
`110`	`114`	`}`