kitchen-azurerm 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bdf1db7e77250e108907f1a40b0d84d08616a99
-  data.tar.gz: 4852f16314f228cd1f244bb037bb59f9598d5bbd
+  metadata.gz: 43e31b997eaad24c664c720fd6e499f04021940c
+  data.tar.gz: 3c92979c97988e1d7af0d84111362c501e577b62
 SHA512:
-  metadata.gz: 8fd391130fdbae24c08acd39e2756c15b2e7bcb0c730d5cfccf00f2043d02fa0a015d461d5acfe4aa1e9cbc90930f8deafd58d8a35876b9ccecb9d2c620bd8c3
-  data.tar.gz: 017185e55b0dc46478343af727d1e0bb04b7ec01de3fbdd276c8ba802847b3eb73df548049bc5d9f347af6aeba416e9da0970c50bf25da6ea312f82b9005504c
+  metadata.gz: 1a3a8b0de1fbf6c832c2fa065515552ec17d7042d9a86ebefc9c22ec5d1a653153111ec19b7c4eb71f0a51078d9ea4d6952707b55d76ce19554cf984d42476cd
+  data.tar.gz: 7ac4c11589b995f3d8c3262d5372015a58420c079547559ad0e93261a218d13db8141935ba35e06d61dd1f89d92b4f5ee0471d5c0d6fac1fed69a3259de2ea9e

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # kitchen-azurerm Changelog
 
+## [0.8.1] - 2017-02-28
+- Adding provider identifier tag to all created resources (@stuartpreston)
+
 ## [0.8.0] - 2017-01-16
 - [Unattend.xml used instead of Custom Script Extension to inject WinRM configuration/AKA support proxy server configurations](https://github.com/pendrica/kitchen-azurerm/pull/44) (@hbuckle)
 - [Public IP addresses can now be used to connect even if the VM is connected to an existing subnet](https://github.com/pendrica/kitchen-azurerm/pull/42) (@vlesierse)

data/README.md

@@ -2,7 +2,7 @@
 
 **kitchen-azurerm** is a driver for the popular test harness [Test Kitchen](http://kitchen.ci) that allows Microsoft Azure resources to be provisioned prior to testing. This driver uses the new Microsoft Azure Resource Management REST API via the [azure-sdk-for-ruby](https://github.com/azure/azure-sdk-for-ruby).
 
-[![Gem Version](https://badge.fury.io/rb/kitchen-azurerm.svg)](http://badge.fury.io/rb/kitchen-azurerm) [![Build Status](https://travis-ci.org/pendrica/kitchen-azurerm.svg)](https://travis-ci.org/pendrica/kitchen-azurerm)
+[![Gem Version](https://badge.fury.io/rb/kitchen-azurerm.svg)](http://badge.fury.io/rb/kitchen-azurerm) [![Build Status](https://travis-ci.org/test-kitchen/kitchen-azurerm.svg)](https://travis-ci.org/test-kitchen/kitchen-azurerm)
 
 This version has been tested on Windows, OS/X and Ubuntu. If you encounter a problem on your platform, please raise an issue.
 
@@ -290,7 +290,7 @@ info:    vm image list command OK
 
 Contributions to the project are welcome via submitting Pull Requests.
 
-1. Fork it ( https://github.com/pendrica/kitchen-azurerm/fork )
+1. Fork it ( https://github.com/test-kitchen/kitchen-azurerm/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/kitchen/driver/azurerm.rb

@@ -136,17 +136,16 @@ module Kitchen
         # Monitor all operations until completion
         follow_deployment_until_end_state(state[:azure_resource_group_name], deployment_name)
 
+        network_management_client = ::Azure::ARM::Network::NetworkManagementClient.new(credentials)
+        network_management_client.subscription_id = config[:subscription_id]
+
         if config[:vnet_id] == '' || config[:public_ip]
           # Retrieve the public IP from the resource group:
-          network_management_client = ::Azure::ARM::Network::NetworkManagementClient.new(credentials)
-          network_management_client.subscription_id = config[:subscription_id]
           result = network_management_client.public_ipaddresses.get(state[:azure_resource_group_name], 'publicip')
           info "IP Address is: #{result.ip_address} [#{result.dns_settings.fqdn}]"
           state[:hostname] = result.ip_address
         else
           # Retrieve the internal IP from the resource group:
-          network_management_client = ::Azure::ARM::Network::NetworkManagementClient.new(credentials)
-          network_management_client.subscription_id = config[:subscription_id]
           network_interfaces = ::Azure::ARM::Network::NetworkInterfaces.new(network_management_client)
           result = network_interfaces.get(state[:azure_resource_group_name], 'nic')
           info "IP Address is: #{result.ip_configurations[0].private_ipaddress}"

data/templates/internal.erb

@@ -103,7 +103,8 @@
         "vmSize": "[parameters('vmSize')]",
         "virtualNetworkName": "vnet",
         "vnetID": "<%= vnet_id %>",
-        "subnetRef": "[concat(variables('vnetID'),'/subnets/',variables('subnetName'))]"
+        "subnetRef": "[concat(variables('vnetID'),'/subnets/',variables('subnetName'))]",
+        "provider": "[toUpper('33194f91-eb5f-4110-827a-e95f640a9e46')]"
     },
     "resources": [
         {
@@ -113,6 +114,9 @@
             "location": "[variables('location')]",
             "properties": {
                 "accountType": "[variables('storageAccountType')]"
+            },
+            "tags": {
+                "provider": "[variables('provider')]"
             }
         },
         <%- if public_ip -%>
@@ -126,6 +130,9 @@
                 "dnsSettings": {
                     "domainNameLabel": "[parameters('dnsNameForPublicIP')]"
                 }
+            },
+            "tags": {
+                "provider": "[variables('provider')]"
             }
         },
         <%- end -%>
@@ -156,6 +163,9 @@
                         }
                     }
                 ]
+            },
+            "tags": {
+                "provider": "[variables('provider')]"
             }
         },
         {
@@ -207,7 +217,8 @@
                 }
             },
             "tags": {
-                <%= vm_tags %>
+                "provider": "[variables('provider')]"
+                <%= ',' + vm_tags unless vm_tags.empty? %>
             }
         }
     ]

