vagrant-config_builder 0.15.1 → 1.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47407bf1a0a680300668ed2e833e65ca5203426b
-  data.tar.gz: e142326b2a7d3eea9a5a9dd97b233800a0ddc8a2
+  metadata.gz: d41a4ada74b11df745bb0eaa5f9ec0cf4a41300f
+  data.tar.gz: eb70c9e062acd752cc5cb90d2a2d42100c91cc2f
 SHA512:
-  metadata.gz: 6df626a26be71354b020715f6f19c09954c99dfe2851dcb07606f0e7ce616b17f9cad667f42cc5b3eea0a157ec556b92f4c5e83149abfb5d4df8274856322082
-  data.tar.gz: f266ad5e67125ab3352f071b59fe1e7fd4e86823327630b2d179202ce317f7fb6f02b378442250c86dbda63a757e938ef0ea1e284c5a009497f1fbbea0b7175b
+  metadata.gz: 7f88a46a53e18afcb4645efb9dafdce983eeaf13f6e72a6d3f780ac997943f9eb4b1311b5bbf9437fb506004035a02c8bdb21928bfbe60486cbce0c249c859e7
+  data.tar.gz: 0737858435ef1b126ddbf16b04c8255f250e5f9c96508729c9acaee893512d1ce0ad74f4ba640288ba29239f40b46d37b7433914665e14b75b61e23f31b004c3

data/.travis.yml

@@ -1,12 +1,26 @@
 ---
 language: ruby
 sudo: false
-install: bundle install --without development
-script: bundle exec rake spec
+before_install:
+  - gem install bundler --version $BUNDLER_VERSION
+install: bundle _${BUNDLER_VERSION}_ install --without development
+script: bundle _${BUNDLER_VERSION}_ exec rspec --color --format documentation
 notifications:
   email: false
-rvm:
-  - 2.0.0
+
 env:
   global:
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
+
+matrix:
+  include:
+    - rvm: 2.0.0
+      env: TEST_VAGRANT_VERSION=v1.6.5 BUNDLER_VERSION=1.6.9
+    - rvm: 2.0.0
+      env: TEST_VAGRANT_VERSION=v1.7.4 BUNDLER_VERSION=1.10.5
+
+    - rvm: 2.2.3
+      env: TEST_VAGRANT_VERSION=v1.8.1 BUNDLER_VERSION=1.10.6
+    - rvm: 2.2.3
+      env: TEST_VAGRANT_VERSION=HEAD BUNDLER_VERSION=1.10.6
+

data/CHANGELOG

@@ -1,6 +1,50 @@
 CHANGELOG
 =========
 
+1.0.0
+-----
+
+(unreleased)
+
+This is a major feature release with small breaks in backwards compatibility.
+
+  * (GH-48) Add support for the create, group and owner synced_folder options.
+
+  * (GH-50) Add support for vagrant-openstack-provider and
+    vagrant-openstack-plugin.
+
+  * (GH-51) Add support for the vagrant-softlayer provider.
+
+  * (GH-52) Support for new Vagrant 1.8.1 features and a sweeping refresh of
+    just about every data model to ensure most Vagrant configuration options are
+    supported.
+
+  * (GH-53) Models now require much, much less boilerplate. In most cases, a
+    a class that inherits form Model::Base and uses def_model_attribute will
+    Do The Right Thing™ without requiring further code.
+
+  * (GH-46) All provider models inheriting from Model::Provider::Base now
+    support provider-specific overrides. All core provider models have been
+    refactored to use this base class.
+
+  * ModelDelegator functionality has been moved to Model::Base to support
+    (GH-46). The ModelDelegator module still exists but is deprecated and does
+    nothing.
+
+  * (GH-40) All provisioner models inheriting from Model::Provisioner::Base now
+    support provisioner-specific options such as name and run. All core
+    provisioner models have been refactored to use this base class.
+
+  * BREAK: The name attribute of the shell provisioner has been re-purposed to
+    support named provisioners in (GH-40).
+
+  * There is now an integration suite that tests whether config_builder
+    correctly transforms data into Vagrant objects.
+
+Many thanks to Brett Delle Grazie and Christoph Fiehe for their contributions
+to this release.
+
+
 0.15.1
 ------
 

data/Gemfile

@@ -1,7 +1,6 @@
 source 'https://rubygems.org'
-ruby '2.0.0' # Required by Vagrant 1.4 and newer.
 
-ENV['TEST_VAGRANT_VERSION'] ||= 'v1.7.4'
+ENV['TEST_VAGRANT_VERSION'] ||= 'v1.8.1'
 
 # Wrapping gemspec in the :plugins group causes Vagrant 1.5 and newer to
 # automagically load this plugin during acceptance tests.
@@ -21,8 +20,8 @@ group :test do
     gem 'vagrant', :github => 'mitchellh/vagrant', :tag => ENV['TEST_VAGRANT_VERSION']
   end
 
-  # Pinned on 12/10/2014. Compatible with Vagrant 1.5.x, 1.6.x and 1.7.x.
-  gem 'vagrant-spec', :github => 'mitchellh/vagrant-spec', :ref => '1df5a3a'
+  # Pinned on 2/21/2016. Compatible with Vagrant 1.6.x?, 1.7.x? and 1.8.x.
+  gem 'vagrant-spec', :github => 'mitchellh/vagrant-spec', :ref => '9bba7e1'
 end
 
 eval_gemfile "#{__FILE__}.local" if File.exists? "#{__FILE__}.local"

data/lib/config_builder/model/base.rb

@@ -23,6 +23,130 @@
 # Implementing classes do not need to inherit from ConfigBuilder::Model::Base,
 # but it makes life easier.
 class ConfigBuilder::Model::Base
+  class << self
+    # Define the model identifier
+    #
+    # This method defines an entry in the data structure which is to be used as
+    # an identifier for generated model instances.
+    #
+    # @since 0.16.0
+    #
+    # @param identifier [Symbol]
+    #
+    # @return [Symbol] The identifier passed to `def_model_id`.
+    def def_model_id(identifier)
+      @model_id = identifier
+    end
+
+    # Fetch the model identifier
+    #
+    # @since 0.16.0
+    #
+    # @return [Symbol] The identifier defined using #{def_model_id}.
+    attr_reader :model_id
+
+    # Define a new model attribute
+    #
+    # Model attributes are used to configure Vagrant objects.
+    #
+    # @param identifier [Symbol]
+    #
+    # @return [Symbol] The identifier passed to `def_model_attribute`.
+    def def_model_attribute(identifier)
+      @model_attributes ||= []
+
+      @model_attributes << identifier
+
+      identifier
+    end
+
+    # Return all attributes defined for this model
+    #
+    # This method also returns inherited attributes.
+    #
+    # @return [Array<Symbol>] A list of model atttributes.
+    def model_attributes
+      @model_attributes ||= []
+
+      if (self < ::ConfigBuilder::Model::Base)
+        # This is a subclass of Model::Base
+        superclass.model_attributes + @model_attributes
+      else
+        @model_attributes
+      end
+    end
+
+    # Define a new model option
+    #
+    # Model options are used when building new Vagrant objects.
+    #
+    # @param identifier [Symbol]
+    #
+    # @since 0.16.0
+    #
+    # @return [Symbol] The identifier passed to `def_model_option`.
+    def def_model_option(identifier)
+      @model_options ||= []
+
+      @model_options << identifier
+
+      identifier
+    end
+
+    # Return all options defined for this model
+    #
+    # This method also returns inherited options.
+    #
+    # @since 0.16.0
+    #
+    # @return [Array<Symbol>] A list of model options.
+    def model_options
+      @model_options ||= []
+
+      if (self < ::ConfigBuilder::Model::Base)
+        # This is a subclass of Model::Base
+        superclass.model_options + @model_options
+      else
+        @model_options
+      end
+    end
+
+    # Define a new model delegator
+    #
+    # Model delegators are used to hand configuration tasks off to other model
+    # classes.
+    #
+    # @param identifier [Symbol]
+    #
+    # @since 0.16.0
+    #
+    # @return [Symbol] The identifier passed to `def_model_delegator`.
+    def def_model_delegator(identifier)
+      @model_delegators ||= []
+
+      @model_delegators << identifier
+
+      identifier
+    end
+
+    # Return all delegators defined for this model
+    #
+    # This method also returns inherited delegators.
+    #
+    # @since 0.16.0
+    #
+    # @return [Array<Symbol>] A list of model delegators.
+    def model_delegators
+      @model_delegators ||= []
+
+      if (self < ::ConfigBuilder::Model::Base)
+        # This is a subclass of Model::Base
+        superclass.model_delegators + @model_delegators
+      else
+        @model_delegators
+      end
+    end
+  end
 
   # Deserialize a hash into a configbuilder model
   #
