Terraform 0.13 upgrade (#56)

* :0.13:

* update

* update

Author: yupwei68

.travis.yml

@@ -13,7 +13,7 @@ services:
   - docker
 
 env:
-  - TERRAFORM_VERSION=0.12.20 IMAGE_NAME=azure-network-security-group-module
+  - TERRAFORM_VERSION=0.13.0 IMAGE_NAME=azure-network-security-group-module
 
 jobs:
   include:

Dockerfile

@@ -1,5 +1,5 @@
 # Pull the base image with given version.
-ARG BUILD_TERRAFORM_VERSION="0.12.20"
+ARG BUILD_TERRAFORM_VERSION="0.13.0"
 FROM mcr.microsoft.com/terraform-test:${BUILD_TERRAFORM_VERSION}
 
 ARG MODULE_NAME="terraform-azurerm-network-security-group"

Gemfile

@@ -2,6 +2,6 @@ source 'https://rubygems.org/'
 
 group :test do
   git 'https://github.com/Azure/terramodtest.git' do
-    gem 'terramodtest', tag: '0.5.0'
+    gem 'terramodtest', tag: '0.6.0'
   end
 end

README.md

@@ -11,7 +11,59 @@ NOTE: We are working on adding the support for applying a NSG to a network inter
 
 This module includes a a set of pre-defined rules for commonly used protocols (for example HTTP or ActiveDirectory) that can be used directly in their corresponding modules or as independent rules.
 
-## Usage with the generic module
+## Usage with the generic module in Terraform 0.13
+
+The following example demonstrate how to use the network-security-group module with a combination of predefined and custom rules.
+
+```hcl
+provider "azurerm" {
+  features {}
+}
+
+resource "azurerm_resource_group" "example" {
+  name     = "my-resources"
+  location = "West Europe"
+}
+
+module "network-security-group" {
+  source                = "Azure/network-security-group/azurerm"
+  resource_group_name   = azurerm_resource_group.example.name
+  location              = "EastUS" # Optional; if not provided, will use Resource Group location
+  security_group_name   = "nsg"
+  source_address_prefix = ["10.0.3.0/24"]
+  predefined_rules = [
+    {
+      name     = "SSH"
+      priority = "500"
+    },
+    {
+      name              = "LDAP"
+      source_port_range = "1024-1026"
+    }
+  ]
+
+  custom_rules = [
+    {
+      name                   = "myhttp"
+      priority               = "200"
+      direction              = "Inbound"
+      access                 = "Allow"
+      protocol               = "tcp"
+      destination_port_range = "8080"
+      description            = "description-myhttp"
+    }
+  ]
+
+  tags = {
+    environment = "dev"
+    costcenter  = "it"
+  }
+
+  depends_on = [azurerm_resource_group.example]
+}
+```
+
+## Usage with the generic module in Terraform 0.12
 
 The following example demonstrate how to use the network-security-group module with a combination of predefined and custom rules.
 
@@ -61,7 +113,7 @@ module "network-security-group" {
 }
 ```
 
-## Usage with the Application Security Group module
+## Usage with the Application Security Group module in Terraform 0.12
 
 The following example demonstrate how to use the network-security-group module with a combination of predefined and custom rules with ASG source or destination.
 
@@ -119,7 +171,7 @@ module "network-security-group" {
 }
 ```
 
-## Usage with the pre-defined module
+## Usage with the pre-defined module in Terraform 0.12
 
 The following example demonstrate how to use the pre-defined HTTP module with a custom rule for ssh.
 

test/fixture/main.tf

@@ -18,12 +18,16 @@ module "testPredefinedHTTP" {
   source              = "../../modules/HTTP/"
   resource_group_name = azurerm_resource_group.test.name
   security_group_name = "nsg_testPredefinedHTTP"
+
+  depends_on = [azurerm_resource_group.test]
 }
 
 module "testPredefinedAD" {
   source              = "../../modules/ActiveDirectory/"
   resource_group_name = azurerm_resource_group.test.name
   security_group_name = "nsg_testPredefinedAD"
+
+  depends_on = [azurerm_resource_group.test]
 }
 
 resource "azurerm_application_security_group" "first" {
@@ -52,6 +56,8 @@ module "testPredefinedRuleWithCustom" {
       priority = 510
     },
   ]
+
+  depends_on = [azurerm_resource_group.test]
 }
 
 
@@ -84,4 +90,6 @@ module "testCustom" {
       destination_application_security_group_ids = [azurerm_application_security_group.second.id]
     },
   ]
+
+  depends_on = [azurerm_resource_group.test]
 }

variables.tf

@@ -1,10 +1,12 @@
 # Network Security Group definition
 variable "resource_group_name" {
   description = "Name of the resource group"
+  type        = string
 }
 
 variable "security_group_name" {
   description = "Network security group name"
+  type        = string
   default     = "nsg"
 }
 
@@ -17,6 +19,7 @@ variable "tags" {
 variable "location" {
   description = "Location (Azure Region) for the network security group."
   # No default - if it's not specified, use the resource group location (see main.tf)
+  type    = string
   default = ""
 }