From 76c170375bdd628f501109357e4c7ce050f396e9 Mon Sep 17 00:00:00 2001 From: Baptiste Mayelle Date: Thu, 24 May 2018 10:31:49 +0200 Subject: [PATCH 1/2] UPD: Errors msg with terraform 0.11.7 --- phpipam/request/request.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/phpipam/request/request.go b/phpipam/request/request.go index d8f47dd..318355c 100644 --- a/phpipam/request/request.go +++ b/phpipam/request/request.go @@ -76,13 +76,8 @@ func (r *requestResponse) BodyString() string { // request is successful and the response data is unmarshalled. func (r *requestResponse) ReadResponseJSON(v interface{}) error { var resp APIResponse - if err := json.Unmarshal(r.Body, &resp); err != nil { - return fmt.Errorf("JSON parsing error: %s - Response body: %s", err, r.Body) - } - if !resp.Success { - return r.handleError() - } + json.Unmarshal(r.Body, &resp); if string(resp.Data) != "" { if err := json.Unmarshal(resp.Data, v); err != nil { From 05d390a6780fc2b31b2290c29161654b389587a6 Mon Sep 17 00:00:00 2001 From: Baptiste Mayelle Date: Thu, 28 Jun 2018 09:31:28 +0200 Subject: [PATCH 2/2] UPD: as the PR is not accepted, I build the project myself --- README.md | 4 ++-- controllers/addresses/addresses.go | 6 +++--- controllers/addresses/addresses_test.go | 6 +++--- controllers/sections/sections.go | 8 ++++---- controllers/sections/sections_test.go | 8 ++++---- controllers/subnets/subnets.go | 8 ++++---- controllers/subnets/subnets_test.go | 8 ++++---- controllers/vlans/vlans.go | 6 +++--- controllers/vlans/vlans_test.go | 6 +++--- phpipam/client/client.go | 6 +++--- phpipam/client/client_test.go | 4 ++-- phpipam/request/request.go | 2 +- phpipam/request/request_test.go | 4 ++-- phpipam/session/session.go | 2 +- phpipam/session/session_test.go | 2 +- sdk.go | 2 +- 16 files changed, 41 insertions(+), 41 deletions(-) diff --git a/README.md b/README.md index a4b571a..ceee9ac 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![GoDoc](https://godoc.org/github.com/paybyphone/phpipam-sdk-go?status.svg)](https://godoc.org/github.com/paybyphone/phpipam-sdk-go) +[![GoDoc](https://godoc.org/github.com/youkoulayley/phpipam-sdk-go?status.svg)](https://godoc.org/github.com/youkoulayley/phpipam-sdk-go) # phpipam-sdk-go - Partial SDK for PHPIPAM @@ -15,7 +15,7 @@ provider to help insert data gathered from AWS and beyond. See the [GoDoc][2] for the SDK usage details. -[2]: https://godoc.org/github.com/paybyphone/phpipam-sdk-go +[2]: https://godoc.org/github.com/youkoulayley/phpipam-sdk-go ## A Note on Custom Fields diff --git a/controllers/addresses/addresses.go b/controllers/addresses/addresses.go index 0a32b95..5a00e8f 100644 --- a/controllers/addresses/addresses.go +++ b/controllers/addresses/addresses.go @@ -5,9 +5,9 @@ package addresses import ( "fmt" - "github.com/paybyphone/phpipam-sdk-go/phpipam" - "github.com/paybyphone/phpipam-sdk-go/phpipam/client" - "github.com/paybyphone/phpipam-sdk-go/phpipam/session" + "github.com/youkoulayley/phpipam-sdk-go/phpipam" + "github.com/youkoulayley/phpipam-sdk-go/phpipam/client" + "github.com/youkoulayley/phpipam-sdk-go/phpipam/session" ) // Address represents an IP address resource within PHPIPAM. diff --git a/controllers/addresses/addresses_test.go b/controllers/addresses/addresses_test.go index a92f1f0..70a7041 100644 --- a/controllers/addresses/addresses_test.go +++ b/controllers/addresses/addresses_test.go @@ -8,9 +8,9 @@ import ( "reflect" "testing" - "github.com/paybyphone/phpipam-sdk-go/phpipam" - "github.com/paybyphone/phpipam-sdk-go/phpipam/session" - "github.com/paybyphone/phpipam-sdk-go/testacc" + "github.com/youkoulayley/phpipam-sdk-go/phpipam" + "github.com/youkoulayley/phpipam-sdk-go/phpipam/session" + "github.com/youkoulayley/phpipam-sdk-go/testacc" ) var testCreateAddressInput = Address{ diff --git a/controllers/sections/sections.go b/controllers/sections/sections.go index 775f680..83c29da 100644 --- a/controllers/sections/sections.go +++ b/controllers/sections/sections.go @@ -5,10 +5,10 @@ package sections import ( "fmt" - "github.com/paybyphone/phpipam-sdk-go/controllers/subnets" - "github.com/paybyphone/phpipam-sdk-go/phpipam" - "github.com/paybyphone/phpipam-sdk-go/phpipam/client" - "github.com/paybyphone/phpipam-sdk-go/phpipam/session" + "github.com/youkoulayley/phpipam-sdk-go/controllers/subnets" + "github.com/youkoulayley/phpipam-sdk-go/phpipam" + "github.com/youkoulayley/phpipam-sdk-go/phpipam/client" + "github.com/youkoulayley/phpipam-sdk-go/phpipam/session" ) // Section represents a PHPIPAM section. diff --git a/controllers/sections/sections_test.go b/controllers/sections/sections_test.go index f8d19b5..7661858 100644 --- a/controllers/sections/sections_test.go +++ b/controllers/sections/sections_test.go @@ -9,10 +9,10 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/paybyphone/phpipam-sdk-go/controllers/subnets" - "github.com/paybyphone/phpipam-sdk-go/phpipam" - "github.com/paybyphone/phpipam-sdk-go/phpipam/session" - "github.com/paybyphone/phpipam-sdk-go/testacc" + "github.com/youkoulayley/phpipam-sdk-go/controllers/subnets" + "github.com/youkoulayley/phpipam-sdk-go/phpipam" + "github.com/youkoulayley/phpipam-sdk-go/phpipam/session" + "github.com/youkoulayley/phpipam-sdk-go/testacc" ) var testListSectionsOutputExpected = []Section{ diff --git a/controllers/subnets/subnets.go b/controllers/subnets/subnets.go index 0a5840a..805bd4b 100644 --- a/controllers/subnets/subnets.go +++ b/controllers/subnets/subnets.go @@ -5,10 +5,10 @@ package subnets import ( "fmt" - "github.com/paybyphone/phpipam-sdk-go/controllers/addresses" - "github.com/paybyphone/phpipam-sdk-go/phpipam" - "github.com/paybyphone/phpipam-sdk-go/phpipam/client" - "github.com/paybyphone/phpipam-sdk-go/phpipam/session" + "github.com/youkoulayley/phpipam-sdk-go/controllers/addresses" + "github.com/youkoulayley/phpipam-sdk-go/phpipam" + "github.com/youkoulayley/phpipam-sdk-go/phpipam/client" + "github.com/youkoulayley/phpipam-sdk-go/phpipam/session" ) // Subnet represents a PHPIPAM subnet. diff --git a/controllers/subnets/subnets_test.go b/controllers/subnets/subnets_test.go index 16d5540..a8fe696 100644 --- a/controllers/subnets/subnets_test.go +++ b/controllers/subnets/subnets_test.go @@ -9,10 +9,10 @@ import ( "reflect" "testing" - "github.com/paybyphone/phpipam-sdk-go/controllers/addresses" - "github.com/paybyphone/phpipam-sdk-go/phpipam" - "github.com/paybyphone/phpipam-sdk-go/phpipam/session" - "github.com/paybyphone/phpipam-sdk-go/testacc" + "github.com/youkoulayley/phpipam-sdk-go/controllers/addresses" + "github.com/youkoulayley/phpipam-sdk-go/phpipam" + "github.com/youkoulayley/phpipam-sdk-go/phpipam/session" + "github.com/youkoulayley/phpipam-sdk-go/testacc" ) var testCreateSubnetInput = Subnet{ diff --git a/controllers/vlans/vlans.go b/controllers/vlans/vlans.go index 09de919..9bc7d08 100644 --- a/controllers/vlans/vlans.go +++ b/controllers/vlans/vlans.go @@ -5,9 +5,9 @@ package vlans import ( "fmt" - "github.com/paybyphone/phpipam-sdk-go/phpipam" - "github.com/paybyphone/phpipam-sdk-go/phpipam/client" - "github.com/paybyphone/phpipam-sdk-go/phpipam/session" + "github.com/youkoulayley/phpipam-sdk-go/phpipam" + "github.com/youkoulayley/phpipam-sdk-go/phpipam/client" + "github.com/youkoulayley/phpipam-sdk-go/phpipam/session" ) // VLAN represents a PHPIPAM VLAN. diff --git a/controllers/vlans/vlans_test.go b/controllers/vlans/vlans_test.go index dc998ed..69461db 100644 --- a/controllers/vlans/vlans_test.go +++ b/controllers/vlans/vlans_test.go @@ -8,9 +8,9 @@ import ( "reflect" "testing" - "github.com/paybyphone/phpipam-sdk-go/phpipam" - "github.com/paybyphone/phpipam-sdk-go/phpipam/session" - "github.com/paybyphone/phpipam-sdk-go/testacc" + "github.com/youkoulayley/phpipam-sdk-go/phpipam" + "github.com/youkoulayley/phpipam-sdk-go/phpipam/session" + "github.com/youkoulayley/phpipam-sdk-go/testacc" ) var testCreateVLANInput = VLAN{ diff --git a/phpipam/client/client.go b/phpipam/client/client.go index b8fd830..a1abc5d 100644 --- a/phpipam/client/client.go +++ b/phpipam/client/client.go @@ -5,9 +5,9 @@ package client import ( "fmt" - "github.com/paybyphone/phpipam-sdk-go/phpipam" - "github.com/paybyphone/phpipam-sdk-go/phpipam/request" - "github.com/paybyphone/phpipam-sdk-go/phpipam/session" + "github.com/youkoulayley/phpipam-sdk-go/phpipam" + "github.com/youkoulayley/phpipam-sdk-go/phpipam/request" + "github.com/youkoulayley/phpipam-sdk-go/phpipam/session" ) // Client encompasses a generic client object that is further extended by diff --git a/phpipam/client/client_test.go b/phpipam/client/client_test.go index 03f2ae8..84278e9 100644 --- a/phpipam/client/client_test.go +++ b/phpipam/client/client_test.go @@ -8,8 +8,8 @@ import ( "reflect" "testing" - "github.com/paybyphone/phpipam-sdk-go/phpipam" - "github.com/paybyphone/phpipam-sdk-go/phpipam/session" + "github.com/youkoulayley/phpipam-sdk-go/phpipam" + "github.com/youkoulayley/phpipam-sdk-go/phpipam/session" ) const testDateStamp = "2999-12-31 23:59:59" diff --git a/phpipam/request/request.go b/phpipam/request/request.go index 318355c..5b60d2c 100644 --- a/phpipam/request/request.go +++ b/phpipam/request/request.go @@ -8,7 +8,7 @@ import ( "io/ioutil" "net/http" - "github.com/paybyphone/phpipam-sdk-go/phpipam/session" + "github.com/youkoulayley/phpipam-sdk-go/phpipam/session" ) // APIResponse represents a PHPIPAM response body. Both successful and diff --git a/phpipam/request/request_test.go b/phpipam/request/request_test.go index 2a7e80e..201b7f6 100644 --- a/phpipam/request/request_test.go +++ b/phpipam/request/request_test.go @@ -9,8 +9,8 @@ import ( "strings" "testing" - "github.com/paybyphone/phpipam-sdk-go/phpipam" - "github.com/paybyphone/phpipam-sdk-go/phpipam/session" + "github.com/youkoulayley/phpipam-sdk-go/phpipam" + "github.com/youkoulayley/phpipam-sdk-go/phpipam/session" ) const errorResponseText = ` diff --git a/phpipam/session/session.go b/phpipam/session/session.go index 9329683..da1ce5c 100644 --- a/phpipam/session/session.go +++ b/phpipam/session/session.go @@ -3,7 +3,7 @@ package session import ( "github.com/imdario/mergo" - "github.com/paybyphone/phpipam-sdk-go/phpipam" + "github.com/youkoulayley/phpipam-sdk-go/phpipam" ) // timeLayout represents the datetime format returned by the PHPIPAM api. diff --git a/phpipam/session/session_test.go b/phpipam/session/session_test.go index b1f81ab..652f051 100644 --- a/phpipam/session/session_test.go +++ b/phpipam/session/session_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/paybyphone/phpipam-sdk-go/phpipam" + "github.com/youkoulayley/phpipam-sdk-go/phpipam" ) func phpipamConfig() phpipam.Config { diff --git a/sdk.go b/sdk.go index be5009c..c951ca3 100644 --- a/sdk.go +++ b/sdk.go @@ -6,5 +6,5 @@ // Terraform provider to help insert data gathered from AWS and beyond. // // For SDK usage, see the GoDoc at -// https://godoc.org/github.com/paybyphone/phpipam-sdk-go. +// https://godoc.org/github.com/youkoulayley/phpipam-sdk-go. package sdk