@@ -70,7 +194,6 @@ class ConfigBuilder::Model::Base
   def attr(identifier)
     @attrs[identifier]
   end
-  private :attr
 
   # Conditionally evaluate a block with a model attribute if it's defined
   #
@@ -85,17 +208,68 @@ class ConfigBuilder::Model::Base
       yield val
     end
   end
-  private :with_attr
 
-  class << self
+  def model_delegators
+    self.class.model_delegators
+  end
 
-    # @param identifier [Symbol]
-    def def_model_attribute(identifier)
-      model_attributes << identifier
+  def eval_models(config)
+    model_delegators.each do |model|
+      meth = "eval_#{model}"
+      self.send(meth, config)
     end
+  end
 
-    def model_attributes
-      (@identifiers ||= [])
+  # Return the identifier value for this model instance
+  #
+  # @since 0.16.0
+  #
+  # @return [Object]
+  def instance_id
+    attr(self.class.model_id)
+  end
+
+  # Return a hash of all options which have been given a value
+  #
+  # This method returns a hash of options and their values. Options that were
+  # not present in the data used to create a model instance will not be
+  # returned.
+  #
+  # @since 0.16.0
+  #
+  # @return [Hash]
+  def instance_options
+    result = Hash.new
+
+    self.class.model_options.each do |id|
+      with_attr(id) {|val| result[id] = val}
+    end
+
+    result
+  end
+
+  # Copy attributes to a Vagrant configuration object
+  #
+  # This method iterates over each attribute defined via
+  # #{.def_model_attribute} and copies data to a Vagrant configuration object.
+  # By default, `config.attributename = value` is used. To provide custom
+  # behavior, define a `configure_attributename` method. This method will be
+  # passed the vagrant configuration object and the attribute value.
+  #
+  # @param [Vagrant.plugin('2', :config)] A Vagrant configuration object.
+  #
+  # @since 0.16.0
+  #
+  # @return [void]
+  def configure!(config)
+    self.class.model_attributes.each do |id|
+      if self.respond_to?("configure_#{id}")
+        # Call custom configuration method if defined.
+        with_attr(id) {|val| send("configure_#{id}", config, val)}
+      else
+        # 99% of the time, it's just config.thing = val
+        with_attr(id) {|val| config.send("#{id}=", val)}
+      end
     end
   end
 end

data/lib/config_builder/model/network/forwarded_port.rb

@@ -3,35 +3,56 @@
 # @see http://docs.vagrantup.com/v2/networking/forwarded_ports.html
 class ConfigBuilder::Model::Network::ForwardedPort < ConfigBuilder::Model::Base
 
+  # @!attribute [rw] id
+  #   @return [String, nil] An optional name used to identify this port forward
+  def_model_attribute :id
+
   # @!attribute [rw] guest
-  #   @return [Fixnum] The guest port
+  #   @return [Fixnum] The port on the guest that you want to be exposed on the
+  #     host.
   def_model_attribute :guest
 
+  # @!attribute [rw] guest_ip
+  #   @return [String] The guest IP to bind the forwarded port to.
+  def_model_attribute :guest_ip
+
   # @!attribute [rw] host
-  #   @return [Fixnum] The host port
+  #   @return [Fixnum] The port on the host that you want to use to access the
+  #     port on the guest.
   def_model_attribute :host
 
+  # @!attribute [rw] host_ip
+  #   @return [String] The IP on the host you want to bind the forwarded port to.
+  def_model_attribute :host_ip
+
+  # @!attribute [rw] protocol
+  #   @return [String] Either `udp` or `tcp`. This specifies the protocol that
+  #     will be allowed through the forwarded port. By default this is "tcp".
+  def_model_attribute :protocol
+
   # @!attribute [rw] auto_correct
   #   @return [Boolean] Whether to automatically correct port collisions
   def_model_attribute :auto_correct
 
-  # @!attribute [rw] id
-  #   @return [String, nil] An optional name used to identify this port forward
-  def_model_attribute :id
-
   def initialize
     @defaults = {:auto_correct => false, :id => nil}
   end
 
   def to_proc
     Proc.new do |vm_config|
