Updating copyright to 2019, adding hardcoded values in example, test …

…is referencing example module
ivankorn · Apr 2, 2019 · 719a8be · 719a8be
1 parent 672c735
commit 719a8be
Show file tree

Hide file tree

Showing 31 changed files with 47 additions and 133 deletions.
diff --git a/.kitchen.yml b/.kitchen.yml
@@ -1,4 +1,4 @@
-# Copyright 2018 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.

diff --git a/Gemfile b/Gemfile
@@ -1,4 +1,4 @@
-# Copyright 2018 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.

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -26,7 +26,7 @@ GEM
     docker-api (1.34.2)
       excon (>= 0.47.0)
       multi_json
-    domain_name (0.5.20180417)
+    domain_name (0.5.20190417)
       unf (>= 0.0.5, < 1.0.0)
     dry-configurable (0.7.0)
       concurrent-ruby (~> 1.0)
@@ -132,7 +132,7 @@ GEM
     method_source (0.9.2)
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2018.0812)
+    mime-types-data (3.2019.0812)
     mixlib-install (3.11.5)
       mixlib-shellout
       mixlib-versioning

diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-# Copyright 2018 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.

diff --git a/README.md b/README.md
@@ -33,27 +33,7 @@ This module provisions a dataset and a table with an associated JSON schema.
 | dataset_labels | Key value pairs in a map for dataset labels |
 | table_labels | Key value pairs in a map for table labels |
 
-[^]: (autogen_docs_end)
 
