Update now that name and namespace are under metadata

Replace id properties with name

Fixes sensu#1012

lib/puppet/provider/sensu_entity/sensuctl.rb

@@ -20,21 +20,17 @@ def self.instances
     data.each do |d|
       entity = {}
       entity[:ensure] = :present
-      entity[:name] = d['id']
-      entity[:id] = d['id']
+      entity[:name] = d['metadata']['name']
       entity[:namespace] = d['metadata']['namespace']
       entity[:labels] = d['metadata']['labels']
       entity[:annotations] = d['metadata']['annotations']
       d.each_pair do |key,value|
-        next if key == 'id'
         next if key == 'metadata'
         if !!value == value
           value = value.to_s.to_sym
         end
         if key == 'deregistration'
           entity[:deregistration_handler] = value['handler']
-        elsif key == 'class'
-          entity[:entity_class] = value
         elsif type_properties.include?(key.to_sym)
           entity[key.to_sym] = value
         else
@@ -72,8 +68,9 @@ def initialize(value = {})
 
   def create
     spec = {}
-    spec[:id] = resource[:id]
     spec[:metadata] = {}
+    spec[:metadata] = {}
+    spec[:metadata][:name] = resource[:name]
     type_properties.each do |property|
       value = resource[property]
       next if value.nil?
@@ -82,9 +79,7 @@ def create
       if [:true, :false].include?(value)
         value = convert_boolean_property_value(value)
       end
-      if property == :entity_class
-        spec[:class] = value
-      elsif property == :deregistration_handler
+      if property == :deregistration_handler
         spec[:deregistration] = {handler: value}
       elsif property == :namespace
         spec[:metadata][:namespace] = value
@@ -107,8 +102,9 @@ def create
   def flush
     if !@property_flush.empty?
       spec = {}
-      spec[:id] = resource[:id]
       spec[:metadata] = {}
+      spec[:metadata] = {}
+      spec[:metadata][:name] = resource[:name]
       type_properties.each do |property|
         if @property_flush[property]
           value = @property_flush[property]
@@ -127,9 +123,7 @@ def flush
         elsif value == :absent
           value = nil
         end
-        if property == :entity_class
-          spec[:class] = value
-        elsif property == :deregistration_handler
+        if property == :deregistration_handler
           spec[:deregistration] = {handler: value}
         elsif property == :namespace
           spec[:metadata][:namespace] = value

lib/puppet/provider/sensu_event/sensuctl.rb

@@ -20,8 +20,8 @@ def self.instances
     data.each do |d|
       event = {}
       event[:ensure] = :present
-      event[:entity] = d['entity']['id']
-      event[:check] = d['check']['name']
+      event[:entity] = d['entity']['metadata']['name']
+      event[:check] = d['check']['metadata']['name']
       event[:name] = "#{event[:check]} for #{event[:entity]}"
       if d['check']['status'] == 0
         event[:ensure] = :resolve

lib/puppet/provider/sensu_extension/sensuctl.rb

@@ -20,9 +20,10 @@ def self.instances
     data.each do |d|
       extension = {}
       extension[:ensure] = :present
-      extension[:name] = d['name']
+      extension[:name] = d['metadata']['name']
+      extension[:namespace] = d['metadata']['namespace']
       d.each_pair do |key, value|
-        next if key == 'name'
+        next if key == 'metadata'
         if !!value == value
           value = value.to_s.to_sym
         end
@@ -61,13 +62,17 @@ def initialize(value = {})
 
   def create
     spec = {}
-    spec[:name] = resource[:name]
+    spec[:metadata] = {}
+    spec[:metadata][:name] = resource[:name]
     type_properties.each do |property|
       value = resource[property]
       next if value.nil?
       next if value == :absent || value == [:absent]
       if [:true, :false].include?(value)
-        spec[property] = convert_boolean_property_value(value)
+        value = convert_boolean_property_value(value)
+      end
+      if property == :namespace
+        spec[:metadata][:namespace] = value
       else
         spec[property] = value
       end
