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

Jump to bottom

Tagging #1803

Closed
wants to merge 1 commit into from
Closed

Tagging #1803

wants to merge 1 commit into from

Conversation

martynipratt
Copy link
Contributor

@martynipratt martynipratt commented Nov 23, 2023 •
edited
Loading

@martynipratt martynipratt marked this pull request as ready for review November 27, 2023 10:51
AgaDufrat
AgaDufrat reviewed Nov 29, 2023
View reviewed changes
Copy link
Contributor

@AgaDufrat AgaDufrat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I started adding individual comments but gave up 😂 and the page got prety slow to respond with that many changes. (It'd make it easier to review if the formatting changes were included in a separate commit.)

Could you please update all instanced of Product value from "GOVUK" to "GOV.UK" and Owner value from [email protected] to [email protected]?

Platform Security and Reliability definitely owns backup buckets, mirrors, Fastly stuff but there's some follow up work to define owners all resources (Publishing Rabbit MQ and Search could have different owners). I'll add a card for it. For now it's probably ok to put Platform Engineering.

terraform/projects/app-apt/main.tf
subnets = ["${data.terraform_remote_state.infra_networking.public_subnet_ids}"]
security_groups = ["${data.terraform_remote_state.infra_security_groups.sg_apt_external_elb_id}"]
alarm_actions = ["${data.terraform_remote_state.infra_monitoring.sns_topic_cloudwatch_alarms_arn}"]
target_group_health_check_path = "/"
target_group_health_check_matcher = "200-499"
default_tags = "${map("Project", var.stackname, "aws_migration", "apt", "aws_environment", var.aws_environment)}"
default_tags = map("Project", var.stackname, "aws_migration", "apt", "aws_environment", var.aws_environment, "Environment", var.aws_environment, "Product", "GOVUK", "Owner", "[email protected]")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
default_tags = map("Project", var.stackname, "aws_migration", "apt", "aws_environment", var.aws_environment, "Environment", var.aws_environment, "Product", "GOVUK", "Owner", "govuk-replatforming-team@digital.cabinet-office.gov.uk")
default_tags = map("Project", var.stackname, "aws_migration", "apt", "aws_environment", var.aws_environment, "Environment", var.aws_environment, "Product", "GOV.UK", "Owner", "govuk-platform-engineering@digital.cabinet-office.gov.uk")

terraform/projects/app-apt/main.tf
subnets = ["${data.terraform_remote_state.infra_networking.private_subnet_ids}"]
security_groups = ["${data.terraform_remote_state.infra_security_groups.sg_apt_internal_elb_id}"]
alarm_actions = ["${data.terraform_remote_state.infra_monitoring.sns_topic_cloudwatch_alarms_arn}"]
target_group_health_check_path = "/"
target_group_health_check_matcher = "200-499"
default_tags = "${map("Project", var.stackname, "aws_migration", "apt", "aws_environment", var.aws_environment)}"
default_tags = map("Project", var.stackname, "aws_migration", "apt", "aws_environment", var.aws_environment, "Environment", var.aws_environment, "Product", "GOVUK", "Owner", "[email protected]")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
default_tags = map("Project", var.stackname, "aws_migration", "apt", "aws_environment", var.aws_environment, "Environment", var.aws_environment, "Product", "GOVUK", "Owner", "govuk-replatforming-team@digital.cabinet-office.gov.uk")
default_tags = map("Project", var.stackname, "aws_migration", "apt", "aws_environment", var.aws_environment, "Environment", var.aws_environment, "Product", "GOV.UK", "Owner", "govuk-platform-engineering@digital.cabinet-office.gov.uk")

terraform/projects/app-apt/main.tf
evaluate_target_health = true
}
}

module "apt" {
source = "../../modules/aws/node_group"
name = "${var.stackname}-apt"
default_tags = "${map("Project", var.stackname, "aws_stackname", var.stackname, "aws_environment", var.aws_environment, "aws_migration", "apt", "aws_hostname", "apt-1")}"
instance_subnet_ids = "${matchkeys(values(data.terraform_remote_state.infra_networking.private_subnet_names_ids_map), keys(data.terraform_remote_state.infra_networking.private_subnet_names_ids_map), list(var.apt_1_subnet))}"
default_tags = map("Project", var.stackname, "aws_stackname", var.stackname, "aws_environment", var.aws_environment, "aws_migration", "apt", "aws_hostname", "apt-1", "Environment", var.aws_environment, "Product", "GOVUK", "Owner", "[email protected]")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
default_tags = map("Project", var.stackname, "aws_stackname", var.stackname, "aws_environment", var.aws_environment, "aws_migration", "apt", "aws_hostname", "apt-1", "Environment", var.aws_environment, "Product", "GOVUK", "Owner", "govuk-replatforming-team@digital.cabinet-office.gov.uk")
default_tags = map("Project", var.stackname, "aws_stackname", var.stackname, "aws_environment", var.aws_environment, "aws_migration", "apt", "aws_hostname", "apt-1", "Environment", var.aws_environment, "Product", "GOV.UK", "Owner", "govuk-platform-engineering@digital.cabinet-office.gov.uk")

terraform/projects/app-apt/main.tf
aws_stackname = var.stackname
aws_environment = var.aws_environment
Environment = var.aws_environment
Product = "GOVUK"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Product = "GOVUK"
Product = "GOV.UK"
Owner = "[email protected]"

terraform/projects/app-asset-master/main.tf
Comment on lines +30 to +31
"Product" = "GOVUK"
"Owner" = "[email protected]"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"Product" = "GOVUK"
"Owner" = "govuk-replatforming-team@digital.cabinet-office.gov.uk"
"Product" = "GOV.UK"
"Owner" = "govuk-platform-engineering@digital.cabinet-office.gov.uk"

terraform/projects/infra-fastly-logs/main.tf
Comment on lines +46 to +47
Product = "GOVUK"
Owner = "[email protected]"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Product = "GOVUK"
Owner = "govuk-replatforming-team@digital.cabinet-office.gov.uk"
Product = "GOV.UK"
Owner = "govuk-platform-security-reliability@digital.cabinet-office.gov.uk"

terraform/projects/infra-fastly-logs/main.tf
Comment on lines +700 to +701
Product = "GOVUK"
Owner = "[email protected]"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Product = "GOVUK"
Owner = "govuk-replatforming-team@digital.cabinet-office.gov.uk"
Product = "GOV.UK"
Owner = "govuk-platform-security-reliability@digital.cabinet-office.gov.uk"

terraform/projects/infra-fastly-logs/main.tf
Comment on lines +753 to +754
Product = "GOVUK"
Owner = "[email protected]"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Product = "GOVUK"
Owner = "govuk-replatforming-team@digital.cabinet-office.gov.uk"
Product = "GOV.UK"
Owner = "govuk-platform-security-reliability@digital.cabinet-office.gov.uk"

terraform/projects/infra-govuk-cdn-logs-monitor-bucket/main.tf
Comment on lines +46 to +47
Product = "GOVUK"
Owner = "[email protected]"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Product = "GOVUK"
Owner = "govuk-replatforming-team@digital.cabinet-office.gov.uk"
Product = "GOV.UK"
Owner = "govuk-platform-security-reliability@digital.cabinet-office.gov.uk"

terraform/projects/infra-graphite-backups-bucket/main.tf
Comment on lines +49 to +50
Product = "GOVUK"
Owner = "[email protected]"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Product = "GOVUK"
Owner = "govuk-replatforming-team@digital.cabinet-office.gov.uk"
Product = "GOV.UK"
Owner = "govuk-platform-security-reliability@digital.cabinet-office.gov.uk"

@AgaDufrat AgaDufrat mentioned this pull request Dec 1, 2023
Merged
@AgaDufrat AgaDufrat marked this pull request as draft December 5, 2023 09:19
@sengi sengi closed this Feb 2, 2024
@sengi sengi deleted the tagging branch February 2, 2024 22:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AgaDufrat AgaDufrat AgaDufrat left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@martynipratt @AgaDufrat @sengi