Migration to wpt-live-app (#80)

jcscottiii · web-flow · commit 9017b2058c13 · 2025-04-29T13:12:15.000-04:00
* Migrate from wpt-live project to wpt-live-app project

Currently, the wpt-live project lives in the chromium.org GCP org.
However, to better support this long term, we created a new project
under the google.com org, wpt-live-app.

This is mostly to help with billing.

* Move .git to another location upon cloning
diff --git a/.terraform.lock.hcl b/.terraform.lock.hcl
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 HOST=gcr.io
-PROJECT_ID=wpt-live
+PROJECT_ID=wpt-live-app
 
 .PHONY: cert-renewer wpt-server-tot
 cert-renewer wpt-server-tot:
@@ -21,15 +21,9 @@ run-%: %
 		--env WPT_BUCKET \
 		wpt-live-$*
 
-google-cloud-platform-credentials.json:
-	@echo To publish images, the file $@ must be present in the root of >&2
-	@echo this repository. >&2
-	@exit 1
-
 .PHONY: login
-login: google-cloud-platform-credentials.json
-	cat $< | \
-		docker login -u _json_key --password-stdin $(HOST)
+login:
+	 yes | gcloud auth configure-docker
 
 publish-%: % login
 	docker tag wpt-live-$* $(HOST)/$(PROJECT_ID)/wpt-live-$*
diff --git a/infrastructure/docker-image/main.tf b/infrastructure/docker-image/main.tf
@@ -9,16 +9,9 @@ variable "image" {
 }
 
 output "identifier" {
-  value = "${var.registry}/${var.image}@${data.external.image.result.identifier}"
+  value = "${var.registry}/${var.image}@${data.docker_registry_image.image.sha256_digest}"
 }
 
-data "external" "image" {
-  program = [
-    "python3",
-    "${path.module}/latest-image.py",
-    "--registry",
-    var.registry,
-    "--image",
-    var.image,
-  ]
+data "docker_registry_image" "image" {
+  name = "${var.registry}/${var.image}:latest"
 }
diff --git a/infrastructure/docker-image/versions.tf b/infrastructure/docker-image/versions.tf
@@ -2,8 +2,16 @@
 terraform {
   required_version = "~> 1.6.2"
   required_providers {
-    external = {
-      source = "hashicorp/external"
+    docker = {
+      source  = "kreuzwerker/docker"
+      version = "3.0.2"
     }
   }
 }
+
+provider "docker" {
+  registry_auth {
+    address     = var.registry
+    config_file = pathexpand("~/.docker/config.json")
+  }
+}
diff --git a/infrastructure/web-platform-tests/compute.tf b/infrastructure/web-platform-tests/compute.tf
@@ -159,7 +159,6 @@ resource "google_compute_instance_template" "wpt_server" {
 resource "google_cloud_run_v2_job" "cert_renewers" {
   name         = "${var.name}-cert-renewers"
   location     = var.region
-  launch_stage = "BETA"
 
   template {
     template {
diff --git a/infrastructure/web-platform-tests/main.tf b/infrastructure/web-platform-tests/main.tf
@@ -37,6 +37,7 @@ module "wpt-server-container" {
 }
 
 resource "google_storage_bucket" "certificates" {
-  name     = local.bucket_name
-  location = "US"
+  name                        = local.bucket_name
+  location                    = "US"
+  uniform_bucket_level_access = true
 }
diff --git a/infrastructure/web-platform-tests/variables.tf b/infrastructure/web-platform-tests/variables.tf
@@ -91,7 +91,7 @@ variable "wpt_server_ports" {
 
 variable "service_account_email" {
   type    = string
-  default = "393246102209-compute@developer.gserviceaccount.com"
+  default = "2226368975-compute@developer.gserviceaccount.com"
 }
 
 variable "cert_renewer_ports" {
diff --git a/terraform.tf b/terraform.tf
@@ -1,13 +1,12 @@
 locals {
   region       = "us-central1"
   zone         = "us-central1-b"
-  project_name = "wpt-live"
+  project_name = "wpt-live-app"
 }
 
 provider "google" {
-  project     = local.project_name
-  region      = local.region
-  credentials = file("google-cloud-platform-credentials.json")
+  project = local.project_name
+  region  = local.region
 }
 
 resource "google_compute_network" "default" {
@@ -38,7 +37,7 @@ module "cert-renewer-image" {
 module "wpt-live" {
   source = "./infrastructure/web-platform-tests"
 
-  name               = "wpt-tot"
+  name               = "wpt-tot-app"
   network_name       = google_compute_network.default.name
   subnetwork_name    = google_compute_subnetwork.default.name
   host_zone_name     = "wpt-live"
diff --git a/terraform.tfstate b/terraform.tfstate
diff --git a/wpt-server-tot.Dockerfile b/wpt-server-tot.Dockerfile

Original file line number	Diff line number	Diff line change
`@@ -9,16 +9,9 @@ variable "image" {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`output "identifier" {`
`12`		`- value = "${var.registry}/${var.image}@${data.external.image.result.identifier}"`
	`12`	`+ value = "${var.registry}/${var.image}@${data.docker_registry_image.image.sha256_digest}"`
`13`	`13`	`}`
`14`	`14`
`15`		`-data "external" "image" {`
`16`		`- program = [`
`17`		`- "python3",`
`18`		`- "${path.module}/latest-image.py",`
`19`		`- "--registry",`
`20`		`- var.registry,`
`21`		`- "--image",`
`22`		`- var.image,`
`23`		`- ]`
	`15`	`+data "docker_registry_image" "image" {`
	`16`	`+ name = "${var.registry}/${var.image}:latest"`
`24`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,16 @@`
`2`	`2`	`terraform {`
`3`	`3`	`required_version = "~> 1.6.2"`
`4`	`4`	`required_providers {`
`5`		`- external = {`
`6`		`- source = "hashicorp/external"`
	`5`	`+ docker = {`
	`6`	`+ source = "kreuzwerker/docker"`
	`7`	`+ version = "3.0.2"`
`7`	`8`	`}`
`8`	`9`	`}`
`9`	`10`	`}`
	`11`	`+`
	`12`	`+provider "docker" {`
	`13`	`+ registry_auth {`
	`14`	`+ address = var.registry`
	`15`	`+ config_file = pathexpand("~/.docker/config.json")`
	`16`	`+ }`
	`17`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@ module "wpt-server-container" {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`resource "google_storage_bucket" "certificates" {`
`40`		`- name = local.bucket_name`
`41`		`- location = "US"`
	`40`	`+ name = local.bucket_name`
	`41`	`+ location = "US"`
	`42`	`+ uniform_bucket_level_access = true`
`42`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ variable "wpt_server_ports" {`
`91`	`91`
`92`	`92`	`variable "service_account_email" {`
`93`	`93`	`type = string`
`94`		`- default = "393246102209[email protected]"`
	`94`	`+ default = "2226368975[email protected]"`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`variable "cert_renewer_ports" {`