@@ -83,7 +88,8 @@ def create
   def flush
     if !@property_flush.empty?
       spec = {}
-      spec[:name] = resource[:name]
+      spec[:metadata] = {}
+      spec[:metadata][:name] = resource[:name]
       type_properties.each do |property|
         if @property_flush[property]
           value = @property_flush[property]
@@ -92,9 +98,12 @@ def flush
         end
         next if value.nil?
         if [:true, :false].include?(value)
-          spec[property] = convert_boolean_property_value(value)
+          value = convert_boolean_property_value(value)
         elsif value == :absent
-          spec[property] = nil
+          value = nil
+        end
+        if property == :namespace
+          spec[:metadata][:namespace] = value
         else
           spec[property] = value
         end

lib/puppet/provider/sensu_filter/sensuctl.rb

@@ -20,9 +20,10 @@ def self.instances
     data.each do |d|
       filter = {}
       filter[:ensure] = :present
-      filter[:name] = d['name']
+      filter[:name] = d['metadata']['name']
+      filter[:namespace] = d['metadata']['namespace']
       d.each_pair do |key, value|
-        next if key == 'name'
+        next if key == 'metadata'
         if !!value == value
           value = value.to_s.to_sym
         end
@@ -63,7 +64,8 @@ def initialize(value = {})
 
   def create
     spec = {}
-    spec[:name] = resource[:name]
+    spec[:metadata] = {}
+    spec[:metadata][:name] = resource[:name]
     type_properties.each do |property|
       value = resource[property]
       next if value.nil?
@@ -73,6 +75,8 @@ def create
       end
       if property == :when_days
         spec[:when] = { days: value }
+      elsif property == :namespace
+        spec[:metadata][:namespace] = value
       else
         spec[property] = value
       end
@@ -88,7 +92,8 @@ def create
   def flush
     if !@property_flush.empty?
       spec = {}
-      spec[:name] = resource[:name]
+      spec[:metadata] = {}
+      spec[:metadata][:name] = resource[:name]
       type_properties.each do |property|
         if @property_flush[property]
           value = @property_flush[property]
@@ -104,6 +109,8 @@ def flush
         end
         if property == :when_days
           spec[:when] = { days: value }
+        elsif property == :namespace
+          spec[:metadata][:namespace] = value
         else
           spec[property] = value
         end

lib/puppet/provider/sensu_handler/sensuctl.rb

@@ -20,9 +20,10 @@ def self.instances
     data.each do |d|
       handler = {}
       handler[:ensure] = :present
-      handler[:name] = d['name']
+      handler[:name] = d['metadata']['name']
+      handler[:namespace] = d['metadata']['namespace']
       d.each_pair do |key, value|
-        next if key == 'name'
+        next if key == 'metadata'
         next if key == 'socket'
         if !!value == value
           value = value.to_s.to_sym
@@ -70,14 +71,18 @@ def initialize(value = {})
 
   def create
     spec = {}
-    spec[:name] = resource[:name]
+    spec[:metadata] = {}
+    spec[:metadata][:name] = resource[:name]
     type_properties.each do |property|
       value = resource[property]
       next if value.nil?
       next if value == :absent || value == [:absent]
       next if property.to_s =~ /^socket/
       if [:true, :false].include?(value)
-        spec[property] = convert_boolean_property_value(value)
+        value = convert_boolean_property_value(value)
+      end
+      if property == :namespace
+        spec[:metadata][:namespace] = value
       else
         spec[property] = value
       end
@@ -98,7 +103,8 @@ def create
   def flush
     if !@property_flush.empty?
       spec = {}
-      spec[:name] = resource[:name]
+      spec[:metadata] = {}
+      spec[:metadata][:name] = resource[:name]
       type_properties.each do |property|
         if @property_flush[property]
           value = @property_flush[property]
@@ -108,9 +114,12 @@ def flush
         next if value.nil?
         next if property.to_s =~ /^socket/
         if [:true, :false].include?(value)
