Skip to content

Commit 6e980d3

Browse files
authored
Stop importing the old registries by default (#638)
This fails for new projects. We have updated all known existing projects by now.
1 parent 2bf783e commit 6e980d3

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

src/bootstrap/cloud/terraform/registry.tf

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,24 @@ locals {
2424
}
2525

2626
# import existing repos, see: gcloud artifacts repositories list --project=<project-id>
27-
# sadly the import statement needs to be commented out when creating a new project:
27+
# uncomment if updating an old project, we can't leave it on by default due to:
2828
# https://github.com/hashicorp/terraform/issues/33633
29-
import {
30-
id = "projects/${data.google_project.project.project_id}/locations/asia/repositories/asia.gcr.io"
31-
to = google_artifact_registry_repository.gcrio_repositories[0]
32-
}
33-
import {
34-
id = "projects/${data.google_project.project.project_id}/locations/europe/repositories/eu.gcr.io"
35-
to = google_artifact_registry_repository.gcrio_repositories[1]
36-
}
37-
import {
38-
id = "projects/${data.google_project.project.project_id}/locations/us/repositories/gcr.io"
39-
to = google_artifact_registry_repository.gcrio_repositories[2]
40-
}
41-
import {
42-
id = "projects/${data.google_project.project.project_id}/locations/us/repositories/us.gcr.io"
43-
to = google_artifact_registry_repository.gcrio_repositories[3]
44-
}
29+
#import {
30+
# id = "projects/${data.google_project.project.project_id}/locations/asia/repositories/asia.gcr.io"
31+
# to = google_artifact_registry_repository.gcrio_repositories[0]
32+
#}
33+
#import {
34+
# id = "projects/${data.google_project.project.project_id}/locations/europe/repositories/eu.gcr.io"
35+
# to = google_artifact_registry_repository.gcrio_repositories[1]
36+
#}
37+
#import {
38+
# id = "projects/${data.google_project.project.project_id}/locations/us/repositories/gcr.io"
39+
# to = google_artifact_registry_repository.gcrio_repositories[2]
40+
#}
41+
#import {
42+
# id = "projects/${data.google_project.project.project_id}/locations/us/repositories/us.gcr.io"
43+
# to = google_artifact_registry_repository.gcrio_repositories[3]
44+
#}
4545

4646
resource "google_artifact_registry_repository" "gcrio_repositories" {
4747
project = data.google_project.project.project_id

0 commit comments

Comments
 (0)