Commit 46b5c190 authored by Adam Robinson's avatar Adam Robinson
Browse files

Merge branch 'fix_dependencies' into 'master'

Fix dependencies

See merge request its-inf-cs/terraform-modules/google_hipaa_aligned_project!33
parents f8428afb 255990e7
......@@ -48,6 +48,8 @@ resource "null_resource" "sink_writer_bq_access" {
provisioner "local-exec" {
command = "${path.module}/set-sink-writer-bq-access.sh ${google_project.hipaa_project["audit"].project_id} ${google_bigquery_dataset.audit_logs[each.key].dataset_id} ${google_logging_project_sink.audit_logs_bq[each.key].writer_identity}"
}
depends_on = [ null_resource.install_gcloud_cli ]
}
resource "google_logging_project_sink" "audit_logs_gcs" {
......
......@@ -95,5 +95,5 @@ resource "null_resource" "datalab" {
when = "destroy"
command = "datalab delete --quiet --delete-disk --project ${google_project.hipaa_project[each.value].project_id} --zone us-central1-a datalab-${split("@", each.key)[0]}"
}
depends_on = [ google_sourcerepo_repository.datalab-notebooks, google_compute_network.datalab-network, null_resource.install_datalab_cli ]
depends_on = [ google_sourcerepo_repository.datalab-notebooks, google_compute_network.datalab-network, null_resource.install_gcloud_cli ]
}
\ No newline at end of file
......@@ -57,7 +57,7 @@ resource "google_logging_metric" "set_iam_permissions_change" {
}
}
resource "null_resource" "install_datalab_cli" {
resource "null_resource" "install_gcloud_cli" {
triggers = {
run_time = timestamp()
}
......@@ -74,5 +74,3 @@ fi
EOH
}
}
resource "null_resource" "dummy_import_resource" {}
\ No newline at end of file
variable "worker_count" {}
variable "organization_id" {}
variable "billing_account_id" {}
variable "parent_folder_id" {}
variable "domain" {}
variable "worker_count" {
description = "The number of worker projects to create"
default = 0
}
variable "project_prefix" {}
variable "organization_id" {
description = "The Organization ID the projects will be created under"
}
# variable "datalab_service_account_readers" {
# default = []
# }
variable "billing_account_id" {
description = "The Billing Account ID the projects should be attached to"
}
# variable "vpc_host_project_id" {
# default = ""
# }
variable "parent_folder_id" {
description = "The folder id of the folder that the project_prefix folder should be created under"
}
# variable "dataset_permissions" {
# type = "list"
# default = []
# }
variable "domain" {
description = "The domain of the GCP account"
}
variable "project_prefix" {
description = "A prefix to use when generating the project and group names"
}
variable "dependencies" {
default = []
......@@ -30,6 +29,7 @@ variable "dependencies" {
variable "datalab_user_list" {
type = "map"
description = "A map of users to create a datalab instance for. The key is the username and the value is the project id"
default = {}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment