smart_proxy_dns_infoblox 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8897b410d2961cdad8b275971188063eee2f43eb36d887acf3bb7b51acc4749
-  data.tar.gz: ab1c93e8b44f9e9583037d9e9ad770a667d81c56371148219f41b0b52e097119
+  metadata.gz: b3a0500e2d29b0e17690364666974cec3258457b8806c4ff743fc85179e9c67b
+  data.tar.gz: df9c2f18edb7a29ce56090ef1ca03f34e6454ec88d9c492c1e23d274e03717bb
 SHA512:
-  metadata.gz: eabe002514aeb1a4519ed1efccebf8f9ba6e28e5b5d474611d81cc9dcc0b57145554d75f3d3f6503d4448765dbd616f2bcfa1a0f6421de75f99e94de08c12254
-  data.tar.gz: 88aed8b900b4db24e55e5230be6afdc53a819ec87030cd49449f334c307531a9c4535e742bcad3667c10a063719e8f974a268144b6fb7f1af090591298d55855
+  metadata.gz: eb8d100b528571220d9f08cda5d9772819114a2712bc2cfff82f5352d92bdeacd5163bad9465c51d6497aff9c346343d66207c7b2f579ce4c4eeee478af137bd
+  data.tar.gz: 916a54d5a0aa1610a4a9d034c27c913f922ad29172a10bf503f3403db182c91d2b20cbc3d250dc04a084ab8936d0f91f07cbdc454047d31fcfcde54f1b14adef

data/lib/smart_proxy_dns_infoblox/dns_infoblox_main.rb

@@ -11,12 +11,14 @@ module Proxy::Dns::Infoblox
     def do_create(name, value, type)
       method = "ib_create_#{type.downcase}_record".to_sym
       raise(Proxy::Dns::Error, "Creation of #{type} records not implemented") unless respond_to?(method, true)
+
       send(method, name, value)
     end
 
     def do_remove(name, type)
       method = "ib_remove_#{type.downcase}_record".to_sym
       raise(Proxy::Dns::Error, "Deletion of #{type} records not implemented") unless respond_to?(method, true)
+
       send(method, name)
     end
 
@@ -34,6 +36,7 @@ module Proxy::Dns::Infoblox
 
       return -1 if send(method, fqdn).empty?
       return 0 if send(method, fqdn, address).any?
+
       1
     end
 
@@ -157,14 +160,15 @@ module Proxy::Dns::Infoblox
     end
 
     def ib_delete(clazz, params)
-      record = clazz.find(connection, params.merge(_max_results: 1, view: dns_view)).first
+      records = clazz.find(connection, params.merge(view: dns_view))
+      raise Proxy::Dns::NotFound, "Cannot find #{clazz.class.name} entry for #{params}" if records.empty?
 
-      raise Proxy::Dns::NotFound, "Cannot find #{clazz.class.name} entry for #{params}" if record.nil?
-      ret_value = record.delete || (raise Proxy::Dns::NotFound, "Cannot find #{clazz.class.name} entry for #{params}")
-
-      ib_clear_dns_cache(record)
+      records.each do |record|
+        record.delete
+        ib_clear_dns_cache(record)
+      end
 
-      ret_value
+      true
     end
 
     def ib_clear_dns_cache(record)
@@ -174,9 +178,9 @@ module Proxy::Dns::Infoblox
       MemberDns.all(connection).each do |member|
         member.clear_dns_cache(view: record.view, domain: record.name)
       end
-    rescue StandardError => ex
+    rescue StandardError => e
       # Failing to clear the DNS cache should never be an error
-      logger.warn("Exception #{ex} was raised when clearing DNS cache")
+      logger.warn("Exception #{e} was raised when clearing DNS cache")
     end
   end
 end

data/lib/smart_proxy_dns_infoblox/dns_infoblox_plugin.rb

@@ -2,7 +2,8 @@ module Proxy::Dns::Infoblox
   class Plugin < ::Proxy::Provider
     plugin :dns_infoblox, ::Proxy::Dns::Infoblox::VERSION
 
-    default_settings :username => 'infoblox', :password => 'infoblox', :dns_server => 'localhost', :dns_view => 'default', :timeout => 60
+    default_settings :username => 'infoblox', :password => 'infoblox', :dns_server => 'localhost',
+                     :dns_view => 'default', :timeout => 60
 
     requires :dns, '>= 1.12'
 

data/lib/smart_proxy_dns_infoblox/dns_infoblox_version.rb

@@ -1,7 +1,7 @@
 module Proxy
   module Dns
     module Infoblox
-      VERSION = '1.1.0'.freeze
+      VERSION = '1.2.0'.freeze
     end
   end
 end

data/lib/smart_proxy_dns_infoblox/infoblox_member_dns.rb

@@ -13,7 +13,7 @@ module Proxy::Dns::Infoblox
       post_body[:domain] = domain unless domain.nil?
       post_body[:view] = view unless view.nil?
 
-      JSON.parse(connection.post(resource_uri + "?_function=clear_dns_cache", post_body).body)
+      JSON.parse(connection.post("#{resource_uri}?_function=clear_dns_cache", post_body).body)
     end
   end
 end

data/test/infoblox_test.rb

@@ -171,6 +171,35 @@ class InfobloxTest < Test::Unit::TestCase
     @provider.do_remove(ptr, 'PTR')
   end
 
+  def test_wapi_remove_multi_a_records
+    address1 = '192.168.1.11'
+    address2 = '192.168.2.22'
+    fqdn = 'test.example.com'
+
+    record1 = Infoblox::Arecord.new name: fqdn, :ipv4addr => address1
+    record1.expects(:delete).returns(record1)
+    record2 = Infoblox::Arecord.new name: fqdn, :ipv4addr => address2
+    record2.expects(:delete).returns(record2)
+
+    Infoblox::Arecord.expects(:find).returns([record1, record2])
+    @provider.do_remove(fqdn, 'A')
+  end
+
+  def test_wapi_remove_multi_ptr_records
+    ptr = '1.1.1.10.in-addr.arpa'
+    ip = '10.1.1.1'
+    fqdn1 = 'test1.example.com'
+    fqdn2 = 'test2.example.com'
+
+    record1 = Infoblox::Ptr.new name: ptr, :ptrdname => fqdn1, :ipv4addr => ip
+    record1.expects(:delete).returns(record1)
+    record2 = Infoblox::Ptr.new name: ptr, :ptrdname => fqdn2, :ipv4addr => ip
+    record2.expects(:delete).returns(record2)
+
+    Infoblox::Ptr.expects(:find).returns([record1, record2])
+    @provider.do_remove(ptr, 'PTR')
+  end
+
   def test_wapi_old
     fqdn = 'test.example.com'
     record = Infoblox::Arecord.new name: fqdn

data/test/integration_test.rb

@@ -21,8 +21,11 @@ class IntegrationTest < ::Test::Unit::TestCase
   include Rack::Test::Methods
 
   class DnsProviderForTesting < Proxy::Dns::Infoblox::Record
+    # This explicitly doesn't want to do anything
+    # rubocop:disable Lint/MissingSuper Style/RedundantInitialize
     def initialize
     end
+    # rubocop:enable Lint/MissingSuper Style/RedundantInitialize
   end
 
   def app

data/test/test_helper.rb

@@ -1,5 +1,5 @@
 require 'test/unit'
-require 'mocha/setup'
+require 'mocha/test_unit'
 require 'json'
 require 'ostruct'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_dns_infoblox
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Matthew Nicholson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-21 00:00:00.000000000 Z
+date: 2024-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: infoblox
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.50.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.50.0
 description: Infoblox DNS provider plugin for Foreman's smart proxy
 email:
 - matthew.a.nicholson@gmail.com
@@ -71,19 +57,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.27
 signing_key: 
 specification_version: 4
 summary: Infoblox DNS provider plugin for Foreman's smart proxy
 test_files:
-- test/test_helper.rb
 - test/configuration_test.rb
 - test/infoblox_test.rb
 - test/integration_test.rb
+- test/test_helper.rb