Merge branch 'master' of https://github.com/hashicorp/terraform
This commit is contained in:
commit
5ed2ee8f37
|
@ -2,6 +2,7 @@ package digitalocean
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"log"
|
"log"
|
||||||
|
"os"
|
||||||
|
|
||||||
"github.com/pearkes/digitalocean"
|
"github.com/pearkes/digitalocean"
|
||||||
)
|
)
|
||||||
|
@ -14,6 +15,13 @@ type Config struct {
|
||||||
// ocean.
|
// ocean.
|
||||||
//
|
//
|
||||||
func (c *Config) Client() (*digitalocean.Client, error) {
|
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)
|
client, err := digitalocean.NewClient(c.Token)
|
||||||
|
|
||||||
log.Printf("[INFO] DigitalOcean Client configured for URL: %s", client.URL)
|
log.Printf("[INFO] DigitalOcean Client configured for URL: %s", client.URL)
|
||||||
|
|
|
@ -296,7 +296,7 @@ func resource_digitalocean_droplet_update_state(
|
||||||
s.Attributes["ipv4_address_private"] = droplet.IPV4Address("private")
|
s.Attributes["ipv4_address_private"] = droplet.IPV4Address("private")
|
||||||
}
|
}
|
||||||
|
|
||||||
s.Attributes["size"] = droplet.SizeSlug()
|
s.Attributes["size"] = droplet.SizeSlug
|
||||||
s.Attributes["status"] = droplet.Status
|
s.Attributes["status"] = droplet.Status
|
||||||
|
|
||||||
return s, nil
|
return s, nil
|
||||||
|
|
|
@ -123,8 +123,8 @@ func testAccCheckDigitalOceanDropletAttributes(droplet *digitalocean.Droplet) re
|
||||||
return fmt.Errorf("Bad image_slug: %s", droplet.ImageSlug())
|
return fmt.Errorf("Bad image_slug: %s", droplet.ImageSlug())
|
||||||
}
|
}
|
||||||
|
|
||||||
if droplet.SizeSlug() != "512mb" {
|
if droplet.SizeSlug != "512mb" {
|
||||||
return fmt.Errorf("Bad size_slug: %s", droplet.SizeSlug())
|
return fmt.Errorf("Bad size_slug: %s", droplet.SizeSlug)
|
||||||
}
|
}
|
||||||
|
|
||||||
if droplet.RegionSlug() != "nyc3" {
|
if droplet.RegionSlug() != "nyc3" {
|
||||||
|
@ -141,8 +141,8 @@ func testAccCheckDigitalOceanDropletAttributes(droplet *digitalocean.Droplet) re
|
||||||
func testAccCheckDigitalOceanDropletRenamedAndResized(droplet *digitalocean.Droplet) resource.TestCheckFunc {
|
func testAccCheckDigitalOceanDropletRenamedAndResized(droplet *digitalocean.Droplet) resource.TestCheckFunc {
|
||||||
return func(s *terraform.State) error {
|
return func(s *terraform.State) error {
|
||||||
|
|
||||||
if droplet.SizeSlug() != "1gb" {
|
if droplet.SizeSlug != "1gb" {
|
||||||
return fmt.Errorf("Bad size_slug: %s", droplet.SizeSlug())
|
return fmt.Errorf("Bad size_slug: %s", droplet.SizeSlug)
|
||||||
}
|
}
|
||||||
|
|
||||||
if droplet.Name != "baz" {
|
if droplet.Name != "baz" {
|
||||||
|
@ -160,8 +160,8 @@ func testAccCheckDigitalOceanDropletAttributes_PrivateNetworkingIpv6(droplet *di
|
||||||
return fmt.Errorf("Bad image_slug: %s", droplet.ImageSlug())
|
return fmt.Errorf("Bad image_slug: %s", droplet.ImageSlug())
|
||||||
}
|
}
|
||||||
|
|
||||||
if droplet.SizeSlug() != "1gb" {
|
if droplet.SizeSlug != "1gb" {
|
||||||
return fmt.Errorf("Bad size_slug: %s", droplet.SizeSlug())
|
return fmt.Errorf("Bad size_slug: %s", droplet.SizeSlug)
|
||||||
}
|
}
|
||||||
|
|
||||||
if droplet.RegionSlug() != "sgp1" {
|
if droplet.RegionSlug() != "sgp1" {
|
||||||
|
|
|
@ -25,9 +25,16 @@ func TestResourceProvider_impl(t *testing.T) {
|
||||||
|
|
||||||
func TestResourceProvider_Configure(t *testing.T) {
|
func TestResourceProvider_Configure(t *testing.T) {
|
||||||
rp := new(ResourceProvider)
|
rp := new(ResourceProvider)
|
||||||
|
var expectedToken string
|
||||||
|
|
||||||
|
if v := os.Getenv("DIGITALOCEAN_TOKEN"); v != "foo" {
|
||||||
|
expectedToken = v
|
||||||
|
} else {
|
||||||
|
expectedToken = "foo"
|
||||||
|
}
|
||||||
|
|
||||||
raw := map[string]interface{}{
|
raw := map[string]interface{}{
|
||||||
"token": "foo",
|
"token": expectedToken,
|
||||||
}
|
}
|
||||||
|
|
||||||
rawConfig, err := config.NewRawConfig(raw)
|
rawConfig, err := config.NewRawConfig(raw)
|
||||||
|
@ -41,7 +48,7 @@ func TestResourceProvider_Configure(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
expected := Config{
|
expected := Config{
|
||||||
Token: "foo",
|
Token: expectedToken,
|
||||||
}
|
}
|
||||||
|
|
||||||
if !reflect.DeepEqual(rp.Config, expected) {
|
if !reflect.DeepEqual(rp.Config, expected) {
|
||||||
|
|
|
@ -23,7 +23,7 @@ resource "aws_db_instance" "default" {
|
||||||
username = "foo"
|
username = "foo"
|
||||||
password = "bar"
|
password = "bar"
|
||||||
security_group_names = ["${aws_db_security_group.bar.name}"]
|
security_group_names = ["${aws_db_security_group.bar.name}"]
|
||||||
subnet_group_name = "my_database_subnet_group"
|
db_subnet_group_name = "my_database_subnet_group"
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue