vagrant-azure 2.0.0.pre3 → 2.0.0.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 500531015ee4b9fa81557c8398f1fed55455cc4c
-  data.tar.gz: dec5502ea4dab238bb49cd61b2559102ad4eada6
+  metadata.gz: b2240c2e25fcd88a3260ac97f911b5e49f6834c8
+  data.tar.gz: e46e404e33a825af6c197bc5484f9bae86051275
 SHA512:
-  metadata.gz: 2dce397adb9a233f7294d3f857e7de47c192b76a4da0f959e826a0ca449015bba6984d655d6a23d19d4d7a83e027f92facf35ba55cf084855d91dfe8f82c509b
-  data.tar.gz: 18d6a73dd73b31e4cafa27b29aaffcfb626653d6f6e36a7aab6a49853658872faadc6ae94b87c26456280b40b5dbe838ce973426eac029c3fd98cc9569902329
+  metadata.gz: 594d5b68122d7c21dd1dfecea569a46419b3cce72724e949cdd2d5e0761519cc1a42aad687b42a9787d2d1891808e2477ae44973ad3e37d9ef3c05120b8cc07d
+  data.tar.gz: afd27c10c848e763473c15611d8841cbe81dcdd914a7924ab935c6f46107f11f09ae0cbca8b75034e174e7bc79d895ca37aef69425bd1fd795b93ea581443f1e

data/.gitignore

@@ -18,3 +18,5 @@ modules/
 .ruby-version
 *.ps1
 .env
+.bundle
+

data/README.md

@@ -124,6 +124,10 @@ For instructions on how to setup an Azure Active Directory Application see: <htt
 * `vm_image_urn`: (Optional) Name of the virtual machine image urn to use -- defaults to 'canonical:ubuntuserver:16.04-LTS:latest'. See documentation for [*nix](https://azure.microsoft.com/en-us/documentation/articles/virtual-machines-linux-cli-ps-findimage/), [Windows](https://docs.microsoft.com/en-us/azure/virtual-machines/virtual-machines-windows-cli-ps-findimage).
 * `virtual_network_name`: (Optional) Name of the virtual network resource
 * `subnet_name`: (Optional) Name of the virtual network subnet resource
+* `tcp_endpoints`: (Optional) The custom inbound security rules part of network security group (a.k.a. opened tcp endpoints). Allows specifying one or more intervals in the form of:
+ * an array `['8000-9000', '9100-9200']`, 
+ * a single interval as `'8000-9000'`,
+ * a single port as `8000`.
 * `instance_ready_timeout`: (Optional) The timeout to wait for an instance to become ready -- default 120 seconds.
 * `instance_check_interval`: (Optional) The interval to wait for checking an instance's state -- default 2 seconds.
 * `endpoint`: (Optional) The Azure Management API endpoint -- default `ENV['AZURE_MANAGEMENT_ENDPOINT']` if exists, falls back to <https://management.azure.com>.

data/lib/vagrant-azure/action/run_instance.rb

@@ -124,6 +124,24 @@ module VagrantPlugins
             deployment_params.merge!(windows_params)
           end
 
+          unless tcp_endpoints.nil?
+
+            if tcp_endpoints.is_a?(Array)
+              # https://docs.microsoft.com/en-us/azure/virtual-network/virtual-networks-nsg#Nsg-rules
+              if tcp_endpoints.length + 133 > 4096
+                raise I18n.t('vagrant_azure.too_many_tcp_endpoints', count: tcp_endpoints.length)
+              end 
+              endpoints = tcp_endpoints
+            elsif tcp_endpoints.is_a?(String) || (tcp_endpoints.is_a?(Integer) && tcp_endpoints > 0)
+              endpoints = [tcp_endpoints]
+            else
+              raise I18n.t('vagrant_azure.unknown_type_as_tcp_endpoints', input: tcp_endpoints)
+            end
+          else 
+            endpoints = []
+          end
+          template_params.merge!(endpoints: endpoints)
+
           env[:ui].info(" -- Create or Update of Resource Group: #{resource_group_name}")
           env[:metrics]['put_resource_group'] = Util::Timer.time do
             put_resource_group(azure, resource_group_name, location)
@@ -191,7 +209,8 @@ module VagrantPlugins
         end
 
         def put_deployment(azure, rg_name, params)
-          azure.resources.deployments.create_or_update(rg_name, 'vagrant', params)
+          deployment_name = "vagrant_#{Time.now.getutc.strftime('%Y%m%d%H%M%S')}"
+          azure.resources.deployments.create_or_update(rg_name, deployment_name, params)
         end
 
         def put_resource_group(azure, name, location)

data/lib/vagrant-azure/services/azure_resource_manager.rb

@@ -12,6 +12,7 @@ module VagrantPlugins
     module Services
       class AzureResourceManager
 
+        TELEMETRY = "vagrant-azure/#{VagrantPlugins::Azure::VERSION}"
         TENANT_ID_NAME = 'AZURE_TENANT_ID'
         CLIENT_ID_NAME = 'AZURE_CLIENT_ID'
         CLIENT_SECRET_NAME = 'AZURE_CLIENT_SECRET'
@@ -68,6 +69,7 @@ module VagrantPlugins
         def build(clazz)
           instance = clazz.new(*client_params)
           instance.subscription_id = @subscription_id
+          instance.add_user_agent_information(TELEMETRY)
           instance
         end
 

data/lib/vagrant-azure/version.rb

@@ -4,6 +4,6 @@
 
 module VagrantPlugins
   module Azure
-    VERSION = '2.0.0.pre3'.freeze
+    VERSION = '2.0.0.pre4'.freeze
   end
 end

data/locales/en.yml

@@ -104,6 +104,12 @@ en:
       Please specify a secure key to use with config.ssh.private_key_path
       (see: https://www.vagrantup.com/docs/vagrantfile/ssh_settings.html).
       If not, you publicly accessible Azure VM will be extremely insecure.
+    too_many_tcp_endpoints: |-
+      There are '%{count}' TCP Endpoints (Inbound Security Rules) specified for the NetworkSecurityGroup, which is too many. 
+      There can be a max of 3963 (4096 - 133, where 133 is where we start as priority for custom rule #1, and so forth)
+      (see: https://docs.microsoft.com/en-us/azure/virtual-network/virtual-networks-nsg#Nsg-rules)
+    unknown_type_as_tcp_endpoints: |-
+      Unrecognized setting '%{input}' as TCP Endpoints (Inbounds Security Rules), expected an array, string or positive number.
     waiting_for_ready: |-
       Waiting for instance to become "ready"...
     waiting_for_stop: |-

data/templates/arm/deployment.json.erb

@@ -173,7 +173,24 @@
               "direction": "Inbound"
             }
           }
-          <% end %>
+        <% end %>
+        <% endpoints.each_with_index do |ports, index| %>
+          ,
+          {
+            "name": "custom_rule_<%= index %>",
+            "properties": {
+              "description": "Custom opened ports.",
+              "protocol": "Tcp",
+              "sourcePortRange": "*",
+              "destinationPortRange": "<%= ports %>",
+              "sourceAddressPrefix": "*",
+              "destinationAddressPrefix": "*",
+              "access": "Allow",
+              "priority": <%= 133 + index %>,
+              "direction": "Inbound"
+            }
+          }
+        <% end %>
         ]
       }
     },
@@ -319,4 +336,4 @@
       }
     }
   ]
-}
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-azure
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre3
+  version: 2.0.0.pre4
 platform: ruby
 authors:
 - Azure
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-03 00:00:00.000000000 Z
+date: 2017-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: azure_mgmt_resources