-      vm_config.network(
-        :forwarded_port,
-        :guest        => attr(:guest),
-        :host         => attr(:host),
-        :auto_correct => attr(:auto_correct),
-        :id           => attr(:id),
-      )
+      vm_config.network(:forwarded_port, forwarded_port_opts)
     end
   end
+
+  def forwarded_port_opts
+    h = {}
+    with_attr(:id)           { |val| h[:id]           = val }
+    with_attr(:guest)        { |val| h[:guest]        = val }
+    with_attr(:guest_ip)     { |val| h[:guest_ip]     = val }
+    with_attr(:host)         { |val| h[:host]         = val }
+    with_attr(:host_ip)      { |val| h[:host_ip]      = val }
+    with_attr(:protocol)     { |val| h[:protocol]     = val }
+    with_attr(:auto_correct) { |val| h[:auto_correct] = val }
+    h
+  end
 end

data/lib/config_builder/model/network/private_network.rb

@@ -4,11 +4,27 @@
 class ConfigBuilder::Model::Network::PrivateNetwork < ConfigBuilder::Model::Base
 
   # @!attribute [rw] :ip
-  #   @return [String] The IP address to use for the private network interface
+  #   @return [String] The IP address to use for the private network interface.
   def_model_attribute :ip
 
+  # @!attribute [rw] :netmask
+  #   @return [String] The netmask to use for the private network interface.
+  def_model_attribute :netmask
+
+  # @!attribute [rw] :type
+  #   @return [String]
+  def_model_attribute :type
+
+  # @!attribute [rw] :auto_config
+  #   @return [Boolean]
+  def_model_attribute :auto_config
+
   def to_proc
     Proc.new do |vm_config|
+      # NOTE: @attrs _must_ be used here to preserve compatibility with the
+      # vagrant-auto_network plugin.
+      # FIXME: Re-factor attribute handling so that this sort of magic isn't
+      # necessary.
       vm_config.network(:private_network, @attrs)
     end
   end

data/lib/config_builder/model/network/public_network.rb

@@ -0,0 +1,39 @@
+# Vagrant public network
+#
+# @see http://docs.vagrantup.com/v2/networking/public_network.html
+class ConfigBuilder::Model::Network::PublicNetwork < ConfigBuilder::Model::Base
+
+  # @!attribute [rw] :ip
+  #   @return [String] The IP address to use for the public network interface.
+  def_model_attribute :ip
+
+  # @!attribute [rw] :bridge
+  #   @return [String, Array<String>] If more than one network interface is
+  #     available on the host machine, Vagrant will ask you to choose which interface
+  #     the virtual machine should bridge to. A default interface can be specified by
+  #     adding a :bridge clause to the network definition.
+  def_model_attribute :bridge
+
+  # @!attribute [rw] :use_dhcp_assigned_default_route
+  #   @return [Boolean]
+  def_model_attribute :use_dhcp_assigned_default_route
+
+  # @!attribute [rw] :auto_config
+  #   @return [Boolean]
+  def_model_attribute :auto_config
+
+  def to_proc
+    Proc.new do |vm_config|
+      vm_config.network(:public_network, public_network_opts)
+    end
+  end
+
+  def public_network_opts
+    h = {}
+    with_attr(:ip)                              { |val| h[:ip]                              = val }
+    with_attr(:use_dhcp_assigned_default_route) { |val| h[:use_dhcp_assigned_default_route] = val }
+    with_attr(:bridge)                          { |val| h[:bridge]                          = val }
+    with_attr(:auto_config)                     { |val| h[:auto_config]                     = val }
+    h
+  end
+end

data/lib/config_builder/model/nfs.rb

@@ -0,0 +1,33 @@
+# Vagrant NFS model
+#
+# @see https://docs.vagrantup.com/v2/synced-folders/nfs.html
+class ConfigBuilder::Model::NFS < ConfigBuilder::Model::Base
+  # @!attribute [rw] functional
+  #   @return [Boolean] If false, then NFS will not be used as a synced folder
+  #     type.
+  def_model_attribute :functional
+
+  # @!attribute [rw] map_uid
+  #   @return [Fixnum] The UID to map all read/write requests to.
+  def_model_attribute :map_uid
+
+  # @!attribute [rw] map_gid
+  #   @return [Fixnum] The GID to map all read/write requests to.
+  def_model_attribute :map_gid
+
+  # @!attribute [rw] verify_installed
+  #   @return [Boolean] If this is false, then Vagrant will skip checking if NFS
+  #     is installed.
+  def_model_attribute :verify_installed
+
+  def to_proc
+    Proc.new do |global_config|
+      nfs = global_config.nfs
+
+      with_attr(:functional)       { |val| nfs.functional       = val }
+      with_attr(:map_uid)          { |val| nfs.map_uid          = val }
+      with_attr(:map_gid)          { |val| nfs.map_gid          = val }
+      with_attr(:verify_installed) { |val| nfs.verify_installed = val }
+    end
+  end
+end

