Fix gcs_to_bq_with_dataflow tests
This commit is contained in:
parent
70d8d1f890
commit
fcd6be9733
|
@ -16,6 +16,7 @@
|
||||||
variable "prefix" {
|
variable "prefix" {
|
||||||
description = "Unique prefix used for resource names. Not used for project if 'project_create' is null."
|
description = "Unique prefix used for resource names. Not used for project if 'project_create' is null."
|
||||||
type = string
|
type = string
|
||||||
|
default = null
|
||||||
}
|
}
|
||||||
|
|
||||||
variable "project_create" {
|
variable "project_create" {
|
||||||
|
|
|
@ -15,9 +15,11 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
module "test" {
|
module "test" {
|
||||||
source = "../../../../../examples/data-solutions/gcs-to-bq-with-dataflow/"
|
source = "../../../../../examples/data-solutions/gcs-to-bq-with-dataflow/"
|
||||||
billing_account = var.billing_account
|
prefix = var.prefix
|
||||||
project_kms_name = var.project_kms_name
|
project_id = var.project_id
|
||||||
project_service_name = var.project_service_name
|
project_create = {
|
||||||
root_node = var.root_node
|
billing_account_id = var.billing_account_id
|
||||||
|
parent = var.parent
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,23 +14,22 @@
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
variable "billing_account" {
|
variable "billing_account_id" {
|
||||||
type = string
|
default = "012345-678901-234567"
|
||||||
default = "123456-123456-123456"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
variable "root_node" {
|
variable "parent" {
|
||||||
description = "The resource name of the parent Folder or Organization. Must be of the form folders/folder_id or organizations/org_id."
|
default = "folders/01234567890"
|
||||||
type = string
|
|
||||||
default = "folders/12345678"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
variable "project_service_name" {
|
variable "prefix" {
|
||||||
type = string
|
default = "fabric"
|
||||||
default = "project-srv"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
variable "project_kms_name" {
|
variable "project_id" {
|
||||||
type = string
|
default = "gcs-to-bq"
|
||||||
default = "project-kms"
|
}
|
||||||
|
|
||||||
|
variable "region" {
|
||||||
|
default = "europe-west1"
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,5 +15,5 @@
|
||||||
def test_resources(e2e_plan_runner):
|
def test_resources(e2e_plan_runner):
|
||||||
"Test that plan works and the numbers of resources is as expected."
|
"Test that plan works and the numbers of resources is as expected."
|
||||||
modules, resources = e2e_plan_runner()
|
modules, resources = e2e_plan_runner()
|
||||||
assert len(modules) == 14
|
assert len(modules) == 12
|
||||||
assert len(resources) == 61
|
assert len(resources) == 57
|
||||||
|
|
Loading…
Reference in New Issue