Strip slashes from partition to ensure coherence, fix the irule exist…

…ence test
swalberg · May 21, 2019 · 693cbda · 693cbda
1 parent ebac8c5
commit 693cbda
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/libraries/base_client.rb b/libraries/base_client.rb
@@ -5,7 +5,7 @@ def initialize(node, resource, load_balancer, partition)
       @node = node
       @resource = resource
       @load_balancer = load_balancer
-      @partition = partition
+      @partition = partition[%r{/?([^/]+)/?},1]
 
       # local module aliases reduce repetetive call chains
       @ProfileContextType = F5::Icontrol::LocalLB::ProfileContextType
@@ -17,7 +17,7 @@ def initialize(node, resource, load_balancer, partition)
     private
 
     def strip_partition(key)
-      key.gsub(%r{^/Common/}, '') if key
+      key.gsub(%r{^/#{@partition}/}, '') if key
     end
 
     def with_partition(key)

diff --git a/resources/irule.rb b/resources/irule.rb
@@ -12,7 +12,7 @@
   actual_irule_name = new_resource.irule_name || new_resource.name
   irule = ChefF5::IRule.new(node, new_resource, new_resource.load_balancer, new_resource.partition)
 
-  if irule.is_missing?(actual_irule_name)
+  if irule.missing?(actual_irule_name)
     converge_by "Create IRule #{actual_irule_name}" do
       irule.create(actual_irule_name, new_resource.definition)
       return