-## File structure
-The project has the following folders and files:
-```bash
-.
-├── docs                   # folder is the landing location for troubleshooting docs
-├── examples               # example deployments of the module
-├── helpers                # optional scripts to setup required packages, gcp services, etc
-├── test                   # kitchen fixtures, boilerplate & integration tests
-├── .kitchen.yml           # establishing the kitchen root
-├── config.tf              # terraform providers & Requirements
-├── Gemfile                # Gemfile containing reqired Gems for running kitchen-terraform
-├── Gemfile.lock           # Locked gem versions
-├── main.tf                # terraform module
-├── Makefile               # enables make to setup local environment
-├── outputs.tf             # module outputs
-├── variables.tf           # variables that can be consumed by the module           
-├── LICENSE
-└── README.md
-```
 ## Requirements
 ### Terraform plugins
 - [Terraform](https://www.terraform.io/downloads.html) 0.11.x

diff --git a/examples/basic_bq/main.tf b/examples/basic_bq/main.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 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.
@@ -23,15 +23,15 @@ provider "google" {
 
 module "bigquery" {
   source            = "../.."
-  dataset_id        = "${var.dataset_id}"
-  dataset_name      = "${var.dataset_name}"
-  description       = "${var.description}"
+  dataset_id        = "foo"
+  dataset_name      = "foo"
+  description       = "some description"
   expiration        = "${var.expiration}"
   project_id        = "${var.project_id}"
-  location          = "${var.location}"
-  table_id          = "${var.table_id}"
+  location          = "US"
+  table_id          = "bar"
   time_partitioning = "${var.time_partitioning}"
-  schema_file       = "${var.schema_file}"
+  schema_file       = "sample_bq_schema.json"
   dataset_labels    = "${var.dataset_labels }"
   table_labels      = "${var.table_labels}"
 }
diff --git a/examples/basic_bq/outputs.tf b/examples/basic_bq/outputs.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 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.

diff --git a/examples/basic_bq/terraform.tfvars.example → examples/basic_bq/terraform.tfvars b/examples/basic_bq/terraform.tfvars.example → examples/basic_bq/terraform.tfvars
@@ -1,12 +1,6 @@
-dataset_id = "foo"
-dataset_name = "foo"
-location = "US"
-description = "some description"
 expiration = 3600000
 project_id = "example-project"
-table_id = "foo"
 time_partitioning = "DAY"
-schema_file = "sample_bq_schema.json"
 dataset_labels = {
   env   = "dev"
   billable   = "true"

diff --git a/examples/basic_bq/variables.tf b/examples/basic_bq/variables.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 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.
@@ -14,18 +14,6 @@
  * limitations under the License.
  */
 
-variable "dataset_id" {
-  description = "Unique ID for the dataset being provisioned"
-}
-
-variable "dataset_name" {
-  description = "Friendly name for the dataset being provisioned"
-}
-
-variable "description" {
-  description = "Dataset description"
-}
-
 variable "expiration" {
   description = "TTL of tables using the dataset in MS"
 }
@@ -34,22 +22,10 @@ variable "project_id" {
   description = "Project wheree the dataset and table are created"
 }
 
-variable "table_id" {
-  description = "Unique ID for the table being provisioned"
-}
-
-variable "location" {
-  description = "The regional location for the dataset only US and EU are allowed in module"
-}
-
 variable "time_partitioning" {
   description = "Configures time-based partitioning for this table"
 }
 
-variable "schema_file" {
-  description = "A JSON schema for the table"
-}
-
 variable "dataset_labels" {
   description = "A mapping of labels to assign to the table"
   type        = "map"

diff --git a/helpers/combine_docfiles.py b/helpers/combine_docfiles.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright 2018 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.

diff --git a/helpers/setup-sa.sh b/helpers/setup-sa.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2018 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.

diff --git a/helpers/version-repo.sh b/helpers/version-repo.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2018 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.

diff --git a/main.tf b/main.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 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.

diff --git a/outputs.tf b/outputs.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 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.

diff --git a/test/boilerplate/boilerplate.Dockerfile.txt b/test/boilerplate/boilerplate.Dockerfile.txt
@@ -1,4 +1,4 @@
-# Copyright 2018 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.

diff --git a/test/boilerplate/boilerplate.Makefile.txt b/test/boilerplate/boilerplate.Makefile.txt
@@ -1,4 +1,4 @@
-# Copyright 2018 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.

diff --git a/test/boilerplate/boilerplate.go.txt b/test/boilerplate/boilerplate.go.txt
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 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.

diff --git a/test/boilerplate/boilerplate.py.txt b/test/boilerplate/boilerplate.py.txt
@@ -1,4 +1,4 @@
-# Copyright 2018 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.

diff --git a/test/boilerplate/boilerplate.sh.txt b/test/boilerplate/boilerplate.sh.txt
@@ -1,4 +1,4 @@
-# Copyright 2018 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.

diff --git a/test/boilerplate/boilerplate.tf.txt b/test/boilerplate/boilerplate.tf.txt
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 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.

diff --git a/test/boilerplate/boilerplate.xml.txt b/test/boilerplate/boilerplate.xml.txt
@@ -1,5 +1,5 @@
 <!--
- Copyright 2018 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.

diff --git a/test/boilerplate/boilerplate.yaml.txt b/test/boilerplate/boilerplate.yaml.txt
@@ -1,4 +1,4 @@
-# Copyright 2018 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.

diff --git a/test/fixtures/full/main.tf b/test/fixtures/full/main.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 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.
@@ -21,17 +21,11 @@ provider "google" {
   version = "~> 1.20.0"
 }
 
-module "bigquery" {
-  source            = "../../.."
-  dataset_id        = "${var.dataset_id}"
-  dataset_name      = "${var.dataset_name}"
-  description       = "${var.description}"
+module "example" {
+  source            = "../../../examples/basic_bq"
   expiration        = "${var.expiration}"
   project_id        = "${var.project_id}"
-  location            = "${var.location}"
-  table_id          = "${var.table_id}"
   time_partitioning = "${var.time_partitioning}"
-  schema_file       = "${var.schema_file}"
   dataset_labels    = "${var.dataset_labels }"
   table_labels      = "${var.table_labels}"
 }
diff --git a/test/fixtures/full/outputs.tf b/test/fixtures/full/outputs.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 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.
@@ -15,31 +15,31 @@
  */
 
 output "dataset_id" {
-  value       = "${module.bigquery.dataset_id}"
+  value       = "${module.example.dataset_id}"
   description = "Unique id for the dataset being provisioned"
 }
 
 output "dataset_name" {
-  value       = "${module.bigquery.dataset_name}"
+  value       = "${module.example.dataset_name}"
   description = "Friendly name for the dataset being provisioned"
 }
 
 output "dataset_project" {
-  value       = "${module.bigquery.dataset_project}"
+  value       = "${module.example.dataset_project}"
   description = "Project wheree the dataset and table are created"
 }
 
 output "table_id" {
-  value       = "${module.bigquery.table_id}"
+  value       = "${module.example.table_id}"
   description = "Unique id for the table being provisioned"
 }
 
 output "dataset_labels" {
-  value       = "${module.bigquery.dataset_labels}"
+  value       = "${module.example.dataset_labels}"
   description = "Key value pairs in a map for dataset labels"
 }
 
 output "table_labels" {
-  value       = "${module.bigquery.table_labels}"
+  value       = "${module.example.table_labels}"
   description = "Key value pairs in a map for table labels"
 }
diff --git a/test/fixtures/full/terraform.tfvars.example → test/fixtures/full/terraform.tfvars b/test/fixtures/full/terraform.tfvars.example → test/fixtures/full/terraform.tfvars
@@ -1,12 +1,6 @@
-dataset_id = "bar"
-dataset_name = "foo"
-location = "US"
-description = "some description"
 expiration = 3600000
-project_id = "example-project"
-table_id = "bar"
+project_id = "scrum-team-coolkids-shared"
 time_partitioning = "DAY"
-schema_file = "sample_bq_schema.json"
 dataset_labels = {
   env   = "dev"
   billable   = "true"

diff --git a/test/fixtures/full/variables.tf b/test/fixtures/full/variables.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 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.
@@ -14,18 +14,6 @@
  * limitations under the License.
  */
 
-variable "dataset_id" {
-  description = "Unique ID for the dataset being provisioned"
-}
-
-variable "dataset_name" {
-  description = "Friendly name for the dataset being provisioned"
-}
-
-variable "description" {
-  description = "Dataset description"
-}
-
 variable "expiration" {
   description = "TTL of tables using the dataset in MS"
 }
@@ -34,22 +22,10 @@ variable "project_id" {
   description = "Project wheree the dataset and table are created"
 }
 
-variable "table_id" {
-  description = "Unique ID for the table being provisioned"
-}
-
-variable "location" {
-  description = "The regional location for the dataset only US and EU are allowed in module"
-}
-
 variable "time_partitioning" {
   description = "Configures time-based partitioning for this table"
 }
 
-variable "schema_file" {
-  description = "A JSON schema for the table"
-}
-
 variable "dataset_labels" {
   description = "Key value pairs in a map for dataset labels"
   type        = "map"

diff --git a/test/integration/full/controls/big_query.rb b/test/integration/full/controls/big_query.rb
@@ -1,4 +1,4 @@
-# Copyright 2018 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.

diff --git a/test/make.sh b/test/make.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# Copyright 2018 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.