Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nsone: fix ns1-go test bugs #28

Merged
merged 2 commits into from
Sep 7, 2016
Merged

nsone: fix ns1-go test bugs #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4519824
vendor: update github.com/ns1/ns1-go
josephholsten Sep 7, 2016
32f4e65
nsone: fix ns1-go test bugs
Sep 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions Godeps/Godeps.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion builtin/providers/nsone/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package nsone

import (
"github.com/bobtfish/go-nsone-api"
"github.com/ns1/ns1-go"
"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/terraform"
)
Expand Down
2 changes: 1 addition & 1 deletion builtin/providers/nsone/resource_apikey.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package nsone

import (
"github.com/bobtfish/go-nsone-api"
"github.com/ns1/ns1-go"
"github.com/hashicorp/terraform/helper/schema"
)

Expand Down
2 changes: 1 addition & 1 deletion builtin/providers/nsone/resource_datafeed.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package nsone

import (
"github.com/bobtfish/go-nsone-api"
"github.com/ns1/ns1-go"
"github.com/hashicorp/terraform/helper/schema"
)

Expand Down
2 changes: 1 addition & 1 deletion builtin/providers/nsone/resource_datafeed_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"testing"

"github.com/bobtfish/go-nsone-api"
"github.com/ns1/ns1-go"
"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform"
)
Expand Down
2 changes: 1 addition & 1 deletion builtin/providers/nsone/resource_datasource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package nsone

import (
"github.com/bobtfish/go-nsone-api"
"github.com/ns1/ns1-go"
"github.com/hashicorp/terraform/helper/schema"
)

Expand Down
2 changes: 1 addition & 1 deletion builtin/providers/nsone/resource_datasource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"testing"

"github.com/bobtfish/go-nsone-api"
"github.com/ns1/ns1-go"
"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform"
)
Expand Down
2 changes: 1 addition & 1 deletion builtin/providers/nsone/resource_monitoringjob.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package nsone

import (
"fmt"
"github.com/bobtfish/go-nsone-api"
"github.com/ns1/ns1-go"
"github.com/hashicorp/terraform/helper/schema"
"regexp"
"strconv"
Expand Down
6 changes: 3 additions & 3 deletions builtin/providers/nsone/resource_monitoringjob_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"testing"

"github.com/bobtfish/go-nsone-api"
"github.com/ns1/ns1-go"
"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform"
)
Expand Down Expand Up @@ -116,10 +116,10 @@ func testAccCheckMonitoringJobDestroy(s *terraform.State) error {
continue
}

_, err := client.GetMonitoringJob(rs.Primary.Attributes["id"])
mj, err := client.GetMonitoringJob(rs.Primary.Attributes["id"])

if err == nil {
return fmt.Errorf("Record still exists")
return fmt.Errorf("Monitoring Job still exists %#v: %#v", err, mj)
}
}

Expand Down
2 changes: 1 addition & 1 deletion builtin/providers/nsone/resource_record.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"bytes"
"errors"
"fmt"
"github.com/bobtfish/go-nsone-api"
"github.com/ns1/ns1-go"
"github.com/hashicorp/terraform/helper/hashcode"
"github.com/hashicorp/terraform/helper/schema"
"log"
Expand Down
4 changes: 2 additions & 2 deletions builtin/providers/nsone/resource_record_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"testing"

"github.com/bobtfish/go-nsone-api"
"github.com/ns1/ns1-go"
"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform"
)
Expand Down Expand Up @@ -195,7 +195,7 @@ func testAccCheckRecordAttributesUpdated(record *nsone.Record) resource.TestChec

const testAccRecordBasic = `
resource "nsone_record" "foobar" {
zone = "terraform.io"
zone = "${nsone_zone.test.zone}"
domain = "test.terraform.io"
type = "CNAME"
ttl = 60
Expand Down
2 changes: 1 addition & 1 deletion builtin/providers/nsone/resource_team.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package nsone

import (
"github.com/bobtfish/go-nsone-api"
"github.com/ns1/ns1-go"
"github.com/hashicorp/terraform/helper/schema"
)

Expand Down
2 changes: 1 addition & 1 deletion builtin/providers/nsone/resource_user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package nsone

import (
"github.com/bobtfish/go-nsone-api"
"github.com/ns1/ns1-go"
"github.com/hashicorp/terraform/helper/schema"
)

Expand Down
2 changes: 1 addition & 1 deletion builtin/providers/nsone/resource_zone.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package nsone
import (
"strings"

"github.com/bobtfish/go-nsone-api"
"github.com/ns1/ns1-go"
"github.com/hashicorp/terraform/helper/schema"
)

Expand Down
6 changes: 3 additions & 3 deletions builtin/providers/nsone/resource_zone_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"testing"

"github.com/bobtfish/go-nsone-api"
"github.com/ns1/ns1-go"
"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform"
)
Expand Down Expand Up @@ -116,10 +116,10 @@ func testAccCheckZoneDestroy(s *terraform.State) error {
continue
}

_, err := client.GetZone(rs.Primary.Attributes["zone"])
zone, err := client.GetZone(rs.Primary.Attributes["zone"])

if err == nil {
return fmt.Errorf("Record still exists")
return fmt.Errorf("Record still exists: %#v: %#v", err, zone)
}
}

Expand Down
0 ...thub.com/bobtfish/go-nsone-api/.gitignore → vendor/github.com/ns1/ns1-go/.gitignore
View file
Open in desktop
File renamed without changes.
5 changes: 5 additions & 0 deletions vendor/github.com/ns1/ns1-go/.travis.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...hub.com/bobtfish/go-nsone-api/LICENSE.txt → vendor/github.com/ns1/ns1-go/LICENSE.txt
View file
Open in desktop
File renamed without changes.
0 ...github.com/bobtfish/go-nsone-api/Makefile → vendor/github.com/ns1/ns1-go/Makefile
View file
Open in desktop
File renamed without changes.
0 ...r/github.com/bobtfish/go-nsone-api/README → vendor/github.com/ns1/ns1-go/README.md
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions ...ithub.com/bobtfish/go-nsone-api/apikey.go → vendor/github.com/ns1/ns1-go/apikey.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions ...hub.com/bobtfish/go-nsone-api/datafeed.go → vendor/github.com/ns1/ns1-go/datafeed.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 8 additions & 5 deletions ...b.com/bobtfish/go-nsone-api/datasource.go → vendor/github.com/ns1/ns1-go/datasource.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 17 additions & 1 deletion ...b.com/bobtfish/go-nsone-api/monitoring.go → vendor/github.com/ns1/ns1-go/monitoring.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading