Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions digger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,15 @@ projects:
- name: server-funch-service-prd
dir: terraform/google/server/funch-service/prd
include_patterns: ["terraform/google/server/funch-service/_shared/**", "terraform/google/_shared/**"]
- name: server-import-gtfs-job-dev
dir: terraform/google/server/import-gtfs-job/dev
include_patterns: ["terraform/google/server/import-gtfs-job/_shared/**", "terraform/google/_shared/**"]
- name: server-import-gtfs-job-stg
dir: terraform/google/server/import-gtfs-job/stg
include_patterns: ["terraform/google/server/import-gtfs-job/_shared/**", "terraform/google/_shared/**"]
- name: server-import-gtfs-job-prd
dir: terraform/google/server/import-gtfs-job/prd
include_patterns: ["terraform/google/server/import-gtfs-job/_shared/**", "terraform/google/_shared/**"]
- name: server-notify-user-job-dev
dir: terraform/google/server/notify-user-job/dev
include_patterns: ["terraform/google/server/notify-user-job/_shared/**", "terraform/google/_shared/**"]
Expand Down
60 changes: 60 additions & 0 deletions terraform/google/server/import-gtfs-job/_shared/cloud-run-job.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
resource "google_cloud_run_v2_job" "import_gtfs_job" {
launch_stage = "GA"
location = var.google_cloud_region
name = var.service_name

template {
template {
containers {
command = [
"/bin/import-gtfs-job",
]

env {
name = "DB_IAM_USER"
value = trimsuffix(google_service_account.import_gtfs_job.email, ".gserviceaccount.com")
}
env {
name = "DB_NAME"
value = var.db_name
}
env {
name = "INSTANCE_CONNECTION_NAME"
value = var.instance_connection_name
}
env {
name = "GTFS_SCHEDULE_URL"
value_source {
secret_key_ref {
secret = var.gtfs_schedule_url_secret_id
version = "latest"
}
}
}

image = var.image

resources {
limits = {
cpu = "1"
memory = "512Mi"
}
}
}

max_retries = 0

service_account = google_service_account.import_gtfs_job.email
timeout = "900s"
}
}

lifecycle {
ignore_changes = [
client,
client_version,
template[0].labels,
template[0].template[0].containers[0].image,
]
}
}
19 changes: 19 additions & 0 deletions terraform/google/server/import-gtfs-job/_shared/outputs.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
output "cloud_run_job_name" {
description = "The name of the Import GTFS Job Cloud Run job."
value = google_cloud_run_v2_job.import_gtfs_job.name
}

output "cloud_run_job_id" {
description = "The full resource ID of the Import GTFS Job Cloud Run job."
value = google_cloud_run_v2_job.import_gtfs_job.id
}

output "service_account_email" {
description = "The email of the job account used by Import GTFS Job."
value = google_service_account.import_gtfs_job.email
}

output "service_account_name" {
description = "The full resource name of the job account used by Import GTFS Job."
value = google_service_account.import_gtfs_job.name
}
18 changes: 18 additions & 0 deletions terraform/google/server/import-gtfs-job/_shared/scheduler.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
resource "google_cloud_scheduler_job" "import_gtfs_job_trigger" {
name = "${var.service_name}-trigger"
schedule = var.schedule
time_zone = var.timezone

http_target {
http_method = "POST"
uri = "https://run.googleapis.com/v2/projects/${google_cloud_run_v2_job.import_gtfs_job.project}/locations/${google_cloud_run_v2_job.import_gtfs_job.location}/jobs/${google_cloud_run_v2_job.import_gtfs_job.name}:run"
headers = {
"Content-Type" = "application/json"
}
body = base64encode("{}")

oauth_token {
service_account_email = google_service_account.import_gtfs_job_scheduler.email
}
}
}
33 changes: 33 additions & 0 deletions terraform/google/server/import-gtfs-job/_shared/service-account.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
resource "google_service_account" "import_gtfs_job" {
account_id = var.service_account_id
display_name = var.service_account_display_name
}

resource "google_project_iam_member" "import_gtfs_job" {
for_each = toset([
"roles/cloudsql.client",
"roles/cloudsql.instanceUser",
"roles/logging.logWriter",
])

project = var.google_cloud_project_id
role = each.value
member = "serviceAccount:${google_service_account.import_gtfs_job.email}"
}