data/templates/public.erb

@@ -103,7 +103,8 @@
         "vmSize": "[parameters('vmSize')]",
         "virtualNetworkName": "vnet",
         "vnetID": "[resourceId('Microsoft.Network/virtualNetworks',variables('virtualNetworkName'))]",
-        "subnetRef": "[concat(variables('vnetID'),'/subnets/',variables('subnetName'))]"
+        "subnetRef": "[concat(variables('vnetID'),'/subnets/',variables('subnetName'))]",
+        "provider": "[toUpper('33194f91-eb5f-4110-827a-e95f640a9e46')]"
     },
     "resources": [
         {
@@ -113,6 +114,9 @@
             "location": "[variables('location')]",
             "properties": {
                 "accountType": "[variables('storageAccountType')]"
+            },
+            "tags": {
+                "provider": "[variables('provider')]"
             }
         },
         {
@@ -125,6 +129,9 @@
                 "dnsSettings": {
                     "domainNameLabel": "[parameters('dnsNameForPublicIP')]"
                 }
+            },
+            "tags": {
+                "provider": "[variables('provider')]"
             }
         },
         {
@@ -146,6 +153,9 @@
                         }
                     }
                 ]
+            },
+            "tags": {
+                "provider": "[variables('provider')]"
             }
         },
         {
@@ -172,6 +182,9 @@
                         }
                     }
                 ]
+            },
+            "tags": {
+                "provider": "[variables('provider')]"
             }
         },
         {
@@ -223,7 +236,8 @@
                 }
             },
             "tags": {
-                <%= vm_tags %>
+                "provider": "[variables('provider')]"
+                <%= ',' + vm_tags unless vm_tags.empty? %>
             }
         }
     ]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-azurerm
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Stuart Preston
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-16 00:00:00.000000000 Z
+date: 2017-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inifile
@@ -122,16 +122,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.46.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.46.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -180,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Test Kitchen driver for Azure Resource Manager.