Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GitHub Actions Code Formatter workflow #4284

Merged
merged 1 commit into from
Dec 11, 2023
Merged

GitHub Actions Code Formatter workflow #4284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion terraform/environments/cdpt-chaps/locals.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ locals {
domain_type_main = [for k, v in local.domain_types : v.type if k == "modernisation-platform.service.justice.gov.uk"]
domain_type_sub = [for k, v in local.domain_types : v.type if k != "modernisation-platform.service.justice.gov.uk"]

ecr_url = "${local.environment_management.account_ids["core-shared-services-production"]}.dkr.ecr.eu-west-2.amazonaws.com/cdpt-chaps-ecr-repo"
ecr_url = "${local.environment_management.account_ids["core-shared-services-production"]}.dkr.ecr.eu-west-2.amazonaws.com/cdpt-chaps-ecr-repo"
}
4 changes: 2 additions & 2 deletions terraform/environments/delius-core/modules/components/oracle_db_shared/ssm.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
resource "aws_ssm_parameter" "rman_password" {
name = "/delius-core-${var.env_name}/delius/oracle-db-operation/rman/rman_password"
type = "SecureString"
name = "/delius-core-${var.env_name}/delius/oracle-db-operation/rman/rman_password"
type = "SecureString"
value = "REPLACE"
lifecycle {
ignore_changes = [
Expand Down
4 changes: 2 additions & 2 deletions terraform/environments/oasys/locals_preproduction.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ locals {
patch_day = "TUE"
}

baseline_s3_buckets = {}
baseline_s3_buckets = {}
baseline_ssm_parameters = {}

baseline_secretsmanager_secrets = {
Expand Down Expand Up @@ -94,7 +94,7 @@ locals {
})
})
tags = merge(local.database_a.tags, {
instance-scheduling = "skip-scheduling"
instance-scheduling = "skip-scheduling"
})
})

Expand Down
24 changes: 12 additions & 12 deletions terraform/environments/oasys/locals_test.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ locals {
patch_day = "TUE"
}

baseline_s3_buckets = {}
baseline_s3_buckets = {}
baseline_ssm_parameters = {}

baseline_secretsmanager_secrets = {
"/oracle/database/T1OASYS" = local.secretsmanager_secrets_oasys_db
"/oracle/database/T1OASREP" = local.secretsmanager_secrets_db
Expand Down Expand Up @@ -153,11 +153,11 @@ locals {
# })
# })
tags = merge(local.bip_a.tags, {
oasys-environment = "t2"
bip-db-name = "T2BIPINF"
bip-db-hostname = "t2-oasys-db-a"
oasys-db-name = "T2OASYS"
oasys-db-hostname = "t2-oasys-db-a"
oasys-environment = "t2"
bip-db-name = "T2BIPINF"
bip-db-hostname = "t2-oasys-db-a"
oasys-db-name = "T2OASYS"
oasys-db-hostname = "t2-oasys-db-a"
})
})

Expand Down Expand Up @@ -195,11 +195,11 @@ locals {
# })
# })
tags = merge(local.bip_b.tags, {
oasys-environment = "t1"
bip-db-name = "T1BIPINF"
bip-db-hostname = "t1-oasys-db-a"
oasys-db-name = "T1OASYS"
oasys-db-hostname = "t1-oasys-db-a"
oasys-environment = "t1"
bip-db-name = "T1BIPINF"
bip-db-hostname = "t1-oasys-db-a"
oasys-db-name = "T1OASYS"
oasys-db-hostname = "t1-oasys-db-a"
})
})