data/lib/config_builder/model/provider/aws.rb

@@ -2,7 +2,7 @@
 #
 # @see https://github.com/mitchellh/vagrant-aws/blob/master/README.md#configuration
 # @since 0.15.0
-class ConfigBuilder::Model::Provider::Aws < ConfigBuilder::Model::Base
+class ConfigBuilder::Model::Provider::Aws < ConfigBuilder::Model::Provider::Base
 
   def_model_attribute :access_key_id
   def_model_attribute :ami
@@ -12,58 +12,35 @@ class ConfigBuilder::Model::Provider::Aws < ConfigBuilder::Model::Base
   def_model_attribute :instance_package_timeout
   def_model_attribute :instance_type
   def_model_attribute :keypair_name
-  def_model_attribute :session_token
   def_model_attribute :private_ip_address
   def_model_attribute :elastic_ip
   def_model_attribute :region
+  def_model_attribute :endpoint
+  def_model_attribute :version
   def_model_attribute :secret_access_key
+  def_model_attribute :session_token
   def_model_attribute :security_groups
   def_model_attribute :iam_instance_profile_arn
+  def_model_attribute :iam_instance_profile_name
   def_model_attribute :subnet_id
-  def_model_attribute :associate_public_ip
-  def_model_attribute :ssh_host_attribute
   def_model_attribute :tags
   def_model_attribute :package_tags
   def_model_attribute :use_iam_profile
+  def_model_attribute :user_data
   def_model_attribute :block_device_mapping
+  def_model_attribute :terminate_on_shutdown
+  def_model_attribute :ssh_host_attribute
+  def_model_attribute :monitoring
+  def_model_attribute :elb_optimized
+  def_model_attribute :source_dest_check
+  def_model_attribute :associate_public_ip
   def_model_attribute :elb
   def_model_attribute :unregister_elb_from_az
-  def_model_attribute :terminate_on_shutdown
-
-  def initialize
-    @defaults = {}
-  end
+  def_model_attribute :kernel_id
+  def_model_attribute :tenancy
 
-  def to_proc
-    Proc.new do |vm_config|
-      vm_config.provider 'aws' do |config|
-        with_attr(:access_key_id)             { |val| config.access_key_id = val }
-        with_attr(:ami)                       { |val| config.ami = val }
-        with_attr(:availability_zone)         { |val| config.availability_zone = val }
-        with_attr(:instance_ready_timeout)    { |val| config.instance_ready_timeout = val }
-        with_attr(:instance_check_interval)   { |val| config.instance_check_interval = val }
-        with_attr(:instance_package_timeout)  { |val| config.instance_package_timeout = val }
-        with_attr(:instance_type)             { |val| config.instance_type = val }
-        with_attr(:keypair_name)              { |val| config.keypair_name = val }
-        with_attr(:session_token)             { |val| config.session_token = val }
-        with_attr(:private_ip_address)        { |val| config.private_ip_address = val }
-        with_attr(:elastic_ip)                { |val| config.elastic_ip = val }
-        with_attr(:region)                    { |val| config.region = val }
-        with_attr(:secret_access_key)         { |val| config.secret_access_key = val }
-        with_attr(:security_groups)           { |val| config.security_groups = val }
-        with_attr(:iam_instance_profile_arn)  { |val| config.iam_instance_profile_arn = val }
-        with_attr(:subnet_id)                 { |val| config.subnet_id = val }
-        with_attr(:associate_public_ip)       { |val| config.associate_public_ip = val }
-        with_attr(:ssh_host_attribute)        { |val| config.ssh_host_attribute = val }
-        with_attr(:tags)                      { |val| config.tags = val }
-        with_attr(:package_tags)              { |val| config.package_tags = val }
-        with_attr(:use_iam_profile)           { |val| config.use_iam_profile = val }
-        with_attr(:block_device_mapping)      { |val| config.block_device_mapping = val }
-        with_attr(:elb)                       { |val| config.elb = val }
-        with_attr(:unregister_elb_from_az)    { |val| config.unregister_elb_from_az = val }
-        with_attr(:terminate_on_shutdown)     { |val| config.terminate_on_shutdown = val }
-      end
-    end
+  def instance_id
+    'aws'
   end
 
   ConfigBuilder::Model::Provider.register('aws', self)

