(MODULES-9895) iis_virtual_directory unable to create directories with the same name on different sites

Author: imaqsood

lib/puppet/provider/iis_virtual_directory/webadministration.rb

@@ -40,17 +40,17 @@ def create
     else
       # New-WebVirtualDirectory fails when PhysicalPath is a UNC path that unavailable,
       # and UNC paths are inherently not necessarily always available.
-      cmd << "New-Item -Type VirtualDirectory 'IIS:\\Sites\\#{@resource[:sitename]}\\#{@resource[:name]}' "
+      cmd << "New-Item -Type VirtualDirectory 'IIS:\\Sites\\#{virt_dir_path(@resouce[:sitename], @resource[:name]}' "
     end
     cmd << "-Application \"#{@resource[:application]}\" " if @resource[:application]
     cmd << "-PhysicalPath \"#{@resource[:physicalpath]}\" " if @resource[:physicalpath]
     cmd << '-ErrorAction Stop;'
     if @resource[:user_name]
-      cmd << "Set-ItemProperty -Path 'IIS:\\Sites\\#{@resource[:sitename]}\\#{@resource[:name]}' " \
+      cmd << "Set-ItemProperty -Path 'IIS:\\Sites\\#{virt_dir_path(@resouce[:sitename], @resource[:name]}' " \
              "-Name 'userName' -Value '#{@resource[:user_name]}' -ErrorAction Stop;"
     end
     if @resource[:password]
-      cmd << "Set-ItemProperty -Path 'IIS:\\Sites\\#{@resource[:sitename]}\\#{@resource[:name]}' " \
+      cmd << "Set-ItemProperty -Path 'IIS:\\Sites\\#{virt_dir_path(@resouce[:sitename], @resource[:name]}' " \
              "-Name 'password' -Value '#{escape_string(@resource[:password])}' -ErrorAction Stop;"
     end
     cmd = cmd.join
@@ -67,10 +67,10 @@ def update
 
     cmd = []
 
-    cmd << "Set-ItemProperty -Path 'IIS:\\Sites\\#{@resource[:sitename]}\\#{@resource[:name]}' -Name 'physicalPath' -Value '#{@resource[:physicalpath]}';" if @resource[:physicalpath]
-    cmd << "Set-ItemProperty -Path 'IIS:\\Sites\\#{@resource[:sitename]}\\#{@resource[:name]}' -Name 'application' -Value '#{@resource[:application]}';" if @resource[:application]
-    cmd << "Set-ItemProperty -Path 'IIS:\\Sites\\#{@resource[:sitename]}\\#{@resource[:name]}' -Name 'userName' -Value '#{@resource[:user_name]}';" if @resource[:user_name]
-    cmd << "Set-ItemProperty -Path 'IIS:\\Sites\\#{@resource[:sitename]}\\#{@resource[:name]}' -Name 'password' -Value '#{escape_string(@resource[:password])}';" if @resource[:password]
+    cmd << "Set-ItemProperty -Path 'IIS:\\Sites\\#{virt_dir_path(@resouce[:sitename], @resource[:name]}' -Name 'physicalPath' -Value '#{@resource[:physicalpath]}';" if @resource[:physicalpath]
+    cmd << "Set-ItemProperty -Path 'IIS:\\Sites\\#{virt_dir_path(@resouce[:sitename], @resource[:name]}' -Name 'application' -Value '#{@resource[:application]}';" if @resource[:application]
+    cmd << "Set-ItemProperty -Path 'IIS:\\Sites\\#{virt_dir_path(@resouce[:sitename], @resource[:name]}' -Name 'userName' -Value '#{@resource[:user_name]}';" if @resource[:user_name]
+    cmd << "Set-ItemProperty -Path 'IIS:\\Sites\\#{virt_dir_path(@resouce[:sitename], @resource[:name]}' -Name 'password' -Value '#{escape_string(@resource[:password])}';" if @resource[:password]
 
     cmd = cmd.join
     result = self.class.run(cmd)
@@ -79,11 +79,11 @@ def update
 
   def destroy
     Puppet.debug "Destroying #{@resource[:name]}"
-    test = self.class.run("Test-Path -Path 'IIS:\\Sites\\#{@resource[:sitename]}\\#{@resource[:name]}'")
+    test = self.class.run("Test-Path -Path 'IIS:\\Sites\\#{virt_dir_path(@resouce[:sitename], @resource[:name]}'")
     if test[:stdout].strip.casecmp('true').zero?
       cmd = []
       cmd << 'Remove-Item '
-      cmd << "-Path 'IIS:\\Sites\\#{@resource[:sitename]}\\#{@resource[:name]}' "
+      cmd << "-Path 'IIS:\\Sites\\#{virt_dir_path(@resouce[:sitename], @resource[:name]}' "
       cmd << '-Recurse '
       cmd << '-ErrorAction Stop '
       cmd = cmd.join
@@ -131,6 +131,19 @@ def self.instances
     end
   end
 
+  def virt_dir_path(sitename, name)
+    @cached_virt_dir_path ||= {}
+
+    key = "#{sitename}/#{name}"
+    @cached_virt_dir_path[key] ||= begin
+      parts = name.tr('/', '\\').split('\\')
+      parts.shift if parts.first.casecmp?(sitename)
+      normalized_name = parts.join('\\')
+      site_path = "#{sitename}\\#{normalized_name}"
+      [normalized_name, site_path]
+    end
+  end
+
   def escape_string(value)
     value.gsub("'", "''")
   end

spec/acceptance/iis_virtual_directory_spec.rb

@@ -214,5 +214,30 @@
         end
       end
     end
+
+    context 'with same names under different sites.' do
+      site_name1 = SecureRandom.hex(10)
+      site_name2 = SecureRandom.hex(10)
+
+      manifest = <<-HERE
+
+      iis_virtual_directory { "#{site_name1}/includes":
+        ensure => present,
+        name => 'includes',
+        sitename => "#{site_name1}",
+        physicalpath => 'G:\inetpub\includes',
+      }
+
+      iis_virtual_directory { "#{site_name2}includes":
+        ensure => present,
+        name => 'includes',
+        sitename => "#{site_name2}",
+        physicalpath => 'G:\inetpub\includes',
+        end
+      end
+      HERE
+
+      iis_idempotent_apply('create iis virtual dir', manifest)
+    end
   end
 end