Expand Down
42 changes: 21 additions & 21 deletions terraform/environments/performance-hub/data.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,26 @@ data "template_file" "launch-template" {
data "template_file" "task_definition" {
template = file("templates/task_definition.json")
vars = {
app_name = local.application_name
env_name = local.environment
system_account_id = local.app_data.accounts[local.environment].system_account_id
ecr_url = format("%s%s%s%s", local.environment_management.account_ids["core-shared-services-production"], ".dkr.ecr.", local.app_data.accounts[local.environment].region, ".amazonaws.com/performance-hub-ecr-repo")
server_port = local.app_data.accounts[local.environment].server_port
aws_region = local.app_data.accounts[local.environment].region
container_version = local.app_data.accounts[local.environment].container_version
db_host = local.app_data.accounts[local.environment].db_enabled ? aws_db_instance.database[0].address : "none"
db_user = local.app_data.accounts[local.environment].db_user
db_password = aws_secretsmanager_secret_version.db_password.arn
mojhub_cnnstr = aws_secretsmanager_secret_version.mojhub_cnnstr.arn
mojhub_membership = aws_secretsmanager_secret_version.mojhub_membership.arn
govuk_notify_api_key = aws_secretsmanager_secret_version.govuk_notify_api_key.arn
os_vts_api_key = aws_secretsmanager_secret_version.os_vts_api_key.arn
storage_bucket = "${aws_s3_bucket.upload_files.id}"
friendly_name = local.app_data.accounts[local.environment].friendly_name
hub_wwwroot = local.app_data.accounts[local.environment].hub_wwwroot
ap_import_access_key_id = aws_secretsmanager_secret_version.ap_import_access_key_id.arn
ap_import_secret_access_key = aws_secretsmanager_secret_version.ap_import_secret_access_key.arn
ap_export_access_key_id = aws_secretsmanager_secret_version.ap_export_access_key_id.arn
ap_export_secret_access_key = aws_secretsmanager_secret_version.ap_export_secret_access_key.arn
app_name = local.application_name
env_name = local.environment
system_account_id = local.app_data.accounts[local.environment].system_account_id
ecr_url = format("%s%s%s%s", local.environment_management.account_ids["core-shared-services-production"], ".dkr.ecr.", local.app_data.accounts[local.environment].region, ".amazonaws.com/performance-hub-ecr-repo")
server_port = local.app_data.accounts[local.environment].server_port
aws_region = local.app_data.accounts[local.environment].region
container_version = local.app_data.accounts[local.environment].container_version
db_host = local.app_data.accounts[local.environment].db_enabled ? aws_db_instance.database[0].address : "none"
db_user = local.app_data.accounts[local.environment].db_user
db_password = aws_secretsmanager_secret_version.db_password.arn
mojhub_cnnstr = aws_secretsmanager_secret_version.mojhub_cnnstr.arn
mojhub_membership = aws_secretsmanager_secret_version.mojhub_membership.arn
govuk_notify_api_key = aws_secretsmanager_secret_version.govuk_notify_api_key.arn
os_vts_api_key = aws_secretsmanager_secret_version.os_vts_api_key.arn
storage_bucket = "${aws_s3_bucket.upload_files.id}"
friendly_name = local.app_data.accounts[local.environment].friendly_name
hub_wwwroot = local.app_data.accounts[local.environment].hub_wwwroot
ap_import_access_key_id = aws_secretsmanager_secret_version.ap_import_access_key_id.arn
ap_import_secret_access_key = aws_secretsmanager_secret_version.ap_import_secret_access_key.arn
ap_export_access_key_id = aws_secretsmanager_secret_version.ap_export_access_key_id.arn
ap_export_secret_access_key = aws_secretsmanager_secret_version.ap_export_secret_access_key.arn
}
}
8 changes: 4 additions & 4 deletions terraform/environments/performance-hub/secrets.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ resource "aws_secretsmanager_secret_version" "os_vts_api_key" {
#tfsec:ignore:AWS095
resource "aws_secretsmanager_secret" "ap_import_access_key_id" {
#checkov:skip=CKV_AWS_149
name = "ap_import_access_key_id"
name = "ap_import_access_key_id"
recovery_window_in_days = 0
tags = merge(
local.tags,
Expand All @@ -92,7 +92,7 @@ resource "aws_secretsmanager_secret_version" "ap_import_access_key_id" {
#tfsec:ignore:AWS095
resource "aws_secretsmanager_secret" "ap_import_secret_access_key" {
#checkov:skip=CKV_AWS_149
name = "ap_import_secret_access_key"
name = "ap_import_secret_access_key"
recovery_window_in_days = 0
tags = merge(
local.tags,
Expand All @@ -109,7 +109,7 @@ resource "aws_secretsmanager_secret_version" "ap_import_secret_access_key" {
#tfsec:ignore:AWS095
resource "aws_secretsmanager_secret" "ap_export_access_key_id" {
#checkov:skip=CKV_AWS_149
name = "ap_export_access_key_id"
name = "ap_export_access_key_id"
recovery_window_in_days = 0
tags = merge(
local.tags,
Expand All @@ -126,7 +126,7 @@ resource "aws_secretsmanager_secret_version" "ap_export_access_key_id" {
#tfsec:ignore:AWS095
resource "aws_secretsmanager_secret" "ap_export_secret_access_key" {
#checkov:skip=CKV_AWS_149
name = "ap_export_secret_access_key"
name = "ap_export_secret_access_key"
recovery_window_in_days = 0
tags = merge(
local.tags,
Expand Down
Loading