Feature/tf13 (#79)

* terraform fmt * allow terraform 0.13.x * fix variable types * fix variable types * update changelog Co-authored-by: Raj Poluri <[email protected]>
ExpediaGroup · Jan 27, 2021 · 9883770 · 9883770
1 parent f3b0f32
commit 9883770
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 32 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [3.2.1] - 2021-01-27
+### Changed
+- Update terraform required version to include 0.13.x.
+
 ## [3.2.0] - 2021-01-19
 ### Added
 - Added ability to pass `database-name-mapping` key/value pairs for each federated metastore.  See [Waggle Dance Database Name Mapping](https://github.com/HotelsDotCom/waggle-dance#database-name-mapping) for more information. Requires docker image version `1.6.0` or greater.

diff --git a/variables.tf b/variables.tf
@@ -6,65 +6,65 @@
 
 variable "instance_name" {
   description = "Waggle Dance instance name to identify resources in multi-instance deployments."
-  type        = "string"
+  type        = string
   default     = ""
 }
 
 variable "wd_instance_type" {
   description = "Waggle Dance instance type, possible values: ecs,k8s."
-  type        = "string"
+  type        = string
   default     = "ecs"
 }
 
 variable "waggledance_version" {
   description = "Waggle Dance version to install on EC2 nodes."
-  type        = "string"
+  type        = string
   default     = "3.3.2"
 }
 
 variable "root_vol_type" {
   description = "Waggle Dance EC2 root volume type."
-  type        = "string"
+  type        = string
   default     = "gp2"
 }
 
 variable "root_vol_size" {
   description = "Waggle Dance EC2 root volume size."
-  type        = "string"
+  type        = string
   default     = "10"
 }
 
 variable "k8s_namespace" {
   description = "K8s namespace to create waggle-dance deployment."
-  type        = "string"
+  type        = string
   default     = "metastore"
 }
 
 variable "aws_region" {
   description = "AWS region to use for resources."
-  type        = "string"
+  type        = string
 }
 
 variable "wd_ecs_task_count" {
   description = "Number of ECS tasks to create."
-  type        = "string"
+  type        = string
   default     = "1"
 }
 
 variable "vpc_id" {
   description = "VPC ID."
-  type        = "string"
+  type        = string
 }
 
 variable "subnets" {
   description = "ECS container subnets."
-  type        = "list"
+  type        = list(string)
 }
 
 # Tags
 variable "tags" {
   description = "A map of tags to apply to resources."
-  type        = "map"
+  type        = map(string)
 
   default = {
     Environment = ""
@@ -79,7 +79,7 @@ The amount of memory (in MiB) used to allocate for the Waggle Dance container.
 Valid values: https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-cpu-memory-error.html
 EOF
 
-  type    = "string"
+  type    = string
   default = "4096"
 }
 
@@ -90,85 +90,85 @@ Valid values can be 256, 512, 1024, 2048 and 4096.
 Reference: https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-cpu-memory-error.html
 EOF
 
-  type    = "string"
+  type    = string
   default = "1024"
 }
 
 variable "ingress_cidr" {
   description = "Generally allowed ingress CIDR list."
-  type        = "list"
+  type        = list(string)
 }
 
 variable "docker_image" {
   description = "Full path Waggle Dance Docker image."
-  type        = "string"
+  type        = string
 }
 
 variable "docker_version" {
   description = "Waggle Dance Docker image version."
-  type        = "string"
+  type        = string
 }
 
 variable "k8s_docker_registry_secret" {
   description = "Docker Registry authentication K8s secret name."
-  type        = "string"
+  type        = string
   default     = ""
 }
 
 variable "graphite_host" {
   description = "Graphite server configured in Waggle Dance to send metrics to."
-  type        = "string"
+  type        = string
   default     = "localhost"
 }
 
 variable "graphite_port" {
   description = "Graphite server port."
-  type        = "string"
+  type        = string
   default     = "2003"
 }
 
 variable "graphite_prefix" {
   description = "Prefix addded to all metrics sent to Graphite from this Waggle Dance instance."
-  type        = "string"
+  type        = string
   default     = "waggle-dance"
 }
 
 variable "primary_metastore_host" {
   description = "Primary Hive Metastore hostname configured in Waggle Dance."
-  type        = "string"
+  type        = string
   default     = "localhost"
 }
 
 variable "primary_metastore_port" {
   description = "Primary Hive Metastore port"
-  type        = "string"
+  type        = string
   default     = "9083"
 }
 
 variable "primary_metastore_whitelist" {
   description = "List of Hive databases to whitelist on primary Metastore."
-  type        = "list"
+  type        = list(string)
   default     = ["default"]
 }
 
 #list of maps, example: [ {host="metastore1", port="9083", prefix="pre1", writable-whitelist="db1,test" }, {host="metastore2", port="9083", prefix="pre2", mapped-databases="dm,test" } ]
 variable "local_metastores" {
   description = "List of federated Metastore endpoints directly accessible on the local network."
-  type        = "list"
+  type        = list(map(string))
   default     = []
 }
 
 #list of maps, example: [ {endpoint="vpce1", port="9083", prefix="pre1", writable-whitelist="db1,test" }, {endpoint="vpce2", port="9083", prefix="pre2", mapped-databases="dm,test", subnets="subnet1,subnet2" } ]
 variable "remote_metastores" {
   description = "List of VPC endpoint services to federate Metastores in other accounts."
-  type        = "list"
+  type        = list(map(string))
   default     = []
 }
 
 #list of maps, example: [ {bastion-host="10.x.x.x", metastore-host="10.x.x.x", port="9083", prefix="pre1", user="my-unix-user", mapped-databases="test1,test2"}, {bastion-host="10.x.x.x", metastore-host="10.x.x.x", port="9083", prefix="pre1", user="my-unix-user", writable-whitelist="db1,test", mapped-databases="test1,test2"} ]
 variable "ssh_metastores" {
   description = "List of federated Metastores to connect to over SSH via bastion."
-  type        = "list"
+  type        = list(map(string))
   default     = []
 }
 
@@ -179,31 +179,31 @@ The secret's key should be `private_key` and the value should be stored as a bas
 Max character limit for a secret's value is 4096.
 EOF
 
-  type    = "string"
+  type    = string
   default = ""
 }
 
 variable "enable_remote_metastore_dns" {
   description = "Option to enable creating DNS records for remote metastores."
-  type        = "string"
+  type        = string
   default     = ""
 }
 
 variable "domain_extension" {
   description = "Domain name to use for Route 53 entry and service discovery."
-  type        = "string"
+  type        = string
   default     = "lcl"
 }
 
 variable "secondary_vpcs" {
   description = "List of VPCs to associate with Service Discovery namespace."
-  type        = "list"
+  type        = list(string)
   default     = []
 }
 
 variable "docker_registry_auth_secret_name" {
   description = "Docker Registry authentication SecretManager secret name."
-  type        = "string"
+  type        = string
   default     = ""
 }
 

diff --git a/version.tf b/version.tf
@@ -5,5 +5,5 @@
  */
 
 terraform {
-  required_version = "~> 0.12.0"
+  required_version = "> 0.12.0, < 0.14.0"
 }