resource "google_secret_manager_secret_iam_member" "import_gtfs_job_gtfs_schedule_url" {
secret_id = var.gtfs_schedule_url_secret_id
role = "roles/secretmanager.secretAccessor"
member = "serviceAccount:${google_service_account.import_gtfs_job.email}"
}

resource "google_service_account" "import_gtfs_job_scheduler" {
account_id = "${var.service_account_id}-scheduler"
display_name = "${var.service_account_display_name} Scheduler"
}

resource "google_cloud_run_v2_job_iam_member" "import_gtfs_job_invoker" {
name = google_cloud_run_v2_job.import_gtfs_job.name
role = "roles/run.invoker"
member = "serviceAccount:${google_service_account.import_gtfs_job_scheduler.email}"
}
27 changes: 27 additions & 0 deletions terraform/google/server/import-gtfs-job/_shared/variables.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
variable "service_account_id" {}

variable "service_account_display_name" {}

variable "db_name" {}

variable "instance_connection_name" {
default = "swift2023groupc:asia-northeast1:dotto"
}

variable "service_name" {}

variable "image" {
default = "asia-northeast1-docker.pkg.dev/swift2023groupc/github-actions/server:latest"
}

variable "schedule" {
default = "0 6 * * *"

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

朝の3時でも良さそう
始発って6時くらいだっけ

Suggested change
default = "0 6 * * *"
default = "0 3 * * *"

}

variable "timezone" {
default = "Asia/Tokyo"
}

variable "gtfs_schedule_url_secret_id" {
default = "gtfs_schedule_url_hakodate_bus"
}
42 changes: 42 additions & 0 deletions terraform/google/server/import-gtfs-job/dev/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions terraform/google/server/import-gtfs-job/dev/backend.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
terraform {
backend "gcs" {
bucket = "swift2023groupc-tfstate"
prefix = "server/import-gtfs-job-dev"
}
}
1 change: 1 addition & 0 deletions terraform/google/server/import-gtfs-job/dev/outputs.tf
1 change: 1 addition & 0 deletions terraform/google/server/import-gtfs-job/dev/providers.tf
1 change: 1 addition & 0 deletions terraform/google/server/import-gtfs-job/dev/scheduler.tf
5 changes: 5 additions & 0 deletions terraform/google/server/import-gtfs-job/dev/terraform.tfvars
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
service_account_id = "import-gtfs-job-dev"
service_account_display_name = "Import GTFS Job (Dev)"
db_name = "dotto_dev"
service_name = "import-gtfs-job-dev"
schedule = "0 4 * * *"

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

devで前の日の夜にやってエラー出たら次の朝までに対応できそう

Suggested change
schedule = "0 4 * * *"
schedule = "0 21 * * *"

1 change: 1 addition & 0 deletions terraform/google/server/import-gtfs-job/dev/variables.tf
1 change: 1 addition & 0 deletions terraform/google/server/import-gtfs-job/dev/versions.tf
42 changes: 42 additions & 0 deletions terraform/google/server/import-gtfs-job/prd/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions terraform/google/server/import-gtfs-job/prd/backend.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
terraform {
backend "gcs" {
bucket = "swift2023groupc-tfstate"
prefix = "server/import-gtfs-job-prd"
}
}
1 change: 1 addition & 0 deletions terraform/google/server/import-gtfs-job/prd/outputs.tf
1 change: 1 addition & 0 deletions terraform/google/server/import-gtfs-job/prd/providers.tf
1 change: 1 addition & 0 deletions terraform/google/server/import-gtfs-job/prd/scheduler.tf
4 changes: 4 additions & 0 deletions terraform/google/server/import-gtfs-job/prd/terraform.tfvars
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
service_account_id = "import-gtfs-job"
service_account_display_name = "Import GTFS Job"
db_name = "dotto"
service_name = "import-gtfs-job"
1 change: 1 addition & 0 deletions terraform/google/server/import-gtfs-job/prd/variables.tf
1 change: 1 addition & 0 deletions terraform/google/server/import-gtfs-job/prd/versions.tf
42 changes: 42 additions & 0 deletions terraform/google/server/import-gtfs-job/stg/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions terraform/google/server/import-gtfs-job/stg/backend.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
terraform {
backend "gcs" {
bucket = "swift2023groupc-tfstate"
prefix = "server/import-gtfs-job-stg"
}
}
Loading
Loading