Update for 0.12

Signed-off-by: Carlo DiCelico <[email protected]>

Author: cdcme

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 - TBD
 
+## v0.3.0
+### Updated
+- Upgrades for Terraform v0.12 (fixes #8)
+
 ## v0.2.0
 ### Added
 - Subnet information to VPC outputs (fixes #4)
@@ -21,8 +25,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - VPC creation and configuration
 - Documentation, including:
   - this CHANGELOG
-  - [AUTHORS](https://github.com/minnowpod/terraform-google-project/tree/master/AUTHORS)
-  - [CONDUCT](https://github.com/minnowpod/terraform-google-project/tree/master/CONDUCT.md)
-  - [CONTRIBUTING](https://github.com/minnowpod/terraform-google-project/tree/master/CONTRIBUTING.md)
-  - [LICENSE](https://github.com/minnowpod/terraform-google-project/tree/master/LICENSE)
-  - [README](https://github.com/minnowpod/terraform-google-project/tree/master/README.md)
+  - [AUTHORS](https://github.com/carlodicelico/terraform-google-project/tree/master/AUTHORS)
+  - [CONDUCT](https://github.com/carlodicelico/terraform-google-project/tree/master/CONDUCT.md)
+  - [CONTRIBUTING](https://github.com/carlodicelico/terraform-google-project/tree/master/CONTRIBUTING.md)
+  - [LICENSE](https://github.com/carlodicelico/terraform-google-project/tree/master/LICENSE)
+  - [README](https://github.com/carlodicelico/terraform-google-project/tree/master/README.md)

CONDUCT.md

@@ -1,23 +1,23 @@
 # Code of Conduct
-The Minnow Open Source community is made up of members from around the globe with a diverse set of skills, personalities, and experiences. It is through these differences that our community experiences great successes and continued growth. When you're working with members of the community, we encourage you to follow these guidelines which help steer our interactions and strive to keep Minnow Open Source a positive, successful, and growing community.
+The Open Source community is made up of members from around the globe with a diverse set of skills, personalities, and experiences. It is through these differences that our community experiences great successes and continued growth. When you're working with members of the community, we encourage you to follow these guidelines which help steer our interactions and strive to keep Open Source a positive, successful, and growing community.
 
-A member of the Minnow Open Source community is:
+A member of the Open Source community is:
 
 ## Open
 Members of the community are open to collaboration, whether it's on GitHub, email, IRC or otherwise. We're receptive to constructive comment and criticism, as the experiences and skill sets of other members contribute to the whole of our efforts. We're accepting of all who wish to take part in our activities, fostering an environment where anyone can participate and everyone can make a difference.
 
 ## Considerate
-Members of the community are considerate of their peers - other Minnow Open Source users. We're thoughtful when addressing the efforts of others, keeping in mind that oftentimes their labor was completed simply for the good of the community. We're attentive in our communications, whether in person or online, and we're tactful when approaching differing views.
+Members of the community are considerate of their peers - other Open Source users. We're thoughtful when addressing the efforts of others, keeping in mind that oftentimes their labor was completed simply for the good of the community. We're attentive in our communications, whether in person or online, and we're tactful when approaching differing views.
 
 ## Respectful
-Members of the community are respectful. We're respectful of others, their positions, their skills, their commitments, and their efforts. We're respectful of the volunteer efforts that permeate the Minnow Open Source community. We're respectful of the processes set forth in the community, and we work within them. When we disagree, we are courteous in raising our issues.
+Members of the community are respectful. We're respectful of others, their positions, their skills, their commitments, and their efforts. We're respectful of the volunteer efforts that permeate the Open Source community. We're respectful of the processes set forth in the community, and we work within them. When we disagree, we are courteous in raising our issues.
 
 Overall, we're good to each other. We contribute to this community not because we have to, but because we want to. If we remember that, these guidelines will come naturally.
 
-# Diversity
-The Minnow Open Source community welcomes and encourages participation by everyone. Our community is based on mutual respect, tolerance, and encouragement, and we are working to help each other live up to these principles. We want our community to be more diverse: whoever you are, and whatever your background, we welcome you.
+# Diverse
+The Open Source community welcomes and encourages participation by everyone. Our community is based on mutual respect, tolerance, and encouragement, and we are working to help each other live up to these principles. We want our community to be more diverse: whoever you are, and whatever your background, we welcome you.
 
-We have created this diversity statement because we believe that a diverse Minnow Open Source community is stronger and more vibrant. A diverse community where people treat each other with respect has more potential contributors and more sources for ideas.
+We have created this diversity statement because we believe that a diverse Open Source community is stronger and more vibrant. A diverse community where people treat each other with respect has more potential contributors and more sources for ideas.
 
 Although we have phrased the formal diversity statement generically to make it all-inclusive, we recognise that there are specific attributes that are used to discriminate against people. In alphabetical order, some of these attributes include (but are not limited to): age, culture, ethnicity, gender identity or expression, national origin, physical or mental difference, politics, race, religion, sex, sexual orientation, socio-economic status, and subculture. We welcome people regardless of the values of these or other attributes.
 

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Contribution Guidelines
 
-First time contributing to a Minnow Open Source project? Read our [Code of Conduct](https://github.com/minnowpod/terraform-google-project/blob/master/CONDUCT.md).
+First time contributing to an Open Source project? Read our [Code of Conduct](https://github.com/carlodicelico/terraform-google-project/blob/master/CONDUCT.md).
 
 Contributions to this Module are very welcome! We follow a fairly standard [pull request
 process](https://help.github.com/articles/about-pull-requests/) for contributions, subject to the following guidelines:
@@ -85,7 +85,7 @@ to include the following:
 ## Merge and release
 
 The maintainers for this repo will review your code and provide feedback. If everything looks good, they will merge the
-code and release a new version, which you'll be able to find in the [releases page](https://github.com/minnowpod/terraform-google-project/tree/master/releases).
+code and release a new version, which you'll be able to find in the [releases page](https://github.com/carlodicelico/terraform-google-project/tree/master/releases).
 
 # Attribution
 These guidelines are heavily based on the [HashiCorp Contribution Guidelines](https://github.com/hashicorp/terraform-google-consul/blob/master/CONTRIBUTING.md) and the [Homebrew Contribution Guidelines](https://github.com/Homebrew/homebrew-core/blob/master/CONTRIBUTING.md).

LICENSE

@@ -1,7 +1,6 @@
 MIT License
 
-Copyright (c) 2018 Minnow Technologies, Inc.
-Copyright (c) 2018 The Terraform Google Project Module Authors
+Copyright (c) 2020 The Terraform Google Project Module Authors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -93,15 +93,15 @@ Use [HCL](https://github.com/hashicorp/hcl) and Terraform as idiomatically as po
 | tfstate\_bucket | Project Terraform state bucket details. |
 | vpc | Project VPC network details. |
 
-Check [_docs/graph.png](https://github.com/minnowpod/terraform-google-project/blob/master/_docs/graph.png) for the Terraform graph.
+Check [_docs/graph.png](https://github.com/carlodicelico/terraform-google-project/blob/master/_docs/graph.png) for the Terraform graph.
 
 ## Usage
 
 ```hcl
 // Create a default project
 module "my-project" {
-  source  = "minnowpod/terraform-google-project"
-  version = "~> 0.2.0"
+  source  = "carlodicelico/terraform-google-project"
+  version = "~> 0.3.0"
 
   // these can also be passed from the environment with TF_VAR_billing_account, for example
   billing_account = "bar"
@@ -124,8 +124,8 @@ module "my-project" {
 
 // Add an additional VPC network
 module "another-vpc" {
-  source  = "minnowpod/terraform-google-project//modules/vpc"
-  version = "~> 0.2.0"
+  source  = "carlodicelico/terraform-google-project//modules/vpc"
+  version = "~> 0.3.0"
 
   // but skip the SSH firewall rule on this one
   create_ssh_fw_rule = "false"
@@ -135,26 +135,22 @@ module "another-vpc" {
 }
 ```
 
-See also the included [examples](https://github.com/minnowpod/terraform-google-project/tree/master/examples).
-
-## Who maintains this Module?
-
-This Module is maintained by [Minnow](https://minnow.me/), an IoT startup that makes smart food pickup kiosks called pods.
+See also the included [examples](https://github.com/carlodicelico/terraform-google-project/tree/master/examples).
 
 ## How do I contribute?
 
-Contributions are welcome! Check out [CONTRIBUTING](https://github.com/minnowpod/terraform-google-project/tree/master/CONTRIBUTING.md) for instructions.
+Contributions are welcome! Check out [CONTRIBUTING](https://github.com/carlodicelico/terraform-google-project/tree/master/CONTRIBUTING.md) for instructions.
 
 ## How is this Module versioned?
 
 This Module follows the principles of [Semantic Versioning](http://semver.org/). You can find each new release,
-along with the changelog, in the [CHANGELOG](https://github.com/minnowpod/terraform-google-project/tree/master/CHANGELOG.md).
+along with the changelog, in the [CHANGELOG](https://github.com/carlodicelico/terraform-google-project/tree/master/CHANGELOG.md).
 
 During initial development, the major version will be 0 (e.g., `0.x.y`), which indicates the code does not yet have a
 stable API. Once we hit `1.0.0`, we will make every effort to maintain a backwards compatible API and use the MAJOR,
 MINOR, and PATCH versions on each release to indicate any incompatibilities.
 
 ## License
 
-This code is released under the MIT License. Please see [LICENSE](https://github.com/minnowpod/terraform-google-project/tree/master/LICENSE) for more details.
+This code is released under the MIT License. Please see [LICENSE](https://github.com/carlodicelico/terraform-google-project/tree/master/LICENSE) for more details.
 

internal.tf

@@ -4,8 +4,8 @@
 
 // Generate a random pet name for memorability.
 resource "random_pet" "project_prefix" {
-  keepers {
-    suffix_id = "${random_id.project_suffix.id}"
+  keepers = {
+    suffix_id = random_id.project_suffix.id
   }
 }
 
@@ -16,45 +16,63 @@ resource "random_id" "project_suffix" {
 
 // Build a prefix for our project ID. If you want a `custom_id` and don't want a prefix, leave `id_prefix` empty and set `random_prefix` to `'false'`.
 data "null_data_source" "project_prefix" {
-  inputs {
-    value = "${var.random_prefix ? random_pet.project_prefix.id : var.id_prefix}"
+  inputs = {
+    value = var.random_prefix ? random_pet.project_prefix.id : var.id_prefix
   }
 }
 
 // Build a random ID that is both memorable *and* unique.
 data "null_data_source" "random_project_id" {
-  inputs {
-    value = "${format("%s-%s", data.null_data_source.project_prefix.outputs["value"], random_id.project_suffix.hex)}"
+  inputs = {
+    value = format(
+      "%s-%s",
+      data.null_data_source.project_prefix.outputs["value"],
+      random_id.project_suffix.hex,
+    )
   }
 }
 
 // Build a custom ID.
 data "null_data_source" "custom_project_id" {
-  inputs {
-    value = "${data.null_data_source.project_prefix.outputs["value"] == "" ? var.custom_id : format("%s-%s", data.null_data_source.project_prefix.outputs["value"], var.custom_id)}"
+  inputs = {
+    value = data.null_data_source.project_prefix.outputs["value"] == "" ? var.custom_id : format(
+      "%s-%s",
+      data.null_data_source.project_prefix.outputs["value"],
+      var.custom_id,
+    )
   }
 }
 
 // Return the correct project ID—a non-empty custom ID takes precedence.
 data "null_data_source" "project_id" {
-  inputs {
-    value = "${var.custom_id == "" ? data.null_data_source.random_project_id.outputs["value"] : data.null_data_source.custom_project_id.outputs["value"]}"
+  inputs = {
+    value = var.custom_id == "" ? data.null_data_source.random_project_id.outputs["value"] : data.null_data_source.custom_project_id.outputs["value"]
   }
 }
 
 // Random project name if one wasn't specified already.
 data "null_data_source" "project_name" {
-  inputs {
-    value = "${var.display_name == "" ? title(join(" ", slice(split("-", data.null_data_source.project_id.outputs["value"]), 0, 2))) : var.display_name}"
+  inputs = {
+    value = var.display_name == "" ? title(
+      join(
+        " ",
+        slice(
+          split("-", data.null_data_source.project_id.outputs["value"]),
+          0,
+          2,
+        ),
+      ),
+    ) : var.display_name
   }
 }
 
 // Fetch information about the organization.
 data "google_organization" "details" {
-  organization = "${var.organization_id}"
+  organization = var.organization_id
 }
 
 // Fetch information about the project's default service account.
 data "google_compute_default_service_account" "details" {
-  project = "${google_project.project.id}"
+  project = google_project.project.id
 }
+

locals.tf

@@ -1,4 +1,5 @@
 locals {
-  project_id   = "${data.null_data_source.project_id.outputs["value"]}"
-  project_name = "${data.null_data_source.project_name.outputs["value"]}"
+  project_id   = data.null_data_source.project_id.outputs["value"]
+  project_name = data.null_data_source.project_name.outputs["value"]
 }
+