Discharge7443/fleet
1
0
Fork 0
Code Issues Pull Requests Actions 27 Packages Projects Releases Wiki Activity

Tf software installers fix (#19715)

Browse Source 
Fixed a typo in the name of the software installers bucket prefix env
var in terraform modules and removed the default prefix as the code
seems to create this prefix automatically. An additional prefix is still
supported for configuration, but can be left empty and will be so as the
default.
This commit is contained in:
Robert Fairburn
2024-06-13 10:07:48 -05:00
committed by GitHub
parent 6d2471d5e5
commit 42b1fc7e30
11 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
terraform/README.md
+1 -1
View File
File diff suppressed because one or more lines are too long
terraform/addons/external-vuln-scans/README.md
+1
View File
@@ -39,6 +39,7 @@ No modules.
| <a name="input_ecs_cluster"></a> [ecs\_cluster](#input\_ecs\_cluster) | The ecs cluster module that is created by the byo-db module | `any` | n/a | yes |
| <a name="input_execution_iam_role_arn"></a> [execution\_iam\_role\_arn](#input\_execution\_iam\_role\_arn) | The ARN of the fleet execution role, this is necessary to pass role from ecs events | `any` | n/a | yes |
| <a name="input_fleet_config"></a> [fleet\_config](#input\_fleet\_config) | The root Fleet config object | `any` | n/a | yes |
| <a name="input_fleet_s3_software_installers_config"></a> [fleet\_s3\_software\_installers\_config](#input\_fleet\_s3\_software\_installers\_config) | use the output of the byo-vpc module with the same name | `map(string)` | n/a | yes |
| <a name="input_fleet_server_private_key_secret_arn"></a> [fleet\_server\_private\_key\_secret\_arn](#input\_fleet\_server\_private\_key\_secret\_arn) | The ARN of the secret that stores the Fleet private key | `string` | n/a | yes |
| <a name="input_security_groups"></a> [security\_groups](#input\_security\_groups) | n/a | `list(string)` | n/a | yes |
| <a name="input_subnets"></a> [subnets](#input\_subnets) | n/a | `list(string)` | n/a | yes |
terraform/addons/external-vuln-scans/main.tf
+1 -1
View File
@@ -117,7 +117,7 @@ resource "aws_ecs_task_definition" "vuln-processing" {
value = var.fleet_s3_software_installers_config.bucket_name
},
{
name = "FLEET_S3_SOFTWARE_INSTALLERS_BUCKET_PREFIX"
name = "FLEET_S3_SOFTWARE_INSTALLERS_PREFIX"
value = var.fleet_s3_software_installers_config.s3_object_prefix
},
], local.environment),
terraform/byo-vpc/README.md
+1 -1
View File
File diff suppressed because one or more lines are too long
terraform/byo-vpc/byo-db/README.md
+1 -1
View File
File diff suppressed because one or more lines are too long
terraform/byo-vpc/byo-db/byo-ecs/README.md
+2 -1
View File
File diff suppressed because one or more lines are too long
terraform/byo-vpc/byo-db/byo-ecs/main.tf
+1 -1
View File
@@ -152,7 +152,7 @@ resource "aws_ecs_task_definition" "backend" {
value = var.fleet_config.software_installers.create_bucket == true ? aws_s3_bucket.software_installers[0].bucket : var.fleet_config.software_installers.bucket_name
},
{
name = "FLEET_S3_SOFTWARE_INSTALLERS_BUCKET_PREFIX"
name = "FLEET_S3_SOFTWARE_INSTALLERS_PREFIX"
value = var.fleet_config.software_installers.s3_object_prefix
},
], local.environment)
terraform/byo-vpc/byo-db/byo-ecs/variables.tf
+3 -3
View File
@@ -100,12 +100,12 @@ variable "fleet_config" {
create_bucket = optional(bool, true)
bucket_name = optional(string, null)
bucket_prefix = optional(string, "fleet-software-installers-")
s3_object_prefix = optional(string, "software_installers/")
s3_object_prefix = optional(string, "")
}), {
create_bucket = true
bucket_name = null
bucket_prefix = "fleet-software-installers-"
s3_object_prefix = "software_installers/"
s3_object_prefix = ""
})
})
default = {
@@ -178,7 +178,7 @@ variable "fleet_config" {
create_bucket = true
bucket_name = null
bucket_prefix = "fleet-software-installers-"
s3_object_prefix = "software_installers/"
s3_object_prefix = ""
}
}
description = "The configuration object for Fleet itself. Fields that default to null will have their respective resources created if not specified."
terraform/byo-vpc/byo-db/variables.tf
+3 -3
View File
@@ -175,12 +175,12 @@ variable "fleet_config" {
create_bucket = optional(bool, true)
bucket_name = optional(string, null)
bucket_prefix = optional(string, "fleet-software-installers-")
s3_object_prefix = optional(string, "software_installers/")
s3_object_prefix = optional(string, "")
}), {
create_bucket = true
bucket_name = null
bucket_prefix = "fleet-software-installers-"
s3_object_prefix = "software_installers/"
s3_object_prefix = ""
})
})
default = {
@@ -253,7 +253,7 @@ variable "fleet_config" {
create_bucket = true
bucket_name = null
bucket_prefix = "fleet-software-installers-"
s3_object_prefix = "software_installers/"
s3_object_prefix = ""
}
}
description = "The configuration object for Fleet itself. Fields that default to null will have their respective resources created if not specified."
terraform/byo-vpc/variables.tf
+3 -3
View File
@@ -268,12 +268,12 @@ variable "fleet_config" {
create_bucket = optional(bool, true)
bucket_name = optional(string, null)
bucket_prefix = optional(string, "fleet-software-installers-")
s3_object_prefix = optional(string, "software_installers/")
s3_object_prefix = optional(string, "")
}), {
create_bucket = true
bucket_name = null
bucket_prefix = "fleet-software-installers-"
s3_object_prefix = "software_installers/"
s3_object_prefix = ""
})
})
default = {
@@ -346,7 +346,7 @@ variable "fleet_config" {
create_bucket = true
bucket_name = null
bucket_prefix = "fleet-software-installers-"
s3_object_prefix = "software_installers/"
s3_object_prefix = ""
}
}
description = "The configuration object for Fleet itself. Fields that default to null will have their respective resources created if not specified."
terraform/variables.tf
+3 -3
View File
@@ -316,12 +316,12 @@ variable "fleet_config" {
create_bucket = optional(bool, true)
bucket_name = optional(string, null)
bucket_prefix = optional(string, "fleet-software-installers-")
s3_object_prefix = optional(string, "software_installers/")
s3_object_prefix = optional(string, "")
}), {
create_bucket = true
bucket_name = null
bucket_prefix = "fleet-software-installers-"
s3_object_prefix = "software_installers/"
s3_object_prefix = ""
})
})
default = {
@@ -394,7 +394,7 @@ variable "fleet_config" {
create_bucket = true
bucket_name = null
bucket_prefix = "fleet-software-installers-"
s3_object_prefix = "software_installers/"
s3_object_prefix = ""
}
}
description = "The configuration object for Fleet itself. Fields that default to null will have their respective resources created if not specified."