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 #4641

Merged
merged 1 commit into from
Jan 22, 2024
Merged

GitHub Actions Code Formatter workflow #4641

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
16 changes: 8 additions & 8 deletions terraform/environments/cdpt-chaps/database.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@
#------------------------------------------------------------------------------

resource "aws_db_instance" "database" {
allocated_storage = local.application_data.accounts[local.environment].db_allocated_storage
storage_type = "gp2"
engine = "sqlserver-web"
engine_version = "14.00.3381.3.v1"
instance_class = local.application_data.accounts[local.environment].db_instance_class
identifier = local.application_data.accounts[local.environment].db_instance_identifier
allocated_storage = local.application_data.accounts[local.environment].db_allocated_storage
storage_type = "gp2"
engine = "sqlserver-web"
engine_version = "14.00.3381.3.v1"
instance_class = local.application_data.accounts[local.environment].db_instance_class
identifier = local.application_data.accounts[local.environment].db_instance_identifier
# username = local.application_data.accounts[local.environment].db_user
password = aws_secretsmanager_secret_version.db_password.secret_string
vpc_security_group_ids = [aws_security_group.db.id]
depends_on = [aws_security_group.db]
# snapshot_identifier = "arn:aws:rds:eu-west-2:613903586696:snapshot:chaps-prod-snapshot-2024-01-19"
db_subnet_group_name = aws_db_subnet_group.db.id
db_subnet_group_name = aws_db_subnet_group.db.id
final_snapshot_identifier = "final-snapshot"
publicly_accessible = true
publicly_accessible = true
}

resource "aws_db_instance_role_association" "database" {
Expand Down
4 changes: 2 additions & 2 deletions terraform/environments/cdpt-chaps/ecs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ resource "aws_ecs_task_definition" "chaps_task_definition" {
],
secrets = [
{
name: "RDS_PASSWORD",
valueFrom: aws_secretsmanager_secret_version.db_password.arn
name : "RDS_PASSWORD",
valueFrom : aws_secretsmanager_secret_version.db_password.arn
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion terraform/environments/cdpt-chaps/secrets.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#### This file can be used to store secrets specific to the member account ####

resource "aws_secretsmanager_secret" "db_password" {
name = "database_password"
name = "database_password"
}

resource "random_password" "password_long" {
Expand Down
20 changes: 10 additions & 10 deletions terraform/environments/data-platform-compute/vpc.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,40 +27,40 @@ module "vpc_endpoints" {

endpoints = {
logs = {
service = "logs"
service_type = "Interface"
service = "logs"
service_type = "Interface"
tags = merge(
local.tags,
{ Name = format("%s-logs-api-vpc-endpoint", local.application_name) }
)
},
sagemaker-api = {
service = "sagemaker.api"
service_type = "Interface"
service = "sagemaker.api"
service_type = "Interface"
tags = merge(
local.tags,
{ Name = format("%s-sagemaker-api-vpc-endpoint", local.application_name) }
)
},
sagemaker-runtime = {
service = "sagemaker.runtime"
service_type = "Interface"
service = "sagemaker.runtime"
service_type = "Interface"
tags = merge(
local.tags,
{ Name = format("%s-sagemaker-runtime-vpc-endpoint", local.application_name) }
)
},
sagemaker-catalog = {
service = "servicecatalog"
service_type = "Interface"
service = "servicecatalog"
service_type = "Interface"
tags = merge(
local.tags,
{ Name = format("%s-servicecatalog-vpc-endpoint", local.application_name) }
)
},
sts = {
service = "sts"
service_type = "Interface"
service = "sts"
service_type = "Interface"
tags = merge(
local.tags,
{ Name = format("%s-sts-vpc-endpoint", local.application_name) }
Expand Down
6 changes: 3 additions & 3 deletions terraform/environments/electronic-monitoring-data/transfer_server_capita.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#------------------------------------------------------------------------------

resource "aws_eip" "capita_eip" {
domain = "vpc"
domain = "vpc"
}

#------------------------------------------------------------------------------
Expand Down Expand Up @@ -73,7 +73,7 @@ resource "aws_vpc_security_group_ingress_rule" "capita_ip_5" {


resource "aws_transfer_server" "capita_transfer_server" {
protocols = ["SFTP"]
protocols = ["SFTP"]
identity_provider_type = "SERVICE_MANAGED"

endpoint_type = "VPC"
Expand All @@ -89,7 +89,7 @@ resource "aws_transfer_server" "capita_transfer_server" {
security_policy_name = "TransferSecurityPolicy-2023-05"

pre_authentication_login_banner = "Hello there"
logging_role = aws_iam_role.test_transfer_user_iam_role.arn
logging_role = aws_iam_role.test_transfer_user_iam_role.arn
structured_log_destinations = [
"${aws_cloudwatch_log_group.transfer.arn}:*"
]
Expand Down
Loading
Loading