You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardexpand all lines: metadata.yaml
+10-16
Original file line number
Diff line number
Diff line change
@@ -1,4 +1,4 @@
1
-
# Copyright 2023 Google LLC
1
+
# Copyright 2024 Google LLC
2
2
#
3
3
# Licensed under the Apache License, Version 2.0 (the "License");
4
4
# you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@ spec:
27
27
version: 7.0.0
28
28
actuationTool:
29
29
flavor: Terraform
30
-
version: ">= 0.13"
30
+
version: ">= 1.3"
31
31
description: {}
32
32
content:
33
33
subBlueprints:
@@ -61,7 +61,6 @@ spec:
61
61
- name: dataset_id
62
62
description: Unique ID for the dataset being provisioned.
63
63
varType: string
64
-
defaultValue: null
65
64
required: true
66
65
- name: dataset_labels
67
66
description: Key value pairs in a map for dataset labels
@@ -70,27 +69,22 @@ spec:
70
69
- name: dataset_name
71
70
description: Friendly name for the dataset being provisioned.
72
71
varType: string
73
-
defaultValue: null
74
72
- name: default_table_expiration_ms
75
73
description: TTL of tables using the dataset in MS
76
74
varType: number
77
-
defaultValue: null
78
75
- name: delete_contents_on_destroy
79
76
description: (Optional) If set to true, delete all the tables in the dataset when destroying the resource; otherwise, destroying the resource will fail if tables are present.
80
77
varType: bool
81
-
defaultValue: null
82
78
- name: deletion_protection
83
-
description: Whether or not to allow Terraform to destroy the instance. Unless this field is set to false in Terraform state, a terraform destroy or terraform apply that would delete the instance will fail
79
+
description: Whether or not to allow deletion of tables and external tables defined by this module. Can be overriden by table-level deletion_protection configuration.
84
80
varType: bool
85
81
defaultValue: false
86
82
- name: description
87
83
description: Dataset description.
88
84
varType: string
89
-
defaultValue: null
90
85
- name: encryption_key
91
86
description: Default encryption key to apply to the dataset. Defaults to null (Google-managed).
92
87
varType: string
93
-
defaultValue: null
94
88
- name: external_tables
95
89
description: A list of objects which include table_id, expiration_time, external_data_configuration, and labels.
96
90
varType: |-
@@ -120,9 +114,10 @@ spec:
120
114
mode = string,
121
115
source_uri_prefix = string,
122
116
}),
123
-
expiration_time = string,
124
-
max_staleness = optional(string),
125
-
labels = map(string),
117
+
expiration_time = string,
118
+
max_staleness = optional(string),
119
+
deletion_protection = optional(bool),
120
+
labels = map(string),
126
121
}))
127
122
defaultValue: []
128
123
- name: location
@@ -161,11 +156,9 @@ spec:
161
156
- name: max_time_travel_hours
162
157
description: Defines the time travel window in hours
163
158
varType: number
164
-
defaultValue: null
165
159
- name: project_id
166
160
description: Project where the dataset and table are created
167
161
varType: string
168
-
defaultValue: null
169
162
required: true
170
163
- name: routines
171
164
description: A list of objects which include routine_id, routine_type, routine_language, definition_body, return_type, routine_description and arguments.
| deletion\_protection | Whether or not to protect GCS resources from deletion when solution is modified or changed. |`string`|`true`| no |
39
+
| create\_ignore\_service\_accounts | Whether or not to ignore creation of a service account if an account of the same name already exists |`string`|`true`| no |
40
+
| dataform\_region | Region that is used to deploy Dataform resources. This does not limit where resources can be run or what region data must be located in. |`string`|`null`| no |
41
+
| deletion\_protection | Whether or not to protect GCS resources from deletion when solution is modified or changed. |`string`|`false`| no |
39
42
| enable\_apis | Whether or not to enable underlying apis in this solution. |`string`|`true`| no |
40
-
| force\_destroy | Whether or not to protect BigQuery resources from deletion when solution is modified or changed. |`string`|`false`| no |
43
+
| force\_destroy | Whether or not to protect BigQuery resources from deletion when solution is modified or changed. |`string`|`true`| no |
41
44
| labels | A map of labels to apply to contained resources. |`map(string)`| <pre>{<br> "data-warehouse": true<br>}</pre> | no |
42
45
| project\_id | Google Cloud Project ID |`string`| n/a | yes |
43
46
| region | Google Cloud Region |`string`| n/a | yes |
@@ -86,6 +89,7 @@ A project with the following APIs enabled must be used to host the
Copy file name to clipboardexpand all lines: modules/data_warehouse/variables.tf
+65-5
Original file line number
Diff line number
Diff line change
@@ -23,12 +23,68 @@ variable "region" {
23
23
type=string
24
24
description="Google Cloud Region"
25
25
26
+
/**
27
+
* This variable list assumes you are using the same region for both Dataform and all other assets.
28
+
* If you want to deploy your Dataform respositories in a different region, set the default value
29
+
* for var.dataform_region to one of the regions in the Dataform validation list.
30
+
* You can then set this variable value to any of the following:
31
+
* "asia-northeast3"
32
+
* "asia-southeast1"
33
+
* "europe-west1"
34
+
* "europe-west2"
35
+
* "europe-west3"
36
+
* "europe-west4"
37
+
* "europe-west9"
38
+
* "us-central1"
39
+
* "us-west4"
40
+
*
41
+
* Be sure to update the validation list below to include these additional values!
42
+
*/
43
+
44
+
validation {
45
+
condition=contains([
46
+
"asia-southeast1",
47
+
"europe-west1",
48
+
"europe-west2",
49
+
"europe-west3",
50
+
"europe-west4",
51
+
"us-central1",
52
+
],
53
+
var.region)
54
+
error_message="This region is not supported. Region must be one of: asia-southeast1, europe-west1, europe-west2, europe-west3, europe-west4, us-central1"
55
+
}
56
+
}
57
+
58
+
59
+
variable"dataform_region" {
60
+
type=string
61
+
description="Region that is used to deploy Dataform resources. This does not limit where resources can be run or what region data must be located in."
error_message="This region is not supported. Region must be one of us-central1, us-west4, europe-west1, europe-west2, europe-west3, europe-west4, europe-west9, asia-northeast3, asia-southeast1."
error_message="This region is not supported for Dataform. Region must be one of: asia-east1, asia-northeast1, asia-south1, asia-southeast1, australia-southeast1, europe-west1, europe-west2, europe-west3, europe-west4, europe-west6, southamerica-east1, us-central1, us-east1, us-west1."
29
84
}
30
85
}
31
86
87
+
32
88
variable"text_generation_model_name" {
33
89
type=string
34
90
description="Name of the BigQuery ML GenAI remote model that connects to the LLM used for text generation"
@@ -50,13 +106,17 @@ variable "enable_apis" {
50
106
variable"force_destroy" {
51
107
type=string
52
108
description="Whether or not to protect BigQuery resources from deletion when solution is modified or changed."
53
-
default=false
109
+
default=true
54
110
}
55
111
56
112
variable"deletion_protection" {
57
113
type=string
58
114
description="Whether or not to protect GCS resources from deletion when solution is modified or changed."
59
-
default=true
115
+
default=false
60
116
}
61
117
62
-
118
+
variable"create_ignore_service_accounts" {
119
+
type=string
120
+
description="Whether or not to ignore creation of a service account if an account of the same name already exists"
0 commit comments