diff --git a/bootstrap/main.tf b/bootstrap/main.tf index 5087505..68a78af 100644 --- a/bootstrap/main.tf +++ b/bootstrap/main.tf @@ -1,8 +1,3 @@ -provider "google" { - default_labels = var.default_labels - user_project_override = true -} - resource "google_project" "stacklet_relay" { count = var.create_project ? 1 : 0 name = var.project_name diff --git a/bootstrap/vars.tf b/bootstrap/vars.tf index 78fe7dd..32c3963 100644 --- a/bootstrap/vars.tf +++ b/bootstrap/vars.tf @@ -1,9 +1,3 @@ -variable "default_labels" { - type = map(string) - default = {} - description = "Labels to be applied to created resources" -} - variable "create_project" { type = bool default = true diff --git a/provider.tf b/provider.tf index 96aed66..9b252d6 100644 --- a/provider.tf +++ b/provider.tf @@ -1,6 +1,14 @@ -provider "google" { - project = var.project_id - billing_project = var.project_id - user_project_override = true - default_labels = var.default_labels +terraform { + required_version = ">= 1.0" + + required_providers { + google = { + source = "hashicorp/google" + version = "~> 7.0" + } + archive = { + source = "hashicorp/archive" + version = "~> 2.0" + } + } } diff --git a/vars.tf b/vars.tf index 2d3b9c5..8cd155f 100644 --- a/vars.tf +++ b/vars.tf @@ -51,12 +51,6 @@ variable "audit_log_include_children" { # # Additional variables # -variable "default_labels" { - type = map(string) - default = {} - description = "Labels to be applied to created resources" -} - variable "prefix" { type = string default = ""