Update our provider to match dnsimple-ruby 4.5.0 #60

martinisoft · 2018-10-18T18:09:56Z

This changeset resolves the breakage that occured in the 4.5.0 release which should resolve dnsimple/dnsimple-ruby#169

onlyhavecans

Good one! Glad the tests help here. I have style suggestions though.
I'm going to mark approved as these are suggestions not requirement for merge

libraries/provider_dnsimple_record.rb

thekendalmiller · 2018-10-19T17:24:48Z

libraries/provider_dnsimple_record.rb

@@ -31,7 +31,7 @@ def load_current_resource
        @current_resource.domain(@new_resource.domain)
        @current_resource.type(@new_resource.type)

-        records = dnsimple_client.zones.all_records(dnsimple_client_account_id,
+        records = dnsimple_client.zones.list_zone_records(dnsimple_client_account_id,


Thanks for taking a look at this. I tried the patch and it does fix that error, but list_zone_records is paginated with 30 records per page so the logic below to detect if this in existing record often fails once someone has more than 30 records.

It should be all_zone_records instead

weppos · 2018-10-19T17:27:16Z

libraries/provider_dnsimple_record.rb

@@ -31,7 +31,7 @@ def load_current_resource
        @current_resource.domain(@new_resource.domain)
        @current_resource.type(@new_resource.type)

-        records = dnsimple_client.zones.all_records(dnsimple_client_account_id,
+        records = dnsimple_client.zones.list_zone_records(dnsimple_client_account_id,


Suggested change

records = dnsimple_client.zones.list_zone_records(dnsimple_client_account_id,

records = dnsimple_client.zones.all_zone_records(dnsimple_client_account_id,

The method was renamed from all_records to all_zone_records.

weppos · 2018-10-19T17:30:04Z

spec/libraries/provider_dnsimple_record_spec.rb

@@ -29,7 +29,7 @@
    let(:response) { instance_double(Dnsimple::Response, data: data) }
    let(:data) { instance_double(Dnsimple::Struct::Whoami, account: account) }
    let(:account) { instance_double(Dnsimple::Struct::Account, id: 1) }
-    let(:zones) { instance_double(Dnsimple::Client::ZonesService, all_records: zone_records, create_record: zone_record) }
+    let(:zones) { instance_double(Dnsimple::Client::ZonesService, list_zone_records: zone_records, create_zone_record: zone_record) }


Suggested change

let(:zones) { instance_double(Dnsimple::Client::ZonesService, list_zone_records: zone_records, create_zone_record: zone_record) }

let(:zones) { instance_double(Dnsimple::Client::ZonesService, all_zone_records: zone_records, create_zone_record: zone_record) }

weppos · 2018-10-19T17:30:41Z

test/integration/create_record/libraries/dnsimple_zone.rb

@@ -40,7 +40,7 @@ def response

    filter = {}
    filter = { type: @type } if @type
-    client.zones.records(account_id, @zone, filter: filter).data.detect do |record|
+    client.zones.list_zone_records(account_id, @zone, filter: filter).data.detect do |record|


Suggested change

client.zones.list_zone_records(account_id, @zone, filter: filter).data.detect do |record|

client.zones.all_zone_records(account_id, @zone, filter: filter).data.detect do |record|

@martinisoft there is this one missing

weppos · 2018-10-19T17:30:55Z

test/integration/update_record/libraries/dnsimple_zone.rb

@@ -40,7 +40,7 @@ def response

    filter = {}
    filter = { type: @type } if @type
-    client.zones.records(account_id, @zone, filter: filter).data.detect do |record|
+    client.zones.list_zone_records(account_id, @zone, filter: filter).data.detect do |record|


Suggested change

client.zones.list_zone_records(account_id, @zone, filter: filter).data.detect do |record|

client.zones.all_zone_records(account_id, @zone, filter: filter).data.detect do |record|

Also this one

weppos · 2018-10-19T17:31:22Z

spec/libraries/provider_dnsimple_record_spec.rb

@@ -171,7 +171,7 @@
    let(:response) { instance_double(Dnsimple::Response, data: data) }
    let(:data) { instance_double(Dnsimple::Struct::Whoami, account: account) }
    let(:account) { instance_double(Dnsimple::Struct::Account, id: 1) }
-    let(:zones) { instance_double(Dnsimple::Client::ZonesService, all_records: zone_records, update_record: zone_record) }
+    let(:zones) { instance_double(Dnsimple::Client::ZonesService, list_zone_records: zone_records, update_zone_record: zone_record) }


Suggested change

let(:zones) { instance_double(Dnsimple::Client::ZonesService, list_zone_records: zone_records, update_zone_record: zone_record) }

let(:zones) { instance_double(Dnsimple::Client::ZonesService, all_zone_records: zone_records, update_zone_record: zone_record) }

weppos · 2018-10-19T17:31:29Z

spec/libraries/provider_dnsimple_record_spec.rb

    end

    let(:client) { instance_double(Dnsimple::Client, identity: identity, zones: zones) }
    let(:identity) { instance_double(Dnsimple::Client::Identity, whoami: response) }
    let(:response) { instance_double(Dnsimple::Response, data: data) }
    let(:data) { instance_double(Dnsimple::Struct::Whoami, account: account) }
    let(:account) { instance_double(Dnsimple::Struct::Account, id: 1) }
-    let(:zones) { instance_double(Dnsimple::Client::ZonesService, all_records: zone_records) }
+    let(:zones) { instance_double(Dnsimple::Client::ZonesService, list_zone_records: zone_records) }


Suggested change

let(:zones) { instance_double(Dnsimple::Client::ZonesService, list_zone_records: zone_records) }

let(:zones) { instance_double(Dnsimple::Client::ZonesService, all_zone_records: zone_records) }

weppos

@martinisoft the direct replacement of all_records is all_zone_records. I provided inline suggestions for easy approval.

martinisoft · 2018-10-19T21:23:09Z

@weppos I have replaced all the methods, thank you for the assist on this one. Waiting for a green CI build.

martinisoft · 2018-10-19T21:30:02Z

@thekendalmiller Let us know how my latest updates work for you now. Did not know about the difference in methods so that should be corrected now. If all is well, I will cut a new patch release since this is also affecting us in production (yes, we dogfood our own cookbook)

thekendalmiller · 2018-10-19T21:42:39Z

@martinisoft Thanks. It works for me now

martinisoft added 2 commits October 18, 2018 12:58

Replace changed method all_records

69c0174

Update create/update/delete record methods

3fa9f7c

martinisoft self-assigned this Oct 18, 2018

Don't forget the inspec tests

3f6f299

martinisoft requested a review from onlyhavecans October 18, 2018 18:27

onlyhavecans approved these changes Oct 18, 2018

View reviewed changes

libraries/provider_dnsimple_record.rb Outdated Show resolved Hide resolved

libraries/provider_dnsimple_record.rb Outdated Show resolved Hide resolved

libraries/provider_dnsimple_record.rb Outdated Show resolved Hide resolved

onlyhavecans and others added 4 commits October 18, 2018 17:45

Expand parens out

abfd6f2

Expand parens out here too

3d6ad35

Expand parens out here as well

8539798

Re-align parens

989272e

thekendalmiller reviewed Oct 19, 2018

View reviewed changes

weppos reviewed Oct 19, 2018

View reviewed changes

weppos requested changes Oct 19, 2018

View reviewed changes

Rename to unpaginated method

a4c643e

martinisoft requested a review from weppos October 19, 2018 21:22

Don't forget these!

1fa36b4

weppos approved these changes Oct 19, 2018

View reviewed changes

martinisoft merged commit 257a790 into master Oct 19, 2018

martinisoft deleted the bugfix/gem_updates branch October 19, 2018 21:54

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update our provider to match dnsimple-ruby 4.5.0 #60

Update our provider to match dnsimple-ruby 4.5.0 #60

martinisoft commented Oct 18, 2018

onlyhavecans left a comment

thekendalmiller Oct 19, 2018

thekendalmiller Oct 19, 2018

weppos Oct 19, 2018 •

edited

weppos Oct 19, 2018

weppos Oct 19, 2018

weppos Oct 19, 2018

weppos Oct 19, 2018

weppos Oct 19, 2018

weppos Oct 19, 2018

weppos Oct 19, 2018

weppos left a comment

martinisoft commented Oct 19, 2018

martinisoft commented Oct 19, 2018

thekendalmiller commented Oct 19, 2018

	records = dnsimple_client.zones.list_zone_records(dnsimple_client_account_id,
	records = dnsimple_client.zones.all_zone_records(dnsimple_client_account_id,

	let(:zones) { instance_double(Dnsimple::Client::ZonesService, list_zone_records: zone_records, create_zone_record: zone_record) }
	let(:zones) { instance_double(Dnsimple::Client::ZonesService, all_zone_records: zone_records, create_zone_record: zone_record) }

	client.zones.list_zone_records(account_id, @zone, filter: filter).data.detect do \|record\|
	client.zones.all_zone_records(account_id, @zone, filter: filter).data.detect do \|record\|

Update our provider to match dnsimple-ruby 4.5.0 #60

Update our provider to match dnsimple-ruby 4.5.0 #60

Conversation

martinisoft commented Oct 18, 2018

onlyhavecans left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

weppos Oct 19, 2018 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

weppos left a comment

Choose a reason for hiding this comment

martinisoft commented Oct 19, 2018

martinisoft commented Oct 19, 2018

thekendalmiller commented Oct 19, 2018

weppos Oct 19, 2018 •

edited