data/lib/config_builder/model/provider/azure.rb

@@ -1,5 +1,5 @@
 # @see https://github.com/MSOpenTech/vagrant-azure
-class ConfigBuilder::Model::Provider::Azure < ConfigBuilder::Model::Base
+class ConfigBuilder::Model::Provider::Azure < ConfigBuilder::Model::Provider::Base
 
   def_model_attribute :mgmt_certificate
   def_model_attribute :mgmt_endpoint
@@ -13,12 +13,20 @@ class ConfigBuilder::Model::Provider::Azure < ConfigBuilder::Model::Base
   def_model_attribute :vm_image
   def_model_attribute :vm_location
   def_model_attribute :vm_affinity_group
+  def_model_attribute :vm_virtual_network_name
 
   def_model_attribute :cloud_service_name
   def_model_attribute :deployment_name
   def_model_attribute :tcp_endpoints
+
+  # ssh_private_key and ssh_certificate_file is overly specific and probably should be deprecated in favor of
+  # private_key_file and certificate_file as they are in Azure ruby sdk.
+  # This is here to not break compatibility with previous versions.
+  def_model_attribute :private_key_file
   def_model_attribute :ssh_private_key_file
+  def_model_attribute :certificate_file
   def_model_attribute :ssh_certificate_file
+
   def_model_attribute :ssh_port
   def_model_attribute :vm_size
   def_model_attribute :winrm_transport
@@ -28,38 +36,8 @@ class ConfigBuilder::Model::Provider::Azure < ConfigBuilder::Model::Base
 
   def_model_attribute :state_read_timeout
 
-  def initialize
-    @defaults = {}
-  end
-
-  def to_proc
-    Proc.new do |vm_config|
-      vm_config.provider 'azure' do |config|
-        with_attr(:mgmt_certificate)      { |val| config.mgmt_certificate = val }
-        with_attr(:mgmt_endpoint)         { |val| config.mgmt_endpoint = val }
-        with_attr(:subscription_id)       { |val| config.subscription_id = val }
-        with_attr(:storage_acct_name)     { |val| config.storage_acct_name = val }
-        with_attr(:storage_access_key)    { |val| config.storage_access_key = val }
-        with_attr(:vm_name)               { |val| config.vm_name = val }
-        with_attr(:vm_user)               { |val| config.vm_user = val }
-        with_attr(:vm_password)           { |val| config.vm_password = val }
-        with_attr(:vm_image)              { |val| config.vm_image = val }
-        with_attr(:vm_location)           { |val| config.vm_location = val }
-        with_attr(:vm_affinity_group)     { |val| config.vm_affinity_group = val }
-        with_attr(:cloud_service_name)    { |val| config.cloud_service_name = val }
-        with_attr(:deployment_name)       { |val| config.deployment_name = val }
-        with_attr(:tcp_endpoints)         { |val| config.tcp_endpoints = val }
-        with_attr(:ssh_private_key_file)  { |val| config.ssh_private_key_file = val }
-        with_attr(:ssh_certificate_file)  { |val| config.ssh_certificate_file = val }
-        with_attr(:ssh_port)              { |val| config.ssh_port = val }
-        with_attr(:vm_size)               { |val| config.vm_size = val }
-        with_attr(:winrm_transport)       { |val| config.winrm_transport = val }
-        with_attr(:winrm_http_port)       { |val| config.winrm_http_port = val }
-        with_attr(:winrm_https_port)      { |val| config.winrm_https_port = val }
-        with_attr(:availability_set_name) { |val| config.availability_set_name = val }
-        with_attr(:state_read_timeout)    { |val| config.state_read_timeout = val }
-      end
-    end
+  def instance_id
+    'azure'
   end
 
   ConfigBuilder::Model::Provider.register('azure', self)