-          spec[property] = convert_boolean_property_value(value)
+          value = convert_boolean_property_value(value)
         elsif value == :absent
-          spec[property] = nil
+          value = nil
+        end
+        if property == :namespace
+          spec[:metadata][:namespace] = value
         else
           spec[property] = value
         end

lib/puppet/provider/sensu_hook/sensuctl.rb

@@ -20,9 +20,10 @@ def self.instances
     data.each do |d|
       hook = {}
       hook[:ensure] = :present
-      hook[:name] = d['name']
+      hook[:name] = d['metadata']['name']
+      hook[:namespace] = d['metadata']['namespace']
       d.each_pair do |key, value|
-        next if key == 'name'
+        next if key == 'metadata'
         if !!value == value
           value = value.to_s.to_sym
         end
@@ -61,13 +62,17 @@ def initialize(value = {})
 
   def create
     spec = {}
-    spec[:name] = resource[:name]
+    spec[:metadata] = {}
+    spec[:metadata][:name] = resource[:name]
     type_properties.each do |property|
       value = resource[property]
       next if value.nil?
       next if value == :absent || value == [:absent]
       if [:true, :false].include?(value)
-        spec[property] = convert_boolean_property_value(value)
+        value = convert_boolean_property_value(value)
+      end
+      if property == :namespace
+        spec[:metadata][:namespace] = value
       else
         spec[property] = value
       end
@@ -83,7 +88,8 @@ def create
   def flush
     if !@property_flush.empty?
       spec = {}
-      spec[:name] = resource[:name]
+      spec[:metadata] = {}
+      spec[:metadata][:name] = resource[:name]
       type_properties.each do |property|
         if @property_flush[property]
           value = @property_flush[property]
@@ -92,9 +98,12 @@ def flush
         end
         next if value.nil?
         if [:true, :false].include?(value)
-          spec[property] = convert_boolean_property_value(value)
+          value = convert_boolean_property_value(value)
         elsif value == :absent
-          spec[property] = nil
+          value = nil
+        end
+        if property == :namespace
+          spec[:metadata][:namespace] = value
         else
           spec[property] = value
         end

lib/puppet/provider/sensu_mutator/sensuctl.rb

@@ -20,9 +20,10 @@ def self.instances
     data.each do |d|
       mutator = {}
       mutator[:ensure] = :present
-      mutator[:name] = d['name']
+      mutator[:name] = d['metadata']['name']
+      mutator[:namespace] = d['metadata']['namespace']
       d.each_pair do |key, value|
-        next if key == 'name'
+        next if key == 'metadata'
         if !!value == value
           value = value.to_s.to_sym
         end
@@ -61,13 +62,17 @@ def initialize(value = {})
 
   def create
     spec = {}
-    spec[:name] = resource[:name]
+    spec[:metadata] = {}
+    spec[:metadata][:name] = resource[:name]
     type_properties.each do |property|
       value = resource[property]
       next if value.nil?
       next if value == :absent || value == [:absent]
       if [:true, :false].include?(value)
-        spec[property] = convert_boolean_property_value(value)
+        value = convert_boolean_property_value(value)
+      end
+      if property == :namespace
+        spec[:metadata][:namespace] = value
       else
         spec[property] = value
       end
@@ -83,7 +88,8 @@ def create
   def flush
     if !@property_flush.empty?
       spec = {}
-      spec[:name] = resource[:name]
+      spec[:metadata] = {}
+      spec[:metadata][:name] = resource[:name]
       type_properties.each do |property|
         if @property_flush[property]
           value = @property_flush[property]
@@ -92,9 +98,12 @@ def flush
         end
         next if value.nil?
         if [:true, :false].include?(value)
-          spec[property] = convert_boolean_property_value(value)
+          value = convert_boolean_property_value(value)
         elsif value == :absent
-          spec[property] = nil
+          value = nil
+        end
+        if property == :namespace
+          spec[:metadata][:namespace] = value
         else
           spec[property] = value
         end