Skip to content

Commit 1f822b8

Browse files
ihtiht
committed
Adapt to new build
1 parent b045c8f commit 1f822b8

File tree

8 files changed

+95
-40
lines changed

8 files changed

+95
-40
lines changed

‎terraform/anomaly_detection/main.tf‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,26 @@ locals {
2121
bigtable_instance = "bt-enrichment"
2222
}
2323

24-
resource "google_project_service" "crm" {
25-
depends_on = [google_project_service.su]
26-
project = var.project_id
27-
service = "cloudresourcemanager.googleapis.com"
28-
disable_dependent_services = true
24+
resource "google_project_default_service_accounts" "default_service_accounts" {
25+
project = var.project_id
26+
action = "PROJECT_ENABLE"
2927
}
3028

3129
resource "google_project_service" "su" {
30+
depends_on = [google_project_default_service_accounts.default_service_accounts]
31+
3232
project = var.project_id
3333
service = "serviceusage.googleapis.com"
3434
disable_dependent_services = true
3535
}
3636

37+
resource "google_project_service" "crm" {
38+
depends_on = [google_project_service.su]
39+
project = var.project_id
40+
service = "cloudresourcemanager.googleapis.com"
41+
disable_dependent_services = true
42+
}
43+
3744
// Project
3845
module "google_cloud_project" {
3946
depends_on = [google_project_service.crm, google_project_service.su]

‎terraform/cdp/main.tf‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,26 @@ locals {
1818
worker_disk_size_gb = 200
1919
machine_type = "e2-standard-8"
2020
}
21-
resource "google_project_service" "crm" {
22-
depends_on = [google_project_service.su]
23-
project = var.project_id
24-
service = "cloudresourcemanager.googleapis.com"
25-
disable_dependent_services = true
21+
resource "google_project_default_service_accounts" "default_service_accounts" {
22+
project = var.project_id
23+
action = "PROJECT_ENABLE"
2624
}
2725

2826
resource "google_project_service" "su" {
27+
depends_on = [google_project_default_service_accounts.default_service_accounts]
28+
2929
project = var.project_id
3030
service = "serviceusage.googleapis.com"
3131
disable_dependent_services = true
3232
}
3333

34+
resource "google_project_service" "crm" {
35+
depends_on = [google_project_service.su]
36+
project = var.project_id
37+
service = "cloudresourcemanager.googleapis.com"
38+
disable_dependent_services = true
39+
}
40+
3441
// Project
3542
module "google_cloud_project" {
3643
depends_on = [google_project_service.crm, google_project_service.su]

‎terraform/clickstream_analytics/main.tf‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,26 @@ locals {
2020
bigquery_dataset = "clickstream_analytics"
2121
}
2222

23-
resource "google_project_service" "crm" {
24-
depends_on = [google_project_service.su]
25-
project = var.project_id
26-
service = "cloudresourcemanager.googleapis.com"
27-
disable_dependent_services = true
23+
resource "google_project_default_service_accounts" "default_service_accounts" {
24+
project = var.project_id
25+
action = "PROJECT_ENABLE"
2826
}
2927

3028
resource "google_project_service" "su" {
29+
depends_on = [google_project_default_service_accounts.default_service_accounts]
30+
3131
project = var.project_id
3232
service = "serviceusage.googleapis.com"
3333
disable_dependent_services = true
3434
}
3535

36+
resource "google_project_service" "crm" {
37+
depends_on = [google_project_service.su]
38+
project = var.project_id
39+
service = "cloudresourcemanager.googleapis.com"
40+
disable_dependent_services = true
41+
}
42+
3643
// Project
3744
module "google_cloud_project" {
3845
depends_on = [google_project_service.crm, google_project_service.su]

‎terraform/etl_integration/main.tf‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,26 @@ locals {
2626
max_dataflow_workers = 10
2727
}
2828

29-
resource "google_project_service" "crm" {
30-
depends_on = [google_project_service.su]
31-
project = var.project_id
32-
service = "cloudresourcemanager.googleapis.com"
33-
disable_dependent_services = true
29+
resource "google_project_default_service_accounts" "default_service_accounts" {
30+
project = var.project_id
31+
action = "PROJECT_ENABLE"
3432
}
3533

3634
resource "google_project_service" "su" {
35+
depends_on = [google_project_default_service_accounts.default_service_accounts]
36+
3737
project = var.project_id
3838
service = "serviceusage.googleapis.com"
3939
disable_dependent_services = true
4040
}
4141

42+
resource "google_project_service" "crm" {
43+
depends_on = [google_project_service.su]
44+
project = var.project_id
45+
service = "cloudresourcemanager.googleapis.com"
46+
disable_dependent_services = true
47+
}
48+
4249
// Project
4350
module "google_cloud_project" {
4451
depends_on = [google_project_service.crm]

‎terraform/iot_analytics/main.tf‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,23 @@ locals {
2121
bigquery_table = "maintenance_analytics"
2222
}
2323

24+
resource "google_project_default_service_accounts" "default_service_accounts" {
25+
project = var.project_id
26+
action = "PROJECT_ENABLE"
27+
}
28+
29+
resource "google_project_service" "su" {
30+
depends_on = [google_project_default_service_accounts.default_service_accounts]
2431

25-
resource "google_project_service" "crm" {
26-
depends_on = [google_project_service.su]
2732
project = var.project_id
28-
service = "cloudresourcemanager.googleapis.com"
33+
service = "serviceusage.googleapis.com"
2934
disable_dependent_services = true
3035
}
3136

32-
resource "google_project_service" "su" {
37+
resource "google_project_service" "crm" {
38+
depends_on = [google_project_service.su]
3339
project = var.project_id
34-
service = "serviceusage.googleapis.com"
40+
service = "cloudresourcemanager.googleapis.com"
3541
disable_dependent_services = true
3642
}
3743

‎terraform/log_replication_splunk/main.tf‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,26 @@ locals {
2020
max_dataflow_workers = 10
2121
}
2222

23-
resource "google_project_service" "crm" {
24-
depends_on = [google_project_service.su]
25-
project = var.project_id
26-
service = "cloudresourcemanager.googleapis.com"
27-
disable_dependent_services = true
23+
resource "google_project_default_service_accounts" "default_service_accounts" {
24+
project = var.project_id
25+
action = "PROJECT_ENABLE"
2826
}
2927

3028
resource "google_project_service" "su" {
29+
depends_on = [google_project_default_service_accounts.default_service_accounts]
30+
3131
project = var.project_id
3232
service = "serviceusage.googleapis.com"
3333
disable_dependent_services = true
3434
}
3535

36+
resource "google_project_service" "crm" {
37+
depends_on = [google_project_service.su]
38+
project = var.project_id
39+
service = "cloudresourcemanager.googleapis.com"
40+
disable_dependent_services = true
41+
}
42+
3643
// Project
3744
module "google_cloud_project" {
3845
depends_on = [google_project_service.crm, google_project_service.su]

‎terraform/marketing_intelligence/main.tf‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,26 @@ locals {
2121
bigtable_instance = "bt-enrichment"
2222
}
2323

24-
resource "google_project_service" "crm" {
25-
depends_on = [google_project_service.su]
26-
project = var.project_id
27-
service = "cloudresourcemanager.googleapis.com"
28-
disable_dependent_services = true
24+
resource "google_project_default_service_accounts" "default_service_accounts" {
25+
project = var.project_id
26+
action = "PROJECT_ENABLE"
2927
}
3028

3129
resource "google_project_service" "su" {
30+
depends_on = [google_project_default_service_accounts.default_service_accounts]
31+
3232
project = var.project_id
3333
service = "serviceusage.googleapis.com"
3434
disable_dependent_services = true
3535
}
3636

37+
resource "google_project_service" "crm" {
38+
depends_on = [google_project_service.su]
39+
project = var.project_id
40+
service = "cloudresourcemanager.googleapis.com"
41+
disable_dependent_services = true
42+
}
43+
3744
// Project
3845
module "google_cloud_project" {
3946
depends_on = [google_project_service.crm, google_project_service.su]

‎terraform/ml_ai/main.tf‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,26 @@ locals {
1919
machine_type = "g2-standard-4"
2020
}
2121

22-
resource "google_project_service" "crm" {
23-
depends_on = [google_project_service.su]
24-
project = var.project_id
25-
service = "cloudresourcemanager.googleapis.com"
26-
disable_dependent_services = true
22+
resource "google_project_default_service_accounts" "default_service_accounts" {
23+
project = var.project_id
24+
action = "PROJECT_ENABLE"
2725
}
2826

2927
resource "google_project_service" "su" {
28+
depends_on = [google_project_default_service_accounts.default_service_accounts]
29+
3030
project = var.project_id
3131
service = "serviceusage.googleapis.com"
3232
disable_dependent_services = true
3333
}
3434

35+
resource "google_project_service" "crm" {
36+
depends_on = [google_project_service.su]
37+
project = var.project_id
38+
service = "cloudresourcemanager.googleapis.com"
39+
disable_dependent_services = true
40+
}
41+
3542
// Project
3643
module "google_cloud_project" {
3744
depends_on = [google_project_service.crm, google_project_service.su]

0 commit comments

Comments
 (0)