From e915807efee79811bf112c71e4a1e284eed67190 Mon Sep 17 00:00:00 2001 From: balser Date: Mon, 27 Oct 2014 17:48:03 -0400 Subject: [PATCH 1/3] Fix typo in aws_db_instance example --- website/source/docs/providers/aws/r/db_instance.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/source/docs/providers/aws/r/db_instance.html.markdown b/website/source/docs/providers/aws/r/db_instance.html.markdown index add35e0aa..d0e96c952 100644 --- a/website/source/docs/providers/aws/r/db_instance.html.markdown +++ b/website/source/docs/providers/aws/r/db_instance.html.markdown @@ -23,7 +23,7 @@ resource "aws_db_instance" "default" { username = "foo" password = "bar" security_group_names = ["${aws_db_security_group.bar.name}"] - subnet_group_name = "my_database_subnet_group" + db_subnet_group_name = "my_database_subnet_group" } ``` From def922551ef66f73b0f69be66483b738aa22bb38 Mon Sep 17 00:00:00 2001 From: Jack Pearkes Date: Sun, 2 Nov 2014 14:44:32 -0800 Subject: [PATCH 2/3] providers/digitalocean: fix acceptance test suite for running --- builtin/providers/digitalocean/config.go | 8 ++++++++ .../providers/digitalocean/resource_provider_test.go | 11 +++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/builtin/providers/digitalocean/config.go b/builtin/providers/digitalocean/config.go index 8e1df5389..a81ff7a48 100644 --- a/builtin/providers/digitalocean/config.go +++ b/builtin/providers/digitalocean/config.go @@ -2,6 +2,7 @@ package digitalocean import ( "log" + "os" "github.com/pearkes/digitalocean" ) @@ -14,6 +15,13 @@ type Config struct { // ocean. // func (c *Config) Client() (*digitalocean.Client, error) { + + // If we have env vars set (like in the acc) tests, + // we need to override the values passed in here. + if v := os.Getenv("DIGITALOCEAN_TOKEN"); v != "" { + c.Token = v + } + client, err := digitalocean.NewClient(c.Token) log.Printf("[INFO] DigitalOcean Client configured for URL: %s", client.URL) diff --git a/builtin/providers/digitalocean/resource_provider_test.go b/builtin/providers/digitalocean/resource_provider_test.go index 464fd6cf0..836c1b244 100644 --- a/builtin/providers/digitalocean/resource_provider_test.go +++ b/builtin/providers/digitalocean/resource_provider_test.go @@ -25,9 +25,16 @@ func TestResourceProvider_impl(t *testing.T) { func TestResourceProvider_Configure(t *testing.T) { rp := new(ResourceProvider) + var expectedToken string + + if v := os.Getenv("DIGITALOCEAN_TOKEN"); v != "foo" { + expectedToken = v + } else { + expectedToken = "foo" + } raw := map[string]interface{}{ - "token": "foo", + "token": expectedToken, } rawConfig, err := config.NewRawConfig(raw) @@ -41,7 +48,7 @@ func TestResourceProvider_Configure(t *testing.T) { } expected := Config{ - Token: "foo", + Token: expectedToken, } if !reflect.DeepEqual(rp.Config, expected) { From ecf66ad7b54e50379b4e670b8b233ad2bc548d42 Mon Sep 17 00:00:00 2001 From: Jack Pearkes Date: Sun, 2 Nov 2014 14:48:40 -0800 Subject: [PATCH 3/3] providers/digitalocean: compat for changes to API for droplet size Upstream in the digitalocean API, the size slug became a size string, breaking pearkes/digitalocean. https://github.com/pearkes/digitalocean/pull/1 This fixes compatibility for changes to that library. closes #510 --- .../digitalocean/resource_digitalocean_droplet.go | 2 +- .../resource_digitalocean_droplet_test.go | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/builtin/providers/digitalocean/resource_digitalocean_droplet.go b/builtin/providers/digitalocean/resource_digitalocean_droplet.go index 712f94a82..9c1965669 100644 --- a/builtin/providers/digitalocean/resource_digitalocean_droplet.go +++ b/builtin/providers/digitalocean/resource_digitalocean_droplet.go @@ -296,7 +296,7 @@ func resource_digitalocean_droplet_update_state( s.Attributes["ipv4_address_private"] = droplet.IPV4Address("private") } - s.Attributes["size"] = droplet.SizeSlug() + s.Attributes["size"] = droplet.SizeSlug s.Attributes["status"] = droplet.Status return s, nil diff --git a/builtin/providers/digitalocean/resource_digitalocean_droplet_test.go b/builtin/providers/digitalocean/resource_digitalocean_droplet_test.go index 12d8a362e..6666576dd 100644 --- a/builtin/providers/digitalocean/resource_digitalocean_droplet_test.go +++ b/builtin/providers/digitalocean/resource_digitalocean_droplet_test.go @@ -123,8 +123,8 @@ func testAccCheckDigitalOceanDropletAttributes(droplet *digitalocean.Droplet) re return fmt.Errorf("Bad image_slug: %s", droplet.ImageSlug()) } - if droplet.SizeSlug() != "512mb" { - return fmt.Errorf("Bad size_slug: %s", droplet.SizeSlug()) + if droplet.SizeSlug != "512mb" { + return fmt.Errorf("Bad size_slug: %s", droplet.SizeSlug) } if droplet.RegionSlug() != "nyc3" { @@ -141,8 +141,8 @@ func testAccCheckDigitalOceanDropletAttributes(droplet *digitalocean.Droplet) re func testAccCheckDigitalOceanDropletRenamedAndResized(droplet *digitalocean.Droplet) resource.TestCheckFunc { return func(s *terraform.State) error { - if droplet.SizeSlug() != "1gb" { - return fmt.Errorf("Bad size_slug: %s", droplet.SizeSlug()) + if droplet.SizeSlug != "1gb" { + return fmt.Errorf("Bad size_slug: %s", droplet.SizeSlug) } if droplet.Name != "baz" { @@ -160,8 +160,8 @@ func testAccCheckDigitalOceanDropletAttributes_PrivateNetworkingIpv6(droplet *di return fmt.Errorf("Bad image_slug: %s", droplet.ImageSlug()) } - if droplet.SizeSlug() != "1gb" { - return fmt.Errorf("Bad size_slug: %s", droplet.SizeSlug()) + if droplet.SizeSlug != "1gb" { + return fmt.Errorf("Bad size_slug: %s", droplet.SizeSlug) } if droplet.RegionSlug() != "sgp1" {