diff --git a/environments/dev/backend.tf b/environments/dev/backend.tf index 33a807a336..69066c4b9c 100644 --- a/environments/dev/backend.tf +++ b/environments/dev/backend.tf @@ -15,7 +15,7 @@ terraform { backend "gcs" { - bucket = "PROJECT_ID-tfstate" + bucket = "kms-protected-bucket" prefix = "env/dev" } } diff --git a/environments/dev/main.tf b/environments/dev/main.tf index a28b76be75..f131fa9d2a 100644 --- a/environments/dev/main.tf +++ b/environments/dev/main.tf @@ -1,40 +1,40 @@ -# Copyright 2019 Google LLC +## Copyright 2019 Google LLC +## +## Licensed under the Apache License, Version 2.0 (the "License"); +## you may not use this file except in compliance with the License. +## You may obtain a copy of the License at +## +## https://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at # -# https://www.apache.org/licenses/LICENSE-2.0 +#locals { +# env = "dev" +#} # -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - - -locals { - env = "dev" -} - -provider "google" { - project = "${var.project}" -} - -module "vpc" { - source = "../../modules/vpc" - project = "${var.project}" - env = "${local.env}" -} - -module "http_server" { - source = "../../modules/http_server" - project = "${var.project}" - subnet = "${module.vpc.subnet}" -} - -module "firewall" { - source = "../../modules/firewall" - project = "${var.project}" - subnet = "${module.vpc.subnet}" -} +#provider "google" { +# project = "${var.project}" +#} +# +#module "vpc" { +# source = "../../modules/vpc" +# project = "${var.project}" +# env = "${local.env}" +#} +# +#module "http_server" { +# source = "../../modules/http_server" +# project = "${var.project}" +# subnet = "${module.vpc.subnet}" +#} +# +#module "firewall" { +# source = "../../modules/firewall" +# project = "${var.project}" +# subnet = "${module.vpc.subnet}" +#} diff --git a/environments/dev/outputs.tf b/environments/dev/outputs.tf index 0ae139e4f7..a965c33e6c 100644 --- a/environments/dev/outputs.tf +++ b/environments/dev/outputs.tf @@ -13,22 +13,22 @@ # limitations under the License. -output "network" { - value = "${module.vpc.network}" -} - -output "subnet" { - value = "${module.vpc.subnet}" -} - -output "firewall_rule" { - value = "${module.firewall.firewall_rule}" -} - -output "instance_name" { - value = "${module.http_server.instance_name}" -} - -output "external_ip" { - value = "${module.http_server.external_ip}" -} +#output "network" { +# value = "${module.vpc.network}" +#} +# +#output "subnet" { +# value = "${module.vpc.subnet}" +#} +# +#output "firewall_rule" { +# value = "${module.firewall.firewall_rule}" +#} +# +#output "instance_name" { +# value = "${module.http_server.instance_name}" +#} +# +#output "external_ip" { +# value = "${module.http_server.external_ip}" +#} diff --git a/environments/dev/terraform.tfvars b/environments/dev/terraform.tfvars index cb8a5a1bbc..081f0177ac 100644 --- a/environments/dev/terraform.tfvars +++ b/environments/dev/terraform.tfvars @@ -1 +1 @@ -project="PROJECT_ID" \ No newline at end of file +project="docker-project-403012" \ No newline at end of file diff --git a/environments/prod/backend.tf b/environments/prod/backend.tf index 7ed343b1a2..68856d2d9e 100644 --- a/environments/prod/backend.tf +++ b/environments/prod/backend.tf @@ -15,7 +15,7 @@ terraform { backend "gcs" { - bucket = "PROJECT_ID-tfstate" + bucket = "kms-protected-bucket" prefix = "env/prod" } } diff --git a/environments/prod/terraform.tfvars b/environments/prod/terraform.tfvars index cb8a5a1bbc..081f0177ac 100644 --- a/environments/prod/terraform.tfvars +++ b/environments/prod/terraform.tfvars @@ -1 +1 @@ -project="PROJECT_ID" \ No newline at end of file +project="docker-project-403012" \ No newline at end of file