Stats | hash artifact location

imperva · Sep 20, 2023 · 316a603 · 316a603
1 parent f4ed8c7
commit 316a603
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 18 deletions.
diff --git a/modules/aws/dam-base-instance/userdata.tf b/modules/aws/dam-base-instance/userdata.tf
@@ -36,7 +36,7 @@ module "statistics" {
   deployment_name = var.name
   product = "DAM"
   resource_type = var.resource_type
-  artifact = join("@", compact(["ami://${data.aws_ami.selected-ami.image_id}", var.ami != null ? null : var.dam_version]))
+  artifact = join("@", compact(["ami://${sha256(data.aws_ami.selected-ami.image_id)}", var.ami != null ? null : var.dam_version]))
 }
 
 resource "null_resource" "readiness" {
@@ -79,6 +79,6 @@ module "statistics_success" {
   source                            = "../../../modules/aws/statistics"
 
   id = module.statistics.id
-  initialization_status = "success"
+  status = "success"
   depends_on = [ null_resource.readiness ]
 }
diff --git a/modules/aws/dra-admin/main.tf b/modules/aws/dra-admin/main.tf
@@ -63,5 +63,5 @@ module "statistics" {
   deployment_name = var.friendly_name
   product = "DRA"
   resource_type = "dra-admin"
-  artifact = "ami://${data.aws_ami.selected-ami.image_id}@${var.dra_version}"
+  artifact = "ami://${sha256(data.aws_ami.selected-ami.image_id)}@${var.dra_version}"
 }
diff --git a/modules/aws/dra-analytics/main.tf b/modules/aws/dra-analytics/main.tf
@@ -60,7 +60,7 @@ module "statistics" {
   deployment_name = var.friendly_name
   product = "DRA"
   resource_type = "dra-analytics"
-  artifact = "ami://${data.aws_ami.selected-ami.image_id}@${var.dra_version}"
+  artifact = "ami://${sha256(data.aws_ami.selected-ami.image_id)}@${var.dra_version}"
 }
 
 resource "null_resource" "readiness" {
@@ -78,6 +78,6 @@ module "statistics_success" {
   source                            = "../../../modules/aws/statistics"
 
   id = module.statistics.id
-  initialization_status = "success"
+  status = "success"
   depends_on = [ null_resource.readiness ]
 }
diff --git a/modules/aws/sonar-base-instance/userdata.tf b/modules/aws/sonar-base-instance/userdata.tf
@@ -30,7 +30,7 @@ module "statistics" {
   deployment_name = var.name
   product = "SONAR"
   resource_type = var.resource_type
-  artifact = "s3://${var.binaries_location.s3_bucket}/${var.binaries_location.s3_key}"
+  artifact = "s3://${sha256(var.binaries_location.s3_bucket)}/${var.binaries_location.s3_key}"
 }
 
 resource "null_resource" "readiness" {
@@ -75,6 +75,6 @@ module "statistics_success" {
   source                            = "../../../modules/aws/statistics"
 
   id = module.statistics.id
-  initialization_status = "success"
+  status = "success"
   depends_on = [ null_resource.readiness ]
 }
diff --git a/modules/aws/statistics/main.tf b/modules/aws/statistics/main.tf
@@ -10,7 +10,7 @@ module "statistics" {
   platform              = "aws"
   account_id            = data.aws_caller_identity.current.account_id
   location              = data.aws_region.current.name
-  initialization_status = var.initialization_status
+  status                = var.status
   additional_info       = var.additional_info
 }
 

diff --git a/modules/aws/statistics/variables.tf b/modules/aws/statistics/variables.tf
@@ -28,10 +28,10 @@ variable "resource_type" {
   default = null
 }
 
-variable "initialization_status" {
+variable "status" {
   type        = string
   default     = null
-  description = "Initialization status"
+  description = "Status"
 }
 
 variable "additional_info" {

diff --git a/modules/azurerm/sonar-base-instance/userdata.tf b/modules/azurerm/sonar-base-instance/userdata.tf
@@ -32,7 +32,7 @@ module "statistics" {
   deployment_name = var.name
   product = "SONAR"
   resource_type = var.resource_type
-  artifact = "blob://${var.binaries_location.az_storage_account}/${var.binaries_location.az_container}/${var.binaries_location.az_blob}"
+  artifact = "blob://${sha256(var.binaries_location.az_storage_account)}/${sha256(var.binaries_location.az_container)}/${var.binaries_location.az_blob}"
   location = var.resource_group.location
 }
 
@@ -78,6 +78,6 @@ module "statistics_success" {
   source                            = "../../../modules/azurerm/statistics"
 
   id = module.statistics.id
-  initialization_status = "success"
+  status = "success"
   depends_on = [ null_resource.readiness ]
 }
diff --git a/modules/azurerm/statistics/main.tf b/modules/azurerm/statistics/main.tf
@@ -10,7 +10,7 @@ module "statistics" {
   platform              = "azure"
   account_id            = data.azurerm_client_config.current.subscription_id
   location              = var.location
-  initialization_status = var.initialization_status
+  status = var.status
   additional_info       = var.additional_info
 }
 

diff --git a/modules/azurerm/statistics/variables.tf b/modules/azurerm/statistics/variables.tf
@@ -28,10 +28,10 @@ variable "resource_type" {
   default = null
 }
 
-variable "initialization_status" {
+variable "status" {
   type        = string
   default     = null
-  description = "Initialization status"
+  description = "Status"
 }
 
 variable "additional_info" {

diff --git a/modules/null/statistics/main.tf b/modules/null/statistics/main.tf
@@ -23,7 +23,7 @@ locals {
     "account_id": sha256(var.account_id)
     "platform" : var.platform
     "location" : var.location
-    "initialization_status" : var.initialization_status
+    "status" : var.status
     "additional_info" : var.additional_info
   })
 }

diff --git a/modules/null/statistics/variables.tf b/modules/null/statistics/variables.tf
@@ -39,10 +39,10 @@ variable "location" {
   description = "Location"
 }
 
-variable "initialization_status" {
+variable "status" {
   type        = string
   default     = null
-  description = "Initialization status"
+  description = "Status"
 }
 
 variable "additional_info" {