Skip to content

Commit 3a71723

Browse files
authored
refactor: remove unused Google OAuth parameter and related references (#977)
1 parent 0dee1db commit 3a71723

File tree

5 files changed

+0
-27
lines changed

5 files changed

+0
-27
lines changed

terraform/ecs.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ data "template_file" "sre-bot" {
1818
fargate_cpu = var.fargate_cpu
1919
fargate_memory = var.fargate_memory
2020
aws_region = "ca-central-1"
21-
PICKLE_STRING = aws_ssm_parameter.google_oauth_pickle_string.arn
2221
GCP_SRE_SERVICE_ACCOUNT_KEY_FILE = aws_ssm_parameter.gcp_sre_service_account_key.arn
2322
}
2423
}

terraform/iam.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ data "aws_iam_policy_document" "sre-bot_secrets_manager" {
2929
]
3030
resources = [
3131
"arn:aws:ssm:ca-central-1:${data.aws_caller_identity.current.account_id}:parameter/sre-bot-config",
32-
aws_ssm_parameter.google_oauth_pickle_string.arn,
3332
aws_ssm_parameter.gcp_sre_service_account_key.arn
3433
]
3534
}

terraform/ssm.tf

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,3 @@
1-
resource "aws_ssm_parameter" "google_oauth_pickle_string" {
2-
name = "google_oauth_pickle_string"
3-
type = "SecureString"
4-
value = var.google_oauth_pickle_string
5-
6-
tags = {
7-
CostCentre = var.billing_code
8-
Terraform = true
9-
}
10-
}
11-
121
resource "aws_ssm_parameter" "gcp_sre_service_account_key" {
132
name = "gcp_sre_service_account_key"
143
type = "SecureString"

terraform/templates/sre-bot.json.tpl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@
2626
}
2727
],
2828
"secrets": [
29-
{
30-
"name": "PICKLE_STRING",
31-
"valueFrom": "${PICKLE_STRING}"
32-
},
3329
{
3430
"name": "GCP_SRE_SERVICE_ACCOUNT_KEY_FILE",
3531
"valueFrom": "${GCP_SRE_SERVICE_ACCOUNT_KEY_FILE}"

terraform/variables.tf

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,6 @@ variable "fargate_memory" {
1313
default = 1024
1414
}
1515

16-
variable "google_oauth_pickle_string" {
17-
description = "(Required) The Google OAuth pickle string"
18-
type = string
19-
sensitive = true
20-
}
21-
2216
variable "gcp_sre_service_account_key" {
2317
description = "(Required) The GCP SRE service account key"
2418
type = string
@@ -51,9 +45,6 @@ variable "authorized_endpoints_with_constraints" {
5145
}))
5246
default = [
5347
{ path = "/", positional_constraint = "EXACTLY" },
54-
{ path = "/auth/login", positional_constraint = "EXACTLY" },
55-
{ path = "/auth/logout", positional_constraint = "EXACTLY" },
56-
{ path = "/auth/callback", positional_constraint = "EXACTLY" },
5748
{ path = "/auth/me", positional_constraint = "EXACTLY" },
5849
{ path = "/request_access", positional_constraint = "EXACTLY" },
5950
{ path = "/active_requests", positional_constraint = "EXACTLY" },
@@ -62,7 +53,6 @@ variable "authorized_endpoints_with_constraints" {
6253
{ path = "/geolocate", positional_constraint = "STARTS_WITH" },
6354
{ path = "/hook", positional_constraint = "STARTS_WITH" },
6455
{ path = "/version", positional_constraint = "EXACTLY" },
65-
{ path = "/static", positional_constraint = "STARTS_WITH" },
6656
{ path = "/access", positional_constraint = "STARTS_WITH" },
6757
{ path = "/health", positional_constraint = "EXACTLY" }
6858
]

0 commit comments

Comments
 (0)