Integration of Terramodtest 0.8.0 (#157)

* update

* update

* update

* update

* remove useless

* update

* update

* update

* update

* update

* update

* update

Co-authored-by: root <root@ubuntu-wyp.4smfdm3ngeyufpdz0muw5zebpc.bx.internal.cloudapp.net>

.gitignore

@@ -1,37 +1,37 @@
-# Variable files
-terraform.tfvars
-
-### https://raw.github.com/github/gitignore/abad92dac5a4306f72242dae3bca6e277bce3615/Terraform.gitignore
-
-# Compiled files
-*.tfstate
-*.tfstate.backup
-
-# Go vendor directory
-vendor/
-
-# Module directory
-.terraform/
-.test-data/
-
-### https://raw.github.com/github/gitignore/abad92dac5a4306f72242dae3bca6e277bce3615/Global/Vim.gitignore
-
-# swap
-[._]*.s[a-w][a-z]
-[._]s[a-w][a-z]
-# session
-Session.vim
-# temporary
-.netrwhist
-*~
-# auto-generated tag files
-tags
-
-# IDE configs
-.idea
-
-# Ruby download package lock file.
-Gemfile.lock
-
-# Test Kitchen files.
-.kitchen
+# Variable files
+terraform.tfvars
+
+### https://raw.github.com/github/gitignore/abad92dac5a4306f72242dae3bca6e277bce3615/Terraform.gitignore
+
+# Compiled files
+*.tfstate
+*.tfstate.backup
+
+# Go vendor directory
+vendor/
+
+# Module directory
+.terraform/
+.test-data/
+
+### https://raw.github.com/github/gitignore/abad92dac5a4306f72242dae3bca6e277bce3615/Global/Vim.gitignore
+
+# swap
+[._]*.s[a-w][a-z]
+[._]s[a-w][a-z]
+# session
+Session.vim
+# temporary
+.netrwhist
+*~
+# auto-generated tag files
+tags
+
+# IDE configs
+.idea
+
+# Ruby download package lock file.
+Gemfile.lock
+
+# Test Kitchen files.
+.kitchen

Dockerfile

@@ -1,5 +1,5 @@
 # Pull the base image with given version.
-ARG BUILD_TERRAFORM_VERSION="0.13.0"
+ARG BUILD_TERRAFORM_VERSION="0.13.5"
 FROM mcr.microsoft.com/terraform-test:${BUILD_TERRAFORM_VERSION}
 
 ARG MODULE_NAME="terraform-azurerm-compute"
@@ -32,6 +32,7 @@ RUN ssh-keygen -q -t rsa -b 4096 -f $HOME/.ssh/id_rsa
 # Install required go packages using dep ensure
 ENV GOPATH /go
 ENV PATH /usr/local/go/bin:$GOPATH/bin:$PATH
+RUN go get github.com/katbyte/terrafmt
 RUN /bin/bash -c "curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh"
 
 RUN ["bundle", "install", "--gemfile", "./Gemfile"]

Gemfile

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

README.md

@@ -227,7 +227,7 @@ module "windowsservers" {
   enable_accelerated_networking = true
   license_type                  = "Windows_Client"
   identity_type                 = "SystemAssigned" // can be empty, SystemAssigned or UserAssigned
-  os_profile_secrets            = [{
+  os_profile_secrets = [{
     source_vault_id   = data.azurerm_key_vault.example.id
     certificate_url   = data.azurerm_key_vault_certificate.example.secret_id
     certificate_store = "My"

Rakefile

@@ -16,6 +16,12 @@ namespace :static do
   task :format do
     format_tf
   end
+  task :readme_style do
+    readme_style_tf
+  end
+  task :fixture_style do
+    fixture_style_tf
+  end
 end
 
 namespace :integration do
@@ -35,7 +41,7 @@ end
 
 task :prereqs => []
 
-task :validate => [ 'static:style', 'static:lint' ]
+task :validate => [ 'static:style', 'static:lint', 'static:readme_style','static:fixture_style' ]
 
 task :format => [ 'static:format' ]
 

os/outputs.tf

@@ -1,15 +1,15 @@
 output "calculated_value_os_publisher" {
-  value = "${element(split(",", lookup(var.standard_os, var.vm_os_simple, "")), 0)}"
+  value = element(split(",", lookup(var.standard_os, var.vm_os_simple, "")), 0)
 }
 
 output "calculated_value_os_offer" {
-  value = "${element(split(",", lookup(var.standard_os, var.vm_os_simple, "")), 1)}"
+  value =element(split(",", lookup(var.standard_os, var.vm_os_simple, "")), 1)
 }
 
 output "calculated_value_os_sku" {
-  value = "${element(split(",", lookup(var.standard_os, var.vm_os_simple, "")), 2)}"
+  value = element(split(",", lookup(var.standard_os, var.vm_os_simple, "")), 2)
 }
 
 output "calculated_remote_port" {
-  value = "${element(split(",", lookup(var.standard_os, var.vm_os_simple, "")), 0) == "MicrosoftWindowsServer" ? 3389 : 22}"
+  value = element(split(",", lookup(var.standard_os, var.vm_os_simple, "")), 0) == "MicrosoftWindowsServer" ? 3389 : 22
 }

test/fixture/main.tf

@@ -68,7 +68,7 @@ module "ubuntuservers" {
     source_vault_id = azurerm_key_vault.test.id
     certificate_url = azurerm_key_vault_certificate.test.secret_id
   }]
-  
+
   depends_on = [azurerm_resource_group.test]
 }