From b05e36a6e378008adf2c435942651e269fd9c586 Mon Sep 17 00:00:00 2001 From: Kirill Shirinkin Date: Wed, 27 May 2015 16:46:12 +0200 Subject: [PATCH 01/91] Add module outputs --- command/output.go | 26 ++++++++++++-- command/output_test.go | 77 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+), 2 deletions(-) diff --git a/command/output.go b/command/output.go index 2e3c1bee0..9e99cce5f 100644 --- a/command/output.go +++ b/command/output.go @@ -15,9 +15,12 @@ type OutputCommand struct { func (c *OutputCommand) Run(args []string) int { args = c.Meta.process(args, false) + var module string cmdFlags := flag.NewFlagSet("output", flag.ContinueOnError) cmdFlags.StringVar(&c.Meta.statePath, "state", DefaultStateFilename, "path") + cmdFlags.StringVar(&module, "module", "", "module") cmdFlags.Usage = func() { c.Ui.Error(c.Help()) } + if err := cmdFlags.Parse(args); err != nil { return 1 } @@ -38,15 +41,34 @@ func (c *OutputCommand) Run(args []string) int { return 1 } + if module == "" { + module = "root" + } else { + module = "root." + module + } + + // Get the proper module we want to get outputs for + modPath := strings.Split(module, ".") + state := stateStore.State() - if state.Empty() || len(state.RootModule().Outputs) == 0 { + mod := state.ModuleByPath(modPath) + + if mod == nil { + c.Ui.Error(fmt.Sprintf( + "The module %s could not be found. There is nothing to taint.", + module)) + return 1 + } + + if state.Empty() || len(mod.Outputs) == 0 { c.Ui.Error(fmt.Sprintf( "The state file has no outputs defined. Define an output\n" + "in your configuration with the `output` directive and re-run\n" + "`terraform apply` for it to become available.")) return 1 } - v, ok := state.RootModule().Outputs[name] + + v, ok := mod.Outputs[name] if !ok { c.Ui.Error(fmt.Sprintf( "The output variable requested could not be found in the state\n" + diff --git a/command/output_test.go b/command/output_test.go index d3444c389..f84642269 100644 --- a/command/output_test.go +++ b/command/output_test.go @@ -47,6 +47,83 @@ func TestOutput(t *testing.T) { } } +func TestModuleOutput(t *testing.T) { + originalState := &terraform.State{ + Modules: []*terraform.ModuleState{ + &terraform.ModuleState{ + Path: []string{"root"}, + Outputs: map[string]string{ + "foo": "bar", + }, + }, + &terraform.ModuleState{ + Path: []string{"root", "my_module"}, + Outputs: map[string]string{ + "blah": "tastatur", + }, + }, + }, + } + + statePath := testStateFile(t, originalState) + + ui := new(cli.MockUi) + c := &OutputCommand{ + Meta: Meta{ + ContextOpts: testCtxConfig(testProvider()), + Ui: ui, + }, + } + + args := []string{ + "-state", statePath, + "-module", "my_module", + "blah", + } + + if code := c.Run(args); code != 0 { + t.Fatalf("bad: \n%s", ui.ErrorWriter.String()) + } + + actual := strings.TrimSpace(ui.OutputWriter.String()) + if actual != "tastatur" { + t.Fatalf("bad: %#v", actual) + } +} + +func TestMissingModuleOutput(t *testing.T) { + originalState := &terraform.State{ + Modules: []*terraform.ModuleState{ + &terraform.ModuleState{ + Path: []string{"root"}, + Outputs: map[string]string{ + "foo": "bar", + }, + }, + }, + } + + statePath := testStateFile(t, originalState) + + ui := new(cli.MockUi) + c := &OutputCommand{ + Meta: Meta{ + ContextOpts: testCtxConfig(testProvider()), + Ui: ui, + }, + } + + args := []string{ + "-state", statePath, + "-module", "not_existing_module", + "blah", + } + + if code := c.Run(args); code != 1 { + t.Fatalf("bad: \n%s", ui.ErrorWriter.String()) + } +} + func TestOutput_badVar(t *testing.T) { originalState := &terraform.State{ Modules: []*terraform.ModuleState{ From b945d1ee0ba3fbb132f323324697b38b2aade3eb Mon Sep 17 00:00:00 2001 From: Kirill Shirinkin Date: Wed, 27 May 2015 17:11:31 +0200 Subject: [PATCH 02/91] Update docs --- website/source/docs/commands/output.html.markdown | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/website/source/docs/commands/output.html.markdown b/website/source/docs/commands/output.html.markdown index ac1ab5a23..f1a70394e 100644 --- a/website/source/docs/commands/output.html.markdown +++ b/website/source/docs/commands/output.html.markdown @@ -21,4 +21,8 @@ current directory for the state file to query. The command-line flags are all optional. The list of available flags are: * `-state=path` - Path to the state file. Defaults to "terraform.tfstate". - +* `-module=module_name` - The module path which has needed output. + By default this is the root path. Other modules can be specified by + a period-separated list. Example: "foo" would reference the module + "foo" but "foo.bar" would reference the "bar" module in the "foo" + module. From 84a870a255aa9625a9eeb00ba1210886e737ab8f Mon Sep 17 00:00:00 2001 From: Sander van Harmelen Date: Fri, 24 Apr 2015 18:18:24 +0200 Subject: [PATCH 03/91] First few azure resources... MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Only the azure_instance is fully working (for both Linux and Windows instances) now, but needs some tests. network and disk and pretty much empty, but the idea is clear so will not take too much time… --- builtin/bins/provider-azure/main.go | 12 + builtin/bins/provider-azure/main_test.go | 1 + builtin/providers/azure/config.go | 29 + builtin/providers/azure/provider.go | 42 ++ builtin/providers/azure/provider_test.go | 35 ++ .../azure/resource_azure_instance.go | 497 ++++++++++++++++++ .../azure/resource_azure_instance_test.go | 1 + .../providers/azure/resource_azure_network.go | 51 ++ .../azure/resource_azure_network_test.go | 1 + builtin/providers/azure/resource_disk.go | 44 ++ builtin/providers/azure/resource_disk_test.go | 1 + builtin/providers/azure/resources.go | 1 + 12 files changed, 715 insertions(+) create mode 100644 builtin/bins/provider-azure/main.go create mode 100644 builtin/bins/provider-azure/main_test.go create mode 100644 builtin/providers/azure/config.go create mode 100644 builtin/providers/azure/provider.go create mode 100644 builtin/providers/azure/provider_test.go create mode 100644 builtin/providers/azure/resource_azure_instance.go create mode 100644 builtin/providers/azure/resource_azure_instance_test.go create mode 100644 builtin/providers/azure/resource_azure_network.go create mode 100644 builtin/providers/azure/resource_azure_network_test.go create mode 100644 builtin/providers/azure/resource_disk.go create mode 100644 builtin/providers/azure/resource_disk_test.go create mode 100644 builtin/providers/azure/resources.go diff --git a/builtin/bins/provider-azure/main.go b/builtin/bins/provider-azure/main.go new file mode 100644 index 000000000..45af21656 --- /dev/null +++ b/builtin/bins/provider-azure/main.go @@ -0,0 +1,12 @@ +package main + +import ( + "github.com/hashicorp/terraform/builtin/providers/azure" + "github.com/hashicorp/terraform/plugin" +) + +func main() { + plugin.Serve(&plugin.ServeOpts{ + ProviderFunc: azure.Provider, + }) +} diff --git a/builtin/bins/provider-azure/main_test.go b/builtin/bins/provider-azure/main_test.go new file mode 100644 index 000000000..06ab7d0f9 --- /dev/null +++ b/builtin/bins/provider-azure/main_test.go @@ -0,0 +1 @@ +package main diff --git a/builtin/providers/azure/config.go b/builtin/providers/azure/config.go new file mode 100644 index 000000000..ad4dc60c0 --- /dev/null +++ b/builtin/providers/azure/config.go @@ -0,0 +1,29 @@ +package azure + +import ( + "fmt" + "os" + + "github.com/MSOpenTech/azure-sdk-for-go/management" +) + +// Config is the configuration structure used to instantiate a +// new Azure management client. +type Config struct { + SettingsFile string + SubscriptionID string +} + +// NewClient returns a new Azure management client +func (c *Config) NewClient() (*management.Client, error) { + if _, err := os.Stat(c.SettingsFile); os.IsNotExist(err) { + return nil, fmt.Errorf("Publish Settings file %q does not exist!", c.SettingsFile) + } + + mc, err := management.ClientFromPublishSettingsFile(c.SettingsFile, c.SubscriptionID) + if err != nil { + return nil, fmt.Errorf("Error creating management client: %s", err) + } + + return &mc, nil +} diff --git a/builtin/providers/azure/provider.go b/builtin/providers/azure/provider.go new file mode 100644 index 000000000..83e577a47 --- /dev/null +++ b/builtin/providers/azure/provider.go @@ -0,0 +1,42 @@ +package azure + +import ( + "github.com/hashicorp/terraform/helper/schema" + "github.com/hashicorp/terraform/terraform" +) + +// Provider returns a terraform.ResourceProvider. +func Provider() terraform.ResourceProvider { + return &schema.Provider{ + Schema: map[string]*schema.Schema{ + "settings_file": &schema.Schema{ + Type: schema.TypeString, + Required: true, + DefaultFunc: schema.EnvDefaultFunc("AZURE_SETTINGS_FILE", nil), + }, + + "subscription_id": &schema.Schema{ + Type: schema.TypeString, + Optional: true, + DefaultFunc: schema.EnvDefaultFunc("AZURE_SUBSCRIPTION_ID", ""), + }, + }, + + ResourcesMap: map[string]*schema.Resource{ + "azure_disk": resourceAzureDisk(), + "azure_instance": resourceAzureInstance(), + "azure_network": resourceAzureNetwork(), + }, + + ConfigureFunc: providerConfigure, + } +} + +func providerConfigure(d *schema.ResourceData) (interface{}, error) { + config := Config{ + SettingsFile: d.Get("settings_file").(string), + SubscriptionID: d.Get("subscription_id").(string), + } + + return config.NewClient() +} diff --git a/builtin/providers/azure/provider_test.go b/builtin/providers/azure/provider_test.go new file mode 100644 index 000000000..5606dcdad --- /dev/null +++ b/builtin/providers/azure/provider_test.go @@ -0,0 +1,35 @@ +package azure + +import ( + "os" + "testing" + + "github.com/hashicorp/terraform/helper/schema" + "github.com/hashicorp/terraform/terraform" +) + +var testAccProviders map[string]terraform.ResourceProvider +var testAccProvider *schema.Provider + +func init() { + testAccProvider = Provider().(*schema.Provider) + testAccProviders = map[string]terraform.ResourceProvider{ + "azure": testAccProvider, + } +} + +func TestProvider(t *testing.T) { + if err := Provider().(*schema.Provider).InternalValidate(); err != nil { + t.Fatalf("err: %s", err) + } +} + +func TestProvider_impl(t *testing.T) { + var _ terraform.ResourceProvider = Provider() +} + +func testAccPreCheck(t *testing.T) { + if v := os.Getenv("AZURE_SETTINGS_FILE"); v == "" { + t.Fatal("AZURE_SETTINGS_FILE must be set for acceptance tests") + } +} diff --git a/builtin/providers/azure/resource_azure_instance.go b/builtin/providers/azure/resource_azure_instance.go new file mode 100644 index 000000000..9c2e461ff --- /dev/null +++ b/builtin/providers/azure/resource_azure_instance.go @@ -0,0 +1,497 @@ +package azure + +import ( + "bytes" + "fmt" + "log" + "strings" + + "github.com/MSOpenTech/azure-sdk-for-go/management" + "github.com/MSOpenTech/azure-sdk-for-go/management/hostedservice" + "github.com/MSOpenTech/azure-sdk-for-go/management/osimage" + "github.com/MSOpenTech/azure-sdk-for-go/management/virtualmachine" + "github.com/MSOpenTech/azure-sdk-for-go/management/vmutils" + "github.com/hashicorp/terraform/helper/hashcode" + "github.com/hashicorp/terraform/helper/schema" +) + +const ( + linux = "Linux" + windows = "Windows" +) + +func resourceAzureInstance() *schema.Resource { + return &schema.Resource{ + Create: resourceAzureInstanceCreate, + Read: resourceAzureInstanceRead, + Update: resourceAzureInstanceUpdate, + Delete: resourceAzureInstanceDelete, + + Schema: map[string]*schema.Schema{ + "name": &schema.Schema{ + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "description": &schema.Schema{ + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, + }, + + "image": &schema.Schema{ + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "size": &schema.Schema{ + Type: schema.TypeString, + Required: true, + }, + + "network": &schema.Schema{ + Type: schema.TypeString, + Optional: true, + ForceNew: true, + }, + + "storage": &schema.Schema{ + Type: schema.TypeString, + Optional: true, + ForceNew: true, + }, + + "reverse_dns": &schema.Schema{ + Type: schema.TypeString, + Optional: true, + ForceNew: true, + }, + + "location": &schema.Schema{ + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "automatic_updates": &schema.Schema{ + Type: schema.TypeBool, + Optional: true, + ForceNew: true, + }, + + "time_zone": &schema.Schema{ + Type: schema.TypeString, + Optional: true, + ForceNew: true, + }, + + "public_rdp": &schema.Schema{ + Type: schema.TypeBool, + Optional: true, + ForceNew: true, + }, + + "public_ssh": &schema.Schema{ + Type: schema.TypeBool, + Optional: true, + ForceNew: true, + }, + + "username": &schema.Schema{ + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "password": &schema.Schema{ + Type: schema.TypeString, + Optional: true, + ForceNew: true, + }, + + "ssh_key_thumbprint": &schema.Schema{ + Type: schema.TypeString, + Optional: true, + ForceNew: true, + }, + + "endpoint": &schema.Schema{ + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "name": &schema.Schema{ + Type: schema.TypeString, + Required: true, + }, + + "protocol": &schema.Schema{ + Type: schema.TypeString, + Required: true, + }, + + "port": &schema.Schema{ + Type: schema.TypeInt, + Required: true, + }, + + "local_port": &schema.Schema{ + Type: schema.TypeInt, + Required: true, + }, + }, + }, + Set: resourceAzureEndpointHash, + }, + + "ip_address": &schema.Schema{ + Type: schema.TypeString, + Computed: true, + }, + + "vip_address": &schema.Schema{ + Type: schema.TypeString, + Computed: true, + }, + }, + } +} + +func resourceAzureInstanceCreate(d *schema.ResourceData, meta interface{}) (err error) { + mc := meta.(*management.Client) + + name := d.Get("name").(string) + + // Compute/set the description + description := d.Get("description").(string) + if description == "" { + description = name + } + + // Retrieve the needed details of the image + imageName, imageURL, osType, err := retrieveImageDetails(mc, d.Get("image").(string)) + if err != nil { + return err + } + + if imageURL == "" { + storage, ok := d.GetOk("storage") + if !ok { + return fmt.Errorf("When using a platform image, the 'storage' parameter is required") + } + imageURL = fmt.Sprintf("http://%s.blob.core.windows.net/vhds/%s.vhd", storage, name) + } + + // Verify if we have all parameters required for the image OS type + if err := verifyParameters(d, osType); err != nil { + return err + } + + log.Printf("[DEBUG] Creating Cloud Service for instance: %s", name) + req, err := hostedservice.NewClient(*mc). + CreateHostedService( + name, + d.Get("location").(string), + d.Get("reverse_dns").(string), + name, + fmt.Sprintf("Cloud Service created automatically for instance %s", name), + ) + if err != nil { + return fmt.Errorf("Error creating Cloud Service for instance %s: %s", name, err) + } + + // Wait until the Cloud Service is created + if err := mc.WaitAsyncOperation(req); err != nil { + return fmt.Errorf( + "Error waiting for Cloud Service of instance %s to be created: %s", name, err) + } + + // Put in this defer here, so we are sure to cleanup already created parts + // when we exit with an error + defer func(mc *management.Client) { + if err != nil { + req, err := hostedservice.NewClient(*mc).DeleteHostedService(name, true) + if err != nil { + log.Printf("[DEBUG] Error cleaning up Cloud Service of instance %s: %s", name, err) + } + + // Wait until the Cloud Service is deleted + if err := mc.WaitAsyncOperation(req); err != nil { + log.Printf( + "[DEBUG] Error waiting for Cloud Service of instance %s to be deleted : %s", name, err) + } + } + }(mc) + + // Create a new role for the instance + role := vmutils.NewVmConfiguration(name, d.Get("size").(string)) + + log.Printf("[DEBUG] Configuring deployment from image...") + err = vmutils.ConfigureDeploymentFromPlatformImage( + &role, + imageName, + imageURL, + d.Get("image").(string), + ) + if err != nil { + return fmt.Errorf("Error configuring the deployment for %s: %s", name, err) + } + + if osType == linux { + // This is pretty ugly, but the Azure SDK leaves me no other choice... + if tp, ok := d.GetOk("ssh_key_thumbprint"); ok { + err = vmutils.ConfigureForLinux( + &role, + name, + d.Get("username").(string), + d.Get("password").(string), + tp.(string), + ) + } else { + err = vmutils.ConfigureForLinux( + &role, + name, + d.Get("username").(string), + d.Get("password").(string), + ) + } + if err != nil { + return fmt.Errorf("Error configuring %s for Linux: %s", name, err) + } + + if d.Get("public_ssh").(bool) { + if err := vmutils.ConfigureWithPublicSSH(&role); err != nil { + return fmt.Errorf("Error configuring %s for public SSH: %s", name, err) + } + } + } + + if osType == windows { + err = vmutils.ConfigureForWindows( + &role, + name, + d.Get("username").(string), + d.Get("password").(string), + d.Get("automatic_updates").(bool), + d.Get("time_zone").(string), + ) + if err != nil { + return fmt.Errorf("Error configuring %s for Windows: %s", name, err) + } + + if d.Get("public_rdp").(bool) { + if err := vmutils.ConfigureWithPublicRDP(&role); err != nil { + return fmt.Errorf("Error configuring %s for public RDP: %s", name, err) + } + } + } + + log.Printf("[DEBUG] Creating the new instance...") + req, err = virtualmachine.NewClient(*mc).CreateDeployment(role, name) + if err != nil { + return fmt.Errorf("Error creating instance %s: %s", name, err) + } + + log.Printf("[DEBUG] Waiting for the new instance to be created...") + if err := mc.WaitAsyncOperation(req); err != nil { + return fmt.Errorf( + "Error waiting for instance %s to be created: %s", name, err) + } + + /* + if v := d.Get("endpoint").(*schema.Set); v.Len() > 0 { + log.Printf("[DEBUG] Adding Endpoints to the Azure Virtual Machine...") + endpoints := make([]vmClient.InputEndpoint, v.Len()) + for i, v := range v.List() { + m := v.(map[string]interface{}) + endpoint := vmClient.InputEndpoint{} + endpoint.Name = m["name"].(string) + endpoint.Protocol = m["protocol"].(string) + endpoint.Port = m["port"].(int) + endpoint.LocalPort = m["local_port"].(int) + endpoints[i] = endpoint + } + + configSets := vmConfig.ConfigurationSets.ConfigurationSet + if len(configSets) == 0 { + return fmt.Errorf("Azure virtual machine does not have configuration sets") + } + for i := 0; i < len(configSets); i++ { + if configSets[i].ConfigurationSetType != "NetworkConfiguration" { + continue + } + configSets[i].InputEndpoints.InputEndpoint = + append(configSets[i].InputEndpoints.InputEndpoint, endpoints...) + } + } + + */ + + d.SetId(name) + + return resourceAzureInstanceRead(d, meta) +} + +func resourceAzureInstanceRead(d *schema.ResourceData, meta interface{}) error { + mc := meta.(*management.Client) + + log.Printf("[DEBUG] Retrieving Cloud Service for instance: %s", d.Id()) + cs, err := hostedservice.NewClient(*mc).GetHostedService(d.Id()) + if err != nil { + return fmt.Errorf("Error retrieving Cloud Service of instance %s: %s", d.Id(), err) + } + + d.Set("reverse_dns", cs.ReverseDnsFqdn) + d.Set("location", cs.Location) + + log.Printf("[DEBUG] Retrieving instance: %s", d.Id()) + wi, err := virtualmachine.NewClient(*mc).GetDeployment(d.Id(), d.Id()) + if err != nil { + return fmt.Errorf("Error retrieving instance %s: %s", d.Id(), err) + } + + if len(wi.RoleList) == 0 { + return fmt.Errorf("Instance %s does not have VIP addresses", d.Id()) + } + role := wi.RoleList[0] + + d.Set("size", role.RoleSize) + + if len(wi.RoleInstanceList) == 0 { + return fmt.Errorf("Instance %s does not have IP addresses", d.Id()) + } + d.Set("ip_address", wi.RoleInstanceList[0].IpAddress) + + if len(wi.VirtualIPs) == 0 { + return fmt.Errorf("Instance %s does not have VIP addresses", d.Id()) + } + d.Set("vip_address", wi.VirtualIPs[0].Address) + + connType := "ssh" + if role.OSVirtualHardDisk.OS == windows { + connType = windows + } + + // Set the connection info for any configured provisioners + d.SetConnInfo(map[string]string{ + "type": connType, + "host": wi.VirtualIPs[0].Address, + "user": d.Get("username").(string), + }) + + return nil +} + +func resourceAzureInstanceUpdate(d *schema.ResourceData, meta interface{}) error { + mc := meta.(*management.Client) + + if d.HasChange("size") { + role, err := virtualmachine.NewClient(*mc).GetRole(d.Id(), d.Id(), d.Id()) + if err != nil { + return fmt.Errorf("Error retrieving role of instance %s: %s", d.Id(), err) + } + + role.RoleSize = d.Get("size").(string) + + req, err := virtualmachine.NewClient(*mc).UpdateRole(d.Id(), d.Id(), d.Id(), *role) + if err != nil { + return fmt.Errorf("Error updating role of instance %s: %s", d.Id(), err) + } + + if err := mc.WaitAsyncOperation(req); err != nil { + return fmt.Errorf( + "Error waiting for role of instance %s to be updated: %s", d.Id(), err) + } + } + + if d.HasChange("endpoint") { + + } + + return resourceAzureInstanceRead(d, meta) +} + +func resourceAzureInstanceDelete(d *schema.ResourceData, meta interface{}) error { + mc := meta.(*management.Client) + + log.Printf("[DEBUG] Deleting instance: %s", d.Id()) + req, err := hostedservice.NewClient(*mc).DeleteHostedService(d.Id(), true) + if err != nil { + return fmt.Errorf("Error deleting instance %s: %s", d.Id(), err) + } + + // Wait until the instance is deleted + if err := mc.WaitAsyncOperation(req); err != nil { + return fmt.Errorf( + "Error waiting for instance %s to be deleted: %s", d.Id(), err) + } + + d.SetId("") + + return nil +} + +func resourceAzureEndpointHash(v interface{}) int { + var buf bytes.Buffer + m := v.(map[string]interface{}) + buf.WriteString(fmt.Sprintf("%s-", m["name"].(string))) + buf.WriteString(fmt.Sprintf("%s-", m["protocol"].(string))) + buf.WriteString(fmt.Sprintf("%d-", m["port"].(int))) + buf.WriteString(fmt.Sprintf("%d-", m["local_port"].(int))) + + return hashcode.String(buf.String()) +} + +func retrieveImageDetails(mc *management.Client, label string) (string, string, string, error) { + imgs, err := osimage.NewClient(*mc).GetImageList() + if err != nil { + return "", "", "", fmt.Errorf("Error retrieving image details: %s", err) + } + + var labels []string + for _, img := range imgs { + if img.Label == label { + if img.OS != linux && img.OS != windows { + return "", "", "", fmt.Errorf("Unsupported image OS: %s", img.OS) + } + return img.Name, img.MediaLink, img.OS, nil + } + labels = append(labels, img.Label) + } + + return "", "", "", + fmt.Errorf("Could not find image with label '%s', available labels are: %s", + label, strings.Join(labels, ",")) +} + +func verifyParameters(d *schema.ResourceData, osType string) error { + if osType == linux { + _, pass := d.GetOk("password") + _, key := d.GetOk("ssh_key_thumbprint") + + if !pass && !key { + return fmt.Errorf( + "You must supply a 'password' and/or a 'ssh_key_thumbprint' when using a Linux image") + } + + if key { + // check if it's a file of a string containing the key + } + } + + if osType == windows { + if _, ok := d.GetOk("password"); !ok { + return fmt.Errorf("You must supply a 'password' when using a Windows image") + } + + if _, ok := d.GetOk("time_zone"); !ok { + return fmt.Errorf("You must supply a 'time_zone' when using a Windows image") + } + } + + return nil +} diff --git a/builtin/providers/azure/resource_azure_instance_test.go b/builtin/providers/azure/resource_azure_instance_test.go new file mode 100644 index 000000000..6512f735e --- /dev/null +++ b/builtin/providers/azure/resource_azure_instance_test.go @@ -0,0 +1 @@ +package azure diff --git a/builtin/providers/azure/resource_azure_network.go b/builtin/providers/azure/resource_azure_network.go new file mode 100644 index 000000000..33d1d15a5 --- /dev/null +++ b/builtin/providers/azure/resource_azure_network.go @@ -0,0 +1,51 @@ +package azure + +import "github.com/hashicorp/terraform/helper/schema" + +func resourceAzureNetwork() *schema.Resource { + return &schema.Resource{ + Create: resourceAzureNetworkCreate, + Read: resourceAzureNetworkRead, + Update: resourceAzureNetworkUpdate, + Delete: resourceAzureNetworkDelete, + + Schema: map[string]*schema.Schema{ + "name": &schema.Schema{ + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "virtual": &schema.Schema{ + Type: schema.TypeBool, + Optional: true, + Default: true, + ForceNew: true, + }, + }, + } +} + +func resourceAzureNetworkCreate(d *schema.ResourceData, meta interface{}) (err error) { + //mc := meta.(*management.Client) + + return resourceAzureNetworkRead(d, meta) +} + +func resourceAzureNetworkRead(d *schema.ResourceData, meta interface{}) error { + //mc := meta.(*management.Client) + + return nil +} + +func resourceAzureNetworkUpdate(d *schema.ResourceData, meta interface{}) error { + //mc := meta.(*management.Client) + + return resourceAzureNetworkRead(d, meta) +} + +func resourceAzureNetworkDelete(d *schema.ResourceData, meta interface{}) error { + //mc := meta.(*management.Client) + + return nil +} diff --git a/builtin/providers/azure/resource_azure_network_test.go b/builtin/providers/azure/resource_azure_network_test.go new file mode 100644 index 000000000..6512f735e --- /dev/null +++ b/builtin/providers/azure/resource_azure_network_test.go @@ -0,0 +1 @@ +package azure diff --git a/builtin/providers/azure/resource_disk.go b/builtin/providers/azure/resource_disk.go new file mode 100644 index 000000000..8b0b09aae --- /dev/null +++ b/builtin/providers/azure/resource_disk.go @@ -0,0 +1,44 @@ +package azure + +import "github.com/hashicorp/terraform/helper/schema" + +func resourceAzureDisk() *schema.Resource { + return &schema.Resource{ + Create: resourceAzureNetworkCreate, + Read: resourceAzureNetworkRead, + Update: resourceAzureNetworkUpdate, + Delete: resourceAzureNetworkDelete, + + Schema: map[string]*schema.Schema{ + "name": &schema.Schema{ + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + }, + } +} + +func resourceAzureDiskCreate(d *schema.ResourceData, meta interface{}) (err error) { + //mc := meta.(*management.Client) + + return resourceAzureDiskRead(d, meta) +} + +func resourceAzureDiskRead(d *schema.ResourceData, meta interface{}) error { + //mc := meta.(*management.Client) + + return nil +} + +func resourceAzureDiskUpdate(d *schema.ResourceData, meta interface{}) error { + //mc := meta.(*management.Client) + + return resourceAzureDiskRead(d, meta) +} + +func resourceAzureDiskDelete(d *schema.ResourceData, meta interface{}) error { + //mc := meta.(*management.Client) + + return nil +} diff --git a/builtin/providers/azure/resource_disk_test.go b/builtin/providers/azure/resource_disk_test.go new file mode 100644 index 000000000..6512f735e --- /dev/null +++ b/builtin/providers/azure/resource_disk_test.go @@ -0,0 +1 @@ +package azure diff --git a/builtin/providers/azure/resources.go b/builtin/providers/azure/resources.go new file mode 100644 index 000000000..6512f735e --- /dev/null +++ b/builtin/providers/azure/resources.go @@ -0,0 +1 @@ +package azure From 4e33d898e9aa1e6806abcfb2e018f44d62e024c6 Mon Sep 17 00:00:00 2001 From: Sander van Harmelen Date: Thu, 30 Apr 2015 10:58:45 +0200 Subject: [PATCH 04/91] Needs more testing and tests, but it's becoming a nice provider --- builtin/providers/azure/provider.go | 7 +- ...esource_disk.go => resource_azure_disk.go} | 10 +- ...rk_test.go => resource_azure_disk_test.go} | 0 .../azure/resource_azure_instance.go | 471 ++++++++++-------- .../providers/azure/resource_azure_network.go | 51 -- .../azure/resource_azure_security_group.go | 304 +++++++++++ ... => resource_azure_security_group_test.go} | 0 .../azure/resource_azure_virtual_network.go | 205 ++++++++ .../resource_azure_virtual_network_test.go | 1 + 9 files changed, 791 insertions(+), 258 deletions(-) rename builtin/providers/azure/{resource_disk.go => resource_azure_disk.go} (83%) rename builtin/providers/azure/{resource_azure_network_test.go => resource_azure_disk_test.go} (100%) delete mode 100644 builtin/providers/azure/resource_azure_network.go create mode 100644 builtin/providers/azure/resource_azure_security_group.go rename builtin/providers/azure/{resource_disk_test.go => resource_azure_security_group_test.go} (100%) create mode 100644 builtin/providers/azure/resource_azure_virtual_network.go create mode 100644 builtin/providers/azure/resource_azure_virtual_network_test.go diff --git a/builtin/providers/azure/provider.go b/builtin/providers/azure/provider.go index 83e577a47..c4f117391 100644 --- a/builtin/providers/azure/provider.go +++ b/builtin/providers/azure/provider.go @@ -23,9 +23,10 @@ func Provider() terraform.ResourceProvider { }, ResourcesMap: map[string]*schema.Resource{ - "azure_disk": resourceAzureDisk(), - "azure_instance": resourceAzureInstance(), - "azure_network": resourceAzureNetwork(), + "azure_disk": resourceAzureDisk(), + "azure_instance": resourceAzureInstance(), + "azure_security_group": resourceAzureSecurityGroup(), + "azure_virtual_network": resourceAzureVirtualNetwork(), }, ConfigureFunc: providerConfigure, diff --git a/builtin/providers/azure/resource_disk.go b/builtin/providers/azure/resource_azure_disk.go similarity index 83% rename from builtin/providers/azure/resource_disk.go rename to builtin/providers/azure/resource_azure_disk.go index 8b0b09aae..3b67a39c7 100644 --- a/builtin/providers/azure/resource_disk.go +++ b/builtin/providers/azure/resource_azure_disk.go @@ -4,10 +4,10 @@ import "github.com/hashicorp/terraform/helper/schema" func resourceAzureDisk() *schema.Resource { return &schema.Resource{ - Create: resourceAzureNetworkCreate, - Read: resourceAzureNetworkRead, - Update: resourceAzureNetworkUpdate, - Delete: resourceAzureNetworkDelete, + Create: resourceAzureDiskCreate, + Read: resourceAzureDiskRead, + Update: resourceAzureDiskUpdate, + Delete: resourceAzureDiskDelete, Schema: map[string]*schema.Schema{ "name": &schema.Schema{ @@ -19,7 +19,7 @@ func resourceAzureDisk() *schema.Resource { } } -func resourceAzureDiskCreate(d *schema.ResourceData, meta interface{}) (err error) { +func resourceAzureDiskCreate(d *schema.ResourceData, meta interface{}) error { //mc := meta.(*management.Client) return resourceAzureDiskRead(d, meta) diff --git a/builtin/providers/azure/resource_azure_network_test.go b/builtin/providers/azure/resource_azure_disk_test.go similarity index 100% rename from builtin/providers/azure/resource_azure_network_test.go rename to builtin/providers/azure/resource_azure_disk_test.go diff --git a/builtin/providers/azure/resource_azure_instance.go b/builtin/providers/azure/resource_azure_instance.go index 9c2e461ff..9fe45eee1 100644 --- a/builtin/providers/azure/resource_azure_instance.go +++ b/builtin/providers/azure/resource_azure_instance.go @@ -52,7 +52,13 @@ func resourceAzureInstance() *schema.Resource { Required: true, }, - "network": &schema.Schema{ + "subnet": &schema.Schema{ + Type: schema.TypeString, + Optional: true, + ForceNew: true, + }, + + "virtual_network": &schema.Schema{ Type: schema.TypeString, Optional: true, ForceNew: true, @@ -88,18 +94,6 @@ func resourceAzureInstance() *schema.Resource { ForceNew: true, }, - "public_rdp": &schema.Schema{ - Type: schema.TypeBool, - Optional: true, - ForceNew: true, - }, - - "public_ssh": &schema.Schema{ - Type: schema.TypeBool, - Optional: true, - ForceNew: true, - }, - "username": &schema.Schema{ Type: schema.TypeString, Required: true, @@ -134,12 +128,12 @@ func resourceAzureInstance() *schema.Resource { Required: true, }, - "port": &schema.Schema{ + "public_port": &schema.Schema{ Type: schema.TypeInt, Required: true, }, - "local_port": &schema.Schema{ + "private_port": &schema.Schema{ Type: schema.TypeInt, Required: true, }, @@ -148,6 +142,16 @@ func resourceAzureInstance() *schema.Resource { Set: resourceAzureEndpointHash, }, + "security_groups": &schema.Schema{ + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: &schema.Schema{Type: schema.TypeString}, + Set: func(v interface{}) int { + return hashcode.String(v.(string)) + }, + }, + "ip_address": &schema.Schema{ Type: schema.TypeString, Computed: true, @@ -162,177 +166,165 @@ func resourceAzureInstance() *schema.Resource { } func resourceAzureInstanceCreate(d *schema.ResourceData, meta interface{}) (err error) { - mc := meta.(*management.Client) + /* + mc := meta.(*management.Client) - name := d.Get("name").(string) + name := d.Get("name").(string) - // Compute/set the description - description := d.Get("description").(string) - if description == "" { - description = name - } - - // Retrieve the needed details of the image - imageName, imageURL, osType, err := retrieveImageDetails(mc, d.Get("image").(string)) - if err != nil { - return err - } - - if imageURL == "" { - storage, ok := d.GetOk("storage") - if !ok { - return fmt.Errorf("When using a platform image, the 'storage' parameter is required") + // Compute/set the description + description := d.Get("description").(string) + if description == "" { + description = name } - imageURL = fmt.Sprintf("http://%s.blob.core.windows.net/vhds/%s.vhd", storage, name) - } - // Verify if we have all parameters required for the image OS type - if err := verifyParameters(d, osType); err != nil { - return err - } - - log.Printf("[DEBUG] Creating Cloud Service for instance: %s", name) - req, err := hostedservice.NewClient(*mc). - CreateHostedService( - name, - d.Get("location").(string), - d.Get("reverse_dns").(string), - name, - fmt.Sprintf("Cloud Service created automatically for instance %s", name), - ) - if err != nil { - return fmt.Errorf("Error creating Cloud Service for instance %s: %s", name, err) - } - - // Wait until the Cloud Service is created - if err := mc.WaitAsyncOperation(req); err != nil { - return fmt.Errorf( - "Error waiting for Cloud Service of instance %s to be created: %s", name, err) - } - - // Put in this defer here, so we are sure to cleanup already created parts - // when we exit with an error - defer func(mc *management.Client) { + // Retrieve the needed details of the image + imageName, imageURL, osType, err := retrieveImageDetails(mc, d.Get("image").(string)) if err != nil { - req, err := hostedservice.NewClient(*mc).DeleteHostedService(name, true) - if err != nil { - log.Printf("[DEBUG] Error cleaning up Cloud Service of instance %s: %s", name, err) + return err + } + + if imageURL == "" { + storage, ok := d.GetOk("storage") + if !ok { + return fmt.Errorf("When using a platform image, the 'storage' parameter is required") } - - // Wait until the Cloud Service is deleted - if err := mc.WaitAsyncOperation(req); err != nil { - log.Printf( - "[DEBUG] Error waiting for Cloud Service of instance %s to be deleted : %s", name, err) - } - } - }(mc) - - // Create a new role for the instance - role := vmutils.NewVmConfiguration(name, d.Get("size").(string)) - - log.Printf("[DEBUG] Configuring deployment from image...") - err = vmutils.ConfigureDeploymentFromPlatformImage( - &role, - imageName, - imageURL, - d.Get("image").(string), - ) - if err != nil { - return fmt.Errorf("Error configuring the deployment for %s: %s", name, err) - } - - if osType == linux { - // This is pretty ugly, but the Azure SDK leaves me no other choice... - if tp, ok := d.GetOk("ssh_key_thumbprint"); ok { - err = vmutils.ConfigureForLinux( - &role, - name, - d.Get("username").(string), - d.Get("password").(string), - tp.(string), - ) - } else { - err = vmutils.ConfigureForLinux( - &role, - name, - d.Get("username").(string), - d.Get("password").(string), - ) - } - if err != nil { - return fmt.Errorf("Error configuring %s for Linux: %s", name, err) + imageURL = fmt.Sprintf("http://%s.blob.core.windows.net/vhds/%s.vhd", storage, name) } - if d.Get("public_ssh").(bool) { - if err := vmutils.ConfigureWithPublicSSH(&role); err != nil { - return fmt.Errorf("Error configuring %s for public SSH: %s", name, err) - } + // Verify if we have all parameters required for the image OS type + if err := verifyParameters(d, osType); err != nil { + return err } - } - if osType == windows { - err = vmutils.ConfigureForWindows( - &role, + log.Printf("[DEBUG] Creating Cloud Service for instance: %s", name) + req, err := hostedservice.NewClient(*mc). + CreateHostedService( name, - d.Get("username").(string), - d.Get("password").(string), - d.Get("automatic_updates").(bool), - d.Get("time_zone").(string), + d.Get("location").(string), + d.Get("reverse_dns").(string), + name, + fmt.Sprintf("Cloud Service created automatically for instance %s", name), ) if err != nil { - return fmt.Errorf("Error configuring %s for Windows: %s", name, err) + return fmt.Errorf("Error creating Cloud Service for instance %s: %s", name, err) } - if d.Get("public_rdp").(bool) { - if err := vmutils.ConfigureWithPublicRDP(&role); err != nil { - return fmt.Errorf("Error configuring %s for public RDP: %s", name, err) - } + // Wait until the Cloud Service is created + if err := mc.WaitAsyncOperation(req); err != nil { + return fmt.Errorf( + "Error waiting for Cloud Service of instance %s to be created: %s", name, err) } - } - log.Printf("[DEBUG] Creating the new instance...") - req, err = virtualmachine.NewClient(*mc).CreateDeployment(role, name) - if err != nil { - return fmt.Errorf("Error creating instance %s: %s", name, err) - } - - log.Printf("[DEBUG] Waiting for the new instance to be created...") - if err := mc.WaitAsyncOperation(req); err != nil { - return fmt.Errorf( - "Error waiting for instance %s to be created: %s", name, err) - } - - /* - if v := d.Get("endpoint").(*schema.Set); v.Len() > 0 { - log.Printf("[DEBUG] Adding Endpoints to the Azure Virtual Machine...") - endpoints := make([]vmClient.InputEndpoint, v.Len()) - for i, v := range v.List() { - m := v.(map[string]interface{}) - endpoint := vmClient.InputEndpoint{} - endpoint.Name = m["name"].(string) - endpoint.Protocol = m["protocol"].(string) - endpoint.Port = m["port"].(int) - endpoint.LocalPort = m["local_port"].(int) - endpoints[i] = endpoint - } - - configSets := vmConfig.ConfigurationSets.ConfigurationSet - if len(configSets) == 0 { - return fmt.Errorf("Azure virtual machine does not have configuration sets") - } - for i := 0; i < len(configSets); i++ { - if configSets[i].ConfigurationSetType != "NetworkConfiguration" { - continue + // Put in this defer here, so we are sure to cleanup already created parts + // when we exit with an error + defer func(mc *management.Client) { + if err != nil { + req, err := hostedservice.NewClient(*mc).DeleteHostedService(name, true) + if err != nil { + log.Printf("[DEBUG] Error cleaning up Cloud Service of instance %s: %s", name, err) } - configSets[i].InputEndpoints.InputEndpoint = - append(configSets[i].InputEndpoints.InputEndpoint, endpoints...) + + // Wait until the Cloud Service is deleted + if err := mc.WaitAsyncOperation(req); err != nil { + log.Printf( + "[DEBUG] Error waiting for Cloud Service of instance %s to be deleted : %s", name, err) + } + } + }(mc) + + // Create a new role for the instance + role := vmutils.NewVmConfiguration(name, d.Get("size").(string)) + + log.Printf("[DEBUG] Configuring deployment from image...") + err = vmutils.ConfigureDeploymentFromPlatformImage( + &role, + imageName, + imageURL, + d.Get("image").(string), + ) + if err != nil { + return fmt.Errorf("Error configuring the deployment for %s: %s", name, err) + } + + if osType == linux { + // This is pretty ugly, but the Azure SDK leaves me no other choice... + if tp, ok := d.GetOk("ssh_key_thumbprint"); ok { + err = vmutils.ConfigureForLinux( + &role, + name, + d.Get("username").(string), + d.Get("password").(string), + tp.(string), + ) + } else { + err = vmutils.ConfigureForLinux( + &role, + name, + d.Get("username").(string), + d.Get("password").(string), + ) + } + if err != nil { + return fmt.Errorf("Error configuring %s for Linux: %s", name, err) } } + if osType == windows { + err = vmutils.ConfigureForWindows( + &role, + name, + d.Get("username").(string), + d.Get("password").(string), + d.Get("automatic_updates").(bool), + d.Get("time_zone").(string), + ) + if err != nil { + return fmt.Errorf("Error configuring %s for Windows: %s", name, err) + } + } + + if s := d.Get("endpoint").(*schema.Set); s.Len() > 0 { + for _, v := range s.List() { + m := v.(map[string]interface{}) + err := vmutils.ConfigureWithExternalPort( + &role, + m["name"].(string), + m["private_port"].(int), + m["public_port"].(int), + endpointProtocol(m["protocol"].(string)), + ) + if err != nil { + return fmt.Errorf( + "Error adding endpoint %s for instance %s: %s", m["name"].(string), name, err) + } + } + } + + err = vmutils.ConfigureForSubnet(&role, d.Get("subnet").(string)) + if err != nil { + return fmt.Errorf( + "Error adding role to subnet %s for instance %s: %s", d.Get("subnet").(string), name, err) + } + + options := &virtualmachine.CreateDeploymentOptions{ + Subnet: d.Get("subnet").(string), + VirtualNetworkName: d.Get("virtual_network").(string), + } + + log.Printf("[DEBUG] Creating the new instance...") + req, err = virtualmachine.NewClient(*mc).CreateDeployment(role, name, options) + if err != nil { + return fmt.Errorf("Error creating instance %s: %s", name, err) + } + + log.Printf("[DEBUG] Waiting for the new instance to be created...") + if err := mc.WaitAsyncOperation(req); err != nil { + return fmt.Errorf( + "Error waiting for instance %s to be created: %s", name, err) + } + + d.SetId(name) */ - - d.SetId(name) - return resourceAzureInstanceRead(d, meta) } @@ -349,37 +341,59 @@ func resourceAzureInstanceRead(d *schema.ResourceData, meta interface{}) error { d.Set("location", cs.Location) log.Printf("[DEBUG] Retrieving instance: %s", d.Id()) - wi, err := virtualmachine.NewClient(*mc).GetDeployment(d.Id(), d.Id()) + dpmt, err := virtualmachine.NewClient(*mc).GetDeployment(d.Id(), d.Id()) if err != nil { return fmt.Errorf("Error retrieving instance %s: %s", d.Id(), err) } - if len(wi.RoleList) == 0 { - return fmt.Errorf("Instance %s does not have VIP addresses", d.Id()) + if len(dpmt.RoleList) != 1 { + return fmt.Errorf( + "Instance %s has an unexpected number of roles: %d", d.Id(), len(dpmt.RoleList)) } - role := wi.RoleList[0] + d.Set("size", dpmt.RoleList[0].RoleSize) - d.Set("size", role.RoleSize) - - if len(wi.RoleInstanceList) == 0 { - return fmt.Errorf("Instance %s does not have IP addresses", d.Id()) + if len(dpmt.RoleInstanceList) != 1 { + return fmt.Errorf( + "Instance %s has an unexpected number of role instances %d", d.Id(), len(dpmt.RoleInstanceList)) } - d.Set("ip_address", wi.RoleInstanceList[0].IpAddress) + d.Set("ip_address", dpmt.RoleInstanceList[0].IpAddress) - if len(wi.VirtualIPs) == 0 { - return fmt.Errorf("Instance %s does not have VIP addresses", d.Id()) + if len(dpmt.RoleInstanceList[0].InstanceEndpoints) > 0 { + d.Set("vip_address", dpmt.RoleInstanceList[0].InstanceEndpoints[0].Vip) + } + + // Create a new set to hold all configured endpoints + endpoints := &schema.Set{ + F: resourceAzureEndpointHash, + } + + // Loop through all endpoints and add them to the set + for _, c := range *dpmt.RoleList[0].ConfigurationSets { + if c.ConfigurationSetType == virtualmachine.ConfigurationSetTypeNetwork { + for _, ep := range *c.InputEndpoints { + endpoint := map[string]interface{}{} + + // Update the values + endpoint["name"] = ep.Name + endpoint["protocol"] = string(ep.Protocol) + endpoint["public_port"] = ep.Port + endpoint["private_port"] = ep.LocalPort + endpoints.Add(endpoint) + } + + d.Set("endpoint", endpoints) + } } - d.Set("vip_address", wi.VirtualIPs[0].Address) connType := "ssh" - if role.OSVirtualHardDisk.OS == windows { + if dpmt.RoleList[0].OSVirtualHardDisk.OS == windows { connType = windows } // Set the connection info for any configured provisioners d.SetConnInfo(map[string]string{ "type": connType, - "host": wi.VirtualIPs[0].Address, + "host": dpmt.VirtualIPs[0].Address, "user": d.Get("username").(string), }) @@ -389,27 +403,65 @@ func resourceAzureInstanceRead(d *schema.ResourceData, meta interface{}) error { func resourceAzureInstanceUpdate(d *schema.ResourceData, meta interface{}) error { mc := meta.(*management.Client) + // First check if anything we can update changed, and if not just return + if !d.HasChange("size") && !d.HasChange("endpoint") { + return nil + } + + // Get the current role + role, err := virtualmachine.NewClient(*mc).GetRole(d.Id(), d.Id(), d.Id()) + if err != nil { + return fmt.Errorf("Error retrieving role of instance %s: %s", d.Id(), err) + } + + // Verify if we have all parameters required for the image OS type + if err := verifyParameters(d, role.OSVirtualHardDisk.OS); err != nil { + return err + } + if d.HasChange("size") { - role, err := virtualmachine.NewClient(*mc).GetRole(d.Id(), d.Id(), d.Id()) - if err != nil { - return fmt.Errorf("Error retrieving role of instance %s: %s", d.Id(), err) - } - role.RoleSize = d.Get("size").(string) - - req, err := virtualmachine.NewClient(*mc).UpdateRole(d.Id(), d.Id(), d.Id(), *role) - if err != nil { - return fmt.Errorf("Error updating role of instance %s: %s", d.Id(), err) - } - - if err := mc.WaitAsyncOperation(req); err != nil { - return fmt.Errorf( - "Error waiting for role of instance %s to be updated: %s", d.Id(), err) - } } if d.HasChange("endpoint") { + _, n := d.GetChange("endpoint") + // Delete the existing endpoints + for i, c := range *role.ConfigurationSets { + if c.ConfigurationSetType == virtualmachine.ConfigurationSetTypeNetwork { + c.InputEndpoints = nil + (*role.ConfigurationSets)[i] = c + } + } + + // And add the ones we still want + if s := n.(*schema.Set); s.Len() > 0 { + for _, v := range s.List() { + m := v.(map[string]interface{}) + err := vmutils.ConfigureWithExternalPort( + role, + m["name"].(string), + m["private_port"].(int), + m["public_port"].(int), + endpointProtocol(m["protocol"].(string)), + ) + if err != nil { + return fmt.Errorf( + "Error adding endpoint %s for instance %s: %s", m["name"].(string), d.Id(), err) + } + } + } + } + + // Update the adjusted role + req, err := virtualmachine.NewClient(*mc).UpdateRole(d.Id(), d.Id(), d.Id(), *role) + if err != nil { + return fmt.Errorf("Error updating role of instance %s: %s", d.Id(), err) + } + + if err := mc.WaitAsyncOperation(req); err != nil { + return fmt.Errorf( + "Error waiting for role of instance %s to be updated: %s", d.Id(), err) } return resourceAzureInstanceRead(d, meta) @@ -440,8 +492,8 @@ func resourceAzureEndpointHash(v interface{}) int { m := v.(map[string]interface{}) buf.WriteString(fmt.Sprintf("%s-", m["name"].(string))) buf.WriteString(fmt.Sprintf("%s-", m["protocol"].(string))) - buf.WriteString(fmt.Sprintf("%d-", m["port"].(int))) - buf.WriteString(fmt.Sprintf("%d-", m["local_port"].(int))) + buf.WriteString(fmt.Sprintf("%d-", m["public_port"].(int))) + buf.WriteString(fmt.Sprintf("%d-", m["private_port"].(int))) return hashcode.String(buf.String()) } @@ -468,6 +520,14 @@ func retrieveImageDetails(mc *management.Client, label string) (string, string, label, strings.Join(labels, ",")) } +func endpointProtocol(p string) virtualmachine.InputEndpointProtocol { + if p == "tcp" { + return virtualmachine.InputEndpointProtocolTcp + } + + return virtualmachine.InputEndpointProtocolUdp +} + func verifyParameters(d *schema.ResourceData, osType string) error { if osType == linux { _, pass := d.GetOk("password") @@ -477,10 +537,6 @@ func verifyParameters(d *schema.ResourceData, osType string) error { return fmt.Errorf( "You must supply a 'password' and/or a 'ssh_key_thumbprint' when using a Linux image") } - - if key { - // check if it's a file of a string containing the key - } } if osType == windows { @@ -493,5 +549,22 @@ func verifyParameters(d *schema.ResourceData, osType string) error { } } + if _, ok := d.GetOk("subnet"); ok { + if _, ok := d.GetOk("virtual_network"); !ok { + return fmt.Errorf("You must also supply a 'virtual_network' when supplying a 'subnet'") + } + } + + if s := d.Get("endpoint").(*schema.Set); s.Len() > 0 { + for _, v := range s.List() { + protocol := v.(map[string]interface{})["protocol"].(string) + + if protocol != "tcp" && protocol != "udp" { + return fmt.Errorf( + "Invalid endpoint protocol %s! Valid options are 'tcp' and 'udp'.", protocol) + } + } + } + return nil } diff --git a/builtin/providers/azure/resource_azure_network.go b/builtin/providers/azure/resource_azure_network.go deleted file mode 100644 index 33d1d15a5..000000000 --- a/builtin/providers/azure/resource_azure_network.go +++ /dev/null @@ -1,51 +0,0 @@ -package azure - -import "github.com/hashicorp/terraform/helper/schema" - -func resourceAzureNetwork() *schema.Resource { - return &schema.Resource{ - Create: resourceAzureNetworkCreate, - Read: resourceAzureNetworkRead, - Update: resourceAzureNetworkUpdate, - Delete: resourceAzureNetworkDelete, - - Schema: map[string]*schema.Schema{ - "name": &schema.Schema{ - Type: schema.TypeString, - Required: true, - ForceNew: true, - }, - - "virtual": &schema.Schema{ - Type: schema.TypeBool, - Optional: true, - Default: true, - ForceNew: true, - }, - }, - } -} - -func resourceAzureNetworkCreate(d *schema.ResourceData, meta interface{}) (err error) { - //mc := meta.(*management.Client) - - return resourceAzureNetworkRead(d, meta) -} - -func resourceAzureNetworkRead(d *schema.ResourceData, meta interface{}) error { - //mc := meta.(*management.Client) - - return nil -} - -func resourceAzureNetworkUpdate(d *schema.ResourceData, meta interface{}) error { - //mc := meta.(*management.Client) - - return resourceAzureNetworkRead(d, meta) -} - -func resourceAzureNetworkDelete(d *schema.ResourceData, meta interface{}) error { - //mc := meta.(*management.Client) - - return nil -} diff --git a/builtin/providers/azure/resource_azure_security_group.go b/builtin/providers/azure/resource_azure_security_group.go new file mode 100644 index 000000000..f288fc0e5 --- /dev/null +++ b/builtin/providers/azure/resource_azure_security_group.go @@ -0,0 +1,304 @@ +package azure + +import ( + "fmt" + "log" + "strconv" + + "github.com/MSOpenTech/azure-sdk-for-go/management" + "github.com/MSOpenTech/azure-sdk-for-go/management/networksecuritygroup" + "github.com/hashicorp/terraform/helper/schema" +) + +func resourceAzureSecurityGroup() *schema.Resource { + return &schema.Resource{ + Create: resourceAzureSecurityGroupCreate, + Read: resourceAzureSecurityGroupRead, + Update: resourceAzureSecurityGroupUpdate, + Delete: resourceAzureSecurityGroupDelete, + + Schema: map[string]*schema.Schema{ + "name": &schema.Schema{ + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "label": &schema.Schema{ + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, + }, + + "subnet": &schema.Schema{ + Type: schema.TypeString, + Optional: true, + }, + + "location": &schema.Schema{ + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "rule": &schema.Schema{ + Type: schema.TypeSet, + Required: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "name": &schema.Schema{ + Type: schema.TypeString, + Required: true, + }, + + "type": &schema.Schema{ + Type: schema.TypeString, + Optional: true, + Default: "inbound", + }, + + "priority": &schema.Schema{ + Type: schema.TypeInt, + Required: true, + }, + + "action": &schema.Schema{ + Type: schema.TypeString, + Optional: true, + Default: "allow", + }, + + "source_cidr": &schema.Schema{ + Type: schema.TypeString, + Required: true, + }, + + "source_port": &schema.Schema{ + Type: schema.TypeString, + Required: true, + }, + + "destination_cidr": &schema.Schema{ + Type: schema.TypeString, + Required: true, + }, + + "destination_port": &schema.Schema{ + Type: schema.TypeString, + Required: true, + }, + + "protocol": &schema.Schema{ + Type: schema.TypeString, + Optional: true, + Default: "tcp", + }, + }, + }, + Set: resourceAzureSecurityGroupRuleHash, + }, + }, + } +} + +func resourceAzureSecurityGroupCreate(d *schema.ResourceData, meta interface{}) (err error) { + mc := meta.(*management.Client) + + name := d.Get("name").(string) + + req, err := networksecuritygroup.NewClient(*mc).CreateNetworkSecurityGroup( + name, + d.Get("label").(string), + d.Get("location").(string), + ) + if err != nil { + return fmt.Errorf("Error creating Network Security Group %s: %s", name, err) + } + + if err := mc.WaitAsyncOperation(req); err != nil { + return fmt.Errorf( + "Error waiting for Network Security Group %s to be created: %s", name, err) + } + + d.SetId(name) + + // Create all rules that are configured + if rs := d.Get("rule").(*schema.Set); rs.Len() > 0 { + + // Create an empty schema.Set to hold all rules + rules := &schema.Set{ + F: resourceAzureSecurityGroupRuleHash, + } + + for _, rule := range rs.List() { + // Create a single rule + err := resourceAzureSecurityGroupRuleCreate(d, meta, rule.(map[string]interface{})) + + // We need to update this first to preserve the correct state + rules.Add(rule) + d.Set("rule", rules) + + if err != nil { + return err + } + } + } + + return resourceAzureSecurityGroupRead(d, meta) +} + +func resourceAzureSecurityGroupRuleCreate( + d *schema.ResourceData, meta interface{}, rule map[string]interface{}) error { + mc := meta.(*management.Client) + + // Make sure all required parameters are there + if err := verifySecurityGroupRuleParams(rule); err != nil { + return err + } + + name := rule["name"].(string) + + // Create the rule + req, err := networksecuritygroup.NewClient(*mc).SetNetworkSecurityGroupRule(d.Id(), + &networksecuritygroup.Rule{ + Name: name, + Type: rule["type"].(string), + Priority: rule["priority"].(int), + Action: rule["action"].(string), + SourceAddressPrefix: rule["source_cidr"].(string), + SourcePortRange: rule["source_port"].(string), + DestinationAddressPrefix: rule["destination_cidr"].(string), + DestinationPortRange: rule["destination_port"].(string), + Protocol: rule["protocol"].(string), + }, + ) + if err != nil { + return fmt.Errorf("Error creating Network Security Group rule %s: %s", name, err) + } + + if err := mc.WaitAsyncOperation(req); err != nil { + return fmt.Errorf( + "Error waiting for Network Security Group rule %s to be created: %s", name, err) + } + + return nil +} + +func resourceAzureSecurityGroupRead(d *schema.ResourceData, meta interface{}) error { + mc := meta.(*management.Client) + + sg, err := networksecuritygroup.NewClient(*mc).GetNetworkSecurityGroup(d.Id()) + if err != nil { + return fmt.Errorf("Error retrieving Network Security Group %s: %s", d.Id(), err) + } + + d.Set("label", sg.Label) + d.Set("location", sg.Location) + + return nil +} + +func resourceAzureSecurityGroupUpdate(d *schema.ResourceData, meta interface{}) error { + // Check if the rule set as a whole has changed + if d.HasChange("rule") { + o, n := d.GetChange("rule") + ors := o.(*schema.Set).Difference(n.(*schema.Set)) + nrs := n.(*schema.Set).Difference(o.(*schema.Set)) + + // Now first loop through all the old rules and delete any obsolete ones + for _, rule := range ors.List() { + // Delete the rule as it no longer exists in the config + err := resourceAzureSecurityGroupRuleDelete(d, meta, rule.(map[string]interface{})) + if err != nil { + return err + } + } + + // Make sure we save the state of the currently configured rules + rules := o.(*schema.Set).Intersection(n.(*schema.Set)) + d.Set("rule", rules) + + // Then loop through al the currently configured rules and create the new ones + for _, rule := range nrs.List() { + err := resourceAzureSecurityGroupRuleCreate(d, meta, rule.(map[string]interface{})) + + // We need to update this first to preserve the correct state + rules.Add(rule) + d.Set("rule", rules) + + if err != nil { + return err + } + } + } + + return resourceAzureSecurityGroupRead(d, meta) +} + +func resourceAzureSecurityGroupDelete(d *schema.ResourceData, meta interface{}) error { + mc := meta.(*management.Client) + + log.Printf("[DEBUG] Deleting Network Security Group: %s", d.Id()) + req, err := networksecuritygroup.NewClient(*mc).DeleteNetworkSecurityGroup(d.Id()) + if err != nil { + return fmt.Errorf("Error deleting Network Security Group %s: %s", d.Id(), err) + } + + // Wait until the network security group is deleted + if err := mc.WaitAsyncOperation(req); err != nil { + return fmt.Errorf( + "Error waiting for Network Security Group %s to be deleted: %s", d.Id(), err) + } + + d.SetId("") + + return nil +} + +func resourceAzureSecurityGroupRuleDelete( + d *schema.ResourceData, meta interface{}, rule map[string]interface{}) error { + mc := meta.(*management.Client) + + name := rule["name"].(string) + + // Delete the rule + req, err := networksecuritygroup.NewClient(*mc).DeleteNetworkSecurityGroupRule(d.Id(), name) + if err != nil { + return fmt.Errorf("Error deleting Network Security Group rule %s: %s", name, err) + } + + if err := mc.WaitAsyncOperation(req); err != nil { + return fmt.Errorf( + "Error waiting for Network Security Group rule %s to be deleted: %s", name, err) + } + + return nil +} + +func resourceAzureSecurityGroupRuleHash(v interface{}) int { + return 0 +} + +func verifySecurityGroupRuleParams(rule map[string]interface{}) error { + typ := rule["type"].(string) + if typ != "inbound" && typ != "outbound" { + return fmt.Errorf("Parameter type only accepts 'inbound' or 'outbound' as values") + } + + action := rule["action"].(string) + if action != "allow" && action != "deny" { + return fmt.Errorf("Parameter action only accepts 'allow' or 'deny' as values") + } + + protocol := rule["protocol"].(string) + if protocol != "tcp" && protocol != "udp" && protocol != "*" { + _, err := strconv.ParseInt(protocol, 0, 0) + if err != nil { + return fmt.Errorf( + "Parameter type only accepts 'tcp', 'udp' or '*' as values") + } + } + + return nil +} diff --git a/builtin/providers/azure/resource_disk_test.go b/builtin/providers/azure/resource_azure_security_group_test.go similarity index 100% rename from builtin/providers/azure/resource_disk_test.go rename to builtin/providers/azure/resource_azure_security_group_test.go diff --git a/builtin/providers/azure/resource_azure_virtual_network.go b/builtin/providers/azure/resource_azure_virtual_network.go new file mode 100644 index 000000000..0de456113 --- /dev/null +++ b/builtin/providers/azure/resource_azure_virtual_network.go @@ -0,0 +1,205 @@ +package azure + +import ( + "fmt" + "log" + "strings" + + "github.com/MSOpenTech/azure-sdk-for-go/management" + "github.com/MSOpenTech/azure-sdk-for-go/management/virtualnetwork" + "github.com/hashicorp/terraform/helper/schema" + "github.com/mitchellh/mapstructure" +) + +const ( + virtualNetworkRetrievalError = "Error retrieving Virtual Network Configuration: %s" +) + +func resourceAzureVirtualNetwork() *schema.Resource { + return &schema.Resource{ + Create: resourceAzureVirtualNetworkCreate, + Read: resourceAzureVirtualNetworkRead, + Update: resourceAzureVirtualNetworkUpdate, + Delete: resourceAzureVirtualNetworkDelete, + + Schema: map[string]*schema.Schema{ + "name": &schema.Schema{ + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "address_space": &schema.Schema{ + Type: schema.TypeList, + Required: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + + "subnet": &schema.Schema{ + Type: schema.TypeMap, + Required: true, + }, + + "location": &schema.Schema{ + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + }, + } +} + +func resourceAzureVirtualNetworkCreate(d *schema.ResourceData, meta interface{}) error { + mc := meta.(*management.Client) + + name := d.Get("name").(string) + + nc, err := virtualnetwork.NewClient(*mc).GetVirtualNetworkConfiguration() + if err != nil { + if strings.Contains(err.Error(), "ResourceNotFound") { + nc = virtualnetwork.NetworkConfiguration{} + } else { + return fmt.Errorf(virtualNetworkRetrievalError, err) + } + } + + for _, n := range nc.Configuration.VirtualNetworkSites { + if n.Name == name { + return fmt.Errorf("Virtual Network %s already exists!", name) + } + } + + network, err := createVirtualNetwork(d) + if err != nil { + return err + } + + nc.Configuration.VirtualNetworkSites = append(nc.Configuration.VirtualNetworkSites, network) + + err = virtualnetwork.NewClient(*mc).SetVirtualNetworkConfiguration(nc) + if err != nil { + return fmt.Errorf("Error creating Virtual Network %s: %s", name, err) + } + + d.SetId(name) + + return resourceAzureVirtualNetworkRead(d, meta) +} + +func resourceAzureVirtualNetworkRead(d *schema.ResourceData, meta interface{}) error { + mc := meta.(*management.Client) + + nc, err := virtualnetwork.NewClient(*mc).GetVirtualNetworkConfiguration() + if err != nil { + return fmt.Errorf(virtualNetworkRetrievalError, err) + } + + for _, n := range nc.Configuration.VirtualNetworkSites { + if n.Name == d.Id() { + d.Set("address_space", n.AddressSpace.AddressPrefix) + d.Set("location", n.Location) + + subnets := map[string]interface{}{} + for _, s := range n.Subnets { + subnets[s.Name] = s.AddressPrefix + } + + d.Set("subnet", subnets) + + return nil + } + } + + log.Printf("[DEBUG] Virtual Network %s does no longer exist", d.Id()) + d.SetId("") + + return nil +} + +func resourceAzureVirtualNetworkUpdate(d *schema.ResourceData, meta interface{}) error { + mc := meta.(*management.Client) + + nc, err := virtualnetwork.NewClient(*mc).GetVirtualNetworkConfiguration() + if err != nil { + return fmt.Errorf(virtualNetworkRetrievalError, err) + } + + found := false + for i, n := range nc.Configuration.VirtualNetworkSites { + if n.Name == d.Id() { + network, err := createVirtualNetwork(d) + if err != nil { + return err + } + + nc.Configuration.VirtualNetworkSites[i] = network + + found = true + } + } + + if !found { + return fmt.Errorf("Virtual Network %s does not exists!", d.Id()) + } + + err = virtualnetwork.NewClient(*mc).SetVirtualNetworkConfiguration(nc) + if err != nil { + return fmt.Errorf("Error updating Virtual Network %s: %s", d.Id(), err) + } + + return resourceAzureVirtualNetworkRead(d, meta) +} + +func resourceAzureVirtualNetworkDelete(d *schema.ResourceData, meta interface{}) error { + mc := meta.(*management.Client) + + nc, err := virtualnetwork.NewClient(*mc).GetVirtualNetworkConfiguration() + if err != nil { + return fmt.Errorf(virtualNetworkRetrievalError, err) + } + + filtered := nc.Configuration.VirtualNetworkSites[:0] + for _, n := range nc.Configuration.VirtualNetworkSites { + if n.Name != d.Id() { + filtered = append(filtered, n) + } + } + + nc.Configuration.VirtualNetworkSites = filtered + + err = virtualnetwork.NewClient(*mc).SetVirtualNetworkConfiguration(nc) + if err != nil { + return fmt.Errorf("Error deleting Virtual Network %s: %s", d.Id(), err) + } + + d.SetId("") + + return nil +} + +func createVirtualNetwork(d *schema.ResourceData) (virtualnetwork.VirtualNetworkSite, error) { + var addressPrefix []string + err := mapstructure.WeakDecode(d.Get("address_space"), &addressPrefix) + if err != nil { + return virtualnetwork.VirtualNetworkSite{}, fmt.Errorf("Error decoding address_space: %s", err) + } + + addressSpace := virtualnetwork.AddressSpace{ + AddressPrefix: addressPrefix, + } + + subnets := []virtualnetwork.Subnet{} + for n, p := range d.Get("subnet").(map[string]interface{}) { + subnets = append(subnets, virtualnetwork.Subnet{ + Name: n, + AddressPrefix: p.(string), + }) + } + + return virtualnetwork.VirtualNetworkSite{ + Name: d.Get("name").(string), + Location: d.Get("location").(string), + AddressSpace: addressSpace, + Subnets: subnets, + }, nil +} diff --git a/builtin/providers/azure/resource_azure_virtual_network_test.go b/builtin/providers/azure/resource_azure_virtual_network_test.go new file mode 100644 index 000000000..6512f735e --- /dev/null +++ b/builtin/providers/azure/resource_azure_virtual_network_test.go @@ -0,0 +1 @@ +package azure From f8a56ad3d704fcbbe1554c59308fcdbce9444f9d Mon Sep 17 00:00:00 2001 From: Sander van Harmelen Date: Thu, 30 Apr 2015 17:12:05 +0200 Subject: [PATCH 05/91] Little refactoring and fixing some issues MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Starting to look pretty nice… --- builtin/providers/azure/config.go | 2 +- .../azure/resource_azure_instance.go | 10 ++-- .../azure/resource_azure_security_group.go | 46 ++++++++++++++----- .../azure/resource_azure_virtual_network.go | 4 +- 4 files changed, 43 insertions(+), 19 deletions(-) diff --git a/builtin/providers/azure/config.go b/builtin/providers/azure/config.go index ad4dc60c0..62e302a27 100644 --- a/builtin/providers/azure/config.go +++ b/builtin/providers/azure/config.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/MSOpenTech/azure-sdk-for-go/management" + "github.com/Azure/azure-sdk-for-go/management" ) // Config is the configuration structure used to instantiate a diff --git a/builtin/providers/azure/resource_azure_instance.go b/builtin/providers/azure/resource_azure_instance.go index 9fe45eee1..b3eb5c5af 100644 --- a/builtin/providers/azure/resource_azure_instance.go +++ b/builtin/providers/azure/resource_azure_instance.go @@ -6,11 +6,11 @@ import ( "log" "strings" - "github.com/MSOpenTech/azure-sdk-for-go/management" - "github.com/MSOpenTech/azure-sdk-for-go/management/hostedservice" - "github.com/MSOpenTech/azure-sdk-for-go/management/osimage" - "github.com/MSOpenTech/azure-sdk-for-go/management/virtualmachine" - "github.com/MSOpenTech/azure-sdk-for-go/management/vmutils" + "github.com/Azure/azure-sdk-for-go/management" + "github.com/Azure/azure-sdk-for-go/management/hostedservice" + "github.com/Azure/azure-sdk-for-go/management/osimage" + "github.com/Azure/azure-sdk-for-go/management/virtualmachine" + "github.com/Azure/azure-sdk-for-go/management/vmutils" "github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/helper/schema" ) diff --git a/builtin/providers/azure/resource_azure_security_group.go b/builtin/providers/azure/resource_azure_security_group.go index f288fc0e5..b6fe4c9a2 100644 --- a/builtin/providers/azure/resource_azure_security_group.go +++ b/builtin/providers/azure/resource_azure_security_group.go @@ -5,8 +5,8 @@ import ( "log" "strconv" - "github.com/MSOpenTech/azure-sdk-for-go/management" - "github.com/MSOpenTech/azure-sdk-for-go/management/networksecuritygroup" + "github.com/Azure/azure-sdk-for-go/management" + "github.com/Azure/azure-sdk-for-go/management/networksecuritygroup" "github.com/hashicorp/terraform/helper/schema" ) @@ -55,7 +55,7 @@ func resourceAzureSecurityGroup() *schema.Resource { "type": &schema.Schema{ Type: schema.TypeString, Optional: true, - Default: "inbound", + Default: "Inbound", }, "priority": &schema.Schema{ @@ -66,7 +66,7 @@ func resourceAzureSecurityGroup() *schema.Resource { "action": &schema.Schema{ Type: schema.TypeString, Optional: true, - Default: "allow", + Default: "Allow", }, "source_cidr": &schema.Schema{ @@ -92,7 +92,7 @@ func resourceAzureSecurityGroup() *schema.Resource { "protocol": &schema.Schema{ Type: schema.TypeString, Optional: true, - Default: "tcp", + Default: "TCP", }, }, }, @@ -196,6 +196,30 @@ func resourceAzureSecurityGroupRead(d *schema.ResourceData, meta interface{}) er d.Set("label", sg.Label) d.Set("location", sg.Location) + // Create an empty schema.Set to hold all rules + rules := &schema.Set{ + F: resourceAzureSecurityGroupRuleHash, + } + + for _, r := range sg.Rules { + if !r.IsDefault { + rule := map[string]interface{}{ + "name": r.Name, + "type": r.Type, + "priority": r.Priority, + "action": r.Action, + "source_cidr": r.SourceAddressPrefix, + "source_port": r.SourcePortRange, + "destination_cidr": r.DestinationAddressPrefix, + "destination_port": r.DestinationPortRange, + "protocol": r.Protocol, + } + rules.Add(rule) + } + } + + d.Set("rule", rules) + return nil } @@ -282,21 +306,21 @@ func resourceAzureSecurityGroupRuleHash(v interface{}) int { func verifySecurityGroupRuleParams(rule map[string]interface{}) error { typ := rule["type"].(string) - if typ != "inbound" && typ != "outbound" { - return fmt.Errorf("Parameter type only accepts 'inbound' or 'outbound' as values") + if typ != "Inbound" && typ != "Outbound" { + return fmt.Errorf("Parameter type only accepts 'Inbound' or 'Outbound' as values") } action := rule["action"].(string) - if action != "allow" && action != "deny" { - return fmt.Errorf("Parameter action only accepts 'allow' or 'deny' as values") + if action != "Allow" && action != "Deny" { + return fmt.Errorf("Parameter action only accepts 'Allow' or 'Deny' as values") } protocol := rule["protocol"].(string) - if protocol != "tcp" && protocol != "udp" && protocol != "*" { + if protocol != "TCP" && protocol != "UDP" && protocol != "*" { _, err := strconv.ParseInt(protocol, 0, 0) if err != nil { return fmt.Errorf( - "Parameter type only accepts 'tcp', 'udp' or '*' as values") + "Parameter type only accepts 'TCP', 'UDP' or '*' as values") } } diff --git a/builtin/providers/azure/resource_azure_virtual_network.go b/builtin/providers/azure/resource_azure_virtual_network.go index 0de456113..39053cf2d 100644 --- a/builtin/providers/azure/resource_azure_virtual_network.go +++ b/builtin/providers/azure/resource_azure_virtual_network.go @@ -5,8 +5,8 @@ import ( "log" "strings" - "github.com/MSOpenTech/azure-sdk-for-go/management" - "github.com/MSOpenTech/azure-sdk-for-go/management/virtualnetwork" + "github.com/Azure/azure-sdk-for-go/management" + "github.com/Azure/azure-sdk-for-go/management/virtualnetwork" "github.com/hashicorp/terraform/helper/schema" "github.com/mitchellh/mapstructure" ) From d45f8ac52af7dbed5e5c307bb4e1ee534b282859 Mon Sep 17 00:00:00 2001 From: Sander van Harmelen Date: Mon, 11 May 2015 18:32:30 +0200 Subject: [PATCH 06/91] Small update after changes in the Azure SDK --- .../azure/resource_azure_security_group.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/builtin/providers/azure/resource_azure_security_group.go b/builtin/providers/azure/resource_azure_security_group.go index b6fe4c9a2..9406e9309 100644 --- a/builtin/providers/azure/resource_azure_security_group.go +++ b/builtin/providers/azure/resource_azure_security_group.go @@ -161,16 +161,16 @@ func resourceAzureSecurityGroupRuleCreate( // Create the rule req, err := networksecuritygroup.NewClient(*mc).SetNetworkSecurityGroupRule(d.Id(), - &networksecuritygroup.Rule{ + networksecuritygroup.RuleRequest{ Name: name, - Type: rule["type"].(string), + Type: networksecuritygroup.RuleType(rule["type"].(string)), Priority: rule["priority"].(int), - Action: rule["action"].(string), + Action: networksecuritygroup.RuleAction(rule["action"].(string)), SourceAddressPrefix: rule["source_cidr"].(string), SourcePortRange: rule["source_port"].(string), DestinationAddressPrefix: rule["destination_cidr"].(string), DestinationPortRange: rule["destination_port"].(string), - Protocol: rule["protocol"].(string), + Protocol: networksecuritygroup.RuleProtocol(rule["protocol"].(string)), }, ) if err != nil { @@ -205,14 +205,14 @@ func resourceAzureSecurityGroupRead(d *schema.ResourceData, meta interface{}) er if !r.IsDefault { rule := map[string]interface{}{ "name": r.Name, - "type": r.Type, + "type": string(r.Type), "priority": r.Priority, - "action": r.Action, + "action": string(r.Action), "source_cidr": r.SourceAddressPrefix, "source_port": r.SourcePortRange, "destination_cidr": r.DestinationAddressPrefix, "destination_port": r.DestinationPortRange, - "protocol": r.Protocol, + "protocol": string(r.Protocol), } rules.Add(rule) } From 123cd9239c294821a3f40015bf2e954ab7cbbdb1 Mon Sep 17 00:00:00 2001 From: Sander van Harmelen Date: Tue, 12 May 2015 08:30:47 +0200 Subject: [PATCH 07/91] Updated to use forked azure-sdk-for-go package --- builtin/providers/azure/config.go | 2 +- .../azure/resource_azure_instance.go | 277 +++++++++--------- .../azure/resource_azure_security_group.go | 4 +- .../azure/resource_azure_virtual_network.go | 4 +- 4 files changed, 143 insertions(+), 144 deletions(-) diff --git a/builtin/providers/azure/config.go b/builtin/providers/azure/config.go index 62e302a27..280866399 100644 --- a/builtin/providers/azure/config.go +++ b/builtin/providers/azure/config.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/Azure/azure-sdk-for-go/management" + "github.com/svanharmelen/azure-sdk-for-go/management" ) // Config is the configuration structure used to instantiate a diff --git a/builtin/providers/azure/resource_azure_instance.go b/builtin/providers/azure/resource_azure_instance.go index b3eb5c5af..d0a4e1186 100644 --- a/builtin/providers/azure/resource_azure_instance.go +++ b/builtin/providers/azure/resource_azure_instance.go @@ -6,13 +6,13 @@ import ( "log" "strings" - "github.com/Azure/azure-sdk-for-go/management" - "github.com/Azure/azure-sdk-for-go/management/hostedservice" - "github.com/Azure/azure-sdk-for-go/management/osimage" - "github.com/Azure/azure-sdk-for-go/management/virtualmachine" - "github.com/Azure/azure-sdk-for-go/management/vmutils" "github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/helper/schema" + "github.com/svanharmelen/azure-sdk-for-go/management" + "github.com/svanharmelen/azure-sdk-for-go/management/hostedservice" + "github.com/svanharmelen/azure-sdk-for-go/management/osimage" + "github.com/svanharmelen/azure-sdk-for-go/management/virtualmachine" + "github.com/svanharmelen/azure-sdk-for-go/management/vmutils" ) const ( @@ -166,165 +166,164 @@ func resourceAzureInstance() *schema.Resource { } func resourceAzureInstanceCreate(d *schema.ResourceData, meta interface{}) (err error) { - /* - mc := meta.(*management.Client) + mc := meta.(*management.Client) - name := d.Get("name").(string) + name := d.Get("name").(string) - // Compute/set the description - description := d.Get("description").(string) - if description == "" { - description = name + // Compute/set the description + description := d.Get("description").(string) + if description == "" { + description = name + } + + // Retrieve the needed details of the image + imageName, imageURL, osType, err := retrieveImageDetails(mc, d.Get("image").(string)) + if err != nil { + return err + } + + if imageURL == "" { + storage, ok := d.GetOk("storage") + if !ok { + return fmt.Errorf("When using a platform image, the 'storage' parameter is required") } + imageURL = fmt.Sprintf("http://%s.blob.core.windows.net/vhds/%s.vhd", storage, name) + } - // Retrieve the needed details of the image - imageName, imageURL, osType, err := retrieveImageDetails(mc, d.Get("image").(string)) + // Verify if we have all parameters required for the image OS type + if err := verifyParameters(d, osType); err != nil { + return err + } + + log.Printf("[DEBUG] Creating Cloud Service for instance: %s", name) + req, err := hostedservice.NewClient(*mc). + CreateHostedService( + name, + d.Get("location").(string), + d.Get("reverse_dns").(string), + name, + fmt.Sprintf("Cloud Service created automatically for instance %s", name), + ) + if err != nil { + return fmt.Errorf("Error creating Cloud Service for instance %s: %s", name, err) + } + + // Wait until the Cloud Service is created + if err := mc.WaitAsyncOperation(req); err != nil { + return fmt.Errorf( + "Error waiting for Cloud Service of instance %s to be created: %s", name, err) + } + + // Put in this defer here, so we are sure to cleanup already created parts + // when we exit with an error + defer func(mc *management.Client) { if err != nil { - return err - } - - if imageURL == "" { - storage, ok := d.GetOk("storage") - if !ok { - return fmt.Errorf("When using a platform image, the 'storage' parameter is required") - } - imageURL = fmt.Sprintf("http://%s.blob.core.windows.net/vhds/%s.vhd", storage, name) - } - - // Verify if we have all parameters required for the image OS type - if err := verifyParameters(d, osType); err != nil { - return err - } - - log.Printf("[DEBUG] Creating Cloud Service for instance: %s", name) - req, err := hostedservice.NewClient(*mc). - CreateHostedService( - name, - d.Get("location").(string), - d.Get("reverse_dns").(string), - name, - fmt.Sprintf("Cloud Service created automatically for instance %s", name), - ) - if err != nil { - return fmt.Errorf("Error creating Cloud Service for instance %s: %s", name, err) - } - - // Wait until the Cloud Service is created - if err := mc.WaitAsyncOperation(req); err != nil { - return fmt.Errorf( - "Error waiting for Cloud Service of instance %s to be created: %s", name, err) - } - - // Put in this defer here, so we are sure to cleanup already created parts - // when we exit with an error - defer func(mc *management.Client) { + req, err := hostedservice.NewClient(*mc).DeleteHostedService(name, true) if err != nil { - req, err := hostedservice.NewClient(*mc).DeleteHostedService(name, true) - if err != nil { - log.Printf("[DEBUG] Error cleaning up Cloud Service of instance %s: %s", name, err) - } - - // Wait until the Cloud Service is deleted - if err := mc.WaitAsyncOperation(req); err != nil { - log.Printf( - "[DEBUG] Error waiting for Cloud Service of instance %s to be deleted : %s", name, err) - } + log.Printf("[DEBUG] Error cleaning up Cloud Service of instance %s: %s", name, err) } - }(mc) - // Create a new role for the instance - role := vmutils.NewVmConfiguration(name, d.Get("size").(string)) - - log.Printf("[DEBUG] Configuring deployment from image...") - err = vmutils.ConfigureDeploymentFromPlatformImage( - &role, - imageName, - imageURL, - d.Get("image").(string), - ) - if err != nil { - return fmt.Errorf("Error configuring the deployment for %s: %s", name, err) - } - - if osType == linux { - // This is pretty ugly, but the Azure SDK leaves me no other choice... - if tp, ok := d.GetOk("ssh_key_thumbprint"); ok { - err = vmutils.ConfigureForLinux( - &role, - name, - d.Get("username").(string), - d.Get("password").(string), - tp.(string), - ) - } else { - err = vmutils.ConfigureForLinux( - &role, - name, - d.Get("username").(string), - d.Get("password").(string), - ) - } - if err != nil { - return fmt.Errorf("Error configuring %s for Linux: %s", name, err) + // Wait until the Cloud Service is deleted + if err := mc.WaitAsyncOperation(req); err != nil { + log.Printf( + "[DEBUG] Error waiting for Cloud Service of instance %s to be deleted : %s", name, err) } } + }(mc) - if osType == windows { - err = vmutils.ConfigureForWindows( + // Create a new role for the instance + role := vmutils.NewVmConfiguration(name, d.Get("size").(string)) + + log.Printf("[DEBUG] Configuring deployment from image...") + err = vmutils.ConfigureDeploymentFromPlatformImage( + &role, + imageName, + imageURL, + d.Get("image").(string), + ) + if err != nil { + return fmt.Errorf("Error configuring the deployment for %s: %s", name, err) + } + + if osType == linux { + // This is pretty ugly, but the Azure SDK leaves me no other choice... + if tp, ok := d.GetOk("ssh_key_thumbprint"); ok { + err = vmutils.ConfigureForLinux( &role, name, d.Get("username").(string), d.Get("password").(string), - d.Get("automatic_updates").(bool), - d.Get("time_zone").(string), + tp.(string), + ) + } else { + err = vmutils.ConfigureForLinux( + &role, + name, + d.Get("username").(string), + d.Get("password").(string), + ) + } + if err != nil { + return fmt.Errorf("Error configuring %s for Linux: %s", name, err) + } + } + + if osType == windows { + err = vmutils.ConfigureForWindows( + &role, + name, + d.Get("username").(string), + d.Get("password").(string), + d.Get("automatic_updates").(bool), + d.Get("time_zone").(string), + ) + if err != nil { + return fmt.Errorf("Error configuring %s for Windows: %s", name, err) + } + } + + if s := d.Get("endpoint").(*schema.Set); s.Len() > 0 { + for _, v := range s.List() { + m := v.(map[string]interface{}) + err := vmutils.ConfigureWithExternalPort( + &role, + m["name"].(string), + m["private_port"].(int), + m["public_port"].(int), + endpointProtocol(m["protocol"].(string)), ) if err != nil { - return fmt.Errorf("Error configuring %s for Windows: %s", name, err) + return fmt.Errorf( + "Error adding endpoint %s for instance %s: %s", m["name"].(string), name, err) } } + } - if s := d.Get("endpoint").(*schema.Set); s.Len() > 0 { - for _, v := range s.List() { - m := v.(map[string]interface{}) - err := vmutils.ConfigureWithExternalPort( - &role, - m["name"].(string), - m["private_port"].(int), - m["public_port"].(int), - endpointProtocol(m["protocol"].(string)), - ) - if err != nil { - return fmt.Errorf( - "Error adding endpoint %s for instance %s: %s", m["name"].(string), name, err) - } - } - } + err = vmutils.ConfigureForSubnet(&role, d.Get("subnet").(string)) + if err != nil { + return fmt.Errorf( + "Error adding role to subnet %s for instance %s: %s", d.Get("subnet").(string), name, err) + } - err = vmutils.ConfigureForSubnet(&role, d.Get("subnet").(string)) - if err != nil { - return fmt.Errorf( - "Error adding role to subnet %s for instance %s: %s", d.Get("subnet").(string), name, err) - } + options := virtualmachine.CreateDeploymentOptions{ + Subnet: d.Get("subnet").(string), + VirtualNetworkName: d.Get("virtual_network").(string), + } - options := &virtualmachine.CreateDeploymentOptions{ - Subnet: d.Get("subnet").(string), - VirtualNetworkName: d.Get("virtual_network").(string), - } + log.Printf("[DEBUG] Creating the new instance...") + req, err = virtualmachine.NewClient(*mc).CreateDeployment(role, name, options) + if err != nil { + return fmt.Errorf("Error creating instance %s: %s", name, err) + } - log.Printf("[DEBUG] Creating the new instance...") - req, err = virtualmachine.NewClient(*mc).CreateDeployment(role, name, options) - if err != nil { - return fmt.Errorf("Error creating instance %s: %s", name, err) - } + log.Printf("[DEBUG] Waiting for the new instance to be created...") + if err := mc.WaitAsyncOperation(req); err != nil { + return fmt.Errorf( + "Error waiting for instance %s to be created: %s", name, err) + } - log.Printf("[DEBUG] Waiting for the new instance to be created...") - if err := mc.WaitAsyncOperation(req); err != nil { - return fmt.Errorf( - "Error waiting for instance %s to be created: %s", name, err) - } + d.SetId(name) - d.SetId(name) - */ return resourceAzureInstanceRead(d, meta) } diff --git a/builtin/providers/azure/resource_azure_security_group.go b/builtin/providers/azure/resource_azure_security_group.go index 9406e9309..97351a91a 100644 --- a/builtin/providers/azure/resource_azure_security_group.go +++ b/builtin/providers/azure/resource_azure_security_group.go @@ -5,9 +5,9 @@ import ( "log" "strconv" - "github.com/Azure/azure-sdk-for-go/management" - "github.com/Azure/azure-sdk-for-go/management/networksecuritygroup" "github.com/hashicorp/terraform/helper/schema" + "github.com/svanharmelen/azure-sdk-for-go/management" + "github.com/svanharmelen/azure-sdk-for-go/management/networksecuritygroup" ) func resourceAzureSecurityGroup() *schema.Resource { diff --git a/builtin/providers/azure/resource_azure_virtual_network.go b/builtin/providers/azure/resource_azure_virtual_network.go index 39053cf2d..ce636044d 100644 --- a/builtin/providers/azure/resource_azure_virtual_network.go +++ b/builtin/providers/azure/resource_azure_virtual_network.go @@ -5,10 +5,10 @@ import ( "log" "strings" - "github.com/Azure/azure-sdk-for-go/management" - "github.com/Azure/azure-sdk-for-go/management/virtualnetwork" "github.com/hashicorp/terraform/helper/schema" "github.com/mitchellh/mapstructure" + "github.com/svanharmelen/azure-sdk-for-go/management" + "github.com/svanharmelen/azure-sdk-for-go/management/virtualnetwork" ) const ( From ca1eb1917b84127d31e55334c8c9dea1c3f822c7 Mon Sep 17 00:00:00 2001 From: Sander van Harmelen Date: Mon, 18 May 2015 15:40:45 +0200 Subject: [PATCH 08/91] Adding docs and tweaking the provider --- .../azure/resource_azure_instance.go | 152 +++++++++++++----- .../azure/resource_azure_security_group.go | 25 ++- website/source/assets/stylesheets/_docs.scss | 16 +- .../docs/providers/azure/index.html.markdown | 43 +++++ .../docs/providers/azure/r/disk.html.markdown | 58 +++++++ .../providers/azure/r/instance.html.markdown | 59 +++++++ .../providers/azure/r/security_group.markdown | 69 ++++++++ .../azure/r/virtual_network.html.markdown | 54 +++++++ website/source/layouts/azure.erb | 38 +++++ website/source/layouts/docs.erb | 10 +- 10 files changed, 467 insertions(+), 57 deletions(-) create mode 100644 website/source/docs/providers/azure/index.html.markdown create mode 100644 website/source/docs/providers/azure/r/disk.html.markdown create mode 100644 website/source/docs/providers/azure/r/instance.html.markdown create mode 100644 website/source/docs/providers/azure/r/security_group.markdown create mode 100644 website/source/docs/providers/azure/r/virtual_network.html.markdown create mode 100644 website/source/layouts/azure.erb diff --git a/builtin/providers/azure/resource_azure_instance.go b/builtin/providers/azure/resource_azure_instance.go index d0a4e1186..dd1752477 100644 --- a/builtin/providers/azure/resource_azure_instance.go +++ b/builtin/providers/azure/resource_azure_instance.go @@ -4,7 +4,6 @@ import ( "bytes" "fmt" "log" - "strings" "github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/helper/schema" @@ -12,6 +11,7 @@ import ( "github.com/svanharmelen/azure-sdk-for-go/management/hostedservice" "github.com/svanharmelen/azure-sdk-for-go/management/osimage" "github.com/svanharmelen/azure-sdk-for-go/management/virtualmachine" + "github.com/svanharmelen/azure-sdk-for-go/management/virtualmachineimage" "github.com/svanharmelen/azure-sdk-for-go/management/vmutils" ) @@ -55,6 +55,7 @@ func resourceAzureInstance() *schema.Resource { "subnet": &schema.Schema{ Type: schema.TypeString, Optional: true, + Computed: true, ForceNew: true, }, @@ -142,14 +143,10 @@ func resourceAzureInstance() *schema.Resource { Set: resourceAzureEndpointHash, }, - "security_groups": &schema.Schema{ - Type: schema.TypeSet, + "security_group": &schema.Schema{ + Type: schema.TypeString, Optional: true, Computed: true, - Elem: &schema.Schema{Type: schema.TypeString}, - Set: func(v interface{}) int { - return hashcode.String(v.(string)) - }, }, "ip_address": &schema.Schema{ @@ -177,19 +174,11 @@ func resourceAzureInstanceCreate(d *schema.ResourceData, meta interface{}) (err } // Retrieve the needed details of the image - imageName, imageURL, osType, err := retrieveImageDetails(mc, d.Get("image").(string)) + configForImage, osType, err := retrieveImageDetails(mc, d.Get("image").(string)) if err != nil { return err } - if imageURL == "" { - storage, ok := d.GetOk("storage") - if !ok { - return fmt.Errorf("When using a platform image, the 'storage' parameter is required") - } - imageURL = fmt.Sprintf("http://%s.blob.core.windows.net/vhds/%s.vhd", storage, name) - } - // Verify if we have all parameters required for the image OS type if err := verifyParameters(d, osType); err != nil { return err @@ -299,14 +288,23 @@ func resourceAzureInstanceCreate(d *schema.ResourceData, meta interface{}) (err } } - err = vmutils.ConfigureForSubnet(&role, d.Get("subnet").(string)) - if err != nil { - return fmt.Errorf( - "Error adding role to subnet %s for instance %s: %s", d.Get("subnet").(string), name, err) + if subnet, ok := d.GetOk("subnet"); ok { + err = vmutils.ConfigureWithSubnet(&role, subnet.(string)) + if err != nil { + return fmt.Errorf( + "Error associating subnet %s with instance %s: %s", d.Get("subnet").(string), name, err) + } + } + + if sg, ok := d.GetOk("security_group"); ok { + err = vmutils.ConfigureWithSecurityGroup(&role, sg.(string)) + if err != nil { + return fmt.Errorf( + "Error associating security group %s with instance %s: %s", sg.(string), name, err) + } } options := virtualmachine.CreateDeploymentOptions{ - Subnet: d.Get("subnet").(string), VirtualNetworkName: d.Get("virtual_network").(string), } @@ -349,11 +347,14 @@ func resourceAzureInstanceRead(d *schema.ResourceData, meta interface{}) error { return fmt.Errorf( "Instance %s has an unexpected number of roles: %d", d.Id(), len(dpmt.RoleList)) } + + d.Set("image", dpmt.RoleList[0].VMImageName) d.Set("size", dpmt.RoleList[0].RoleSize) if len(dpmt.RoleInstanceList) != 1 { return fmt.Errorf( - "Instance %s has an unexpected number of role instances %d", d.Id(), len(dpmt.RoleInstanceList)) + "Instance %s has an unexpected number of role instances: %d", + d.Id(), len(dpmt.RoleInstanceList)) } d.Set("ip_address", dpmt.RoleInstanceList[0].IpAddress) @@ -361,15 +362,16 @@ func resourceAzureInstanceRead(d *schema.ResourceData, meta interface{}) error { d.Set("vip_address", dpmt.RoleInstanceList[0].InstanceEndpoints[0].Vip) } - // Create a new set to hold all configured endpoints - endpoints := &schema.Set{ - F: resourceAzureEndpointHash, - } - - // Loop through all endpoints and add them to the set - for _, c := range *dpmt.RoleList[0].ConfigurationSets { + // Find the network configuration set + for _, c := range dpmt.RoleList[0].ConfigurationSets { if c.ConfigurationSetType == virtualmachine.ConfigurationSetTypeNetwork { - for _, ep := range *c.InputEndpoints { + // Create a new set to hold all configured endpoints + endpoints := &schema.Set{ + F: resourceAzureEndpointHash, + } + + // Loop through all endpoints + for _, ep := range c.InputEndpoints { endpoint := map[string]interface{}{} // Update the values @@ -379,8 +381,22 @@ func resourceAzureInstanceRead(d *schema.ResourceData, meta interface{}) error { endpoint["private_port"] = ep.LocalPort endpoints.Add(endpoint) } - d.Set("endpoint", endpoints) + + // Update the subnet + switch len(c.SubnetNames) { + case 1: + d.Set("subnet", c.SubnetNames[0]) + case 0: + d.Set("subnet", "") + default: + return fmt.Errorf( + "Instance %s has an unexpected number of associated subnets %d", + d.Id(), len(dpmt.RoleInstanceList)) + } + + // Update the security group + d.Set("security_group", c.NetworkSecurityGroup) } } @@ -403,7 +419,7 @@ func resourceAzureInstanceUpdate(d *schema.ResourceData, meta interface{}) error mc := meta.(*management.Client) // First check if anything we can update changed, and if not just return - if !d.HasChange("size") && !d.HasChange("endpoint") { + if !d.HasChange("size") && !d.HasChange("endpoint") && !d.HasChange("security_group") { return nil } @@ -426,10 +442,10 @@ func resourceAzureInstanceUpdate(d *schema.ResourceData, meta interface{}) error _, n := d.GetChange("endpoint") // Delete the existing endpoints - for i, c := range *role.ConfigurationSets { + for i, c := range role.ConfigurationSets { if c.ConfigurationSetType == virtualmachine.ConfigurationSetTypeNetwork { c.InputEndpoints = nil - (*role.ConfigurationSets)[i] = c + role.ConfigurationSets[i] = c } } @@ -452,6 +468,15 @@ func resourceAzureInstanceUpdate(d *schema.ResourceData, meta interface{}) error } } + if d.HasChange("security_group") { + sg := d.Get("security_group").(string) + err := vmutils.ConfigureWithSecurityGroup(role, sg) + if err != nil { + return fmt.Errorf( + "Error associating security group %s with instance %s: %s", sg, d.Id(), err) + } + } + // Update the adjusted role req, err := virtualmachine.NewClient(*mc).UpdateRole(d.Id(), d.Id(), d.Id(), *role) if err != nil { @@ -497,26 +522,65 @@ func resourceAzureEndpointHash(v interface{}) int { return hashcode.String(buf.String()) } -func retrieveImageDetails(mc *management.Client, label string) (string, string, string, error) { +func retrieveImageDetails(mc *management.Client, id, storage string) (func() error, string, error) { + imageName, imageURL, osType, err := retrieveOSImageDetails(mc, id) + if err == nil { + + return imageName, imageURL, osType, nil + } + + imageName, imageURL, osType, err = retrieveVMImageDetails(mc, id) + if err == nil { + return imageName, imageURL, osType, nil + } + + return "", "", "", fmt.Errorf("Could not find image with label or name '%s'", id) +} + +func retrieveOSImageDetails( + mc *management.Client, + label, + storage string) (func() error, string, error) { imgs, err := osimage.NewClient(*mc).GetImageList() + if err != nil { + return nil, "", fmt.Errorf("Error retrieving image details: %s", err) + } + + for _, img := range imgs { + if img.Label == label { + if img.OS != linux && img.OS != windows { + return nil, "", fmt.Errorf("Unsupported image OS: %s", img.OS) + } + if img.MediaLink == "" { + if storage == "" { + return nil, "", + fmt.Errorf("When using a platform image, the 'storage' parameter is required") + } + imageURL = fmt.Sprintf("http://%s.blob.core.windows.net/vhds/%s.vhd", storage, id) + } + return img.Name, img.MediaLink, img.OS, nil + } + } + + return "", "", "", fmt.Errorf("Could not find image with label '%s'", label) +} + +func retrieveVMImageDetails(mc *management.Client, name string) (string, string, string, error) { + imgs, err := virtualmachineimage.NewClient(*mc).GetImageList() if err != nil { return "", "", "", fmt.Errorf("Error retrieving image details: %s", err) } - var labels []string for _, img := range imgs { - if img.Label == label { - if img.OS != linux && img.OS != windows { - return "", "", "", fmt.Errorf("Unsupported image OS: %s", img.OS) + if img.Name == name { + if img.OSDiskConfiguration.OS != linux && img.OSDiskConfiguration.OS != windows { + return "", "", "", fmt.Errorf("Unsupported image OS: %s", img.OSDiskConfiguration.OS) } - return img.Name, img.MediaLink, img.OS, nil + return img.Name, img.OSDiskConfiguration.MediaLink, img.OSDiskConfiguration.OS, nil } - labels = append(labels, img.Label) } - return "", "", "", - fmt.Errorf("Could not find image with label '%s', available labels are: %s", - label, strings.Join(labels, ",")) + return "", "", "", fmt.Errorf("Could not find image with name '%s'", name) } func endpointProtocol(p string) virtualmachine.InputEndpointProtocol { diff --git a/builtin/providers/azure/resource_azure_security_group.go b/builtin/providers/azure/resource_azure_security_group.go index 97351a91a..cbac36a3e 100644 --- a/builtin/providers/azure/resource_azure_security_group.go +++ b/builtin/providers/azure/resource_azure_security_group.go @@ -1,10 +1,12 @@ package azure import ( + "bytes" "fmt" "log" "strconv" + "github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/helper/schema" "github.com/svanharmelen/azure-sdk-for-go/management" "github.com/svanharmelen/azure-sdk-for-go/management/networksecuritygroup" @@ -107,9 +109,15 @@ func resourceAzureSecurityGroupCreate(d *schema.ResourceData, meta interface{}) name := d.Get("name").(string) + // Compute/set the label + label := d.Get("label").(string) + if label == "" { + label = name + } + req, err := networksecuritygroup.NewClient(*mc).CreateNetworkSecurityGroup( name, - d.Get("label").(string), + label, d.Get("location").(string), ) if err != nil { @@ -301,7 +309,20 @@ func resourceAzureSecurityGroupRuleDelete( } func resourceAzureSecurityGroupRuleHash(v interface{}) int { - return 0 + var buf bytes.Buffer + m := v.(map[string]interface{}) + buf.WriteString(fmt.Sprintf( + "%s-%d-%s-%s-%s-%s-%s-%s", + m["type"].(string), + m["priority"].(int), + m["action"].(string), + m["source_cidr"].(string), + m["source_port"].(string), + m["destination_cidr"].(string), + m["destination_port"].(string), + m["protocol"].(string))) + + return hashcode.String(buf.String()) } func verifySecurityGroupRuleParams(rule map[string]interface{}) error { diff --git a/website/source/assets/stylesheets/_docs.scss b/website/source/assets/stylesheets/_docs.scss index 48a92b0a7..0cf800715 100755 --- a/website/source/assets/stylesheets/_docs.scss +++ b/website/source/assets/stylesheets/_docs.scss @@ -7,22 +7,23 @@ body.page-sub{ } body.layout-atlas, -body.layout-consul, -body.layout-dnsimple, -body.layout-dme, -body.layout-docker, +body.layout-aws, +body.layout-azure, body.layout-cloudflare, body.layout-cloudstack, +body.layout-consul, +body.layout-digitalocean, +body.layout-dme, +body.layout-dnsimple, +body.layout-docker, body.layout-google, body.layout-heroku, body.layout-mailgun, body.layout-openstack, body.layout-template, -body.layout-digitalocean, -body.layout-aws, body.layout-docs, -body.layout-inner, body.layout-downloads, +body.layout-inner, body.layout-intro{ background: $light-black image-url('sidebar-wire.png') left 62px no-repeat; @@ -287,4 +288,3 @@ body.layout-intro{ } } } - diff --git a/website/source/docs/providers/azure/index.html.markdown b/website/source/docs/providers/azure/index.html.markdown new file mode 100644 index 000000000..fd4081a67 --- /dev/null +++ b/website/source/docs/providers/azure/index.html.markdown @@ -0,0 +1,43 @@ +--- +layout: "azure" +page_title: "Provider: Azure" +sidebar_current: "docs-azure-index" +description: |- + The Azure provider is used to interact with the many resources supported by Azure. The provider needs to be configured with a publish settings file and optionally a subscription ID before it can be used. +--- + +# Azure Provider + +The Azure provider is used to interact with the many resources supported +by Azure. The provider needs to be configured with a [publish settings +file](https://manage.windowsazure.com/publishsettings) and optionally a +subscription ID before it can be used. + +Use the navigation to the left to read about the available resources. + +## Example Usage + +``` +# Configure the Azure Provider +provider "azure" { + settings_file = "${var.azure_settings_file}" +} + +# Create a web server +resource "azure_instance" "web" { + ... +} +``` + +## Argument Reference + +The following arguments are supported: + +* `settings_file` - (Required) The path to a publish settings file used to + authenticate with the Azure API. You can download the settings file here: + https://manage.windowsazure.com/publishsettings. It must be provided, but + it can also be sourced from the `AZURE_SETTINGS_FILE` environment variable. + +* `subscription_id` - (Optional) The subscription ID to use. If not provided + the first subscription ID in publish settings file will be used. It can + also be sourced from the `AZURE_SUBSCRIPTION_ID` environment variable. diff --git a/website/source/docs/providers/azure/r/disk.html.markdown b/website/source/docs/providers/azure/r/disk.html.markdown new file mode 100644 index 000000000..53ae73656 --- /dev/null +++ b/website/source/docs/providers/azure/r/disk.html.markdown @@ -0,0 +1,58 @@ +--- +layout: "cloudstack" +page_title: "CloudStack: cloudstack_disk" +sidebar_current: "docs-cloudstack-resource-disk" +description: |- + Creates a disk volume from a disk offering. This disk volume will be attached to a virtual machine if the optional parameters are configured. +--- + +# cloudstack\_disk + +Creates a disk volume from a disk offering. This disk volume will be attached to +a virtual machine if the optional parameters are configured. + +## Example Usage + +``` +resource "cloudstack_disk" "default" { + name = "test-disk" + attach = "true" + disk_offering = "custom" + size = 50 + virtual-machine = "server-1" + zone = "zone-1" +} +``` + +## Argument Reference + +The following arguments are supported: + +* `name` - (Required) The name of the disk volume. Changing this forces a new + resource to be created. + +* `attach` - (Optional) Determines whether or not to attach the disk volume to a + virtual machine (defaults false). + +* `device` - (Optional) The device to map the disk volume to within the guest OS. + +* `disk_offering` - (Required) The name or ID of the disk offering to use for + this disk volume. + +* `size` - (Optional) The size of the disk volume in gigabytes. + +* `shrink_ok` - (Optional) Verifies if the disk volume is allowed to shrink when + resizing (defaults false). + +* `virtual_machine` - (Optional) The name of the virtual machine to which you + want to attach the disk volume. + +* `zone` - (Required) The name or ID of the zone where this disk volume will be available. + Changing this forces a new resource to be created. + +## Attributes Reference + +The following attributes are exported: + +* `id` - The ID of the disk volume. +* `device` - The device the disk volume is mapped to within the guest OS. diff --git a/website/source/docs/providers/azure/r/instance.html.markdown b/website/source/docs/providers/azure/r/instance.html.markdown new file mode 100644 index 000000000..8779494e4 --- /dev/null +++ b/website/source/docs/providers/azure/r/instance.html.markdown @@ -0,0 +1,59 @@ +--- +layout: "azure" +page_title: "Azure: azure_instance" +sidebar_current: "docs-azure-resource-instance" +description: |- + Creates and automatically starts a virtual machine based on a service offering, disk offering, and template. +--- + +# azure\_instance + +Creates and automatically starts a virtual machine based on a service offering, +disk offering, and template. + +## Example Usage + +``` +resource "azure_instance" "web" { + name = "server-1" + service_offering= "small" + network = "network-1" + template = "CentOS 6.5" + zone = "zone-1" +} +``` + +## Argument Reference + +The following arguments are supported: + +* `name` - (Required) The name of the instance. Changing this forces a new + resource to be created. + +* `display_name` - (Optional) The display name of the instance. + +* `service_offering` - (Required) The name or ID of the service offering used for this instance. + +* `network` - (Optional) The name or ID of the network to connect this instance to. + Changing this forces a new resource to be created. + +* `ipaddress` - (Optional) The IP address to assign to this instance. Changing + this forces a new resource to be created. + +* `template` - (Required) The name or ID of the template used for this instance. + Changing this forces a new resource to be created. + +* `zone` - (Required) The name of the zone where this instance will be created. + Changing this forces a new resource to be created. + +* `user_data` - (Optional) The user data to provide when launching the instance. + +* `expunge` - (Optional) This determines if the instance is expunged when it is + destroyed (defaults false) + +## Attributes Reference + +The following attributes are exported: + +* `id` - The instance ID. +* `display_name` - The display name of the instance. diff --git a/website/source/docs/providers/azure/r/security_group.markdown b/website/source/docs/providers/azure/r/security_group.markdown new file mode 100644 index 000000000..f82b8f446 --- /dev/null +++ b/website/source/docs/providers/azure/r/security_group.markdown @@ -0,0 +1,69 @@ +--- +layout: "cloudstack" +page_title: "CloudStack: cloudstack_network_acl_rule" +sidebar_current: "docs-cloudstack-resource-network-acl-rule" +description: |- + Creates network ACL rules for a given network ACL. +--- + +# cloudstack\_network\_acl\_rule + +Creates network ACL rules for a given network ACL. + +## Example Usage + +``` +resource "cloudstack_network_acl_rule" "default" { + aclid = "f3843ce0-334c-4586-bbd3-0c2e2bc946c6" + + rule { + action = "allow" + source_cidr = "10.0.0.0/8" + protocol = "tcp" + ports = ["80", "1000-2000"] + traffic_type = "ingress" + } +} +``` + +## Argument Reference + +The following arguments are supported: + +* `aclid` - (Required) The network ACL ID for which to create the rules. + Changing this forces a new resource to be created. + +* `managed` - (Optional) USE WITH CAUTION! If enabled all the firewall rules for + this network ACL will be managed by this resource. This means it will delete + all firewall rules that are not in your config! (defaults false) + +* `rule` - (Optional) Can be specified multiple times. Each rule block supports + fields documented below. If `managed = false` at least one rule is required! + +The `rule` block supports: + +* `action` - (Optional) The action for the rule. Valid options are: `allow` and + `deny` (defaults allow). + +* `source_cidr` - (Required) The source CIDR to allow access to the given ports. + +* `protocol` - (Required) The name of the protocol to allow. Valid options are: + `tcp`, `udp`, `icmp`, `all` or a valid protocol number. + +* `icmp_type` - (Optional) The ICMP type to allow. This can only be specified if + the protocol is ICMP. + +* `icmp_code` - (Optional) The ICMP code to allow. This can only be specified if + the protocol is ICMP. + +* `ports` - (Optional) List of ports and/or port ranges to allow. This can only + be specified if the protocol is TCP, UDP, ALL or a valid protocol number. + +* `traffic_type` - (Optional) The traffic type for the rule. Valid options are: + `ingress` or `egress` (defaults ingress). + +## Attributes Reference + +The following attributes are exported: + +* `id` - The ACL ID for which the rules are created. diff --git a/website/source/docs/providers/azure/r/virtual_network.html.markdown b/website/source/docs/providers/azure/r/virtual_network.html.markdown new file mode 100644 index 000000000..9819a8ce3 --- /dev/null +++ b/website/source/docs/providers/azure/r/virtual_network.html.markdown @@ -0,0 +1,54 @@ +--- +layout: "cloudstack" +page_title: "CloudStack: cloudstack_network" +sidebar_current: "docs-cloudstack-resource-network" +description: |- + Creates a network. +--- + +# cloudstack\_network + +Creates a network. + +## Example Usage + +Basic usage: + +``` +resource "cloudstack_network" "default" { + name = "test-network" + cidr = "10.0.0.0/16" + network_offering = "Default Network" + zone = "zone-1" +} +``` + +## Argument Reference + +The following arguments are supported: + +* `name` - (Required) The name of the network. + +* `display_text` - (Optional) The display text of the network. + +* `cidr` - (Required) The CIDR block for the network. Changing this forces a new + resource to be created. + +* `network_offering` - (Required) The name or ID of the network offering to use + for this network. + +* `vpc` - (Optional) The name of the VPC to create this network for. Changing + this forces a new resource to be created. + +* `aclid` - (Optional) The ID of a network ACL that should be attached to the + network. Changing this forces a new resource to be created. + +* `zone` - (Required) The name or ID of the zone where this disk volume will be + available. Changing this forces a new resource to be created. + +## Attributes Reference + +The following attributes are exported: + +* `id` - The ID of the network. +* `display_text` - The display text of the network. diff --git a/website/source/layouts/azure.erb b/website/source/layouts/azure.erb new file mode 100644 index 000000000..9d60e3f90 --- /dev/null +++ b/website/source/layouts/azure.erb @@ -0,0 +1,38 @@ +<% wrap_layout :inner do %> + <% content_for :sidebar do %> + + <% end %> + + <%= yield %> +<% end %> diff --git a/website/source/layouts/docs.erb b/website/source/layouts/docs.erb index dd60cad04..dbbf87b8a 100644 --- a/website/source/layouts/docs.erb +++ b/website/source/layouts/docs.erb @@ -119,19 +119,23 @@
    > Atlas - + > AWS + > + Azure + + > CloudFlare - + > CloudStack - + > Consul From 1dbd32c6a7eb71ba3df21c8d36c0cf15e9ad099a Mon Sep 17 00:00:00 2001 From: Sander van Harmelen Date: Mon, 18 May 2015 18:46:02 +0200 Subject: [PATCH 09/91] Extending instance resource to enable using custom VM images --- .../azure/resource_azure_instance.go | 82 ++++++++++++------- 1 file changed, 52 insertions(+), 30 deletions(-) diff --git a/builtin/providers/azure/resource_azure_instance.go b/builtin/providers/azure/resource_azure_instance.go index dd1752477..958a28bbe 100644 --- a/builtin/providers/azure/resource_azure_instance.go +++ b/builtin/providers/azure/resource_azure_instance.go @@ -174,7 +174,11 @@ func resourceAzureInstanceCreate(d *schema.ResourceData, meta interface{}) (err } // Retrieve the needed details of the image - configForImage, osType, err := retrieveImageDetails(mc, d.Get("image").(string)) + configureForImage, osType, err := retrieveImageDetails( + mc, + d.Get("image").(string), + d.Get("storage").(string), + ) if err != nil { return err } @@ -221,15 +225,10 @@ func resourceAzureInstanceCreate(d *schema.ResourceData, meta interface{}) (err }(mc) // Create a new role for the instance - role := vmutils.NewVmConfiguration(name, d.Get("size").(string)) + role := vmutils.NewVMConfiguration(name, d.Get("size").(string)) log.Printf("[DEBUG] Configuring deployment from image...") - err = vmutils.ConfigureDeploymentFromPlatformImage( - &role, - imageName, - imageURL, - d.Get("image").(string), - ) + err = configureForImage(&role) if err != nil { return fmt.Errorf("Error configuring the deployment for %s: %s", name, err) } @@ -334,7 +333,7 @@ func resourceAzureInstanceRead(d *schema.ResourceData, meta interface{}) error { return fmt.Errorf("Error retrieving Cloud Service of instance %s: %s", d.Id(), err) } - d.Set("reverse_dns", cs.ReverseDnsFqdn) + d.Set("reverse_dns", cs.ReverseDNSFqdn) d.Set("location", cs.Location) log.Printf("[DEBUG] Retrieving instance: %s", d.Id()) @@ -348,7 +347,6 @@ func resourceAzureInstanceRead(d *schema.ResourceData, meta interface{}) error { "Instance %s has an unexpected number of roles: %d", d.Id(), len(dpmt.RoleList)) } - d.Set("image", dpmt.RoleList[0].VMImageName) d.Set("size", dpmt.RoleList[0].RoleSize) if len(dpmt.RoleInstanceList) != 1 { @@ -356,7 +354,7 @@ func resourceAzureInstanceRead(d *schema.ResourceData, meta interface{}) error { "Instance %s has an unexpected number of role instances: %d", d.Id(), len(dpmt.RoleInstanceList)) } - d.Set("ip_address", dpmt.RoleInstanceList[0].IpAddress) + d.Set("ip_address", dpmt.RoleInstanceList[0].IPAddress) if len(dpmt.RoleInstanceList[0].InstanceEndpoints) > 0 { d.Set("vip_address", dpmt.RoleInstanceList[0].InstanceEndpoints[0].Vip) @@ -522,25 +520,27 @@ func resourceAzureEndpointHash(v interface{}) int { return hashcode.String(buf.String()) } -func retrieveImageDetails(mc *management.Client, id, storage string) (func() error, string, error) { - imageName, imageURL, osType, err := retrieveOSImageDetails(mc, id) +func retrieveImageDetails( + mc *management.Client, + label string, + storage string) (func(*virtualmachine.Role) error, string, error) { + configureForImage, osType, err := retrieveOSImageDetails(mc, label, storage) if err == nil { - - return imageName, imageURL, osType, nil + return configureForImage, osType, nil } - imageName, imageURL, osType, err = retrieveVMImageDetails(mc, id) + configureForImage, osType, err = retrieveVMImageDetails(mc, label) if err == nil { - return imageName, imageURL, osType, nil + return configureForImage, osType, nil } - return "", "", "", fmt.Errorf("Could not find image with label or name '%s'", id) + return nil, "", fmt.Errorf("Could not find image with label '%s'", label) } func retrieveOSImageDetails( mc *management.Client, label, - storage string) (func() error, string, error) { + storage string) (func(*virtualmachine.Role) error, string, error) { imgs, err := osimage.NewClient(*mc).GetImageList() if err != nil { return nil, "", fmt.Errorf("Error retrieving image details: %s", err) @@ -556,39 +556,61 @@ func retrieveOSImageDetails( return nil, "", fmt.Errorf("When using a platform image, the 'storage' parameter is required") } - imageURL = fmt.Sprintf("http://%s.blob.core.windows.net/vhds/%s.vhd", storage, id) + img.MediaLink = fmt.Sprintf("http://%s.blob.core.windows.net/vhds/%s.vhd", storage, label) } - return img.Name, img.MediaLink, img.OS, nil + + configureForImage := func(role *virtualmachine.Role) error { + return vmutils.ConfigureDeploymentFromPlatformImage( + role, + img.Name, + img.MediaLink, + label, + ) + } + + return configureForImage, img.OS, nil } } - return "", "", "", fmt.Errorf("Could not find image with label '%s'", label) + return nil, "", fmt.Errorf("Could not find image with label '%s'", label) } -func retrieveVMImageDetails(mc *management.Client, name string) (string, string, string, error) { +func retrieveVMImageDetails( + mc *management.Client, + label string) (func(*virtualmachine.Role) error, string, error) { imgs, err := virtualmachineimage.NewClient(*mc).GetImageList() if err != nil { - return "", "", "", fmt.Errorf("Error retrieving image details: %s", err) + return nil, "", fmt.Errorf("Error retrieving image details: %s", err) } for _, img := range imgs { - if img.Name == name { + if img.Label == label { if img.OSDiskConfiguration.OS != linux && img.OSDiskConfiguration.OS != windows { - return "", "", "", fmt.Errorf("Unsupported image OS: %s", img.OSDiskConfiguration.OS) + return nil, "", fmt.Errorf("Unsupported image OS: %s", img.OSDiskConfiguration.OS) } - return img.Name, img.OSDiskConfiguration.MediaLink, img.OSDiskConfiguration.OS, nil + + configureForImage := func(role *virtualmachine.Role) error { + return vmutils.ConfigureDeploymentFromVMImage( + role, + img.Name, + "", + true, + ) + } + + return configureForImage, img.OSDiskConfiguration.OS, nil } } - return "", "", "", fmt.Errorf("Could not find image with name '%s'", name) + return nil, "", fmt.Errorf("Could not find image with label '%s'", label) } func endpointProtocol(p string) virtualmachine.InputEndpointProtocol { if p == "tcp" { - return virtualmachine.InputEndpointProtocolTcp + return virtualmachine.InputEndpointProtocolTCP } - return virtualmachine.InputEndpointProtocolUdp + return virtualmachine.InputEndpointProtocolUDP } func verifyParameters(d *schema.ResourceData, osType string) error { From 83e3ab1fc711c70dcbb5731d941ae9d2ea70083a Mon Sep 17 00:00:00 2001 From: Sander van Harmelen Date: Fri, 22 May 2015 15:31:14 +0200 Subject: [PATCH 10/91] Seems to be almost ready... --- builtin/providers/azure/provider.go | 2 +- .../providers/azure/resource_azure_disk.go | 291 +++++++++++++++++- .../azure/resource_azure_instance.go | 146 +++++---- .../azure/resource_azure_security_group.go | 8 +- .../azure/resource_azure_virtual_network.go | 24 +- 5 files changed, 372 insertions(+), 99 deletions(-) diff --git a/builtin/providers/azure/provider.go b/builtin/providers/azure/provider.go index c4f117391..8fec6f012 100644 --- a/builtin/providers/azure/provider.go +++ b/builtin/providers/azure/provider.go @@ -23,7 +23,7 @@ func Provider() terraform.ResourceProvider { }, ResourcesMap: map[string]*schema.Resource{ - "azure_disk": resourceAzureDisk(), + "azure_data_disk": resourceAzureDataDisk(), "azure_instance": resourceAzureInstance(), "azure_security_group": resourceAzureSecurityGroup(), "azure_virtual_network": resourceAzureVirtualNetwork(), diff --git a/builtin/providers/azure/resource_azure_disk.go b/builtin/providers/azure/resource_azure_disk.go index 3b67a39c7..bbb4a68cc 100644 --- a/builtin/providers/azure/resource_azure_disk.go +++ b/builtin/providers/azure/resource_azure_disk.go @@ -1,44 +1,301 @@ package azure -import "github.com/hashicorp/terraform/helper/schema" +import ( + "fmt" + "log" -func resourceAzureDisk() *schema.Resource { + "github.com/hashicorp/terraform/helper/schema" + "github.com/svanharmelen/azure-sdk-for-go/management" + "github.com/svanharmelen/azure-sdk-for-go/management/virtualmachinedisk" +) + +const dataDiskBlobStorageURL = "http://%s.blob.core.windows.net/disks/%s.vhd" + +func resourceAzureDataDisk() *schema.Resource { return &schema.Resource{ - Create: resourceAzureDiskCreate, - Read: resourceAzureDiskRead, - Update: resourceAzureDiskUpdate, - Delete: resourceAzureDiskDelete, + Create: resourceAzureDataDiskCreate, + Read: resourceAzureDataDiskRead, + Update: resourceAzureDataDiskUpdate, + Delete: resourceAzureDataDiskDelete, Schema: map[string]*schema.Schema{ "name": &schema.Schema{ Type: schema.TypeString, - Required: true, + Optional: true, + Computed: true, ForceNew: true, }, + + "lun": &schema.Schema{ + Type: schema.TypeInt, + Required: true, + }, + + "size": &schema.Schema{ + Type: schema.TypeInt, + Required: true, + }, + + "caching": &schema.Schema{ + Type: schema.TypeString, + Optional: true, + Default: "None", + }, + + "storage": &schema.Schema{ + Type: schema.TypeString, + Optional: true, + ForceNew: true, + }, + + "media_link": &schema.Schema{ + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, + }, + + "source_media_link": &schema.Schema{ + Type: schema.TypeString, + Optional: true, + ForceNew: true, + }, + + "virtual_machine": &schema.Schema{ + Type: schema.TypeString, + Required: true, + }, }, } } -func resourceAzureDiskCreate(d *schema.ResourceData, meta interface{}) error { - //mc := meta.(*management.Client) +func resourceAzureDataDiskCreate(d *schema.ResourceData, meta interface{}) error { + mc := meta.(*management.Client) - return resourceAzureDiskRead(d, meta) + if err := verifyDataDiskParameters(d); err != nil { + return err + } + + lun := d.Get("lun").(int) + vm := d.Get("virtual_machine").(string) + + p := virtualmachinedisk.CreateDataDiskParameters{ + Lun: lun, + LogicalDiskSizeInGB: d.Get("size").(int), + HostCaching: hostCaching(d), + MediaLink: mediaLink(d), + SourceMediaLink: d.Get("source_media_link").(string), + } + + if name, ok := d.GetOk("name"); ok { + p.DiskName = name.(string) + } + + log.Printf("[DEBUG] Adding data disk %d to instance: %s", lun, vm) + req, err := virtualmachinedisk.NewClient(*mc).AddDataDisk(vm, vm, vm, p) + if err != nil { + return fmt.Errorf("Error adding data disk %d to instance %s: %s", lun, vm, err) + } + + // Wait until the data disk is added + if err := mc.WaitForOperation(req, nil); err != nil { + return fmt.Errorf( + "Error waiting for data disk %d to be added to instance %s: %s", lun, vm, err) + } + + log.Printf("[DEBUG] Retrieving data disk %d from instance %s", lun, vm) + disk, err := virtualmachinedisk.NewClient(*mc).GetDataDisk(vm, vm, vm, lun) + if err != nil { + return fmt.Errorf("Error retrieving data disk %d from instance %s: %s", lun, vm, err) + } + + d.SetId(disk.DiskName) + + return resourceAzureDataDiskRead(d, meta) } -func resourceAzureDiskRead(d *schema.ResourceData, meta interface{}) error { - //mc := meta.(*management.Client) +func resourceAzureDataDiskRead(d *schema.ResourceData, meta interface{}) error { + mc := meta.(*management.Client) + + lun := d.Get("lun").(int) + vm := d.Get("virtual_machine").(string) + + log.Printf("[DEBUG] Retrieving data disk: %s", d.Id()) + datadisk, err := virtualmachinedisk.NewClient(*mc).GetDataDisk(vm, vm, vm, lun) + if err != nil { + return fmt.Errorf("Error retrieving data disk %s: %s", d.Id(), err) + } + + d.Set("name", datadisk.DiskName) + d.Set("lun", datadisk.Lun) + d.Set("size", datadisk.LogicalDiskSizeInGB) + d.Set("caching", datadisk.HostCaching) + d.Set("media_link", datadisk.MediaLink) + + log.Printf("[DEBUG] Retrieving disk: %s", d.Id()) + disk, err := virtualmachinedisk.NewClient(*mc).GetDisk(d.Id()) + if err != nil { + return fmt.Errorf("Error retrieving disk %s: %s", d.Id(), err) + } + + d.Set("virtual_machine", disk.AttachedTo.RoleName) return nil } -func resourceAzureDiskUpdate(d *schema.ResourceData, meta interface{}) error { - //mc := meta.(*management.Client) +func resourceAzureDataDiskUpdate(d *schema.ResourceData, meta interface{}) error { + mc := meta.(*management.Client) + lun := d.Get("lun").(int) + vm := d.Get("virtual_machine").(string) - return resourceAzureDiskRead(d, meta) + if d.HasChange("size") { + p := virtualmachinedisk.UpdateDiskParameters{ + Name: d.Id(), + } + + if d.HasChange("size") { + p.ResizedSizeInGB = d.Get("size").(int) + } + + log.Printf("[DEBUG] Updating disk: %s", d.Id()) + req, err := virtualmachinedisk.NewClient(*mc).UpdateDisk(d.Id(), p) + if err != nil { + return fmt.Errorf("Error updating disk %s: %s", d.Id(), err) + } + + // Wait until the disk is updated + if err := mc.WaitForOperation(req, nil); err != nil { + return fmt.Errorf( + "Error waiting for disk %s to be updated: %s", d.Id(), err) + } + } + + if d.HasChange("virtual_machine") { + log.Printf("[DEBUG] Detaching data disk: %s", d.Id()) + req, err := virtualmachinedisk.NewClient(*mc).DeleteDataDisk(vm, vm, vm, lun, false) + if err != nil { + return fmt.Errorf("Error detaching data disk %s: %s", d.Id(), err) + } + + // Wait until the data disk is detached + if err := mc.WaitForOperation(req, nil); err != nil { + return fmt.Errorf( + "Error waiting for data disk %s to be detached: %s", d.Id(), err) + } + + p := virtualmachinedisk.CreateDataDiskParameters{ + DiskName: d.Id(), + Lun: lun, + HostCaching: hostCaching(d), + MediaLink: mediaLink(d), + } + + log.Printf("[DEBUG] Attaching data disk: %s", d.Id()) + req, err = virtualmachinedisk.NewClient(*mc).AddDataDisk(vm, vm, vm, p) + if err != nil { + return fmt.Errorf("Error attaching data disk %s to instance %s: %s", d.Id(), vm, err) + } + + // Wait until the data disk is attached + if err := mc.WaitForOperation(req, nil); err != nil { + return fmt.Errorf( + "Error waiting for data disk %s to be attached to instance %s: %s", d.Id(), vm, err) + } + + // Make sure we return here since all possible changes are + // already updated if we reach this point + return nil + } + + if d.HasChange("caching") || d.HasChange("lun") { + p := virtualmachinedisk.UpdateDataDiskParameters{ + DiskName: d.Id(), + Lun: lun, + HostCaching: hostCaching(d), + MediaLink: mediaLink(d), + } + + log.Printf("[DEBUG] Updating data disk: %s", d.Id()) + req, err := virtualmachinedisk.NewClient(*mc).UpdateDataDisk(vm, vm, vm, lun, p) + if err != nil { + return fmt.Errorf("Error updating data disk %s: %s", d.Id(), err) + } + + // Wait until the data disk is updated + if err := mc.WaitForOperation(req, nil); err != nil { + return fmt.Errorf( + "Error waiting for data disk %s to be updated: %s", d.Id(), err) + } + } + + return resourceAzureDataDiskRead(d, meta) } -func resourceAzureDiskDelete(d *schema.ResourceData, meta interface{}) error { - //mc := meta.(*management.Client) +func resourceAzureDataDiskDelete(d *schema.ResourceData, meta interface{}) error { + mc := meta.(*management.Client) + lun := d.Get("lun").(int) + vm := d.Get("virtual_machine").(string) + + // If a name was not supplied, it means we created a new emtpy disk and we now want to + // delete that disk again. Otherwise we only want to detach the disk and keep the blob. + _, removeBlob := d.GetOk("name") + + log.Printf("[DEBUG] Detaching data disk %s with removeBlob = %t", d.Id(), removeBlob) + req, err := virtualmachinedisk.NewClient(*mc).DeleteDataDisk(vm, vm, vm, lun, removeBlob) + if err != nil { + return fmt.Errorf( + "Error detaching data disk %s with removeBlob = %t: %s", d.Id(), removeBlob, err) + } + + // Wait until the data disk is detached and optionally deleted + if err := mc.WaitForOperation(req, nil); err != nil { + return fmt.Errorf( + "Error waiting for data disk %s to be detached with removeBlob = %t: %s", + d.Id(), removeBlob, err) + } + + d.SetId("") + + return nil +} + +func hostCaching(d *schema.ResourceData) virtualmachinedisk.HostCachingType { + switch d.Get("caching").(string) { + case "ReadOnly": + return virtualmachinedisk.HostCachingTypeReadOnly + case "ReadWrite": + return virtualmachinedisk.HostCachingTypeReadWrite + default: + return virtualmachinedisk.HostCachingTypeNone + } +} + +func mediaLink(d *schema.ResourceData) string { + mediaLink, ok := d.GetOk("media_link") + if ok { + return mediaLink.(string) + } + + name, ok := d.GetOk("name") + if !ok { + name = fmt.Sprintf("%s-%d", d.Get("virtual_machine").(string), d.Get("lun").(int)) + } + + return fmt.Sprintf(dataDiskBlobStorageURL, d.Get("storage").(string), name.(string)) +} + +func verifyDataDiskParameters(d *schema.ResourceData) error { + caching := d.Get("caching").(string) + if caching != "None" && caching != "ReadOnly" && caching != "ReadWrite" { + return fmt.Errorf( + "Invalid caching type %s! Valid options are 'None', 'ReadOnly' and 'ReadWrite'.", caching) + } + + if _, ok := d.GetOk("media_link"); !ok { + if _, ok := d.GetOk("storage"); !ok { + return fmt.Errorf("If not supplying 'media_link', you must supply 'storage'.") + } + } return nil } diff --git a/builtin/providers/azure/resource_azure_instance.go b/builtin/providers/azure/resource_azure_instance.go index 958a28bbe..3b682d018 100644 --- a/builtin/providers/azure/resource_azure_instance.go +++ b/builtin/providers/azure/resource_azure_instance.go @@ -2,6 +2,7 @@ package azure import ( "bytes" + "encoding/base64" "fmt" "log" @@ -16,8 +17,9 @@ import ( ) const ( - linux = "Linux" - windows = "Windows" + linux = "Linux" + windows = "Windows" + osDiskBlobStorageURL = "http://%s.blob.core.windows.net/vhds/%s.vhd" ) func resourceAzureInstance() *schema.Resource { @@ -183,28 +185,23 @@ func resourceAzureInstanceCreate(d *schema.ResourceData, meta interface{}) (err return err } - // Verify if we have all parameters required for the image OS type - if err := verifyParameters(d, osType); err != nil { + // Verify if we have all required parameters + if err := verifyInstanceParameters(d, osType); err != nil { return err } - log.Printf("[DEBUG] Creating Cloud Service for instance: %s", name) - req, err := hostedservice.NewClient(*mc). - CreateHostedService( - name, - d.Get("location").(string), - d.Get("reverse_dns").(string), - name, - fmt.Sprintf("Cloud Service created automatically for instance %s", name), - ) - if err != nil { - return fmt.Errorf("Error creating Cloud Service for instance %s: %s", name, err) + p := hostedservice.CreateHostedServiceParameters{ + ServiceName: name, + Label: base64.StdEncoding.EncodeToString([]byte(name)), + Description: fmt.Sprintf("Cloud Service created automatically for instance %s", name), + Location: d.Get("location").(string), + ReverseDNSFqdn: d.Get("reverse_dns").(string), } - // Wait until the Cloud Service is created - if err := mc.WaitAsyncOperation(req); err != nil { - return fmt.Errorf( - "Error waiting for Cloud Service of instance %s to be created: %s", name, err) + log.Printf("[DEBUG] Creating Cloud Service for instance: %s", name) + err = hostedservice.NewClient(*mc).CreateHostedService(p) + if err != nil { + return fmt.Errorf("Error creating Cloud Service for instance %s: %s", name, err) } // Put in this defer here, so we are sure to cleanup already created parts @@ -217,9 +214,9 @@ func resourceAzureInstanceCreate(d *schema.ResourceData, meta interface{}) (err } // Wait until the Cloud Service is deleted - if err := mc.WaitAsyncOperation(req); err != nil { + if err := mc.WaitForOperation(req, nil); err != nil { log.Printf( - "[DEBUG] Error waiting for Cloud Service of instance %s to be deleted : %s", name, err) + "[DEBUG] Error waiting for Cloud Service of instance %s to be deleted: %s", name, err) } } }(mc) @@ -308,13 +305,13 @@ func resourceAzureInstanceCreate(d *schema.ResourceData, meta interface{}) (err } log.Printf("[DEBUG] Creating the new instance...") - req, err = virtualmachine.NewClient(*mc).CreateDeployment(role, name, options) + req, err := virtualmachine.NewClient(*mc).CreateDeployment(role, name, options) if err != nil { return fmt.Errorf("Error creating instance %s: %s", name, err) } log.Printf("[DEBUG] Waiting for the new instance to be created...") - if err := mc.WaitAsyncOperation(req); err != nil { + if err := mc.WaitForOperation(req, nil); err != nil { return fmt.Errorf( "Error waiting for instance %s to be created: %s", name, err) } @@ -400,14 +397,15 @@ func resourceAzureInstanceRead(d *schema.ResourceData, meta interface{}) error { connType := "ssh" if dpmt.RoleList[0].OSVirtualHardDisk.OS == windows { - connType = windows + connType = "winrm" } // Set the connection info for any configured provisioners d.SetConnInfo(map[string]string{ - "type": connType, - "host": dpmt.VirtualIPs[0].Address, - "user": d.Get("username").(string), + "type": connType, + "host": dpmt.VirtualIPs[0].Address, + "user": d.Get("username").(string), + "password": d.Get("password").(string), }) return nil @@ -427,8 +425,8 @@ func resourceAzureInstanceUpdate(d *schema.ResourceData, meta interface{}) error return fmt.Errorf("Error retrieving role of instance %s: %s", d.Id(), err) } - // Verify if we have all parameters required for the image OS type - if err := verifyParameters(d, role.OSVirtualHardDisk.OS); err != nil { + // Verify if we have all required parameters + if err := verifyInstanceParameters(d, role.OSVirtualHardDisk.OS); err != nil { return err } @@ -481,7 +479,7 @@ func resourceAzureInstanceUpdate(d *schema.ResourceData, meta interface{}) error return fmt.Errorf("Error updating role of instance %s: %s", d.Id(), err) } - if err := mc.WaitAsyncOperation(req); err != nil { + if err := mc.WaitForOperation(req, nil); err != nil { return fmt.Errorf( "Error waiting for role of instance %s to be updated: %s", d.Id(), err) } @@ -499,7 +497,7 @@ func resourceAzureInstanceDelete(d *schema.ResourceData, meta interface{}) error } // Wait until the instance is deleted - if err := mc.WaitAsyncOperation(req); err != nil { + if err := mc.WaitForOperation(req, nil); err != nil { return fmt.Errorf( "Error waiting for instance %s to be deleted: %s", d.Id(), err) } @@ -524,12 +522,12 @@ func retrieveImageDetails( mc *management.Client, label string, storage string) (func(*virtualmachine.Role) error, string, error) { - configureForImage, osType, err := retrieveOSImageDetails(mc, label, storage) + configureForImage, osType, err := retrieveVMImageDetails(mc, label) if err == nil { return configureForImage, osType, nil } - configureForImage, osType, err = retrieveVMImageDetails(mc, label) + configureForImage, osType, err = retrieveOSImageDetails(mc, label, storage) if err == nil { return configureForImage, osType, nil } @@ -537,53 +535,15 @@ func retrieveImageDetails( return nil, "", fmt.Errorf("Could not find image with label '%s'", label) } -func retrieveOSImageDetails( - mc *management.Client, - label, - storage string) (func(*virtualmachine.Role) error, string, error) { - imgs, err := osimage.NewClient(*mc).GetImageList() - if err != nil { - return nil, "", fmt.Errorf("Error retrieving image details: %s", err) - } - - for _, img := range imgs { - if img.Label == label { - if img.OS != linux && img.OS != windows { - return nil, "", fmt.Errorf("Unsupported image OS: %s", img.OS) - } - if img.MediaLink == "" { - if storage == "" { - return nil, "", - fmt.Errorf("When using a platform image, the 'storage' parameter is required") - } - img.MediaLink = fmt.Sprintf("http://%s.blob.core.windows.net/vhds/%s.vhd", storage, label) - } - - configureForImage := func(role *virtualmachine.Role) error { - return vmutils.ConfigureDeploymentFromPlatformImage( - role, - img.Name, - img.MediaLink, - label, - ) - } - - return configureForImage, img.OS, nil - } - } - - return nil, "", fmt.Errorf("Could not find image with label '%s'", label) -} - func retrieveVMImageDetails( mc *management.Client, label string) (func(*virtualmachine.Role) error, string, error) { - imgs, err := virtualmachineimage.NewClient(*mc).GetImageList() + imgs, err := virtualmachineimage.NewClient(*mc).ListVirtualMachineImages() if err != nil { return nil, "", fmt.Errorf("Error retrieving image details: %s", err) } - for _, img := range imgs { + for _, img := range imgs.VMImages { if img.Label == label { if img.OSDiskConfiguration.OS != linux && img.OSDiskConfiguration.OS != windows { return nil, "", fmt.Errorf("Unsupported image OS: %s", img.OSDiskConfiguration.OS) @@ -605,6 +565,44 @@ func retrieveVMImageDetails( return nil, "", fmt.Errorf("Could not find image with label '%s'", label) } +func retrieveOSImageDetails( + mc *management.Client, + label, + storage string) (func(*virtualmachine.Role) error, string, error) { + imgs, err := osimage.NewClient(*mc).ListOSImages() + if err != nil { + return nil, "", fmt.Errorf("Error retrieving image details: %s", err) + } + + for _, img := range imgs.OSImages { + if img.Label == label { + if img.OS != linux && img.OS != windows { + return nil, "", fmt.Errorf("Unsupported image OS: %s", img.OS) + } + if img.MediaLink == "" { + if storage == "" { + return nil, "", + fmt.Errorf("When using a platform image, the 'storage' parameter is required") + } + img.MediaLink = fmt.Sprintf(osDiskBlobStorageURL, storage, label) + } + + configureForImage := func(role *virtualmachine.Role) error { + return vmutils.ConfigureDeploymentFromPlatformImage( + role, + img.Name, + img.MediaLink, + label, + ) + } + + return configureForImage, img.OS, nil + } + } + + return nil, "", fmt.Errorf("Could not find image with label '%s'", label) +} + func endpointProtocol(p string) virtualmachine.InputEndpointProtocol { if p == "tcp" { return virtualmachine.InputEndpointProtocolTCP @@ -613,7 +611,7 @@ func endpointProtocol(p string) virtualmachine.InputEndpointProtocol { return virtualmachine.InputEndpointProtocolUDP } -func verifyParameters(d *schema.ResourceData, osType string) error { +func verifyInstanceParameters(d *schema.ResourceData, osType string) error { if osType == linux { _, pass := d.GetOk("password") _, key := d.GetOk("ssh_key_thumbprint") diff --git a/builtin/providers/azure/resource_azure_security_group.go b/builtin/providers/azure/resource_azure_security_group.go index cbac36a3e..ec818ee07 100644 --- a/builtin/providers/azure/resource_azure_security_group.go +++ b/builtin/providers/azure/resource_azure_security_group.go @@ -124,7 +124,7 @@ func resourceAzureSecurityGroupCreate(d *schema.ResourceData, meta interface{}) return fmt.Errorf("Error creating Network Security Group %s: %s", name, err) } - if err := mc.WaitAsyncOperation(req); err != nil { + if err := mc.WaitForOperation(req, nil); err != nil { return fmt.Errorf( "Error waiting for Network Security Group %s to be created: %s", name, err) } @@ -185,7 +185,7 @@ func resourceAzureSecurityGroupRuleCreate( return fmt.Errorf("Error creating Network Security Group rule %s: %s", name, err) } - if err := mc.WaitAsyncOperation(req); err != nil { + if err := mc.WaitForOperation(req, nil); err != nil { return fmt.Errorf( "Error waiting for Network Security Group rule %s to be created: %s", name, err) } @@ -278,7 +278,7 @@ func resourceAzureSecurityGroupDelete(d *schema.ResourceData, meta interface{}) } // Wait until the network security group is deleted - if err := mc.WaitAsyncOperation(req); err != nil { + if err := mc.WaitForOperation(req, nil); err != nil { return fmt.Errorf( "Error waiting for Network Security Group %s to be deleted: %s", d.Id(), err) } @@ -300,7 +300,7 @@ func resourceAzureSecurityGroupRuleDelete( return fmt.Errorf("Error deleting Network Security Group rule %s: %s", name, err) } - if err := mc.WaitAsyncOperation(req); err != nil { + if err := mc.WaitForOperation(req, nil); err != nil { return fmt.Errorf( "Error waiting for Network Security Group rule %s to be deleted: %s", name, err) } diff --git a/builtin/providers/azure/resource_azure_virtual_network.go b/builtin/providers/azure/resource_azure_virtual_network.go index ce636044d..eaf1ff049 100644 --- a/builtin/providers/azure/resource_azure_virtual_network.go +++ b/builtin/providers/azure/resource_azure_virtual_network.go @@ -76,11 +76,17 @@ func resourceAzureVirtualNetworkCreate(d *schema.ResourceData, meta interface{}) nc.Configuration.VirtualNetworkSites = append(nc.Configuration.VirtualNetworkSites, network) - err = virtualnetwork.NewClient(*mc).SetVirtualNetworkConfiguration(nc) + req, err := virtualnetwork.NewClient(*mc).SetVirtualNetworkConfiguration(nc) if err != nil { return fmt.Errorf("Error creating Virtual Network %s: %s", name, err) } + // Wait until the virtual network is created + if err := mc.WaitForOperation(req, nil); err != nil { + log.Printf( + "[DEBUG] Error waiting for Virtual Network %s to be created: %s", name, err) + } + d.SetId(name) return resourceAzureVirtualNetworkRead(d, meta) @@ -142,11 +148,17 @@ func resourceAzureVirtualNetworkUpdate(d *schema.ResourceData, meta interface{}) return fmt.Errorf("Virtual Network %s does not exists!", d.Id()) } - err = virtualnetwork.NewClient(*mc).SetVirtualNetworkConfiguration(nc) + req, err := virtualnetwork.NewClient(*mc).SetVirtualNetworkConfiguration(nc) if err != nil { return fmt.Errorf("Error updating Virtual Network %s: %s", d.Id(), err) } + // Wait until the virtual network is updated + if err := mc.WaitForOperation(req, nil); err != nil { + log.Printf( + "[DEBUG] Error waiting for Virtual Network %s to be updated: %s", d.Id(), err) + } + return resourceAzureVirtualNetworkRead(d, meta) } @@ -167,11 +179,17 @@ func resourceAzureVirtualNetworkDelete(d *schema.ResourceData, meta interface{}) nc.Configuration.VirtualNetworkSites = filtered - err = virtualnetwork.NewClient(*mc).SetVirtualNetworkConfiguration(nc) + req, err := virtualnetwork.NewClient(*mc).SetVirtualNetworkConfiguration(nc) if err != nil { return fmt.Errorf("Error deleting Virtual Network %s: %s", d.Id(), err) } + // Wait until the virtual network is deleted + if err := mc.WaitForOperation(req, nil); err != nil { + log.Printf( + "[DEBUG] Error waiting for Virtual Network %s to be deleted: %s", d.Id(), err) + } + d.SetId("") return nil From 8c3cb400d78dde0aa4d96710f48c2e139262ac4f Mon Sep 17 00:00:00 2001 From: Sander van Harmelen Date: Fri, 22 May 2015 22:02:48 +0200 Subject: [PATCH 11/91] Updated to work with the latest Azure SDK changes --- builtin/providers/azure/config.go | 4 +-- .../providers/azure/resource_azure_disk.go | 26 +++++++------- .../azure/resource_azure_instance.go | 36 +++++++++---------- .../azure/resource_azure_security_group.go | 20 +++++------ .../azure/resource_azure_virtual_network.go | 22 ++++++------ 5 files changed, 54 insertions(+), 54 deletions(-) diff --git a/builtin/providers/azure/config.go b/builtin/providers/azure/config.go index 280866399..f9c7cea42 100644 --- a/builtin/providers/azure/config.go +++ b/builtin/providers/azure/config.go @@ -15,7 +15,7 @@ type Config struct { } // NewClient returns a new Azure management client -func (c *Config) NewClient() (*management.Client, error) { +func (c *Config) NewClient() (management.Client, error) { if _, err := os.Stat(c.SettingsFile); os.IsNotExist(err) { return nil, fmt.Errorf("Publish Settings file %q does not exist!", c.SettingsFile) } @@ -25,5 +25,5 @@ func (c *Config) NewClient() (*management.Client, error) { return nil, fmt.Errorf("Error creating management client: %s", err) } - return &mc, nil + return mc, nil } diff --git a/builtin/providers/azure/resource_azure_disk.go b/builtin/providers/azure/resource_azure_disk.go index bbb4a68cc..8f9e1b4c9 100644 --- a/builtin/providers/azure/resource_azure_disk.go +++ b/builtin/providers/azure/resource_azure_disk.go @@ -70,7 +70,7 @@ func resourceAzureDataDisk() *schema.Resource { } func resourceAzureDataDiskCreate(d *schema.ResourceData, meta interface{}) error { - mc := meta.(*management.Client) + mc := meta.(management.Client) if err := verifyDataDiskParameters(d); err != nil { return err @@ -92,7 +92,7 @@ func resourceAzureDataDiskCreate(d *schema.ResourceData, meta interface{}) error } log.Printf("[DEBUG] Adding data disk %d to instance: %s", lun, vm) - req, err := virtualmachinedisk.NewClient(*mc).AddDataDisk(vm, vm, vm, p) + req, err := virtualmachinedisk.NewClient(mc).AddDataDisk(vm, vm, vm, p) if err != nil { return fmt.Errorf("Error adding data disk %d to instance %s: %s", lun, vm, err) } @@ -104,7 +104,7 @@ func resourceAzureDataDiskCreate(d *schema.ResourceData, meta interface{}) error } log.Printf("[DEBUG] Retrieving data disk %d from instance %s", lun, vm) - disk, err := virtualmachinedisk.NewClient(*mc).GetDataDisk(vm, vm, vm, lun) + disk, err := virtualmachinedisk.NewClient(mc).GetDataDisk(vm, vm, vm, lun) if err != nil { return fmt.Errorf("Error retrieving data disk %d from instance %s: %s", lun, vm, err) } @@ -115,13 +115,13 @@ func resourceAzureDataDiskCreate(d *schema.ResourceData, meta interface{}) error } func resourceAzureDataDiskRead(d *schema.ResourceData, meta interface{}) error { - mc := meta.(*management.Client) + mc := meta.(management.Client) lun := d.Get("lun").(int) vm := d.Get("virtual_machine").(string) log.Printf("[DEBUG] Retrieving data disk: %s", d.Id()) - datadisk, err := virtualmachinedisk.NewClient(*mc).GetDataDisk(vm, vm, vm, lun) + datadisk, err := virtualmachinedisk.NewClient(mc).GetDataDisk(vm, vm, vm, lun) if err != nil { return fmt.Errorf("Error retrieving data disk %s: %s", d.Id(), err) } @@ -133,7 +133,7 @@ func resourceAzureDataDiskRead(d *schema.ResourceData, meta interface{}) error { d.Set("media_link", datadisk.MediaLink) log.Printf("[DEBUG] Retrieving disk: %s", d.Id()) - disk, err := virtualmachinedisk.NewClient(*mc).GetDisk(d.Id()) + disk, err := virtualmachinedisk.NewClient(mc).GetDisk(d.Id()) if err != nil { return fmt.Errorf("Error retrieving disk %s: %s", d.Id(), err) } @@ -144,7 +144,7 @@ func resourceAzureDataDiskRead(d *schema.ResourceData, meta interface{}) error { } func resourceAzureDataDiskUpdate(d *schema.ResourceData, meta interface{}) error { - mc := meta.(*management.Client) + mc := meta.(management.Client) lun := d.Get("lun").(int) vm := d.Get("virtual_machine").(string) @@ -158,7 +158,7 @@ func resourceAzureDataDiskUpdate(d *schema.ResourceData, meta interface{}) error } log.Printf("[DEBUG] Updating disk: %s", d.Id()) - req, err := virtualmachinedisk.NewClient(*mc).UpdateDisk(d.Id(), p) + req, err := virtualmachinedisk.NewClient(mc).UpdateDisk(d.Id(), p) if err != nil { return fmt.Errorf("Error updating disk %s: %s", d.Id(), err) } @@ -172,7 +172,7 @@ func resourceAzureDataDiskUpdate(d *schema.ResourceData, meta interface{}) error if d.HasChange("virtual_machine") { log.Printf("[DEBUG] Detaching data disk: %s", d.Id()) - req, err := virtualmachinedisk.NewClient(*mc).DeleteDataDisk(vm, vm, vm, lun, false) + req, err := virtualmachinedisk.NewClient(mc).DeleteDataDisk(vm, vm, vm, lun, false) if err != nil { return fmt.Errorf("Error detaching data disk %s: %s", d.Id(), err) } @@ -191,7 +191,7 @@ func resourceAzureDataDiskUpdate(d *schema.ResourceData, meta interface{}) error } log.Printf("[DEBUG] Attaching data disk: %s", d.Id()) - req, err = virtualmachinedisk.NewClient(*mc).AddDataDisk(vm, vm, vm, p) + req, err = virtualmachinedisk.NewClient(mc).AddDataDisk(vm, vm, vm, p) if err != nil { return fmt.Errorf("Error attaching data disk %s to instance %s: %s", d.Id(), vm, err) } @@ -216,7 +216,7 @@ func resourceAzureDataDiskUpdate(d *schema.ResourceData, meta interface{}) error } log.Printf("[DEBUG] Updating data disk: %s", d.Id()) - req, err := virtualmachinedisk.NewClient(*mc).UpdateDataDisk(vm, vm, vm, lun, p) + req, err := virtualmachinedisk.NewClient(mc).UpdateDataDisk(vm, vm, vm, lun, p) if err != nil { return fmt.Errorf("Error updating data disk %s: %s", d.Id(), err) } @@ -232,7 +232,7 @@ func resourceAzureDataDiskUpdate(d *schema.ResourceData, meta interface{}) error } func resourceAzureDataDiskDelete(d *schema.ResourceData, meta interface{}) error { - mc := meta.(*management.Client) + mc := meta.(management.Client) lun := d.Get("lun").(int) vm := d.Get("virtual_machine").(string) @@ -241,7 +241,7 @@ func resourceAzureDataDiskDelete(d *schema.ResourceData, meta interface{}) error _, removeBlob := d.GetOk("name") log.Printf("[DEBUG] Detaching data disk %s with removeBlob = %t", d.Id(), removeBlob) - req, err := virtualmachinedisk.NewClient(*mc).DeleteDataDisk(vm, vm, vm, lun, removeBlob) + req, err := virtualmachinedisk.NewClient(mc).DeleteDataDisk(vm, vm, vm, lun, removeBlob) if err != nil { return fmt.Errorf( "Error detaching data disk %s with removeBlob = %t: %s", d.Id(), removeBlob, err) diff --git a/builtin/providers/azure/resource_azure_instance.go b/builtin/providers/azure/resource_azure_instance.go index 3b682d018..814144ea4 100644 --- a/builtin/providers/azure/resource_azure_instance.go +++ b/builtin/providers/azure/resource_azure_instance.go @@ -165,7 +165,7 @@ func resourceAzureInstance() *schema.Resource { } func resourceAzureInstanceCreate(d *schema.ResourceData, meta interface{}) (err error) { - mc := meta.(*management.Client) + mc := meta.(management.Client) name := d.Get("name").(string) @@ -199,16 +199,16 @@ func resourceAzureInstanceCreate(d *schema.ResourceData, meta interface{}) (err } log.Printf("[DEBUG] Creating Cloud Service for instance: %s", name) - err = hostedservice.NewClient(*mc).CreateHostedService(p) + err = hostedservice.NewClient(mc).CreateHostedService(p) if err != nil { return fmt.Errorf("Error creating Cloud Service for instance %s: %s", name, err) } // Put in this defer here, so we are sure to cleanup already created parts // when we exit with an error - defer func(mc *management.Client) { + defer func(mc management.Client) { if err != nil { - req, err := hostedservice.NewClient(*mc).DeleteHostedService(name, true) + req, err := hostedservice.NewClient(mc).DeleteHostedService(name, true) if err != nil { log.Printf("[DEBUG] Error cleaning up Cloud Service of instance %s: %s", name, err) } @@ -305,7 +305,7 @@ func resourceAzureInstanceCreate(d *schema.ResourceData, meta interface{}) (err } log.Printf("[DEBUG] Creating the new instance...") - req, err := virtualmachine.NewClient(*mc).CreateDeployment(role, name, options) + req, err := virtualmachine.NewClient(mc).CreateDeployment(role, name, options) if err != nil { return fmt.Errorf("Error creating instance %s: %s", name, err) } @@ -322,10 +322,10 @@ func resourceAzureInstanceCreate(d *schema.ResourceData, meta interface{}) (err } func resourceAzureInstanceRead(d *schema.ResourceData, meta interface{}) error { - mc := meta.(*management.Client) + mc := meta.(management.Client) log.Printf("[DEBUG] Retrieving Cloud Service for instance: %s", d.Id()) - cs, err := hostedservice.NewClient(*mc).GetHostedService(d.Id()) + cs, err := hostedservice.NewClient(mc).GetHostedService(d.Id()) if err != nil { return fmt.Errorf("Error retrieving Cloud Service of instance %s: %s", d.Id(), err) } @@ -334,7 +334,7 @@ func resourceAzureInstanceRead(d *schema.ResourceData, meta interface{}) error { d.Set("location", cs.Location) log.Printf("[DEBUG] Retrieving instance: %s", d.Id()) - dpmt, err := virtualmachine.NewClient(*mc).GetDeployment(d.Id(), d.Id()) + dpmt, err := virtualmachine.NewClient(mc).GetDeployment(d.Id(), d.Id()) if err != nil { return fmt.Errorf("Error retrieving instance %s: %s", d.Id(), err) } @@ -412,7 +412,7 @@ func resourceAzureInstanceRead(d *schema.ResourceData, meta interface{}) error { } func resourceAzureInstanceUpdate(d *schema.ResourceData, meta interface{}) error { - mc := meta.(*management.Client) + mc := meta.(management.Client) // First check if anything we can update changed, and if not just return if !d.HasChange("size") && !d.HasChange("endpoint") && !d.HasChange("security_group") { @@ -420,7 +420,7 @@ func resourceAzureInstanceUpdate(d *schema.ResourceData, meta interface{}) error } // Get the current role - role, err := virtualmachine.NewClient(*mc).GetRole(d.Id(), d.Id(), d.Id()) + role, err := virtualmachine.NewClient(mc).GetRole(d.Id(), d.Id(), d.Id()) if err != nil { return fmt.Errorf("Error retrieving role of instance %s: %s", d.Id(), err) } @@ -474,7 +474,7 @@ func resourceAzureInstanceUpdate(d *schema.ResourceData, meta interface{}) error } // Update the adjusted role - req, err := virtualmachine.NewClient(*mc).UpdateRole(d.Id(), d.Id(), d.Id(), *role) + req, err := virtualmachine.NewClient(mc).UpdateRole(d.Id(), d.Id(), d.Id(), *role) if err != nil { return fmt.Errorf("Error updating role of instance %s: %s", d.Id(), err) } @@ -488,10 +488,10 @@ func resourceAzureInstanceUpdate(d *schema.ResourceData, meta interface{}) error } func resourceAzureInstanceDelete(d *schema.ResourceData, meta interface{}) error { - mc := meta.(*management.Client) + mc := meta.(management.Client) log.Printf("[DEBUG] Deleting instance: %s", d.Id()) - req, err := hostedservice.NewClient(*mc).DeleteHostedService(d.Id(), true) + req, err := hostedservice.NewClient(mc).DeleteHostedService(d.Id(), true) if err != nil { return fmt.Errorf("Error deleting instance %s: %s", d.Id(), err) } @@ -519,7 +519,7 @@ func resourceAzureEndpointHash(v interface{}) int { } func retrieveImageDetails( - mc *management.Client, + mc management.Client, label string, storage string) (func(*virtualmachine.Role) error, string, error) { configureForImage, osType, err := retrieveVMImageDetails(mc, label) @@ -536,9 +536,9 @@ func retrieveImageDetails( } func retrieveVMImageDetails( - mc *management.Client, + mc management.Client, label string) (func(*virtualmachine.Role) error, string, error) { - imgs, err := virtualmachineimage.NewClient(*mc).ListVirtualMachineImages() + imgs, err := virtualmachineimage.NewClient(mc).ListVirtualMachineImages() if err != nil { return nil, "", fmt.Errorf("Error retrieving image details: %s", err) } @@ -566,10 +566,10 @@ func retrieveVMImageDetails( } func retrieveOSImageDetails( - mc *management.Client, + mc management.Client, label, storage string) (func(*virtualmachine.Role) error, string, error) { - imgs, err := osimage.NewClient(*mc).ListOSImages() + imgs, err := osimage.NewClient(mc).ListOSImages() if err != nil { return nil, "", fmt.Errorf("Error retrieving image details: %s", err) } diff --git a/builtin/providers/azure/resource_azure_security_group.go b/builtin/providers/azure/resource_azure_security_group.go index ec818ee07..e5cca0f88 100644 --- a/builtin/providers/azure/resource_azure_security_group.go +++ b/builtin/providers/azure/resource_azure_security_group.go @@ -105,7 +105,7 @@ func resourceAzureSecurityGroup() *schema.Resource { } func resourceAzureSecurityGroupCreate(d *schema.ResourceData, meta interface{}) (err error) { - mc := meta.(*management.Client) + mc := meta.(management.Client) name := d.Get("name").(string) @@ -115,7 +115,7 @@ func resourceAzureSecurityGroupCreate(d *schema.ResourceData, meta interface{}) label = name } - req, err := networksecuritygroup.NewClient(*mc).CreateNetworkSecurityGroup( + req, err := networksecuritygroup.NewClient(mc).CreateNetworkSecurityGroup( name, label, d.Get("location").(string), @@ -158,7 +158,7 @@ func resourceAzureSecurityGroupCreate(d *schema.ResourceData, meta interface{}) func resourceAzureSecurityGroupRuleCreate( d *schema.ResourceData, meta interface{}, rule map[string]interface{}) error { - mc := meta.(*management.Client) + mc := meta.(management.Client) // Make sure all required parameters are there if err := verifySecurityGroupRuleParams(rule); err != nil { @@ -168,7 +168,7 @@ func resourceAzureSecurityGroupRuleCreate( name := rule["name"].(string) // Create the rule - req, err := networksecuritygroup.NewClient(*mc).SetNetworkSecurityGroupRule(d.Id(), + req, err := networksecuritygroup.NewClient(mc).SetNetworkSecurityGroupRule(d.Id(), networksecuritygroup.RuleRequest{ Name: name, Type: networksecuritygroup.RuleType(rule["type"].(string)), @@ -194,9 +194,9 @@ func resourceAzureSecurityGroupRuleCreate( } func resourceAzureSecurityGroupRead(d *schema.ResourceData, meta interface{}) error { - mc := meta.(*management.Client) + mc := meta.(management.Client) - sg, err := networksecuritygroup.NewClient(*mc).GetNetworkSecurityGroup(d.Id()) + sg, err := networksecuritygroup.NewClient(mc).GetNetworkSecurityGroup(d.Id()) if err != nil { return fmt.Errorf("Error retrieving Network Security Group %s: %s", d.Id(), err) } @@ -269,10 +269,10 @@ func resourceAzureSecurityGroupUpdate(d *schema.ResourceData, meta interface{}) } func resourceAzureSecurityGroupDelete(d *schema.ResourceData, meta interface{}) error { - mc := meta.(*management.Client) + mc := meta.(management.Client) log.Printf("[DEBUG] Deleting Network Security Group: %s", d.Id()) - req, err := networksecuritygroup.NewClient(*mc).DeleteNetworkSecurityGroup(d.Id()) + req, err := networksecuritygroup.NewClient(mc).DeleteNetworkSecurityGroup(d.Id()) if err != nil { return fmt.Errorf("Error deleting Network Security Group %s: %s", d.Id(), err) } @@ -290,12 +290,12 @@ func resourceAzureSecurityGroupDelete(d *schema.ResourceData, meta interface{}) func resourceAzureSecurityGroupRuleDelete( d *schema.ResourceData, meta interface{}, rule map[string]interface{}) error { - mc := meta.(*management.Client) + mc := meta.(management.Client) name := rule["name"].(string) // Delete the rule - req, err := networksecuritygroup.NewClient(*mc).DeleteNetworkSecurityGroupRule(d.Id(), name) + req, err := networksecuritygroup.NewClient(mc).DeleteNetworkSecurityGroupRule(d.Id(), name) if err != nil { return fmt.Errorf("Error deleting Network Security Group rule %s: %s", name, err) } diff --git a/builtin/providers/azure/resource_azure_virtual_network.go b/builtin/providers/azure/resource_azure_virtual_network.go index eaf1ff049..de451fe8d 100644 --- a/builtin/providers/azure/resource_azure_virtual_network.go +++ b/builtin/providers/azure/resource_azure_virtual_network.go @@ -50,11 +50,11 @@ func resourceAzureVirtualNetwork() *schema.Resource { } func resourceAzureVirtualNetworkCreate(d *schema.ResourceData, meta interface{}) error { - mc := meta.(*management.Client) + mc := meta.(management.Client) name := d.Get("name").(string) - nc, err := virtualnetwork.NewClient(*mc).GetVirtualNetworkConfiguration() + nc, err := virtualnetwork.NewClient(mc).GetVirtualNetworkConfiguration() if err != nil { if strings.Contains(err.Error(), "ResourceNotFound") { nc = virtualnetwork.NetworkConfiguration{} @@ -76,7 +76,7 @@ func resourceAzureVirtualNetworkCreate(d *schema.ResourceData, meta interface{}) nc.Configuration.VirtualNetworkSites = append(nc.Configuration.VirtualNetworkSites, network) - req, err := virtualnetwork.NewClient(*mc).SetVirtualNetworkConfiguration(nc) + req, err := virtualnetwork.NewClient(mc).SetVirtualNetworkConfiguration(nc) if err != nil { return fmt.Errorf("Error creating Virtual Network %s: %s", name, err) } @@ -93,9 +93,9 @@ func resourceAzureVirtualNetworkCreate(d *schema.ResourceData, meta interface{}) } func resourceAzureVirtualNetworkRead(d *schema.ResourceData, meta interface{}) error { - mc := meta.(*management.Client) + mc := meta.(management.Client) - nc, err := virtualnetwork.NewClient(*mc).GetVirtualNetworkConfiguration() + nc, err := virtualnetwork.NewClient(mc).GetVirtualNetworkConfiguration() if err != nil { return fmt.Errorf(virtualNetworkRetrievalError, err) } @@ -123,9 +123,9 @@ func resourceAzureVirtualNetworkRead(d *schema.ResourceData, meta interface{}) e } func resourceAzureVirtualNetworkUpdate(d *schema.ResourceData, meta interface{}) error { - mc := meta.(*management.Client) + mc := meta.(management.Client) - nc, err := virtualnetwork.NewClient(*mc).GetVirtualNetworkConfiguration() + nc, err := virtualnetwork.NewClient(mc).GetVirtualNetworkConfiguration() if err != nil { return fmt.Errorf(virtualNetworkRetrievalError, err) } @@ -148,7 +148,7 @@ func resourceAzureVirtualNetworkUpdate(d *schema.ResourceData, meta interface{}) return fmt.Errorf("Virtual Network %s does not exists!", d.Id()) } - req, err := virtualnetwork.NewClient(*mc).SetVirtualNetworkConfiguration(nc) + req, err := virtualnetwork.NewClient(mc).SetVirtualNetworkConfiguration(nc) if err != nil { return fmt.Errorf("Error updating Virtual Network %s: %s", d.Id(), err) } @@ -163,9 +163,9 @@ func resourceAzureVirtualNetworkUpdate(d *schema.ResourceData, meta interface{}) } func resourceAzureVirtualNetworkDelete(d *schema.ResourceData, meta interface{}) error { - mc := meta.(*management.Client) + mc := meta.(management.Client) - nc, err := virtualnetwork.NewClient(*mc).GetVirtualNetworkConfiguration() + nc, err := virtualnetwork.NewClient(mc).GetVirtualNetworkConfiguration() if err != nil { return fmt.Errorf(virtualNetworkRetrievalError, err) } @@ -179,7 +179,7 @@ func resourceAzureVirtualNetworkDelete(d *schema.ResourceData, meta interface{}) nc.Configuration.VirtualNetworkSites = filtered - req, err := virtualnetwork.NewClient(*mc).SetVirtualNetworkConfiguration(nc) + req, err := virtualnetwork.NewClient(mc).SetVirtualNetworkConfiguration(nc) if err != nil { return fmt.Errorf("Error deleting Virtual Network %s: %s", d.Id(), err) } From a2aeb9f79d2572961fc554c9c0b2725c5cc11abd Mon Sep 17 00:00:00 2001 From: Sander van Harmelen Date: Thu, 28 May 2015 00:50:45 +0200 Subject: [PATCH 12/91] Adding acceptance tests together with a few minor tweaks --- builtin/providers/azure/config.go | 30 +- builtin/providers/azure/provider.go | 16 +- builtin/providers/azure/provider_test.go | 12 +- ...re_disk.go => resource_azure_data_disk.go} | 85 +++- .../azure/resource_azure_data_disk_test.go | 238 +++++++++ .../azure/resource_azure_disk_test.go | 1 - .../azure/resource_azure_instance.go | 43 +- .../azure/resource_azure_instance_test.go | 456 ++++++++++++++++++ .../azure/resource_azure_security_group.go | 5 - .../resource_azure_security_group_test.go | 272 +++++++++++ .../azure/resource_azure_virtual_network.go | 148 +++++- .../resource_azure_virtual_network_test.go | 295 +++++++++++ 12 files changed, 1531 insertions(+), 70 deletions(-) rename builtin/providers/azure/{resource_azure_disk.go => resource_azure_data_disk.go} (81%) create mode 100644 builtin/providers/azure/resource_azure_data_disk_test.go delete mode 100644 builtin/providers/azure/resource_azure_disk_test.go diff --git a/builtin/providers/azure/config.go b/builtin/providers/azure/config.go index f9c7cea42..b62ab435e 100644 --- a/builtin/providers/azure/config.go +++ b/builtin/providers/azure/config.go @@ -12,18 +12,34 @@ import ( type Config struct { SettingsFile string SubscriptionID string + Certificate []byte + ManagementURL string } -// NewClient returns a new Azure management client +// NewClient returns a new Azure management client which is created +// using different functions depending on the supplied settings func (c *Config) NewClient() (management.Client, error) { - if _, err := os.Stat(c.SettingsFile); os.IsNotExist(err) { - return nil, fmt.Errorf("Publish Settings file %q does not exist!", c.SettingsFile) + if c.SettingsFile != "" { + if _, err := os.Stat(c.SettingsFile); os.IsNotExist(err) { + return nil, fmt.Errorf("Publish Settings file %q does not exist!", c.SettingsFile) + } + + return management.ClientFromPublishSettingsFile(c.SettingsFile, c.SubscriptionID) } - mc, err := management.ClientFromPublishSettingsFile(c.SettingsFile, c.SubscriptionID) - if err != nil { - return nil, fmt.Errorf("Error creating management client: %s", err) + if c.ManagementURL != "" { + return management.NewClientFromConfig( + c.SubscriptionID, + c.Certificate, + management.ClientConfig{ManagementURL: c.ManagementURL}, + ) } - return mc, nil + if c.SubscriptionID != "" && len(c.Certificate) > 0 { + return management.NewClient(c.SubscriptionID, c.Certificate) + } + + return nil, fmt.Errorf( + "Insufficient configuration data. Please specify either a 'settings_file'\n" + + "or both a 'subscription_id' and 'certificate' with an optional 'management_url'.") } diff --git a/builtin/providers/azure/provider.go b/builtin/providers/azure/provider.go index 8fec6f012..1bf8233fa 100644 --- a/builtin/providers/azure/provider.go +++ b/builtin/providers/azure/provider.go @@ -11,7 +11,7 @@ func Provider() terraform.ResourceProvider { Schema: map[string]*schema.Schema{ "settings_file": &schema.Schema{ Type: schema.TypeString, - Required: true, + Optional: true, DefaultFunc: schema.EnvDefaultFunc("AZURE_SETTINGS_FILE", nil), }, @@ -20,6 +20,18 @@ func Provider() terraform.ResourceProvider { Optional: true, DefaultFunc: schema.EnvDefaultFunc("AZURE_SUBSCRIPTION_ID", ""), }, + + "certificate": &schema.Schema{ + Type: schema.TypeString, + Optional: true, + DefaultFunc: schema.EnvDefaultFunc("AZURE_CERTIFICATE", ""), + }, + + "management_url": &schema.Schema{ + Type: schema.TypeString, + Optional: true, + DefaultFunc: schema.EnvDefaultFunc("AZURE_MANAGEMENT_URL", ""), + }, }, ResourcesMap: map[string]*schema.Resource{ @@ -37,6 +49,8 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) { config := Config{ SettingsFile: d.Get("settings_file").(string), SubscriptionID: d.Get("subscription_id").(string), + Certificate: []byte(d.Get("certificate").(string)), + ManagementURL: d.Get("management_url").(string), } return config.NewClient() diff --git a/builtin/providers/azure/provider_test.go b/builtin/providers/azure/provider_test.go index 5606dcdad..5403df3ef 100644 --- a/builtin/providers/azure/provider_test.go +++ b/builtin/providers/azure/provider_test.go @@ -30,6 +30,16 @@ func TestProvider_impl(t *testing.T) { func testAccPreCheck(t *testing.T) { if v := os.Getenv("AZURE_SETTINGS_FILE"); v == "" { - t.Fatal("AZURE_SETTINGS_FILE must be set for acceptance tests") + subscriptionID := os.Getenv("AZURE_SUBSCRIPTION_ID") + certificate := os.Getenv("AZURE_CERTIFICATE") + + if subscriptionID == "" || certificate == "" { + t.Fatal("either AZURE_SETTINGS_FILE, or AZURE_SUBSCRIPTION_ID " + + "and AZURE_CERTIFICATE must be set for acceptance tests") + } + } + + if v := os.Getenv("AZURE_STORAGE"); v == "" { + t.Fatal("AZURE_STORAGE must be set for acceptance tests") } } diff --git a/builtin/providers/azure/resource_azure_disk.go b/builtin/providers/azure/resource_azure_data_disk.go similarity index 81% rename from builtin/providers/azure/resource_azure_disk.go rename to builtin/providers/azure/resource_azure_data_disk.go index 8f9e1b4c9..a306e96f0 100644 --- a/builtin/providers/azure/resource_azure_disk.go +++ b/builtin/providers/azure/resource_azure_data_disk.go @@ -3,6 +3,7 @@ package azure import ( "fmt" "log" + "time" "github.com/hashicorp/terraform/helper/schema" "github.com/svanharmelen/azure-sdk-for-go/management" @@ -26,6 +27,13 @@ func resourceAzureDataDisk() *schema.Resource { ForceNew: true, }, + "label": &schema.Schema{ + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, + }, + "lun": &schema.Schema{ Type: schema.TypeInt, Required: true, @@ -79,7 +87,13 @@ func resourceAzureDataDiskCreate(d *schema.ResourceData, meta interface{}) error lun := d.Get("lun").(int) vm := d.Get("virtual_machine").(string) + label := d.Get("label").(string) + if label == "" { + label = fmt.Sprintf("%s-%d", vm, lun) + } + p := virtualmachinedisk.CreateDataDiskParameters{ + DiskLabel: label, Lun: lun, LogicalDiskSizeInGB: d.Get("size").(int), HostCaching: hostCaching(d), @@ -123,10 +137,15 @@ func resourceAzureDataDiskRead(d *schema.ResourceData, meta interface{}) error { log.Printf("[DEBUG] Retrieving data disk: %s", d.Id()) datadisk, err := virtualmachinedisk.NewClient(mc).GetDataDisk(vm, vm, vm, lun) if err != nil { + if management.IsResourceNotFoundError(err) { + d.SetId("") + return nil + } return fmt.Errorf("Error retrieving data disk %s: %s", d.Id(), err) } d.Set("name", datadisk.DiskName) + d.Set("label", datadisk.DiskLabel) d.Set("lun", datadisk.Lun) d.Set("size", datadisk.LogicalDiskSizeInGB) d.Set("caching", datadisk.HostCaching) @@ -148,31 +167,13 @@ func resourceAzureDataDiskUpdate(d *schema.ResourceData, meta interface{}) error lun := d.Get("lun").(int) vm := d.Get("virtual_machine").(string) - if d.HasChange("size") { - p := virtualmachinedisk.UpdateDiskParameters{ - Name: d.Id(), - } + if d.HasChange("lun") || d.HasChange("size") || d.HasChange("virtual_machine") { + olun, _ := d.GetChange("lun") + ovm, _ := d.GetChange("virtual_machine") - if d.HasChange("size") { - p.ResizedSizeInGB = d.Get("size").(int) - } - - log.Printf("[DEBUG] Updating disk: %s", d.Id()) - req, err := virtualmachinedisk.NewClient(mc).UpdateDisk(d.Id(), p) - if err != nil { - return fmt.Errorf("Error updating disk %s: %s", d.Id(), err) - } - - // Wait until the disk is updated - if err := mc.WaitForOperation(req, nil); err != nil { - return fmt.Errorf( - "Error waiting for disk %s to be updated: %s", d.Id(), err) - } - } - - if d.HasChange("virtual_machine") { log.Printf("[DEBUG] Detaching data disk: %s", d.Id()) - req, err := virtualmachinedisk.NewClient(mc).DeleteDataDisk(vm, vm, vm, lun, false) + req, err := virtualmachinedisk.NewClient(mc). + DeleteDataDisk(ovm.(string), ovm.(string), ovm.(string), olun.(int), false) if err != nil { return fmt.Errorf("Error detaching data disk %s: %s", d.Id(), err) } @@ -183,6 +184,42 @@ func resourceAzureDataDiskUpdate(d *schema.ResourceData, meta interface{}) error "Error waiting for data disk %s to be detached: %s", d.Id(), err) } + log.Printf("[DEBUG] Verifying data disk %s is properly detached...", d.Id()) + for i := 0; i < 6; i++ { + disk, err := virtualmachinedisk.NewClient(mc).GetDisk(d.Id()) + if err != nil { + return fmt.Errorf("Error retrieving disk %s: %s", d.Id(), err) + } + + // Check if the disk is really detached + if disk.AttachedTo.RoleName == "" { + break + } + + // If not, wait 30 seconds and try it again... + time.Sleep(time.Duration(30 * time.Second)) + } + + if d.HasChange("size") { + p := virtualmachinedisk.UpdateDiskParameters{ + DiskName: d.Id(), + Label: d.Get("label").(string), + ResizedSizeInGB: d.Get("size").(int), + } + + log.Printf("[DEBUG] Updating disk: %s", d.Id()) + req, err := virtualmachinedisk.NewClient(mc).UpdateDisk(d.Id(), p) + if err != nil { + return fmt.Errorf("Error updating disk %s: %s", d.Id(), err) + } + + // Wait until the disk is updated + if err := mc.WaitForOperation(req, nil); err != nil { + return fmt.Errorf( + "Error waiting for disk %s to be updated: %s", d.Id(), err) + } + } + p := virtualmachinedisk.CreateDataDiskParameters{ DiskName: d.Id(), Lun: lun, @@ -207,7 +244,7 @@ func resourceAzureDataDiskUpdate(d *schema.ResourceData, meta interface{}) error return nil } - if d.HasChange("caching") || d.HasChange("lun") { + if d.HasChange("caching") { p := virtualmachinedisk.UpdateDataDiskParameters{ DiskName: d.Id(), Lun: lun, diff --git a/builtin/providers/azure/resource_azure_data_disk_test.go b/builtin/providers/azure/resource_azure_data_disk_test.go new file mode 100644 index 000000000..1e1fb3132 --- /dev/null +++ b/builtin/providers/azure/resource_azure_data_disk_test.go @@ -0,0 +1,238 @@ +package azure + +import ( + "fmt" + "os" + "strconv" + "testing" + + "github.com/hashicorp/terraform/helper/resource" + "github.com/hashicorp/terraform/terraform" + "github.com/svanharmelen/azure-sdk-for-go/management" + "github.com/svanharmelen/azure-sdk-for-go/management/virtualmachinedisk" +) + +func TestAccAzureDataDisk_basic(t *testing.T) { + var disk virtualmachinedisk.DataDiskResponse + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAzureDataDiskDestroy, + Steps: []resource.TestStep{ + resource.TestStep{ + Config: testAccAzureDataDisk_basic, + Check: resource.ComposeTestCheckFunc( + testAccCheckAzureDataDiskExists( + "azure_data_disk.foo", &disk), + testAccCheckAzureDataDiskAttributes(&disk), + resource.TestCheckResourceAttr( + "azure_data_disk.foo", "label", "terraform-test-0"), + resource.TestCheckResourceAttr( + "azure_data_disk.foo", "size", "10"), + ), + }, + }, + }) +} + +func TestAccAzureDataDisk_update(t *testing.T) { + var disk virtualmachinedisk.DataDiskResponse + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAzureDataDiskDestroy, + Steps: []resource.TestStep{ + resource.TestStep{ + Config: testAccAzureDataDisk_advanced, + Check: resource.ComposeTestCheckFunc( + testAccCheckAzureDataDiskExists( + "azure_data_disk.foo", &disk), + resource.TestCheckResourceAttr( + "azure_data_disk.foo", "label", "terraform-test1-1"), + resource.TestCheckResourceAttr( + "azure_data_disk.foo", "lun", "1"), + resource.TestCheckResourceAttr( + "azure_data_disk.foo", "size", "10"), + resource.TestCheckResourceAttr( + "azure_data_disk.foo", "caching", "ReadOnly"), + resource.TestCheckResourceAttr( + "azure_data_disk.foo", "virtual_machine", "terraform-test1"), + ), + }, + + resource.TestStep{ + Config: testAccAzureDataDisk_update, + Check: resource.ComposeTestCheckFunc( + testAccCheckAzureDataDiskExists( + "azure_data_disk.foo", &disk), + resource.TestCheckResourceAttr( + "azure_data_disk.foo", "label", "terraform-test1-1"), + resource.TestCheckResourceAttr( + "azure_data_disk.foo", "lun", "2"), + resource.TestCheckResourceAttr( + "azure_data_disk.foo", "size", "20"), + resource.TestCheckResourceAttr( + "azure_data_disk.foo", "caching", "ReadWrite"), + resource.TestCheckResourceAttr( + "azure_data_disk.foo", "virtual_machine", "terraform-test2"), + ), + }, + }, + }) +} + +func testAccCheckAzureDataDiskExists( + n string, + disk *virtualmachinedisk.DataDiskResponse) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[n] + if !ok { + return fmt.Errorf("Not found: %s", n) + } + + if rs.Primary.ID == "" { + return fmt.Errorf("No Data Disk ID is set") + } + + vm := rs.Primary.Attributes["virtual_machine"] + lun, err := strconv.Atoi(rs.Primary.Attributes["lun"]) + if err != nil { + return err + } + + mc := testAccProvider.Meta().(management.Client) + d, err := virtualmachinedisk.NewClient(mc).GetDataDisk(vm, vm, vm, lun) + if err != nil { + return err + } + + if d.DiskName != rs.Primary.ID { + return fmt.Errorf("Data Disk not found") + } + + *disk = d + + return nil + } +} + +func testAccCheckAzureDataDiskAttributes( + disk *virtualmachinedisk.DataDiskResponse) resource.TestCheckFunc { + return func(s *terraform.State) error { + + if disk.Lun != 0 { + return fmt.Errorf("Bad lun: %d", disk.Lun) + } + + if disk.LogicalDiskSizeInGB != 10 { + return fmt.Errorf("Bad size: %d", disk.LogicalDiskSizeInGB) + } + + if disk.HostCaching != "None" { + return fmt.Errorf("Bad caching: %s", disk.HostCaching) + } + + return nil + } +} + +func testAccCheckAzureDataDiskDestroy(s *terraform.State) error { + mc := testAccProvider.Meta().(management.Client) + + for _, rs := range s.RootModule().Resources { + if rs.Type != "azure_data_disk" { + continue + } + + if rs.Primary.ID == "" { + return fmt.Errorf("No Disk ID is set") + } + + vm := rs.Primary.Attributes["virtual_machine"] + lun, err := strconv.Atoi(rs.Primary.Attributes["lun"]) + if err != nil { + return err + } + + req, err := virtualmachinedisk.NewClient(mc).DeleteDataDisk(vm, vm, vm, lun, true) + if err != nil { + return fmt.Errorf("Error deleting Data Disk (%s): %s", rs.Primary.ID, err) + } + + // Wait until the data disk is deleted + if err := mc.WaitForOperation(req, nil); err != nil { + return fmt.Errorf( + "Error deleting Data Disk (%s): %s", rs.Primary.ID, err) + } + } + + return nil +} + +var testAccAzureDataDisk_basic = fmt.Sprintf(` +resource "azure_instance" "foo" { + name = "terraform-test" + image = "Ubuntu Server 14.04 LTS" + size = "Basic_A1" + storage = "%s" + location = "West US" + username = "terraform" + password = "Pass!admin123" +} + +resource "azure_data_disk" "foo" { + lun = 0 + size = 10 + storage = "${azure_instance.foo.storage}" + virtual_machine = "${azure_instance.foo.id}" +}`, os.Getenv("AZURE_STORAGE")) + +var testAccAzureDataDisk_advanced = fmt.Sprintf(` +resource "azure_instance" "foo" { + name = "terraform-test1" + image = "Ubuntu Server 14.04 LTS" + size = "Basic_A1" + storage = "%s" + location = "West US" + username = "terraform" + password = "Pass!admin123" +} + +resource "azure_data_disk" "foo" { + lun = 1 + size = 10 + caching = "ReadOnly" + storage = "${azure_instance.foo.storage}" + virtual_machine = "${azure_instance.foo.id}" +}`, os.Getenv("AZURE_STORAGE")) + +var testAccAzureDataDisk_update = fmt.Sprintf(` +resource "azure_instance" "foo" { + name = "terraform-test1" + image = "Ubuntu Server 14.04 LTS" + size = "Basic_A1" + storage = "%s" + location = "West US" + username = "terraform" + password = "Pass!admin123" +} + +resource "azure_instance" "bar" { + name = "terraform-test2" + image = "Ubuntu Server 14.04 LTS" + size = "Basic_A1" + storage = "${azure_instance.foo.storage}" + location = "West US" + username = "terraform" + password = "Pass!admin123" +} + +resource "azure_data_disk" "foo" { + lun = 2 + size = 20 + caching = "ReadWrite" + storage = "${azure_instance.bar.storage}" + virtual_machine = "${azure_instance.bar.id}" +}`, os.Getenv("AZURE_STORAGE")) diff --git a/builtin/providers/azure/resource_azure_disk_test.go b/builtin/providers/azure/resource_azure_disk_test.go deleted file mode 100644 index 6512f735e..000000000 --- a/builtin/providers/azure/resource_azure_disk_test.go +++ /dev/null @@ -1 +0,0 @@ -package azure diff --git a/builtin/providers/azure/resource_azure_instance.go b/builtin/providers/azure/resource_azure_instance.go index 814144ea4..ed34d9fc2 100644 --- a/builtin/providers/azure/resource_azure_instance.go +++ b/builtin/providers/azure/resource_azure_instance.go @@ -5,6 +5,7 @@ import ( "encoding/base64" "fmt" "log" + "strings" "github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/helper/schema" @@ -179,6 +180,7 @@ func resourceAzureInstanceCreate(d *schema.ResourceData, meta interface{}) (err configureForImage, osType, err := retrieveImageDetails( mc, d.Get("image").(string), + name, d.Get("storage").(string), ) if err != nil { @@ -521,32 +523,35 @@ func resourceAzureEndpointHash(v interface{}) int { func retrieveImageDetails( mc management.Client, label string, + name string, storage string) (func(*virtualmachine.Role) error, string, error) { - configureForImage, osType, err := retrieveVMImageDetails(mc, label) + configureForImage, osType, VMLabels, err := retrieveVMImageDetails(mc, label) if err == nil { return configureForImage, osType, nil } - configureForImage, osType, err = retrieveOSImageDetails(mc, label, storage) + configureForImage, osType, OSLabels, err := retrieveOSImageDetails(mc, label, name, storage) if err == nil { return configureForImage, osType, nil } - return nil, "", fmt.Errorf("Could not find image with label '%s'", label) + return nil, "", fmt.Errorf("Could not find image with label '%s'. Available images are: %s", + label, strings.Join(append(VMLabels, OSLabels...), ", ")) } func retrieveVMImageDetails( mc management.Client, - label string) (func(*virtualmachine.Role) error, string, error) { + label string) (func(*virtualmachine.Role) error, string, []string, error) { imgs, err := virtualmachineimage.NewClient(mc).ListVirtualMachineImages() if err != nil { - return nil, "", fmt.Errorf("Error retrieving image details: %s", err) + return nil, "", nil, fmt.Errorf("Error retrieving image details: %s", err) } + var labels []string for _, img := range imgs.VMImages { if img.Label == label { if img.OSDiskConfiguration.OS != linux && img.OSDiskConfiguration.OS != windows { - return nil, "", fmt.Errorf("Unsupported image OS: %s", img.OSDiskConfiguration.OS) + return nil, "", nil, fmt.Errorf("Unsupported image OS: %s", img.OSDiskConfiguration.OS) } configureForImage := func(role *virtualmachine.Role) error { @@ -558,33 +563,37 @@ func retrieveVMImageDetails( ) } - return configureForImage, img.OSDiskConfiguration.OS, nil + return configureForImage, img.OSDiskConfiguration.OS, nil, nil } + + labels = append(labels, img.Label) } - return nil, "", fmt.Errorf("Could not find image with label '%s'", label) + return nil, "", labels, fmt.Errorf("Could not find image with label '%s'", label) } func retrieveOSImageDetails( mc management.Client, - label, - storage string) (func(*virtualmachine.Role) error, string, error) { + label string, + name string, + storage string) (func(*virtualmachine.Role) error, string, []string, error) { imgs, err := osimage.NewClient(mc).ListOSImages() if err != nil { - return nil, "", fmt.Errorf("Error retrieving image details: %s", err) + return nil, "", nil, fmt.Errorf("Error retrieving image details: %s", err) } + var labels []string for _, img := range imgs.OSImages { if img.Label == label { if img.OS != linux && img.OS != windows { - return nil, "", fmt.Errorf("Unsupported image OS: %s", img.OS) + return nil, "", nil, fmt.Errorf("Unsupported image OS: %s", img.OS) } if img.MediaLink == "" { if storage == "" { - return nil, "", + return nil, "", nil, fmt.Errorf("When using a platform image, the 'storage' parameter is required") } - img.MediaLink = fmt.Sprintf(osDiskBlobStorageURL, storage, label) + img.MediaLink = fmt.Sprintf(osDiskBlobStorageURL, storage, name) } configureForImage := func(role *virtualmachine.Role) error { @@ -596,11 +605,13 @@ func retrieveOSImageDetails( ) } - return configureForImage, img.OS, nil + return configureForImage, img.OS, nil, nil } + + labels = append(labels, img.Label) } - return nil, "", fmt.Errorf("Could not find image with label '%s'", label) + return nil, "", labels, fmt.Errorf("Could not find image with label '%s'", label) } func endpointProtocol(p string) virtualmachine.InputEndpointProtocol { diff --git a/builtin/providers/azure/resource_azure_instance_test.go b/builtin/providers/azure/resource_azure_instance_test.go index 6512f735e..0a272baa2 100644 --- a/builtin/providers/azure/resource_azure_instance_test.go +++ b/builtin/providers/azure/resource_azure_instance_test.go @@ -1 +1,457 @@ package azure + +import ( + "fmt" + "os" + "testing" + + "github.com/hashicorp/terraform/helper/resource" + "github.com/hashicorp/terraform/terraform" + "github.com/svanharmelen/azure-sdk-for-go/management" + "github.com/svanharmelen/azure-sdk-for-go/management/hostedservice" + "github.com/svanharmelen/azure-sdk-for-go/management/virtualmachine" +) + +func TestAccAzureInstance_basic(t *testing.T) { + var dpmt virtualmachine.DeploymentResponse + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAzureInstanceDestroy, + Steps: []resource.TestStep{ + resource.TestStep{ + Config: testAccAzureInstance_basic, + Check: resource.ComposeTestCheckFunc( + testAccCheckAzureInstanceExists( + "azure_instance.foo", &dpmt), + testAccCheckAzureInstanceBasicAttributes(&dpmt), + resource.TestCheckResourceAttr( + "azure_instance.foo", "name", "terraform-test"), + resource.TestCheckResourceAttr( + "azure_instance.foo", "location", "West US"), + resource.TestCheckResourceAttr( + "azure_instance.foo", "endpoint.2462817782.public_port", "22"), + ), + }, + }, + }) +} + +func TestAccAzureInstance_advanced(t *testing.T) { + var dpmt virtualmachine.DeploymentResponse + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAzureInstanceDestroy, + Steps: []resource.TestStep{ + resource.TestStep{ + Config: testAccAzureInstance_advanced, + Check: resource.ComposeTestCheckFunc( + testAccCheckAzureInstanceExists( + "azure_instance.foo", &dpmt), + testAccCheckAzureInstanceAdvancedAttributes(&dpmt), + resource.TestCheckResourceAttr( + "azure_instance.foo", "name", "terraform-test1"), + resource.TestCheckResourceAttr( + "azure_instance.foo", "size", "Basic_A1"), + resource.TestCheckResourceAttr( + "azure_instance.foo", "subnet", "subnet1"), + resource.TestCheckResourceAttr( + "azure_instance.foo", "virtual_network", "terraform-vnet"), + resource.TestCheckResourceAttr( + "azure_instance.foo", "security_group", "terraform-security-group1"), + resource.TestCheckResourceAttr( + "azure_instance.foo", "endpoint.1814039778.public_port", "3389"), + ), + }, + }, + }) +} + +func TestAccAzureInstance_update(t *testing.T) { + var dpmt virtualmachine.DeploymentResponse + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAzureInstanceDestroy, + Steps: []resource.TestStep{ + resource.TestStep{ + Config: testAccAzureInstance_advanced, + Check: resource.ComposeTestCheckFunc( + testAccCheckAzureInstanceExists( + "azure_instance.foo", &dpmt), + testAccCheckAzureInstanceAdvancedAttributes(&dpmt), + resource.TestCheckResourceAttr( + "azure_instance.foo", "name", "terraform-test1"), + resource.TestCheckResourceAttr( + "azure_instance.foo", "size", "Basic_A1"), + resource.TestCheckResourceAttr( + "azure_instance.foo", "subnet", "subnet1"), + resource.TestCheckResourceAttr( + "azure_instance.foo", "virtual_network", "terraform-vnet"), + resource.TestCheckResourceAttr( + "azure_instance.foo", "security_group", "terraform-security-group1"), + resource.TestCheckResourceAttr( + "azure_instance.foo", "endpoint.1814039778.public_port", "3389"), + ), + }, + + resource.TestStep{ + Config: testAccAzureInstance_update, + Check: resource.ComposeTestCheckFunc( + testAccCheckAzureInstanceExists( + "azure_instance.foo", &dpmt), + testAccCheckAzureInstanceUpdatedAttributes(&dpmt), + resource.TestCheckResourceAttr( + "azure_instance.foo", "size", "Basic_A2"), + resource.TestCheckResourceAttr( + "azure_instance.foo", "security_group", "terraform-security-group2"), + resource.TestCheckResourceAttr( + "azure_instance.foo", "endpoint.1814039778.public_port", "3389"), + resource.TestCheckResourceAttr( + "azure_instance.foo", "endpoint.3713350066.public_port", "5985"), + ), + }, + }, + }) +} + +func testAccCheckAzureInstanceExists( + n string, + dpmt *virtualmachine.DeploymentResponse) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[n] + if !ok { + return fmt.Errorf("Not found: %s", n) + } + + if rs.Primary.ID == "" { + return fmt.Errorf("No instance ID is set") + } + + mc := testAccProvider.Meta().(management.Client) + vm, err := virtualmachine.NewClient(mc).GetDeployment(rs.Primary.ID, rs.Primary.ID) + if err != nil { + return err + } + + if vm.Name != rs.Primary.ID { + return fmt.Errorf("Instance not found") + } + + *dpmt = vm + + return nil + } +} + +func testAccCheckAzureInstanceBasicAttributes( + dpmt *virtualmachine.DeploymentResponse) resource.TestCheckFunc { + return func(s *terraform.State) error { + + if dpmt.Name != "terraform-test" { + return fmt.Errorf("Bad name: %s", dpmt.Name) + } + + if len(dpmt.RoleList) != 1 { + return fmt.Errorf( + "Instance %s has an unexpected number of roles: %d", dpmt.Name, len(dpmt.RoleList)) + } + + if dpmt.RoleList[0].RoleSize != "Basic_A1" { + return fmt.Errorf("Bad size: %s", dpmt.RoleList[0].RoleSize) + } + + return nil + } +} + +func testAccCheckAzureInstanceAdvancedAttributes( + dpmt *virtualmachine.DeploymentResponse) resource.TestCheckFunc { + return func(s *terraform.State) error { + + if dpmt.Name != "terraform-test1" { + return fmt.Errorf("Bad name: %s", dpmt.Name) + } + + if dpmt.VirtualNetworkName != "terraform-vnet" { + return fmt.Errorf("Bad virtual network: %s", dpmt.VirtualNetworkName) + } + + if len(dpmt.RoleList) != 1 { + return fmt.Errorf( + "Instance %s has an unexpected number of roles: %d", dpmt.Name, len(dpmt.RoleList)) + } + + if dpmt.RoleList[0].RoleSize != "Basic_A1" { + return fmt.Errorf("Bad size: %s", dpmt.RoleList[0].RoleSize) + } + + for _, c := range dpmt.RoleList[0].ConfigurationSets { + if c.ConfigurationSetType == virtualmachine.ConfigurationSetTypeNetwork { + if len(c.InputEndpoints) != 1 { + return fmt.Errorf( + "Instance %s has an unexpected number of endpoints %d", + dpmt.Name, len(c.InputEndpoints)) + } + + if c.InputEndpoints[0].Name != "RDP" { + return fmt.Errorf("Bad endpoint name: %s", c.InputEndpoints[0].Name) + } + + if c.InputEndpoints[0].Port != 3389 { + return fmt.Errorf("Bad endpoint port: %d", c.InputEndpoints[0].Port) + } + + if len(c.SubnetNames) != 1 { + return fmt.Errorf( + "Instance %s has an unexpected number of associated subnets %d", + dpmt.Name, len(c.SubnetNames)) + } + + if c.SubnetNames[0] != "subnet1" { + return fmt.Errorf("Bad subnet: %s", c.SubnetNames[0]) + } + + if c.NetworkSecurityGroup != "terraform-security-group1" { + return fmt.Errorf("Bad security group: %s", c.NetworkSecurityGroup) + } + } + } + + return nil + } +} + +func testAccCheckAzureInstanceUpdatedAttributes( + dpmt *virtualmachine.DeploymentResponse) resource.TestCheckFunc { + return func(s *terraform.State) error { + + if dpmt.Name != "terraform-test1" { + return fmt.Errorf("Bad name: %s", dpmt.Name) + } + + if dpmt.VirtualNetworkName != "terraform-vnet" { + return fmt.Errorf("Bad virtual network: %s", dpmt.VirtualNetworkName) + } + + if len(dpmt.RoleList) != 1 { + return fmt.Errorf( + "Instance %s has an unexpected number of roles: %d", dpmt.Name, len(dpmt.RoleList)) + } + + if dpmt.RoleList[0].RoleSize != "Basic_A2" { + return fmt.Errorf("Bad size: %s", dpmt.RoleList[0].RoleSize) + } + + for _, c := range dpmt.RoleList[0].ConfigurationSets { + if c.ConfigurationSetType == virtualmachine.ConfigurationSetTypeNetwork { + if len(c.InputEndpoints) != 2 { + return fmt.Errorf( + "Instance %s has an unexpected number of endpoints %d", + dpmt.Name, len(c.InputEndpoints)) + } + + if c.InputEndpoints[1].Name != "WINRM" { + return fmt.Errorf("Bad endpoint name: %s", c.InputEndpoints[1].Name) + } + + if c.InputEndpoints[1].Port != 5985 { + return fmt.Errorf("Bad endpoint port: %d", c.InputEndpoints[1].Port) + } + + if len(c.SubnetNames) != 1 { + return fmt.Errorf( + "Instance %s has an unexpected number of associated subnets %d", + dpmt.Name, len(c.SubnetNames)) + } + + if c.SubnetNames[0] != "subnet1" { + return fmt.Errorf("Bad subnet: %s", c.SubnetNames[0]) + } + + if c.NetworkSecurityGroup != "terraform-security-group2" { + return fmt.Errorf("Bad security group: %s", c.NetworkSecurityGroup) + } + } + } + + return nil + } +} + +func testAccCheckAzureInstanceDestroy(s *terraform.State) error { + mc := testAccProvider.Meta().(management.Client) + + for _, rs := range s.RootModule().Resources { + if rs.Type != "azure_instance" { + continue + } + + if rs.Primary.ID == "" { + return fmt.Errorf("No instance ID is set") + } + + req, err := hostedservice.NewClient(mc).DeleteHostedService(rs.Primary.ID, true) + if err != nil { + return fmt.Errorf("Error deleting instance (%s): %s", rs.Primary.ID, err) + } + + // Wait until the instance is deleted + if err := mc.WaitForOperation(req, nil); err != nil { + return fmt.Errorf( + "Error deleting instance (%s): %s", rs.Primary.ID, err) + } + } + + return nil +} + +var testAccAzureInstance_basic = fmt.Sprintf(` +resource "azure_instance" "foo" { + name = "terraform-test" + image = "Ubuntu Server 14.04 LTS" + size = "Basic_A1" + storage = "%s" + location = "West US" + username = "terraform" + password = "Pass!admin123" + + endpoint { + name = "SSH" + protocol = "tcp" + public_port = 22 + private_port = 22 + } +}`, os.Getenv("AZURE_STORAGE")) + +var testAccAzureInstance_advanced = fmt.Sprintf(` +resource "azure_virtual_network" "foo" { + name = "terraform-vnet" + address_space = ["10.1.2.0/24"] + location = "West US" + + subnet { + name = "subnet1" + address_prefix = "10.1.2.0/25" + } + + subnet { + name = "subnet2" + address_prefix = "10.1.2.128/25" + } +} + +resource "azure_security_group" "foo" { + name = "terraform-security-group1" + location = "West US" + + rule { + name = "rdp" + priority = 101 + source_cidr = "*" + source_port = "*" + destination_cidr = "*" + destination_port = 3389 + protocol = "TCP" + } +} + +resource "azure_instance" "foo" { + name = "terraform-test1" + image = "Windows Server 2012 R2 Datacenter, April 2015" + size = "Basic_A1" + storage = "%s" + location = "West US" + time_zone = "America/Los_Angeles" + subnet = "subnet1" + virtual_network = "${azure_virtual_network.foo.name}" + security_group = "${azure_security_group.foo.name}" + username = "terraform" + password = "Pass!admin123" + + endpoint { + name = "RDP" + protocol = "tcp" + public_port = 3389 + private_port = 3389 + } +}`, os.Getenv("AZURE_STORAGE")) + +var testAccAzureInstance_update = fmt.Sprintf(` +resource "azure_virtual_network" "foo" { + name = "terraform-vnet" + address_space = ["10.1.2.0/24"] + location = "West US" + + subnet { + name = "subnet1" + address_prefix = "10.1.2.0/25" + } + + subnet { + name = "subnet2" + address_prefix = "10.1.2.128/25" + } +} + +resource "azure_security_group" "foo" { + name = "terraform-security-group1" + location = "West US" + + rule { + name = "rdp" + priority = 101 + source_cidr = "*" + source_port = "*" + destination_cidr = "*" + destination_port = 3389 + protocol = "TCP" + } +} + +resource "azure_security_group" "bar" { + name = "terraform-security-group2" + location = "West US" + + rule { + name = "rdp" + priority = 101 + source_cidr = "192.168.0.0/24" + source_port = "*" + destination_cidr = "*" + destination_port = 3389 + protocol = "TCP" + } +} + +resource "azure_instance" "foo" { + name = "terraform-test1" + image = "Windows Server 2012 R2 Datacenter, April 2015" + size = "Basic_A2" + storage = "%s" + location = "West US" + time_zone = "America/Los_Angeles" + subnet = "subnet1" + virtual_network = "${azure_virtual_network.foo.name}" + security_group = "${azure_security_group.bar.name}" + username = "terraform" + password = "Pass!admin123" + + endpoint { + name = "RDP" + protocol = "tcp" + public_port = 3389 + private_port = 3389 + } + + endpoint { + name = "WINRM" + protocol = "tcp" + public_port = 5985 + private_port = 5985 + } +}`, os.Getenv("AZURE_STORAGE")) diff --git a/builtin/providers/azure/resource_azure_security_group.go b/builtin/providers/azure/resource_azure_security_group.go index e5cca0f88..98d79bad0 100644 --- a/builtin/providers/azure/resource_azure_security_group.go +++ b/builtin/providers/azure/resource_azure_security_group.go @@ -33,11 +33,6 @@ func resourceAzureSecurityGroup() *schema.Resource { ForceNew: true, }, - "subnet": &schema.Schema{ - Type: schema.TypeString, - Optional: true, - }, - "location": &schema.Schema{ Type: schema.TypeString, Required: true, diff --git a/builtin/providers/azure/resource_azure_security_group_test.go b/builtin/providers/azure/resource_azure_security_group_test.go index 6512f735e..1e48faad8 100644 --- a/builtin/providers/azure/resource_azure_security_group_test.go +++ b/builtin/providers/azure/resource_azure_security_group_test.go @@ -1 +1,273 @@ package azure + +import ( + "fmt" + "testing" + + "github.com/hashicorp/terraform/helper/resource" + "github.com/hashicorp/terraform/terraform" + "github.com/svanharmelen/azure-sdk-for-go/management" + "github.com/svanharmelen/azure-sdk-for-go/management/networksecuritygroup" +) + +func TestAccAzureSecurityGroup_basic(t *testing.T) { + var group networksecuritygroup.SecurityGroupResponse + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAzureSecurityGroupDestroy, + Steps: []resource.TestStep{ + resource.TestStep{ + Config: testAccAzureSecurityGroup_basic, + Check: resource.ComposeTestCheckFunc( + testAccCheckAzureSecurityGroupExists( + "azure_security_group.foo", &group), + testAccCheckAzureSecurityGroupBasicAttributes(&group), + resource.TestCheckResourceAttr( + "azure_security_group.foo", "name", "terraform-security-group"), + resource.TestCheckResourceAttr( + "azure_security_group.foo", "location", "West US"), + resource.TestCheckResourceAttr( + "azure_security_group.foo", "rule.936204579.name", "RDP"), + resource.TestCheckResourceAttr( + "azure_security_group.foo", "rule.936204579.source_port", "*"), + resource.TestCheckResourceAttr( + "azure_security_group.foo", "rule.936204579.destination_port", "3389"), + ), + }, + }, + }) +} + +func TestAccAzureSecurityGroup_update(t *testing.T) { + var group networksecuritygroup.SecurityGroupResponse + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAzureSecurityGroupDestroy, + Steps: []resource.TestStep{ + resource.TestStep{ + Config: testAccAzureSecurityGroup_basic, + Check: resource.ComposeTestCheckFunc( + testAccCheckAzureSecurityGroupExists( + "azure_security_group.foo", &group), + testAccCheckAzureSecurityGroupBasicAttributes(&group), + resource.TestCheckResourceAttr( + "azure_security_group.foo", "name", "terraform-security-group"), + resource.TestCheckResourceAttr( + "azure_security_group.foo", "location", "West US"), + resource.TestCheckResourceAttr( + "azure_security_group.foo", "rule.936204579.name", "RDP"), + resource.TestCheckResourceAttr( + "azure_security_group.foo", "rule.936204579.source_cidr", "*"), + resource.TestCheckResourceAttr( + "azure_security_group.foo", "rule.936204579.destination_port", "3389"), + ), + }, + + resource.TestStep{ + Config: testAccAzureSecurityGroup_update, + Check: resource.ComposeTestCheckFunc( + testAccCheckAzureSecurityGroupExists( + "azure_security_group.foo", &group), + testAccCheckAzureSecurityGroupUpdatedAttributes(&group), + resource.TestCheckResourceAttr( + "azure_security_group.foo", "rule.3322523298.name", "RDP"), + resource.TestCheckResourceAttr( + "azure_security_group.foo", "rule.3322523298.source_cidr", "192.168.0.0/24"), + resource.TestCheckResourceAttr( + "azure_security_group.foo", "rule.3322523298.destination_port", "3389"), + resource.TestCheckResourceAttr( + "azure_security_group.foo", "rule.3929353075.name", "WINRM"), + resource.TestCheckResourceAttr( + "azure_security_group.foo", "rule.3929353075.source_cidr", "192.168.0.0/24"), + resource.TestCheckResourceAttr( + "azure_security_group.foo", "rule.3929353075.destination_port", "5985"), + ), + }, + }, + }) +} + +func testAccCheckAzureSecurityGroupExists( + n string, + group *networksecuritygroup.SecurityGroupResponse) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[n] + if !ok { + return fmt.Errorf("Not found: %s", n) + } + + if rs.Primary.ID == "" { + return fmt.Errorf("No Network Security Group ID is set") + } + + mc := testAccProvider.Meta().(management.Client) + sg, err := networksecuritygroup.NewClient(mc).GetNetworkSecurityGroup(rs.Primary.ID) + if err != nil { + return err + } + + if sg.Name != rs.Primary.ID { + return fmt.Errorf("Security Group not found") + } + + *group = sg + + return nil + } +} + +func testAccCheckAzureSecurityGroupBasicAttributes( + group *networksecuritygroup.SecurityGroupResponse) resource.TestCheckFunc { + return func(s *terraform.State) error { + + if group.Name != "terraform-security-group" { + return fmt.Errorf("Bad name: %s", group.Name) + } + + for _, r := range group.Rules { + if !r.IsDefault { + if r.Name != "RDP" { + return fmt.Errorf("Bad rule name: %s", r.Name) + } + if r.Priority != 101 { + return fmt.Errorf("Bad rule priority: %d", r.Priority) + } + if r.SourceAddressPrefix != "*" { + return fmt.Errorf("Bad source CIDR: %s", r.SourceAddressPrefix) + } + if r.DestinationAddressPrefix != "*" { + return fmt.Errorf("Bad destination CIDR: %s", r.DestinationAddressPrefix) + } + if r.DestinationPortRange != "3389" { + return fmt.Errorf("Bad destination port: %s", r.DestinationPortRange) + } + } + } + + return nil + } +} + +func testAccCheckAzureSecurityGroupUpdatedAttributes( + group *networksecuritygroup.SecurityGroupResponse) resource.TestCheckFunc { + return func(s *terraform.State) error { + + if group.Name != "terraform-security-group" { + return fmt.Errorf("Bad name: %s", group.Name) + } + + foundRDP := false + foundWINRM := false + for _, r := range group.Rules { + if !r.IsDefault { + if r.Name == "RDP" { + if r.SourceAddressPrefix != "192.168.0.0/24" { + return fmt.Errorf("Bad source CIDR: %s", r.SourceAddressPrefix) + } + + foundRDP = true + } + + if r.Name == "WINRM" { + if r.Priority != 102 { + return fmt.Errorf("Bad rule priority: %d", r.Priority) + } + if r.SourceAddressPrefix != "192.168.0.0/24" { + return fmt.Errorf("Bad source CIDR: %s", r.SourceAddressPrefix) + } + if r.DestinationAddressPrefix != "*" { + return fmt.Errorf("Bad destination CIDR: %s", r.DestinationAddressPrefix) + } + if r.DestinationPortRange != "5985" { + return fmt.Errorf("Bad destination port: %s", r.DestinationPortRange) + } + + foundWINRM = true + } + } + } + + if !foundRDP { + return fmt.Errorf("RDP rule not found") + } + + if !foundWINRM { + return fmt.Errorf("WINRM rule not found") + } + + return nil + } +} + +func testAccCheckAzureSecurityGroupDestroy(s *terraform.State) error { + mc := testAccProvider.Meta().(management.Client) + + for _, rs := range s.RootModule().Resources { + if rs.Type != "azure_security_group" { + continue + } + + if rs.Primary.ID == "" { + return fmt.Errorf("No Network Security Group ID is set") + } + + req, err := networksecuritygroup.NewClient(mc).DeleteNetworkSecurityGroup(rs.Primary.ID) + if err != nil { + return fmt.Errorf("Error deleting Network Security Group (%s): %s", rs.Primary.ID, err) + } + + // Wait until the instance is deleted + if err := mc.WaitForOperation(req, nil); err != nil { + return fmt.Errorf( + "Error deleting Network Security Group (%s): %s", rs.Primary.ID, err) + } + } + + return nil +} + +const testAccAzureSecurityGroup_basic = ` +resource "azure_security_group" "foo" { + name = "terraform-security-group" + location = "West US" + + rule { + name = "RDP" + priority = 101 + source_cidr = "*" + source_port = "*" + destination_cidr = "*" + destination_port = "3389" + protocol = "TCP" + } +}` + +const testAccAzureSecurityGroup_update = ` +resource "azure_security_group" "foo" { + name = "terraform-security-group" + location = "West US" + + rule { + name = "RDP" + priority = 101 + source_cidr = "192.168.0.0/24" + source_port = "*" + destination_cidr = "*" + destination_port = "3389" + protocol = "TCP" + } + + rule { + name = "WINRM" + priority = 102 + source_cidr = "192.168.0.0/24" + source_port = "*" + destination_cidr = "*" + destination_port = "5985" + protocol = "TCP" + } +}` diff --git a/builtin/providers/azure/resource_azure_virtual_network.go b/builtin/providers/azure/resource_azure_virtual_network.go index de451fe8d..7125f24a0 100644 --- a/builtin/providers/azure/resource_azure_virtual_network.go +++ b/builtin/providers/azure/resource_azure_virtual_network.go @@ -5,9 +5,11 @@ import ( "log" "strings" + "github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/helper/schema" "github.com/mitchellh/mapstructure" "github.com/svanharmelen/azure-sdk-for-go/management" + "github.com/svanharmelen/azure-sdk-for-go/management/networksecuritygroup" "github.com/svanharmelen/azure-sdk-for-go/management/virtualnetwork" ) @@ -36,8 +38,25 @@ func resourceAzureVirtualNetwork() *schema.Resource { }, "subnet": &schema.Schema{ - Type: schema.TypeMap, + Type: schema.TypeSet, Required: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "name": &schema.Schema{ + Type: schema.TypeString, + Required: true, + }, + "address_prefix": &schema.Schema{ + Type: schema.TypeString, + Required: true, + }, + "security_group": &schema.Schema{ + Type: schema.TypeString, + Optional: true, + }, + }, + }, + Set: resourceAzureSubnetHash, }, "location": &schema.Schema{ @@ -83,12 +102,15 @@ func resourceAzureVirtualNetworkCreate(d *schema.ResourceData, meta interface{}) // Wait until the virtual network is created if err := mc.WaitForOperation(req, nil); err != nil { - log.Printf( - "[DEBUG] Error waiting for Virtual Network %s to be created: %s", name, err) + return fmt.Errorf("Error waiting for Virtual Network %s to be created: %s", name, err) } d.SetId(name) + if err := associateSecurityGroups(d, meta); err != nil { + return err + } + return resourceAzureVirtualNetworkRead(d, meta) } @@ -105,9 +127,29 @@ func resourceAzureVirtualNetworkRead(d *schema.ResourceData, meta interface{}) e d.Set("address_space", n.AddressSpace.AddressPrefix) d.Set("location", n.Location) - subnets := map[string]interface{}{} + // Create a new set to hold all configured subnets + subnets := &schema.Set{ + F: resourceAzureSubnetHash, + } + + // Loop through all endpoints for _, s := range n.Subnets { - subnets[s.Name] = s.AddressPrefix + subnet := map[string]interface{}{} + + // Get the associated (if any) security group + sg, err := networksecuritygroup.NewClient(mc). + GetNetworkSecurityGroupForSubnet(s.Name, d.Id()) + if err != nil && !management.IsResourceNotFoundError(err) { + return fmt.Errorf( + "Error retrieving Network Security Group associations of subnet %s: %s", s.Name, err) + } + + // Update the values + subnet["name"] = s.Name + subnet["address_prefix"] = s.AddressPrefix + subnet["security_group"] = sg.Name + + subnets.Add(subnet) } d.Set("subnet", subnets) @@ -155,8 +197,11 @@ func resourceAzureVirtualNetworkUpdate(d *schema.ResourceData, meta interface{}) // Wait until the virtual network is updated if err := mc.WaitForOperation(req, nil); err != nil { - log.Printf( - "[DEBUG] Error waiting for Virtual Network %s to be updated: %s", d.Id(), err) + return fmt.Errorf("Error waiting for Virtual Network %s to be updated: %s", d.Id(), err) + } + + if err := associateSecurityGroups(d, meta); err != nil { + return err } return resourceAzureVirtualNetworkRead(d, meta) @@ -186,8 +231,7 @@ func resourceAzureVirtualNetworkDelete(d *schema.ResourceData, meta interface{}) // Wait until the virtual network is deleted if err := mc.WaitForOperation(req, nil); err != nil { - log.Printf( - "[DEBUG] Error waiting for Virtual Network %s to be deleted: %s", d.Id(), err) + return fmt.Errorf("Error waiting for Virtual Network %s to be deleted: %s", d.Id(), err) } d.SetId("") @@ -195,6 +239,12 @@ func resourceAzureVirtualNetworkDelete(d *schema.ResourceData, meta interface{}) return nil } +func resourceAzureSubnetHash(v interface{}) int { + m := v.(map[string]interface{}) + subnet := m["name"].(string) + m["address_prefix"].(string) + m["security_group"].(string) + return hashcode.String(subnet) +} + func createVirtualNetwork(d *schema.ResourceData) (virtualnetwork.VirtualNetworkSite, error) { var addressPrefix []string err := mapstructure.WeakDecode(d.Get("address_space"), &addressPrefix) @@ -206,12 +256,16 @@ func createVirtualNetwork(d *schema.ResourceData) (virtualnetwork.VirtualNetwork AddressPrefix: addressPrefix, } - subnets := []virtualnetwork.Subnet{} - for n, p := range d.Get("subnet").(map[string]interface{}) { - subnets = append(subnets, virtualnetwork.Subnet{ - Name: n, - AddressPrefix: p.(string), - }) + // Add all subnets that are configured + var subnets []virtualnetwork.Subnet + if rs := d.Get("subnet").(*schema.Set); rs.Len() > 0 { + for _, subnet := range rs.List() { + subnet := subnet.(map[string]interface{}) + subnets = append(subnets, virtualnetwork.Subnet{ + Name: subnet["name"].(string), + AddressPrefix: subnet["address_prefix"].(string), + }) + } } return virtualnetwork.VirtualNetworkSite{ @@ -221,3 +275,67 @@ func createVirtualNetwork(d *schema.ResourceData) (virtualnetwork.VirtualNetwork Subnets: subnets, }, nil } + +func associateSecurityGroups(d *schema.ResourceData, meta interface{}) error { + mc := meta.(management.Client) + + virtualNetwork := d.Get("name").(string) + + if rs := d.Get("subnet").(*schema.Set); rs.Len() > 0 { + for _, subnet := range rs.List() { + subnet := subnet.(map[string]interface{}) + securityGroup := subnet["security_group"].(string) + subnetName := subnet["name"].(string) + + // Get the associated (if any) security group + sg, err := networksecuritygroup.NewClient(mc). + GetNetworkSecurityGroupForSubnet(subnetName, d.Id()) + if err != nil && !management.IsResourceNotFoundError(err) { + return fmt.Errorf( + "Error retrieving Network Security Group associations of subnet %s: %s", subnetName, err) + } + + // If the desired and actual security group are the same, were done so can just continue + if sg.Name == securityGroup { + continue + } + + // If there is an associated security group, make sure we first remove it from the subnet + if sg.Name != "" { + req, err := networksecuritygroup.NewClient(mc). + RemoveNetworkSecurityGroupFromSubnet(sg.Name, subnetName, virtualNetwork) + if err != nil { + return fmt.Errorf("Error removing Network Security Group %s from subnet %s: %s", + securityGroup, subnetName, err) + } + + // Wait until the security group is associated + if err := mc.WaitForOperation(req, nil); err != nil { + return fmt.Errorf( + "Error waiting for Network Security Group %s to be removed from subnet %s: %s", + securityGroup, subnetName, err) + } + } + + // If the desired security group is not empty, assign the security group to the subnet + if securityGroup != "" { + req, err := networksecuritygroup.NewClient(mc). + AddNetworkSecurityToSubnet(securityGroup, subnetName, virtualNetwork) + if err != nil { + return fmt.Errorf("Error associating Network Security Group %s to subnet %s: %s", + securityGroup, subnetName, err) + } + + // Wait until the security group is associated + if err := mc.WaitForOperation(req, nil); err != nil { + return fmt.Errorf( + "Error waiting for Network Security Group %s to be associated with subnet %s: %s", + securityGroup, subnetName, err) + } + } + + } + } + + return nil +} diff --git a/builtin/providers/azure/resource_azure_virtual_network_test.go b/builtin/providers/azure/resource_azure_virtual_network_test.go index 6512f735e..2ade3de00 100644 --- a/builtin/providers/azure/resource_azure_virtual_network_test.go +++ b/builtin/providers/azure/resource_azure_virtual_network_test.go @@ -1 +1,296 @@ package azure + +import ( + "fmt" + "testing" + + "github.com/hashicorp/terraform/helper/resource" + "github.com/hashicorp/terraform/terraform" + "github.com/svanharmelen/azure-sdk-for-go/management" + "github.com/svanharmelen/azure-sdk-for-go/management/virtualnetwork" +) + +func TestAccAzureVirtualNetwork_basic(t *testing.T) { + var network virtualnetwork.VirtualNetworkSite + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAzureVirtualNetworkDestroy, + Steps: []resource.TestStep{ + resource.TestStep{ + Config: testAccAzureVirtualNetwork_basic, + Check: resource.ComposeTestCheckFunc( + testAccCheckAzureVirtualNetworkExists( + "azure_virtual_network.foo", &network), + testAccCheckAzureVirtualNetworkAttributes(&network), + resource.TestCheckResourceAttr( + "azure_virtual_network.foo", "name", "terraform-vnet"), + resource.TestCheckResourceAttr( + "azure_virtual_network.foo", "location", "West US"), + resource.TestCheckResourceAttr( + "azure_virtual_network.foo", "address_space.0", "10.1.2.0/24"), + resource.TestCheckResourceAttr( + "azure_virtual_network.foo", "subnet.1787288781.name", "subnet1"), + resource.TestCheckResourceAttr( + "azure_virtual_network.foo", "subnet.1787288781.address_prefix", "10.1.2.0/25"), + ), + }, + }, + }) +} + +func TestAccAzureVirtualNetwork_advanced(t *testing.T) { + var network virtualnetwork.VirtualNetworkSite + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAzureVirtualNetworkDestroy, + Steps: []resource.TestStep{ + resource.TestStep{ + Config: testAccAzureVirtualNetwork_advanced, + Check: resource.ComposeTestCheckFunc( + testAccCheckAzureVirtualNetworkExists( + "azure_virtual_network.foo", &network), + testAccCheckAzureVirtualNetworkAttributes(&network), + resource.TestCheckResourceAttr( + "azure_virtual_network.foo", "name", "terraform-vnet"), + resource.TestCheckResourceAttr( + "azure_virtual_network.foo", "location", "West US"), + resource.TestCheckResourceAttr( + "azure_virtual_network.foo", "address_space.0", "10.1.2.0/24"), + resource.TestCheckResourceAttr( + "azure_virtual_network.foo", "subnet.33778499.name", "subnet1"), + resource.TestCheckResourceAttr( + "azure_virtual_network.foo", "subnet.33778499.address_prefix", "10.1.2.0/25"), + resource.TestCheckResourceAttr( + "azure_virtual_network.foo", "subnet.33778499.security_group", "terraform-security-group1"), + ), + }, + }, + }) +} + +func TestAccAzureVirtualNetwork_update(t *testing.T) { + var network virtualnetwork.VirtualNetworkSite + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAzureVirtualNetworkDestroy, + Steps: []resource.TestStep{ + resource.TestStep{ + Config: testAccAzureVirtualNetwork_advanced, + Check: resource.ComposeTestCheckFunc( + testAccCheckAzureVirtualNetworkExists( + "azure_virtual_network.foo", &network), + testAccCheckAzureVirtualNetworkAttributes(&network), + resource.TestCheckResourceAttr( + "azure_virtual_network.foo", "name", "terraform-vnet"), + resource.TestCheckResourceAttr( + "azure_virtual_network.foo", "location", "West US"), + resource.TestCheckResourceAttr( + "azure_virtual_network.foo", "address_space.0", "10.1.2.0/24"), + resource.TestCheckResourceAttr( + "azure_virtual_network.foo", "subnet.33778499.name", "subnet1"), + resource.TestCheckResourceAttr( + "azure_virtual_network.foo", "subnet.33778499.address_prefix", "10.1.2.0/25"), + resource.TestCheckResourceAttr( + "azure_virtual_network.foo", "subnet.33778499.security_group", "terraform-security-group1"), + ), + }, + + resource.TestStep{ + Config: testAccAzureVirtualNetwork_update, + Check: resource.ComposeTestCheckFunc( + testAccCheckAzureVirtualNetworkExists( + "azure_virtual_network.foo", &network), + testAccCheckAzureVirtualNetworkAttributes(&network), + resource.TestCheckResourceAttr( + "azure_virtual_network.foo", "name", "terraform-vnet"), + resource.TestCheckResourceAttr( + "azure_virtual_network.foo", "location", "West US"), + resource.TestCheckResourceAttr( + "azure_virtual_network.foo", "address_space.0", "10.1.3.0/24"), + resource.TestCheckResourceAttr( + "azure_virtual_network.foo", "subnet.514595123.name", "subnet1"), + resource.TestCheckResourceAttr( + "azure_virtual_network.foo", "subnet.514595123.address_prefix", "10.1.3.128/25"), + resource.TestCheckResourceAttr( + "azure_virtual_network.foo", "subnet.514595123.security_group", "terraform-security-group2"), + ), + }, + }, + }) +} + +func testAccCheckAzureVirtualNetworkExists( + n string, + network *virtualnetwork.VirtualNetworkSite) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[n] + if !ok { + return fmt.Errorf("Not found: %s", n) + } + + if rs.Primary.ID == "" { + return fmt.Errorf("No Virtual Network ID is set") + } + + mc := testAccProvider.Meta().(management.Client) + nc, err := virtualnetwork.NewClient(mc).GetVirtualNetworkConfiguration() + if err != nil { + return err + } + + for _, n := range nc.Configuration.VirtualNetworkSites { + if n.Name == rs.Primary.ID { + *network = n + + return nil + } + } + + return fmt.Errorf("Virtual Network not found") + } +} + +func testAccCheckAzureVirtualNetworkAttributes( + network *virtualnetwork.VirtualNetworkSite) resource.TestCheckFunc { + return func(s *terraform.State) error { + + if network.Name != "terraform-vnet" { + return fmt.Errorf("Bad name: %s", network.Name) + } + + if network.Location != "West US" { + return fmt.Errorf("Bad location: %s", network.Location) + } + + return nil + } +} + +func testAccCheckAzureVirtualNetworkDestroy(s *terraform.State) error { + mc := testAccProvider.Meta().(management.Client) + + for _, rs := range s.RootModule().Resources { + if rs.Type != "azure_virtual_network" { + continue + } + + if rs.Primary.ID == "" { + return fmt.Errorf("No Virtual Network ID is set") + } + + nc, err := virtualnetwork.NewClient(mc).GetVirtualNetworkConfiguration() + if err != nil { + return fmt.Errorf("Error retrieving Virtual Network Configuration: %s", err) + } + + filtered := nc.Configuration.VirtualNetworkSites[:0] + for _, n := range nc.Configuration.VirtualNetworkSites { + if n.Name != rs.Primary.ID { + filtered = append(filtered, n) + } + } + + nc.Configuration.VirtualNetworkSites = filtered + + req, err := virtualnetwork.NewClient(mc).SetVirtualNetworkConfiguration(nc) + if err != nil { + return fmt.Errorf("Error deleting Virtual Network %s: %s", rs.Primary.ID, err) + } + + // Wait until the virtual network is deleted + if err := mc.WaitForOperation(req, nil); err != nil { + return fmt.Errorf("Error waiting for Virtual Network %s to be deleted: %s", rs.Primary.ID, err) + } + } + + return nil +} + +const testAccAzureVirtualNetwork_basic = ` +resource "azure_virtual_network" "foo" { + name = "terraform-vnet" + address_space = ["10.1.2.0/24"] + location = "West US" + + subnet { + name = "subnet1" + address_prefix = "10.1.2.0/25" + } +}` + +const testAccAzureVirtualNetwork_advanced = ` +resource "azure_security_group" "foo" { + name = "terraform-security-group1" + location = "West US" + + rule { + name = "RDP" + priority = 101 + source_cidr = "*" + source_port = "*" + destination_cidr = "*" + destination_port = "3389" + protocol = "TCP" + } +} + +resource "azure_virtual_network" "foo" { + name = "terraform-vnet" + address_space = ["10.1.2.0/24"] + location = "West US" + + subnet { + name = "subnet1" + address_prefix = "10.1.2.0/25" + security_group = "${azure_security_group.foo.name}" + } +}` + +const testAccAzureVirtualNetwork_update = ` +resource "azure_security_group" "foo" { + name = "terraform-security-group1" + location = "West US" + + rule { + name = "RDP" + priority = 101 + source_cidr = "*" + source_port = "*" + destination_cidr = "*" + destination_port = "3389" + protocol = "TCP" + } +} + +resource "azure_security_group" "bar" { + name = "terraform-security-group2" + location = "West US" + + rule { + name = "SSH" + priority = 101 + source_cidr = "*" + source_port = "*" + destination_cidr = "*" + destination_port = "22" + protocol = "TCP" + } +} + +resource "azure_virtual_network" "foo" { + name = "terraform-vnet" + address_space = ["10.1.3.0/24"] + location = "West US" + + subnet { + name = "subnet1" + address_prefix = "10.1.3.128/25" + security_group = "${azure_security_group.bar.name}" + } +}` From cef82599235b02cb40a332e2ab73a50660ecde61 Mon Sep 17 00:00:00 2001 From: Sander van Harmelen Date: Fri, 29 May 2015 00:10:21 +0200 Subject: [PATCH 13/91] Adding the last parts of the docs for the new Azure provider Next to the remaining docs, I also updated the code so any Virtual Network related API calls are now synchronised by using a mutex (thanks @aznashwan for pointing that out!). --- builtin/providers/azure/config.go | 65 +++++++----- builtin/providers/azure/provider.go | 21 ++-- .../azure/resource_azure_data_disk.go | 23 +++-- .../azure/resource_azure_data_disk_test.go | 5 +- .../azure/resource_azure_instance.go | 12 ++- .../azure/resource_azure_instance_test.go | 5 +- .../azure/resource_azure_security_group.go | 15 +-- .../resource_azure_security_group_test.go | 5 +- .../azure/resource_azure_virtual_network.go | 38 ++++--- .../resource_azure_virtual_network_test.go | 5 +- .../docs/providers/azure/index.html.markdown | 17 ++-- .../providers/azure/r/data_disk.html.markdown | 70 +++++++++++++ .../docs/providers/azure/r/disk.html.markdown | 58 ----------- .../providers/azure/r/instance.html.markdown | 98 +++++++++++++++---- .../providers/azure/r/security_group.markdown | 87 +++++++++------- .../azure/r/virtual_network.html.markdown | 57 ++++++----- website/source/layouts/azure.erb | 4 +- 17 files changed, 359 insertions(+), 226 deletions(-) create mode 100644 website/source/docs/providers/azure/r/data_disk.html.markdown delete mode 100644 website/source/docs/providers/azure/r/disk.html.markdown diff --git a/builtin/providers/azure/config.go b/builtin/providers/azure/config.go index b62ab435e..c21f6f705 100644 --- a/builtin/providers/azure/config.go +++ b/builtin/providers/azure/config.go @@ -3,6 +3,7 @@ package azure import ( "fmt" "os" + "sync" "github.com/svanharmelen/azure-sdk-for-go/management" ) @@ -16,30 +17,42 @@ type Config struct { ManagementURL string } -// NewClient returns a new Azure management client which is created -// using different functions depending on the supplied settings -func (c *Config) NewClient() (management.Client, error) { - if c.SettingsFile != "" { - if _, err := os.Stat(c.SettingsFile); os.IsNotExist(err) { - return nil, fmt.Errorf("Publish Settings file %q does not exist!", c.SettingsFile) - } - - return management.ClientFromPublishSettingsFile(c.SettingsFile, c.SubscriptionID) - } - - if c.ManagementURL != "" { - return management.NewClientFromConfig( - c.SubscriptionID, - c.Certificate, - management.ClientConfig{ManagementURL: c.ManagementURL}, - ) - } - - if c.SubscriptionID != "" && len(c.Certificate) > 0 { - return management.NewClient(c.SubscriptionID, c.Certificate) - } - - return nil, fmt.Errorf( - "Insufficient configuration data. Please specify either a 'settings_file'\n" + - "or both a 'subscription_id' and 'certificate' with an optional 'management_url'.") +// Client contains all the handles required for managing Azure services. +type Client struct { + // unfortunately; because of how Azure's network API works; doing networking operations + // concurrently is very hazardous, and we need a mutex to guard the management.Client. + mutex *sync.Mutex + mgmtClient management.Client +} + +// NewClientFromSettingsFile returns a new Azure management +// client created using a publish settings file. +func (c *Config) NewClientFromSettingsFile() (*Client, error) { + if _, err := os.Stat(c.SettingsFile); os.IsNotExist(err) { + return nil, fmt.Errorf("Publish Settings file %q does not exist!", c.SettingsFile) + } + + mc, err := management.ClientFromPublishSettingsFile(c.SettingsFile, c.SubscriptionID) + if err != nil { + return nil, nil + } + + return &Client{ + mutex: &sync.Mutex{}, + mgmtClient: mc, + }, nil +} + +// NewClient returns a new Azure management client created +// using a subscription ID and certificate. +func (c *Config) NewClient() (*Client, error) { + mc, err := management.NewClient(c.SubscriptionID, c.Certificate) + if err != nil { + return nil, nil + } + + return &Client{ + mutex: &sync.Mutex{}, + mgmtClient: mc, + }, nil } diff --git a/builtin/providers/azure/provider.go b/builtin/providers/azure/provider.go index 1bf8233fa..bba65fcfd 100644 --- a/builtin/providers/azure/provider.go +++ b/builtin/providers/azure/provider.go @@ -1,6 +1,8 @@ package azure import ( + "fmt" + "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/terraform" ) @@ -26,12 +28,6 @@ func Provider() terraform.ResourceProvider { Optional: true, DefaultFunc: schema.EnvDefaultFunc("AZURE_CERTIFICATE", ""), }, - - "management_url": &schema.Schema{ - Type: schema.TypeString, - Optional: true, - DefaultFunc: schema.EnvDefaultFunc("AZURE_MANAGEMENT_URL", ""), - }, }, ResourcesMap: map[string]*schema.Resource{ @@ -50,8 +46,17 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) { SettingsFile: d.Get("settings_file").(string), SubscriptionID: d.Get("subscription_id").(string), Certificate: []byte(d.Get("certificate").(string)), - ManagementURL: d.Get("management_url").(string), } - return config.NewClient() + if config.SettingsFile != "" { + return config.NewClientFromSettingsFile() + } + + if config.SubscriptionID != "" && len(config.Certificate) > 0 { + return config.NewClient() + } + + return nil, fmt.Errorf( + "Insufficient configuration data. Please specify either a 'settings_file'\n" + + "or both a 'subscription_id' and 'certificate'.") } diff --git a/builtin/providers/azure/resource_azure_data_disk.go b/builtin/providers/azure/resource_azure_data_disk.go index a306e96f0..f73821783 100644 --- a/builtin/providers/azure/resource_azure_data_disk.go +++ b/builtin/providers/azure/resource_azure_data_disk.go @@ -41,7 +41,7 @@ func resourceAzureDataDisk() *schema.Resource { "size": &schema.Schema{ Type: schema.TypeInt, - Required: true, + Optional: true, }, "caching": &schema.Schema{ @@ -78,7 +78,7 @@ func resourceAzureDataDisk() *schema.Resource { } func resourceAzureDataDiskCreate(d *schema.ResourceData, meta interface{}) error { - mc := meta.(management.Client) + mc := meta.(*Client).mgmtClient if err := verifyDataDiskParameters(d); err != nil { return err @@ -129,7 +129,7 @@ func resourceAzureDataDiskCreate(d *schema.ResourceData, meta interface{}) error } func resourceAzureDataDiskRead(d *schema.ResourceData, meta interface{}) error { - mc := meta.(management.Client) + mc := meta.(*Client).mgmtClient lun := d.Get("lun").(int) vm := d.Get("virtual_machine").(string) @@ -163,7 +163,9 @@ func resourceAzureDataDiskRead(d *schema.ResourceData, meta interface{}) error { } func resourceAzureDataDiskUpdate(d *schema.ResourceData, meta interface{}) error { - mc := meta.(management.Client) + mc := meta.(*Client).mgmtClient + diskClient := virtualmachinedisk.NewClient(mc) + lun := d.Get("lun").(int) vm := d.Get("virtual_machine").(string) @@ -172,7 +174,7 @@ func resourceAzureDataDiskUpdate(d *schema.ResourceData, meta interface{}) error ovm, _ := d.GetChange("virtual_machine") log.Printf("[DEBUG] Detaching data disk: %s", d.Id()) - req, err := virtualmachinedisk.NewClient(mc). + req, err := diskClient. DeleteDataDisk(ovm.(string), ovm.(string), ovm.(string), olun.(int), false) if err != nil { return fmt.Errorf("Error detaching data disk %s: %s", d.Id(), err) @@ -186,7 +188,7 @@ func resourceAzureDataDiskUpdate(d *schema.ResourceData, meta interface{}) error log.Printf("[DEBUG] Verifying data disk %s is properly detached...", d.Id()) for i := 0; i < 6; i++ { - disk, err := virtualmachinedisk.NewClient(mc).GetDisk(d.Id()) + disk, err := diskClient.GetDisk(d.Id()) if err != nil { return fmt.Errorf("Error retrieving disk %s: %s", d.Id(), err) } @@ -208,7 +210,7 @@ func resourceAzureDataDiskUpdate(d *schema.ResourceData, meta interface{}) error } log.Printf("[DEBUG] Updating disk: %s", d.Id()) - req, err := virtualmachinedisk.NewClient(mc).UpdateDisk(d.Id(), p) + req, err := diskClient.UpdateDisk(d.Id(), p) if err != nil { return fmt.Errorf("Error updating disk %s: %s", d.Id(), err) } @@ -228,7 +230,7 @@ func resourceAzureDataDiskUpdate(d *schema.ResourceData, meta interface{}) error } log.Printf("[DEBUG] Attaching data disk: %s", d.Id()) - req, err = virtualmachinedisk.NewClient(mc).AddDataDisk(vm, vm, vm, p) + req, err = diskClient.AddDataDisk(vm, vm, vm, p) if err != nil { return fmt.Errorf("Error attaching data disk %s to instance %s: %s", d.Id(), vm, err) } @@ -253,7 +255,7 @@ func resourceAzureDataDiskUpdate(d *schema.ResourceData, meta interface{}) error } log.Printf("[DEBUG] Updating data disk: %s", d.Id()) - req, err := virtualmachinedisk.NewClient(mc).UpdateDataDisk(vm, vm, vm, lun, p) + req, err := diskClient.UpdateDataDisk(vm, vm, vm, lun, p) if err != nil { return fmt.Errorf("Error updating data disk %s: %s", d.Id(), err) } @@ -269,7 +271,8 @@ func resourceAzureDataDiskUpdate(d *schema.ResourceData, meta interface{}) error } func resourceAzureDataDiskDelete(d *schema.ResourceData, meta interface{}) error { - mc := meta.(management.Client) + mc := meta.(*Client).mgmtClient + lun := d.Get("lun").(int) vm := d.Get("virtual_machine").(string) diff --git a/builtin/providers/azure/resource_azure_data_disk_test.go b/builtin/providers/azure/resource_azure_data_disk_test.go index 1e1fb3132..2aa5e474c 100644 --- a/builtin/providers/azure/resource_azure_data_disk_test.go +++ b/builtin/providers/azure/resource_azure_data_disk_test.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "github.com/svanharmelen/azure-sdk-for-go/management" "github.com/svanharmelen/azure-sdk-for-go/management/virtualmachinedisk" ) @@ -102,7 +101,7 @@ func testAccCheckAzureDataDiskExists( return err } - mc := testAccProvider.Meta().(management.Client) + mc := testAccProvider.Meta().(*Client).mgmtClient d, err := virtualmachinedisk.NewClient(mc).GetDataDisk(vm, vm, vm, lun) if err != nil { return err @@ -139,7 +138,7 @@ func testAccCheckAzureDataDiskAttributes( } func testAccCheckAzureDataDiskDestroy(s *terraform.State) error { - mc := testAccProvider.Meta().(management.Client) + mc := testAccProvider.Meta().(*Client).mgmtClient for _, rs := range s.RootModule().Resources { if rs.Type != "azure_data_disk" { diff --git a/builtin/providers/azure/resource_azure_instance.go b/builtin/providers/azure/resource_azure_instance.go index ed34d9fc2..7ad150c3d 100644 --- a/builtin/providers/azure/resource_azure_instance.go +++ b/builtin/providers/azure/resource_azure_instance.go @@ -89,6 +89,7 @@ func resourceAzureInstance() *schema.Resource { "automatic_updates": &schema.Schema{ Type: schema.TypeBool, Optional: true, + Default: false, ForceNew: true, }, @@ -129,7 +130,8 @@ func resourceAzureInstance() *schema.Resource { "protocol": &schema.Schema{ Type: schema.TypeString, - Required: true, + Optional: true, + Default: "tcp", }, "public_port": &schema.Schema{ @@ -166,7 +168,7 @@ func resourceAzureInstance() *schema.Resource { } func resourceAzureInstanceCreate(d *schema.ResourceData, meta interface{}) (err error) { - mc := meta.(management.Client) + mc := meta.(*Client).mgmtClient name := d.Get("name").(string) @@ -324,7 +326,7 @@ func resourceAzureInstanceCreate(d *schema.ResourceData, meta interface{}) (err } func resourceAzureInstanceRead(d *schema.ResourceData, meta interface{}) error { - mc := meta.(management.Client) + mc := meta.(*Client).mgmtClient log.Printf("[DEBUG] Retrieving Cloud Service for instance: %s", d.Id()) cs, err := hostedservice.NewClient(mc).GetHostedService(d.Id()) @@ -414,7 +416,7 @@ func resourceAzureInstanceRead(d *schema.ResourceData, meta interface{}) error { } func resourceAzureInstanceUpdate(d *schema.ResourceData, meta interface{}) error { - mc := meta.(management.Client) + mc := meta.(*Client).mgmtClient // First check if anything we can update changed, and if not just return if !d.HasChange("size") && !d.HasChange("endpoint") && !d.HasChange("security_group") { @@ -490,7 +492,7 @@ func resourceAzureInstanceUpdate(d *schema.ResourceData, meta interface{}) error } func resourceAzureInstanceDelete(d *schema.ResourceData, meta interface{}) error { - mc := meta.(management.Client) + mc := meta.(*Client).mgmtClient log.Printf("[DEBUG] Deleting instance: %s", d.Id()) req, err := hostedservice.NewClient(mc).DeleteHostedService(d.Id(), true) diff --git a/builtin/providers/azure/resource_azure_instance_test.go b/builtin/providers/azure/resource_azure_instance_test.go index 0a272baa2..d6c92fe72 100644 --- a/builtin/providers/azure/resource_azure_instance_test.go +++ b/builtin/providers/azure/resource_azure_instance_test.go @@ -7,7 +7,6 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "github.com/svanharmelen/azure-sdk-for-go/management" "github.com/svanharmelen/azure-sdk-for-go/management/hostedservice" "github.com/svanharmelen/azure-sdk-for-go/management/virtualmachine" ) @@ -132,7 +131,7 @@ func testAccCheckAzureInstanceExists( return fmt.Errorf("No instance ID is set") } - mc := testAccProvider.Meta().(management.Client) + mc := testAccProvider.Meta().(*Client).mgmtClient vm, err := virtualmachine.NewClient(mc).GetDeployment(rs.Primary.ID, rs.Primary.ID) if err != nil { return err @@ -284,7 +283,7 @@ func testAccCheckAzureInstanceUpdatedAttributes( } func testAccCheckAzureInstanceDestroy(s *terraform.State) error { - mc := testAccProvider.Meta().(management.Client) + mc := testAccProvider.Meta().(*Client).mgmtClient for _, rs := range s.RootModule().Resources { if rs.Type != "azure_instance" { diff --git a/builtin/providers/azure/resource_azure_security_group.go b/builtin/providers/azure/resource_azure_security_group.go index 98d79bad0..0d7e8a0a1 100644 --- a/builtin/providers/azure/resource_azure_security_group.go +++ b/builtin/providers/azure/resource_azure_security_group.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/helper/schema" - "github.com/svanharmelen/azure-sdk-for-go/management" "github.com/svanharmelen/azure-sdk-for-go/management/networksecuritygroup" ) @@ -100,7 +99,7 @@ func resourceAzureSecurityGroup() *schema.Resource { } func resourceAzureSecurityGroupCreate(d *schema.ResourceData, meta interface{}) (err error) { - mc := meta.(management.Client) + mc := meta.(*Client).mgmtClient name := d.Get("name").(string) @@ -152,8 +151,10 @@ func resourceAzureSecurityGroupCreate(d *schema.ResourceData, meta interface{}) } func resourceAzureSecurityGroupRuleCreate( - d *schema.ResourceData, meta interface{}, rule map[string]interface{}) error { - mc := meta.(management.Client) + d *schema.ResourceData, + meta interface{}, + rule map[string]interface{}) error { + mc := meta.(*Client).mgmtClient // Make sure all required parameters are there if err := verifySecurityGroupRuleParams(rule); err != nil { @@ -189,7 +190,7 @@ func resourceAzureSecurityGroupRuleCreate( } func resourceAzureSecurityGroupRead(d *schema.ResourceData, meta interface{}) error { - mc := meta.(management.Client) + mc := meta.(*Client).mgmtClient sg, err := networksecuritygroup.NewClient(mc).GetNetworkSecurityGroup(d.Id()) if err != nil { @@ -264,7 +265,7 @@ func resourceAzureSecurityGroupUpdate(d *schema.ResourceData, meta interface{}) } func resourceAzureSecurityGroupDelete(d *schema.ResourceData, meta interface{}) error { - mc := meta.(management.Client) + mc := meta.(*Client).mgmtClient log.Printf("[DEBUG] Deleting Network Security Group: %s", d.Id()) req, err := networksecuritygroup.NewClient(mc).DeleteNetworkSecurityGroup(d.Id()) @@ -285,7 +286,7 @@ func resourceAzureSecurityGroupDelete(d *schema.ResourceData, meta interface{}) func resourceAzureSecurityGroupRuleDelete( d *schema.ResourceData, meta interface{}, rule map[string]interface{}) error { - mc := meta.(management.Client) + mc := meta.(*Client).mgmtClient name := rule["name"].(string) diff --git a/builtin/providers/azure/resource_azure_security_group_test.go b/builtin/providers/azure/resource_azure_security_group_test.go index 1e48faad8..b4e79ebb9 100644 --- a/builtin/providers/azure/resource_azure_security_group_test.go +++ b/builtin/providers/azure/resource_azure_security_group_test.go @@ -6,7 +6,6 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "github.com/svanharmelen/azure-sdk-for-go/management" "github.com/svanharmelen/azure-sdk-for-go/management/networksecuritygroup" ) @@ -104,7 +103,7 @@ func testAccCheckAzureSecurityGroupExists( return fmt.Errorf("No Network Security Group ID is set") } - mc := testAccProvider.Meta().(management.Client) + mc := testAccProvider.Meta().(*Client).mgmtClient sg, err := networksecuritygroup.NewClient(mc).GetNetworkSecurityGroup(rs.Primary.ID) if err != nil { return err @@ -204,7 +203,7 @@ func testAccCheckAzureSecurityGroupUpdatedAttributes( } func testAccCheckAzureSecurityGroupDestroy(s *terraform.State) error { - mc := testAccProvider.Meta().(management.Client) + mc := testAccProvider.Meta().(*Client).mgmtClient for _, rs := range s.RootModule().Resources { if rs.Type != "azure_security_group" { diff --git a/builtin/providers/azure/resource_azure_virtual_network.go b/builtin/providers/azure/resource_azure_virtual_network.go index 7125f24a0..be66c1a42 100644 --- a/builtin/providers/azure/resource_azure_virtual_network.go +++ b/builtin/providers/azure/resource_azure_virtual_network.go @@ -69,10 +69,16 @@ func resourceAzureVirtualNetwork() *schema.Resource { } func resourceAzureVirtualNetworkCreate(d *schema.ResourceData, meta interface{}) error { - mc := meta.(management.Client) + ac := meta.(*Client) + mc := ac.mgmtClient name := d.Get("name").(string) + // Lock the client just before we get the virtual network configuration and immediately + // set an defer to unlock the client again whenever this function exits + ac.mutex.Lock() + defer ac.mutex.Unlock() + nc, err := virtualnetwork.NewClient(mc).GetVirtualNetworkConfiguration() if err != nil { if strings.Contains(err.Error(), "ResourceNotFound") { @@ -115,7 +121,7 @@ func resourceAzureVirtualNetworkCreate(d *schema.ResourceData, meta interface{}) } func resourceAzureVirtualNetworkRead(d *schema.ResourceData, meta interface{}) error { - mc := meta.(management.Client) + mc := meta.(*Client).mgmtClient nc, err := virtualnetwork.NewClient(mc).GetVirtualNetworkConfiguration() if err != nil { @@ -165,7 +171,13 @@ func resourceAzureVirtualNetworkRead(d *schema.ResourceData, meta interface{}) e } func resourceAzureVirtualNetworkUpdate(d *schema.ResourceData, meta interface{}) error { - mc := meta.(management.Client) + ac := meta.(*Client) + mc := ac.mgmtClient + + // Lock the client just before we get the virtual network configuration and immediately + // set an defer to unlock the client again whenever this function exits + ac.mutex.Lock() + defer ac.mutex.Unlock() nc, err := virtualnetwork.NewClient(mc).GetVirtualNetworkConfiguration() if err != nil { @@ -208,7 +220,13 @@ func resourceAzureVirtualNetworkUpdate(d *schema.ResourceData, meta interface{}) } func resourceAzureVirtualNetworkDelete(d *schema.ResourceData, meta interface{}) error { - mc := meta.(management.Client) + ac := meta.(*Client) + mc := ac.mgmtClient + + // Lock the client just before we get the virtual network configuration and immediately + // set an defer to unlock the client again whenever this function exits + ac.mutex.Lock() + defer ac.mutex.Unlock() nc, err := virtualnetwork.NewClient(mc).GetVirtualNetworkConfiguration() if err != nil { @@ -277,7 +295,8 @@ func createVirtualNetwork(d *schema.ResourceData) (virtualnetwork.VirtualNetwork } func associateSecurityGroups(d *schema.ResourceData, meta interface{}) error { - mc := meta.(management.Client) + mc := meta.(*Client).mgmtClient + nsgClient := networksecuritygroup.NewClient(mc) virtualNetwork := d.Get("name").(string) @@ -288,8 +307,7 @@ func associateSecurityGroups(d *schema.ResourceData, meta interface{}) error { subnetName := subnet["name"].(string) // Get the associated (if any) security group - sg, err := networksecuritygroup.NewClient(mc). - GetNetworkSecurityGroupForSubnet(subnetName, d.Id()) + sg, err := nsgClient.GetNetworkSecurityGroupForSubnet(subnetName, d.Id()) if err != nil && !management.IsResourceNotFoundError(err) { return fmt.Errorf( "Error retrieving Network Security Group associations of subnet %s: %s", subnetName, err) @@ -302,8 +320,7 @@ func associateSecurityGroups(d *schema.ResourceData, meta interface{}) error { // If there is an associated security group, make sure we first remove it from the subnet if sg.Name != "" { - req, err := networksecuritygroup.NewClient(mc). - RemoveNetworkSecurityGroupFromSubnet(sg.Name, subnetName, virtualNetwork) + req, err := nsgClient.RemoveNetworkSecurityGroupFromSubnet(sg.Name, subnetName, virtualNetwork) if err != nil { return fmt.Errorf("Error removing Network Security Group %s from subnet %s: %s", securityGroup, subnetName, err) @@ -319,8 +336,7 @@ func associateSecurityGroups(d *schema.ResourceData, meta interface{}) error { // If the desired security group is not empty, assign the security group to the subnet if securityGroup != "" { - req, err := networksecuritygroup.NewClient(mc). - AddNetworkSecurityToSubnet(securityGroup, subnetName, virtualNetwork) + req, err := nsgClient.AddNetworkSecurityToSubnet(securityGroup, subnetName, virtualNetwork) if err != nil { return fmt.Errorf("Error associating Network Security Group %s to subnet %s: %s", securityGroup, subnetName, err) diff --git a/builtin/providers/azure/resource_azure_virtual_network_test.go b/builtin/providers/azure/resource_azure_virtual_network_test.go index 2ade3de00..c6787f3fe 100644 --- a/builtin/providers/azure/resource_azure_virtual_network_test.go +++ b/builtin/providers/azure/resource_azure_virtual_network_test.go @@ -6,7 +6,6 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "github.com/svanharmelen/azure-sdk-for-go/management" "github.com/svanharmelen/azure-sdk-for-go/management/virtualnetwork" ) @@ -138,7 +137,7 @@ func testAccCheckAzureVirtualNetworkExists( return fmt.Errorf("No Virtual Network ID is set") } - mc := testAccProvider.Meta().(management.Client) + mc := testAccProvider.Meta().(*Client).mgmtClient nc, err := virtualnetwork.NewClient(mc).GetVirtualNetworkConfiguration() if err != nil { return err @@ -173,7 +172,7 @@ func testAccCheckAzureVirtualNetworkAttributes( } func testAccCheckAzureVirtualNetworkDestroy(s *terraform.State) error { - mc := testAccProvider.Meta().(management.Client) + mc := testAccProvider.Meta().(*Client).mgmtClient for _, rs := range s.RootModule().Resources { if rs.Type != "azure_virtual_network" { diff --git a/website/source/docs/providers/azure/index.html.markdown b/website/source/docs/providers/azure/index.html.markdown index fd4081a67..ea38e472e 100644 --- a/website/source/docs/providers/azure/index.html.markdown +++ b/website/source/docs/providers/azure/index.html.markdown @@ -33,11 +33,16 @@ resource "azure_instance" "web" { The following arguments are supported: -* `settings_file` - (Required) The path to a publish settings file used to +* `settings_file` - (Optional) The path to a publish settings file used to authenticate with the Azure API. You can download the settings file here: - https://manage.windowsazure.com/publishsettings. It must be provided, but - it can also be sourced from the `AZURE_SETTINGS_FILE` environment variable. + https://manage.windowsazure.com/publishsettings. You must either provide + (or source from the `AZURE_SETTINGS_FILE` environment variable) a settings + file or both a `subscription_id` and `certificate`. -* `subscription_id` - (Optional) The subscription ID to use. If not provided - the first subscription ID in publish settings file will be used. It can - also be sourced from the `AZURE_SUBSCRIPTION_ID` environment variable. +* `subscription_id` - (Optional) The subscription ID to use. If a + `settings_file` is not provided `subscription_id` is required. It can also + be sourced from the `AZURE_SUBSCRIPTION_ID` environment variable. + +* `certificate` - (Optional) The certificate used to authenticate with the + Azure API. If a `settings_file` is not provided `certificate` is required. + It can also be sourced from the `AZURE_CERTIFICATE` environment variable. diff --git a/website/source/docs/providers/azure/r/data_disk.html.markdown b/website/source/docs/providers/azure/r/data_disk.html.markdown new file mode 100644 index 000000000..3e95c5736 --- /dev/null +++ b/website/source/docs/providers/azure/r/data_disk.html.markdown @@ -0,0 +1,70 @@ +--- +layout: "azure" +page_title: "Azure: azure_data_disk" +sidebar_current: "docs-azure-resource-data-disk" +description: |- + Adds a data disk to a virtual machine. If the name of an existing disk is given, it will attach that disk. Otherwise it will create and attach a new empty disk. +--- + +# azure\_data\_disk + +Adds a data disk to a virtual machine. If the name of an existing disk is given, +it will attach that disk. Otherwise it will create and attach a new empty disk. + +## Example Usage + +``` +resource "azure_data_disk" "data" { + lun = 0 + size = 10 + storage = "yourstorage" + virtual_machine = "server1" +} +``` + +## Argument Reference + +The following arguments are supported: + +* `name` - (Optional) The name of an existing registered disk to attach to the + virtual machine. If left empty, a new empty disk will be created and + attached instead. Changing this forces a new resource to be created. + +* `label` - (Optional) The identifier of the data disk. Changing this forces a + new resource to be created (defaults to "virtual_machine-lun") + +* `lun` - (Required) The Logical Unit Number (LUN) for the disk. The LUN + specifies the slot in which the data drive appears when mounted for usage + by the virtual machine. Valid LUN values are 0 through 31. + +* `size` - (Optional) The size, in GB, of an empty disk to be attached to the + virtual machine. Required when creating a new disk, not used otherwise. + +* `caching` - (Optional) The caching behavior of data disk. Valid options are: + `None`, `ReadOnly` and `ReadWrite` (defaults `None`) + +* `storage ` - (Optional) The name of an existing storage account within the + subscription which will be used to store the VHD of this disk. Required + if no value is supplied for `media_link`. Changing this forces a new + resource to be created. + +* `media_link` - (Optional) The location of the blob in storage where the VHD + of this disk will be created. The storage account where must be associated + with the subscription. Changing this forces a new resource to be created. + +* `source_media_link` - (Optional) The location of a blob in storage where a + VHD file is located that is imported and registered as a disk. If a value + is supplied, `media_link` will not be used. + +* `virtual_machine` - (Required) The name of the virtual machine the disk will + be attached to. + +## Attributes Reference + +The following attributes are exported: + +* `id` - The security group ID. +* `name` - The name of the disk. +* `label` - The identifier for the disk. +* `media_link` - The location of the blob in storage where the VHD of this disk + is created. diff --git a/website/source/docs/providers/azure/r/disk.html.markdown b/website/source/docs/providers/azure/r/disk.html.markdown deleted file mode 100644 index 53ae73656..000000000 --- a/website/source/docs/providers/azure/r/disk.html.markdown +++ /dev/null @@ -1,58 +0,0 @@ ---- -layout: "cloudstack" -page_title: "CloudStack: cloudstack_disk" -sidebar_current: "docs-cloudstack-resource-disk" -description: |- - Creates a disk volume from a disk offering. This disk volume will be attached to a virtual machine if the optional parameters are configured. ---- - -# cloudstack\_disk - -Creates a disk volume from a disk offering. This disk volume will be attached to -a virtual machine if the optional parameters are configured. - -## Example Usage - -``` -resource "cloudstack_disk" "default" { - name = "test-disk" - attach = "true" - disk_offering = "custom" - size = 50 - virtual-machine = "server-1" - zone = "zone-1" -} -``` - -## Argument Reference - -The following arguments are supported: - -* `name` - (Required) The name of the disk volume. Changing this forces a new - resource to be created. - -* `attach` - (Optional) Determines whether or not to attach the disk volume to a - virtual machine (defaults false). - -* `device` - (Optional) The device to map the disk volume to within the guest OS. - -* `disk_offering` - (Required) The name or ID of the disk offering to use for - this disk volume. - -* `size` - (Optional) The size of the disk volume in gigabytes. - -* `shrink_ok` - (Optional) Verifies if the disk volume is allowed to shrink when - resizing (defaults false). - -* `virtual_machine` - (Optional) The name of the virtual machine to which you - want to attach the disk volume. - -* `zone` - (Required) The name or ID of the zone where this disk volume will be available. - Changing this forces a new resource to be created. - -## Attributes Reference - -The following attributes are exported: - -* `id` - The ID of the disk volume. -* `device` - The device the disk volume is mapped to within the guest OS. diff --git a/website/source/docs/providers/azure/r/instance.html.markdown b/website/source/docs/providers/azure/r/instance.html.markdown index 8779494e4..0ece7668d 100644 --- a/website/source/docs/providers/azure/r/instance.html.markdown +++ b/website/source/docs/providers/azure/r/instance.html.markdown @@ -3,23 +3,32 @@ layout: "azure" page_title: "Azure: azure_instance" sidebar_current: "docs-azure-resource-instance" description: |- - Creates and automatically starts a virtual machine based on a service offering, disk offering, and template. + Creates a hosted service, role and deployment and then creates a virtual machine in the deployment based on the specified configuration. --- # azure\_instance -Creates and automatically starts a virtual machine based on a service offering, -disk offering, and template. +Creates a hosted service, role and deployment and then creates a virtual +machine in the deployment based on the specified configuration. ## Example Usage ``` resource "azure_instance" "web" { - name = "server-1" - service_offering= "small" - network = "network-1" - template = "CentOS 6.5" - zone = "zone-1" + name = "terraform-test" + image = "Ubuntu Server 14.04 LTS" + size = "Basic_A1" + storage = "yourstorage" + location = "West US" + username = "terraform" + password = "Pass!admin123" + + endpoint { + name = "SSH" + protocol = "tcp" + public_port = 22 + private_port = 22 + } } ``` @@ -30,30 +39,81 @@ The following arguments are supported: * `name` - (Required) The name of the instance. Changing this forces a new resource to be created. -* `display_name` - (Optional) The display name of the instance. +* `description` - (Optional) The description for the associated hosted service. + Changing this forces a new resource to be created (defaults to the instance + name). -* `service_offering` - (Required) The name or ID of the service offering used for this instance. +* `image` - (Required) The name of an existing VM or OS image to use for this + instance. Changing this forces a new resource to be created. -* `network` - (Optional) The name or ID of the network to connect this instance to. +* `size` - (Required) The size of the instance. + +* `subnet` - (Optional) The name of the subnet to connect this instance to. If + a value is supplied `virtual_network` is required. Changing this forces a + new resource to be created. + +* `virtual_network` - (Optional) The name of the virtual network the `subnet` + belongs to. If a value is supplied `subnet` is required. Changing this + forces a new resource to be created. + +* `storage` - (Optional) The name of an existing storage account within the + subscription which will be used to store the VHDs of this instance. Changing this forces a new resource to be created. -* `ipaddress` - (Optional) The IP address to assign to this instance. Changing +* `reverse_dns` - (Optional) The DNS address to which the IP address of the + hosted service resolves when queried using a reverse DNS query. Changing this forces a new resource to be created. -* `template` - (Required) The name or ID of the template used for this instance. +* `location` - (Required) The location/region where the cloud service is + created. Changing this forces a new resource to be created. + +* `automatic_updates` - (Optional) If true this will enable automatic updates. + This attribute is only used when creating a Windows instance. Changing this + forces a new resource to be created (defaults false) + +* `time_zone` - (Optional) The appropriate time zone for this instance in the + format 'America/Los_Angeles'. This attribute is only used when creating a + Windows instance. Changing this forces a new resource to be created + (defaults false) + +* `username` - (Required) The username of a new user that will be created while + creating the instance. Changing this forces a new resource to be created. + +* `password` - (Optional) The password of the new user that will be created + while creating the instance. Required when creating a Windows instance or + when not supplying an `ssh_key_thumbprint` while creating a Linux instance. Changing this forces a new resource to be created. -* `zone` - (Required) The name of the zone where this instance will be created. - Changing this forces a new resource to be created. +* `ssh_key_thumbprint` - (Optional) The SSH thumbprint of an existing SSH key + within the subscription. This attribute is only used when creating a Linux + instance. Changing this forces a new resource to be created. -* `user_data` - (Optional) The user data to provide when launching the instance. +* `security_group` - (Optional) The Network Security Group to associate with + this instance. -* `expunge` - (Optional) This determines if the instance is expunged when it is - destroyed (defaults false) +* `endpoint` - (Optional) Can be specified multiple times to define multiple + endpoints. Each `endpoint` block supports fields documented below. + +The `endpoint` block supports: + +* `name` - (Required) The name of the external endpoint. + +* `protocol` - (Optional) The transport protocol for the endpoint. Valid + options are: `tcp` and `udp` (defaults `tcp`) + +* `public_port` - (Required) The external port to use for the endpoint. + +* `private_port` - (Required) The private port on which the instance is + listening. ## Attributes Reference The following attributes are exported: * `id` - The instance ID. -* `display_name` - The display name of the instance. +* `description` - The description for the associated hosted service. +* `subnet` - The subnet the instance is connected to. +* `endpoint` - The complete set of configured endpoints. +* `security_group` - The associated Network Security Group. +* `ip_address` - The private IP address assigned to the instance. +* `vip_address` - The public IP address assigned to the instance. diff --git a/website/source/docs/providers/azure/r/security_group.markdown b/website/source/docs/providers/azure/r/security_group.markdown index f82b8f446..c4699f716 100644 --- a/website/source/docs/providers/azure/r/security_group.markdown +++ b/website/source/docs/providers/azure/r/security_group.markdown @@ -1,28 +1,32 @@ --- -layout: "cloudstack" -page_title: "CloudStack: cloudstack_network_acl_rule" -sidebar_current: "docs-cloudstack-resource-network-acl-rule" +layout: "azure" +page_title: "Azure: azure_security_group" +sidebar_current: "docs-azure-resource-security-group" description: |- - Creates network ACL rules for a given network ACL. + Creates a new network security group within the context of the specified subscription. --- -# cloudstack\_network\_acl\_rule +# azure\_security\_group -Creates network ACL rules for a given network ACL. +Creates a new network security group within the context of the specified +subscription. ## Example Usage ``` -resource "cloudstack_network_acl_rule" "default" { - aclid = "f3843ce0-334c-4586-bbd3-0c2e2bc946c6" +resource "azure_security_group" "web" { + name = "webservers" + location = "West US" - rule { - action = "allow" - source_cidr = "10.0.0.0/8" - protocol = "tcp" - ports = ["80", "1000-2000"] - traffic_type = "ingress" - } + rule { + name = "HTTPS" + priority = 101 + source_cidr = "*" + source_port = "*" + destination_cidr = "*" + destination_port = "443" + protocol = "TCP" + } } ``` @@ -30,40 +34,51 @@ resource "cloudstack_network_acl_rule" "default" { The following arguments are supported: -* `aclid` - (Required) The network ACL ID for which to create the rules. - Changing this forces a new resource to be created. +* `name` - (Required) The name of the security group. Changing this forces a + new resource to be created. -* `managed` - (Optional) USE WITH CAUTION! If enabled all the firewall rules for - this network ACL will be managed by this resource. This means it will delete - all firewall rules that are not in your config! (defaults false) +* `label` - (Optional) The identifier for the security group. The label can be + up to 1024 characters long. Changing this forces a new resource to be + created (defaults to the security group name) -* `rule` - (Optional) Can be specified multiple times. Each rule block supports - fields documented below. If `managed = false` at least one rule is required! +* `location` - (Required) The location/region where the security group is + created. Changing this forces a new resource to be created. + +* `rule` - (Required) Can be specified multiple times to define multiple + rules. Each `rule` block supports fields documented below. The `rule` block supports: -* `action` - (Optional) The action for the rule. Valid options are: `allow` and - `deny` (defaults allow). +* `name` - (Required) The name of the security rule. -* `source_cidr` - (Required) The source CIDR to allow access to the given ports. +* `type ` - (Optional) The type of the security rule. Valid options are: + `Inbound` and `Outbound` (defaults `Inbound`) -* `protocol` - (Required) The name of the protocol to allow. Valid options are: - `tcp`, `udp`, `icmp`, `all` or a valid protocol number. +* `priority` - (Required) The priority of the network security rule. Rules with + lower priority are evaluated first. This value can be between 100 and 4096. -* `icmp_type` - (Optional) The ICMP type to allow. This can only be specified if - the protocol is ICMP. +* `action` - (Optional) The action that is performed when the security rule is + matched. Valid options are: `Allow` and `Deny` (defaults `Allow`) -* `icmp_code` - (Optional) The ICMP code to allow. This can only be specified if - the protocol is ICMP. +* `source_cidr` - (Required) The CIDR or source IP range. An asterisk (\*) can + also be used to match all source IPs. -* `ports` - (Optional) List of ports and/or port ranges to allow. This can only - be specified if the protocol is TCP, UDP, ALL or a valid protocol number. +* `source_port` - (Required) The source port or range. This value can be + between 0 and 65535. An asterisk (\*) can also be used to match all ports. -* `traffic_type` - (Optional) The traffic type for the rule. Valid options are: - `ingress` or `egress` (defaults ingress). +* `destination_cidr` - (Required) The CIDR or destination IP range. An asterisk + (\*) can also be used to match all destination IPs. + +* `destination_port` - (Required) The destination port or range. This value can + be between 0 and 65535. An asterisk (\*) can also be used to match all + ports. + +* `protocol` - (Optional) The protocol of the security rule. Valid options are: + `TCP`, `UDP` and `*` (defaults `TCP`) ## Attributes Reference The following attributes are exported: -* `id` - The ACL ID for which the rules are created. +* `id` - The security group ID. +* `label` - The identifier for the security group. diff --git a/website/source/docs/providers/azure/r/virtual_network.html.markdown b/website/source/docs/providers/azure/r/virtual_network.html.markdown index 9819a8ce3..66140c73d 100644 --- a/website/source/docs/providers/azure/r/virtual_network.html.markdown +++ b/website/source/docs/providers/azure/r/virtual_network.html.markdown @@ -1,25 +1,28 @@ --- -layout: "cloudstack" -page_title: "CloudStack: cloudstack_network" -sidebar_current: "docs-cloudstack-resource-network" +layout: "azure" +page_title: "Azure: azure_virtual_network" +sidebar_current: "docs-azure-resource-virtual-network" description: |- - Creates a network. + Creates a new virtual network including any configured subnets. Each subnet can optionally be configured with a security group to be associated with the subnet. --- -# cloudstack\_network +# azure\_virtual\_network -Creates a network. +Creates a new virtual network including any configured subnets. Each subnet can +optionally be configured with a security group to be associated with the subnet. ## Example Usage -Basic usage: - ``` -resource "cloudstack_network" "default" { +resource "azure_virtual_network" "default" { name = "test-network" - cidr = "10.0.0.0/16" - network_offering = "Default Network" - zone = "zone-1" + address_space = ["10.1.2.0/24"] + location = "West US" + + subnet { + name = "subnet1" + address_prefix = "10.1.2.0/25" + } } ``` @@ -27,28 +30,30 @@ resource "cloudstack_network" "default" { The following arguments are supported: -* `name` - (Required) The name of the network. +* `name` - (Required) The name of the virtual network. Changing this forces a + new resource to be created. -* `display_text` - (Optional) The display text of the network. +* `address_space` - (Required) The address space that is used the virtual + network. You can supply more than one address space. Changing this forces + a new resource to be created. -* `cidr` - (Required) The CIDR block for the network. Changing this forces a new - resource to be created. +* `location` - (Required) The location/region where the virtual network is + created. Changing this forces a new resource to be created. -* `network_offering` - (Required) The name or ID of the network offering to use - for this network. +* `subnet` - (Required) Can be specified multiple times to define multiple + subnets. Each `subnet` block supports fields documented below. -* `vpc` - (Optional) The name of the VPC to create this network for. Changing - this forces a new resource to be created. +The `subnet` block supports: -* `aclid` - (Optional) The ID of a network ACL that should be attached to the - network. Changing this forces a new resource to be created. +* `name` - (Required) The name of the subnet. -* `zone` - (Required) The name or ID of the zone where this disk volume will be - available. Changing this forces a new resource to be created. +* `address_prefix` - (Required) The address prefix to use for the subnet. + +* `security_group` - (Optional) The Network Security Group to associate with + the subnet. ## Attributes Reference The following attributes are exported: -* `id` - The ID of the network. -* `display_text` - The display text of the network. +* `id` - The virtual NetworkConfiguration ID. diff --git a/website/source/layouts/azure.erb b/website/source/layouts/azure.erb index 9d60e3f90..4699b354d 100644 --- a/website/source/layouts/azure.erb +++ b/website/source/layouts/azure.erb @@ -13,8 +13,8 @@ > Resources
      - > - azure_disk + > + azure_data_disk > From 08dd7dece984e5511dcbe500c8825f669b46ed9f Mon Sep 17 00:00:00 2001 From: Sander van Harmelen Date: Fri, 29 May 2015 10:17:43 +0200 Subject: [PATCH 14/91] Very minor change needed to realign with the updated Azure SDK --- builtin/providers/azure/resource_azure_data_disk.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/providers/azure/resource_azure_data_disk.go b/builtin/providers/azure/resource_azure_data_disk.go index f73821783..39316a49c 100644 --- a/builtin/providers/azure/resource_azure_data_disk.go +++ b/builtin/providers/azure/resource_azure_data_disk.go @@ -204,7 +204,7 @@ func resourceAzureDataDiskUpdate(d *schema.ResourceData, meta interface{}) error if d.HasChange("size") { p := virtualmachinedisk.UpdateDiskParameters{ - DiskName: d.Id(), + Name: d.Id(), Label: d.Get("label").(string), ResizedSizeInGB: d.Get("size").(int), } From b236cdf918e31146c536b03df2c8d6446a4efa7f Mon Sep 17 00:00:00 2001 From: Jake Champlin Date: Sun, 31 May 2015 18:01:07 -0400 Subject: [PATCH 15/91] Set AWS Elasticache Port Number to be required Set Elasticache Port number to not be set by default, and require Elasticache Port number to be specified. Also updated acceptance tests to supply port number upon resource declaration Fixes #2084 --- builtin/providers/aws/resource_aws_elasticache_cluster.go | 5 ++--- .../providers/aws/resource_aws_elasticache_cluster_test.go | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/builtin/providers/aws/resource_aws_elasticache_cluster.go b/builtin/providers/aws/resource_aws_elasticache_cluster.go index 1095a9307..c8f5e5518 100644 --- a/builtin/providers/aws/resource_aws_elasticache_cluster.go +++ b/builtin/providers/aws/resource_aws_elasticache_cluster.go @@ -52,8 +52,7 @@ func resourceAwsElasticacheCluster() *schema.Resource { }, "port": &schema.Schema{ Type: schema.TypeInt, - Default: 11211, - Optional: true, + Required: true, ForceNew: true, }, "engine_version": &schema.Schema{ @@ -123,7 +122,7 @@ func resourceAwsElasticacheClusterCreate(d *schema.ResourceData, meta interface{ numNodes := int64(d.Get("num_cache_nodes").(int)) // 2 engine := d.Get("engine").(string) // memcached engineVersion := d.Get("engine_version").(string) // 1.4.14 - port := int64(d.Get("port").(int)) // 11211 + port := int64(d.Get("port").(int)) // e.g) 11211 subnetGroupName := d.Get("subnet_group_name").(string) securityNameSet := d.Get("security_group_names").(*schema.Set) securityIdSet := d.Get("security_group_ids").(*schema.Set) diff --git a/builtin/providers/aws/resource_aws_elasticache_cluster_test.go b/builtin/providers/aws/resource_aws_elasticache_cluster_test.go index 1fb478b26..3257d9ac7 100644 --- a/builtin/providers/aws/resource_aws_elasticache_cluster_test.go +++ b/builtin/providers/aws/resource_aws_elasticache_cluster_test.go @@ -95,7 +95,7 @@ func genRandInt() int { } var testAccAWSElasticacheClusterConfig = fmt.Sprintf(` -provider "aws" { +provider "aws" { region = "us-east-1" } resource "aws_security_group" "bar" { @@ -120,6 +120,7 @@ resource "aws_elasticache_cluster" "bar" { engine = "memcached" node_type = "cache.m1.small" num_cache_nodes = 1 + port = 11211 parameter_group_name = "default.memcached1.4" security_group_names = ["${aws_elasticache_security_group.bar.name}"] } From 5bdd43072099dc39bb08a02b32688e529b154c53 Mon Sep 17 00:00:00 2001 From: Sathiya Shunmugasundaram Date: Mon, 1 Jun 2015 02:45:01 -0400 Subject: [PATCH 16/91] README enhancement --- examples/aws-count/README.md | 22 ++++++++++++++++++++-- examples/aws-two-tier/README.md | 26 ++++++++++++++++++++++++-- 2 files changed, 44 insertions(+), 4 deletions(-) diff --git a/examples/aws-count/README.md b/examples/aws-count/README.md index a2703f59d..75739f6e8 100644 --- a/examples/aws-count/README.md +++ b/examples/aws-count/README.md @@ -6,5 +6,23 @@ and let you scale resources by simply incrementing a number. Additionally, variables can be used to expand a list of resources for use elsewhere. -As with all examples, just copy and paste the example and run -`terraform apply` to see it work. +To run, set the environment variables as below with correct values + +export AWS_ACCESS_KEY_ID="..." +export AWS_SECRET_ACCESS_KEY="..." +export AWS_DEFAULT_REGION="..." + +Alternatively, you can configure the provider configuration where you invoke the module. + +For example, you can use section similar to below. + +# Specify the provider and access details +provider "aws" { + region = "${var.aws_region}" + access_key = "${var.access_key}" + secret_key = "${var.secret_key}" +} + +Running the example + +run `terraform apply` to see it work. diff --git a/examples/aws-two-tier/README.md b/examples/aws-two-tier/README.md index 8a5ad61a3..2da0b92f5 100644 --- a/examples/aws-two-tier/README.md +++ b/examples/aws-two-tier/README.md @@ -14,5 +14,27 @@ After you run `terraform apply` on this configuration, it will automatically output the DNS address of the ELB. After your instance registers, this should respond with the default nginx web page. -As with all examples, just copy and paste the example and run -`terraform apply` to see it work. +To run, set the environment variables as below with correct values + +export AWS_ACCESS_KEY_ID="..." +export AWS_SECRET_ACCESS_KEY="..." +export AWS_DEFAULT_REGION="..." + +Alternatively, you can configure the provider configuration where you invoke the module. + +For example, you can use section similar to below. + +# Specify the provider and access details +provider "aws" { + region = "${var.aws_region}" + access_key = "${var.access_key}" + secret_key = "${var.secret_key}" +} + +Running the example + +run `terraform apply -var 'key_name={your_aws_Key_name}' -var 'key_path={location_of_your_key_in_your_local_machine}'` + +example + +terraform apply -var 'key_name=terraform' -var 'key_path=/Users/jsmith/.ssh/terraform.pem \ No newline at end of file From 7f619db0e5f142ed2d4eae611c7293d8820eb242 Mon Sep 17 00:00:00 2001 From: Sathiya Shunmugasundaram Date: Mon, 1 Jun 2015 02:47:14 -0400 Subject: [PATCH 17/91] new line --- examples/aws-two-tier/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/examples/aws-two-tier/README.md b/examples/aws-two-tier/README.md index 2da0b92f5..3d5544543 100644 --- a/examples/aws-two-tier/README.md +++ b/examples/aws-two-tier/README.md @@ -37,4 +37,5 @@ run `terraform apply -var 'key_name={your_aws_Key_name}' -var 'key_path={locatio example -terraform apply -var 'key_name=terraform' -var 'key_path=/Users/jsmith/.ssh/terraform.pem \ No newline at end of file +terraform apply -var 'key_name=terraform' -var 'key_path=/Users/jsmith/.ssh/terraform.pem + From 120599e68f27100be3a4a53ca2078f1f7f620ff6 Mon Sep 17 00:00:00 2001 From: Sander van Harmelen Date: Mon, 1 Jun 2015 11:18:48 +0200 Subject: [PATCH 18/91] Add some additional checks --- builtin/providers/azure/resource_azure_instance.go | 4 ++++ builtin/providers/azure/resource_azure_security_group.go | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/builtin/providers/azure/resource_azure_instance.go b/builtin/providers/azure/resource_azure_instance.go index 7ad150c3d..ad8a77a9c 100644 --- a/builtin/providers/azure/resource_azure_instance.go +++ b/builtin/providers/azure/resource_azure_instance.go @@ -340,6 +340,10 @@ func resourceAzureInstanceRead(d *schema.ResourceData, meta interface{}) error { log.Printf("[DEBUG] Retrieving instance: %s", d.Id()) dpmt, err := virtualmachine.NewClient(mc).GetDeployment(d.Id(), d.Id()) if err != nil { + if management.IsResourceNotFoundError(err) { + d.SetId("") + return nil + } return fmt.Errorf("Error retrieving instance %s: %s", d.Id(), err) } diff --git a/builtin/providers/azure/resource_azure_security_group.go b/builtin/providers/azure/resource_azure_security_group.go index 0d7e8a0a1..842b12434 100644 --- a/builtin/providers/azure/resource_azure_security_group.go +++ b/builtin/providers/azure/resource_azure_security_group.go @@ -8,6 +8,7 @@ import ( "github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/helper/schema" + "github.com/svanharmelen/azure-sdk-for-go/management" "github.com/svanharmelen/azure-sdk-for-go/management/networksecuritygroup" ) @@ -194,6 +195,10 @@ func resourceAzureSecurityGroupRead(d *schema.ResourceData, meta interface{}) er sg, err := networksecuritygroup.NewClient(mc).GetNetworkSecurityGroup(d.Id()) if err != nil { + if management.IsResourceNotFoundError(err) { + d.SetId("") + return nil + } return fmt.Errorf("Error retrieving Network Security Group %s: %s", d.Id(), err) } @@ -293,6 +298,9 @@ func resourceAzureSecurityGroupRuleDelete( // Delete the rule req, err := networksecuritygroup.NewClient(mc).DeleteNetworkSecurityGroupRule(d.Id(), name) if err != nil { + if management.IsResourceNotFoundError(err) { + return nil + } return fmt.Errorf("Error deleting Network Security Group rule %s: %s", name, err) } From 60d34ae9405c0f95a125303a83dfbcdadeecb5d3 Mon Sep 17 00:00:00 2001 From: Sathiya Shunmugasundaram Date: Mon, 1 Jun 2015 08:03:05 -0400 Subject: [PATCH 19/91] Replace AWS Provider sections with link from terraform.io --- examples/aws-count/README.md | 17 +---------------- examples/aws-two-tier/README.md | 17 ++--------------- 2 files changed, 3 insertions(+), 31 deletions(-) diff --git a/examples/aws-count/README.md b/examples/aws-count/README.md index 75739f6e8..102841b94 100644 --- a/examples/aws-count/README.md +++ b/examples/aws-count/README.md @@ -6,22 +6,7 @@ and let you scale resources by simply incrementing a number. Additionally, variables can be used to expand a list of resources for use elsewhere. -To run, set the environment variables as below with correct values - -export AWS_ACCESS_KEY_ID="..." -export AWS_SECRET_ACCESS_KEY="..." -export AWS_DEFAULT_REGION="..." - -Alternatively, you can configure the provider configuration where you invoke the module. - -For example, you can use section similar to below. - -# Specify the provider and access details -provider "aws" { - region = "${var.aws_region}" - access_key = "${var.access_key}" - secret_key = "${var.secret_key}" -} +To run, configure your AWS provider as described in https://www.terraform.io/docs/providers/aws/index.html Running the example diff --git a/examples/aws-two-tier/README.md b/examples/aws-two-tier/README.md index 3d5544543..d79b6588e 100644 --- a/examples/aws-two-tier/README.md +++ b/examples/aws-two-tier/README.md @@ -14,22 +14,9 @@ After you run `terraform apply` on this configuration, it will automatically output the DNS address of the ELB. After your instance registers, this should respond with the default nginx web page. -To run, set the environment variables as below with correct values +To run, configure your AWS provider as described in -export AWS_ACCESS_KEY_ID="..." -export AWS_SECRET_ACCESS_KEY="..." -export AWS_DEFAULT_REGION="..." - -Alternatively, you can configure the provider configuration where you invoke the module. - -For example, you can use section similar to below. - -# Specify the provider and access details -provider "aws" { - region = "${var.aws_region}" - access_key = "${var.access_key}" - secret_key = "${var.secret_key}" -} +https://www.terraform.io/docs/providers/aws/index.html Running the example From a6e17d3b5f46079d66bfc4a5599c5769d6189fc3 Mon Sep 17 00:00:00 2001 From: Jake Champlin Date: Mon, 1 Jun 2015 10:55:07 -0400 Subject: [PATCH 20/91] Update Documentation --- .../docs/providers/aws/r/elasticache_cluster.html.markdown | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/website/source/docs/providers/aws/r/elasticache_cluster.html.markdown b/website/source/docs/providers/aws/r/elasticache_cluster.html.markdown index ccc4429dd..575c74ad4 100644 --- a/website/source/docs/providers/aws/r/elasticache_cluster.html.markdown +++ b/website/source/docs/providers/aws/r/elasticache_cluster.html.markdown @@ -17,6 +17,7 @@ resource "aws_elasticache_cluster" "bar" { cluster_id = "cluster-example" engine = "memcached" node_type = "cache.m1.small" + port = 11211 num_cache_nodes = 1 parameter_group_name = "default.memcached1.4" } @@ -47,8 +48,8 @@ value must be between 1 and 20 * `parameter_group_name` – (Required) Name of the parameter group to associate with this cache cluster -* `port` – (Optional) The port number on which each of the cache nodes will -accept connections. Default 11211. +* `port` – (Required) The port number on which each of the cache nodes will +accept connections. For Memcache the default is 11211, and for Redis the default port is 6379. * `subnet_group_name` – (Optional, VPC only) Name of the subnet group to be used for the cache cluster. From 7a5cf7e361be3c3752eb2a8f5328d347cd51eae7 Mon Sep 17 00:00:00 2001 From: Radek Simko Date: Mon, 1 Jun 2015 20:57:57 +0100 Subject: [PATCH 21/91] docs: aws_sqs_queue - Add newline to fix Markdown --- website/source/docs/providers/aws/r/sqs_queue.html.markdown | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/website/source/docs/providers/aws/r/sqs_queue.html.markdown b/website/source/docs/providers/aws/r/sqs_queue.html.markdown index 47cae1f7a..a3bf25c57 100644 --- a/website/source/docs/providers/aws/r/sqs_queue.html.markdown +++ b/website/source/docs/providers/aws/r/sqs_queue.html.markdown @@ -23,6 +23,7 @@ resource "aws_sqs_queue" "terraform_queue" { ## Argument Reference The following arguments are supported: + * `name` - (Required) This is the human-readable name of the queue * `visibility_timeout_seconds` - (Optional) The time in seconds that the delivery of all messages in the queue will be delayed. An integer from 0 to 900 (15 minutes). The default for this attribute is 30 seconds * `message_retention_seconds` - (Optional) The number of seconds Amazon SQS retains a message. Integer representing seconds, from 60 (1 minute) to 1209600 (14 days). The default for this attribute is 345600 (4 days). @@ -36,4 +37,4 @@ The following arguments are supported: The following attributes are exported: * `id` - The URL for the created Amazon SQS queue. -* `arn` - The ARN of the SQS queue \ No newline at end of file +* `arn` - The ARN of the SQS queue From 544236df940db3234d151682b913ec49cb2b35cd Mon Sep 17 00:00:00 2001 From: Mike Zupan Date: Mon, 1 Jun 2015 15:05:07 -0700 Subject: [PATCH 22/91] tags lacking from docs --- .../docs/providers/aws/r/elasticache_cluster.html.markdown | 2 ++ 1 file changed, 2 insertions(+) diff --git a/website/source/docs/providers/aws/r/elasticache_cluster.html.markdown b/website/source/docs/providers/aws/r/elasticache_cluster.html.markdown index ccc4429dd..74ccd1481 100644 --- a/website/source/docs/providers/aws/r/elasticache_cluster.html.markdown +++ b/website/source/docs/providers/aws/r/elasticache_cluster.html.markdown @@ -59,6 +59,8 @@ names to associate with this cache cluster * `security_group_ids` – (Optional, VPC only) One or more VPC security groups associated with the cache cluster +* `tags` - (Optional) A mapping of tags to assign to the resource. + ## Attributes Reference From 70c90f420ed56b4330eccbdf0b553ebda74f47de Mon Sep 17 00:00:00 2001 From: Andrew Langhorn Date: Mon, 25 May 2015 16:09:32 +0100 Subject: [PATCH 23/91] Clarify syntax for RDS maintenance window param Closes #2069 --- website/source/docs/providers/aws/r/db_instance.html.markdown | 2 ++ 1 file changed, 2 insertions(+) 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 def96d442..6d02d02b1 100644 --- a/website/source/docs/providers/aws/r/db_instance.html.markdown +++ b/website/source/docs/providers/aws/r/db_instance.html.markdown @@ -57,6 +57,8 @@ The following arguments are supported: * `iops` - (Optional) The amount of provisioned IOPS. Setting this implies a storage_type of "io1". * `maintenance_window` - (Optional) The window to perform maintenance in. + Syntax: "ddd:hh24:mi-ddd:hh24:mi". Eg: "Mon:00:00-Mon:03:00". + See [RDS Maintenance Window docs](http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/AdjustingTheMaintenanceWindow.html) for more. * `multi_az` - (Optional) Specifies if the RDS instance is multi-AZ * `port` - (Optional) The port on which the DB accepts connections. * `publicly_accessible` - (Optional) Bool to control if instance is publicly accessible. From 0b11c33fd44494e0a9e5b78f290435a7c1d9eed4 Mon Sep 17 00:00:00 2001 From: Yuji Yamano Date: Tue, 2 Jun 2015 18:16:01 +0900 Subject: [PATCH 24/91] Fix typos. --- CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 32c5b6359..1b9964a52 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -140,7 +140,7 @@ IMPROVEMENTS: * **New resource: `google_dns_record_set`** * **Migrate to upstream AWS SDK:** Migrate the AWS provider to [awslabs/aws-sdk-go](https://github.com/awslabs/aws-sdk-go), - the offical `awslabs` library. Previously we had forked the library for + the official `awslabs` library. Previously we had forked the library for stability while `awslabs` refactored. Now that work has completed, and we've migrated back to the upstream version. * core: Improve error message on diff mismatch [GH-1501] @@ -168,7 +168,7 @@ IMPROVEMENTS: * provider/aws: `aws_network_acl` improved validation for network ACL ports and protocols [GH-1798] [GH-1808] * provider/aws: `aws_route_table` can target network interfaces [GH-968] - * provider/aws: `aws_route_table` can specify propogating VGWs [GH-1516] + * provider/aws: `aws_route_table` can specify propagating VGWs [GH-1516] * provider/aws: `aws_route53_record` supports weighted sets [GH-1578] * provider/aws: `aws_route53_zone` exports nameservers [GH-1525] * provider/aws: `aws_s3_bucket` website support [GH-1738] @@ -325,7 +325,7 @@ FEATURES: * **Math operations** in interpolations. You can now do things like `${count.index+1}`. [GH-1068] * **New AWS SDK:** Move to `aws-sdk-go` (hashicorp/aws-sdk-go), - a fork of the offical `awslabs` repo. We forked for stability while + a fork of the official `awslabs` repo. We forked for stability while `awslabs` refactored the library, and will move back to the officially supported version in the next release. @@ -354,7 +354,7 @@ IMPROVEMENTS: * providers/aws: Improve dependency violation error handling, when deleting Internet Gateways or Auto Scaling groups [GH-1325]. * provider/aws: Add non-destructive updates to AWS RDS. You can now upgrade - `egine_version`, `parameter_group_name`, and `multi_az` without forcing + `engine_version`, `parameter_group_name`, and `multi_az` without forcing a new database to be created.[GH-1341] * providers/aws: Full support for block device mappings on instances and launch configurations [GH-1045, GH-1364] From a2717acf81104f888b4f3661fc5192854a519b92 Mon Sep 17 00:00:00 2001 From: Clint Shryock Date: Tue, 2 Jun 2015 11:19:23 -0500 Subject: [PATCH 25/91] provider/aws: Allow ElastiCache Subnet Group updates Adds update method for ElastiCache Subnet Groups, things are not all ForceNew anymore. - can update description - can update subnet ids --- .../resource_aws_elasticache_cluster_test.go | 3 +- .../resource_aws_elasticache_subnet_group.go | 26 +++- ...ource_aws_elasticache_subnet_group_test.go | 137 +++++++++++++++++- 3 files changed, 156 insertions(+), 10 deletions(-) diff --git a/builtin/providers/aws/resource_aws_elasticache_cluster_test.go b/builtin/providers/aws/resource_aws_elasticache_cluster_test.go index 1fb478b26..fde8bc56e 100644 --- a/builtin/providers/aws/resource_aws_elasticache_cluster_test.go +++ b/builtin/providers/aws/resource_aws_elasticache_cluster_test.go @@ -32,6 +32,7 @@ func TestAccAWSElasticacheCluster_basic(t *testing.T) { } func TestAccAWSElasticacheCluster_vpc(t *testing.T) { + var csg elasticache.CacheSubnetGroup resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, @@ -40,7 +41,7 @@ func TestAccAWSElasticacheCluster_vpc(t *testing.T) { resource.TestStep{ Config: testAccAWSElasticacheClusterInVPCConfig, Check: resource.ComposeTestCheckFunc( - testAccCheckAWSElasticacheSubnetGroupExists("aws_elasticache_subnet_group.bar"), + testAccCheckAWSElasticacheSubnetGroupExists("aws_elasticache_subnet_group.bar", &csg), testAccCheckAWSElasticacheClusterExists("aws_elasticache_cluster.bar"), ), }, diff --git a/builtin/providers/aws/resource_aws_elasticache_subnet_group.go b/builtin/providers/aws/resource_aws_elasticache_subnet_group.go index cd1ef4445..b245a4bfa 100644 --- a/builtin/providers/aws/resource_aws_elasticache_subnet_group.go +++ b/builtin/providers/aws/resource_aws_elasticache_subnet_group.go @@ -17,13 +17,13 @@ func resourceAwsElasticacheSubnetGroup() *schema.Resource { return &schema.Resource{ Create: resourceAwsElasticacheSubnetGroupCreate, Read: resourceAwsElasticacheSubnetGroupRead, + Update: resourceAwsElasticacheSubnetGroupUpdate, Delete: resourceAwsElasticacheSubnetGroupDelete, Schema: map[string]*schema.Schema{ "description": &schema.Schema{ Type: schema.TypeString, Required: true, - ForceNew: true, }, "name": &schema.Schema{ Type: schema.TypeString, @@ -34,7 +34,6 @@ func resourceAwsElasticacheSubnetGroup() *schema.Resource { Type: schema.TypeSet, Optional: true, Computed: true, - ForceNew: true, Elem: &schema.Schema{Type: schema.TypeString}, Set: func(v interface{}) int { return hashcode.String(v.(string)) @@ -110,6 +109,29 @@ func resourceAwsElasticacheSubnetGroupRead(d *schema.ResourceData, meta interfac return nil } +func resourceAwsElasticacheSubnetGroupUpdate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).elasticacheconn + if d.HasChange("subnet_ids") || d.HasChange("description") { + var subnets []*string + if v := d.Get("subnet_ids"); v != nil { + for _, v := range v.(*schema.Set).List() { + subnets = append(subnets, aws.String(v.(string))) + } + } + log.Printf("[DEBUG] Updating ElastiCache Subnet Group") + + _, err := conn.ModifyCacheSubnetGroup(&elasticache.ModifyCacheSubnetGroupInput{ + CacheSubnetGroupName: aws.String(d.Get("name").(string)), + CacheSubnetGroupDescription: aws.String(d.Get("description").(string)), + SubnetIDs: subnets, + }) + if err != nil { + return err + } + } + + return resourceAwsElasticacheSubnetGroupRead(d, meta) +} func resourceAwsElasticacheSubnetGroupDelete(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).elasticacheconn diff --git a/builtin/providers/aws/resource_aws_elasticache_subnet_group_test.go b/builtin/providers/aws/resource_aws_elasticache_subnet_group_test.go index 0a16ebf84..94ecdf340 100644 --- a/builtin/providers/aws/resource_aws_elasticache_subnet_group_test.go +++ b/builtin/providers/aws/resource_aws_elasticache_subnet_group_test.go @@ -10,16 +10,50 @@ import ( "github.com/hashicorp/terraform/terraform" ) -func TestAccAWSElasticacheSubnetGroup(t *testing.T) { +func TestAccAWSElasticacheSubnetGroup_basic(t *testing.T) { + var csg elasticache.CacheSubnetGroup + config := fmt.Sprintf(testAccAWSElasticacheSubnetGroupConfig, genRandInt()) + resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, CheckDestroy: testAccCheckAWSElasticacheSubnetGroupDestroy, Steps: []resource.TestStep{ resource.TestStep{ - Config: testAccAWSElasticacheSubnetGroupConfig, + Config: config, Check: resource.ComposeTestCheckFunc( - testAccCheckAWSElasticacheSubnetGroupExists("aws_elasticache_subnet_group.bar"), + testAccCheckAWSElasticacheSubnetGroupExists("aws_elasticache_subnet_group.bar", &csg), + ), + }, + }, + }) +} + +func TestAccAWSElasticacheSubnetGroup_update(t *testing.T) { + var csg elasticache.CacheSubnetGroup + rn := "aws_elasticache_subnet_group.bar" + ri := genRandInt() + preConfig := fmt.Sprintf(testAccAWSElasticacheSubnetGroupUpdateConfigPre, ri) + postConfig := fmt.Sprintf(testAccAWSElasticacheSubnetGroupUpdateConfigPost, ri) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSElasticacheSubnetGroupDestroy, + Steps: []resource.TestStep{ + resource.TestStep{ + Config: preConfig, + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSElasticacheSubnetGroupExists(rn, &csg), + testAccCheckAWSElastiCacheSubnetGroupAttrs(&csg, rn, 1), + ), + }, + + resource.TestStep{ + Config: postConfig, + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSElasticacheSubnetGroupExists(rn, &csg), + testAccCheckAWSElastiCacheSubnetGroupAttrs(&csg, rn, 2), ), }, }, @@ -46,7 +80,7 @@ func testAccCheckAWSElasticacheSubnetGroupDestroy(s *terraform.State) error { return nil } -func testAccCheckAWSElasticacheSubnetGroupExists(n string) resource.TestCheckFunc { +func testAccCheckAWSElasticacheSubnetGroupExists(n string, csg *elasticache.CacheSubnetGroup) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] if !ok { @@ -58,17 +92,47 @@ func testAccCheckAWSElasticacheSubnetGroupExists(n string) resource.TestCheckFun } conn := testAccProvider.Meta().(*AWSClient).elasticacheconn - _, err := conn.DescribeCacheSubnetGroups(&elasticache.DescribeCacheSubnetGroupsInput{ + resp, err := conn.DescribeCacheSubnetGroups(&elasticache.DescribeCacheSubnetGroupsInput{ CacheSubnetGroupName: aws.String(rs.Primary.ID), }) if err != nil { return fmt.Errorf("CacheSubnetGroup error: %v", err) } + + for _, c := range resp.CacheSubnetGroups { + if rs.Primary.ID == *c.CacheSubnetGroupName { + *csg = *c + } + } + + if csg == nil { + return fmt.Errorf("cache subnet group not found") + } return nil } } -var testAccAWSElasticacheSubnetGroupConfig = fmt.Sprintf(` +func testAccCheckAWSElastiCacheSubnetGroupAttrs(csg *elasticache.CacheSubnetGroup, n string, count int) resource.TestCheckFunc { + return func(s *terraform.State) error { + + rs, ok := s.RootModule().Resources[n] + if !ok { + return fmt.Errorf("Not found: %s", n) + } + + if len(csg.Subnets) != count { + return fmt.Errorf("Bad cache subnet count, expected: %d, got: %d", count, len(csg.Subnets)) + } + + if rs.Primary.Attributes["description"] != *csg.CacheSubnetGroupDescription { + return fmt.Errorf("Bad cache subnet description, expected: %s, got: %s", rs.Primary.Attributes["description"], *csg.CacheSubnetGroupDescription) + } + + return nil + } +} + +var testAccAWSElasticacheSubnetGroupConfig = ` resource "aws_vpc" "foo" { cidr_block = "192.168.0.0/16" tags { @@ -90,4 +154,63 @@ resource "aws_elasticache_subnet_group" "bar" { description = "tf-test-cache-subnet-group-descr" subnet_ids = ["${aws_subnet.foo.id}"] } -`, genRandInt()) +` +var testAccAWSElasticacheSubnetGroupUpdateConfigPre = ` +resource "aws_vpc" "foo" { + cidr_block = "10.0.0.0/16" + tags { + Name = "tf-elc-sub-test" + } +} + +resource "aws_subnet" "foo" { + vpc_id = "${aws_vpc.foo.id}" + cidr_block = "10.0.1.0/24" + availability_zone = "us-west-2a" + tags { + Name = "tf-test" + } +} + +resource "aws_elasticache_subnet_group" "bar" { + name = "tf-test-cache-subnet-%03d" + description = "tf-test-cache-subnet-group-descr" + subnet_ids = ["${aws_subnet.foo.id}"] +} +` + +var testAccAWSElasticacheSubnetGroupUpdateConfigPost = ` +resource "aws_vpc" "foo" { + cidr_block = "10.0.0.0/16" + tags { + Name = "tf-elc-sub-test" + } +} + +resource "aws_subnet" "foo" { + vpc_id = "${aws_vpc.foo.id}" + cidr_block = "10.0.1.0/24" + availability_zone = "us-west-2a" + tags { + Name = "tf-test" + } +} + +resource "aws_subnet" "bar" { + vpc_id = "${aws_vpc.foo.id}" + cidr_block = "10.0.2.0/24" + availability_zone = "us-west-2a" + tags { + Name = "tf-test-foo-update" + } +} + +resource "aws_elasticache_subnet_group" "bar" { + name = "tf-test-cache-subnet-%03d" + description = "tf-test-cache-subnet-group-descr-edited" + subnet_ids = [ + "${aws_subnet.foo.id}", + "${aws_subnet.bar.id}", + ] +} +` From 5e9d385f960c0e4352505c55f5d1e822cef65143 Mon Sep 17 00:00:00 2001 From: Benjamin vickers Date: Thu, 7 May 2015 15:10:57 +0100 Subject: [PATCH 26/91] Add cloudstack ssh key resource and attr for instances --- builtin/providers/cloudstack/provider.go | 1 + builtin/providers/cloudstack/provider_test.go | 2 + .../resource_cloudstack_instance.go | 75 +++++--- .../resource_cloudstack_instance_test.go | 20 ++- .../resource_cloudstack_ssh_keypair.go | 122 +++++++++++++ .../resource_cloudstack_ssh_keypair_test.go | 160 ++++++++++++++++++ 6 files changed, 354 insertions(+), 26 deletions(-) create mode 100644 builtin/providers/cloudstack/resource_cloudstack_ssh_keypair.go create mode 100644 builtin/providers/cloudstack/resource_cloudstack_ssh_keypair_test.go diff --git a/builtin/providers/cloudstack/provider.go b/builtin/providers/cloudstack/provider.go index 8cdafd1ab..73ce38b76 100644 --- a/builtin/providers/cloudstack/provider.go +++ b/builtin/providers/cloudstack/provider.go @@ -45,6 +45,7 @@ func Provider() terraform.ResourceProvider { "cloudstack_network_acl_rule": resourceCloudStackNetworkACLRule(), "cloudstack_nic": resourceCloudStackNIC(), "cloudstack_port_forward": resourceCloudStackPortForward(), + "cloudstack_ssh_keypair": resourceCloudStackSSHKeyPair(), "cloudstack_template": resourceCloudStackTemplate(), "cloudstack_vpc": resourceCloudStackVPC(), "cloudstack_vpn_connection": resourceCloudStackVPNConnection(), diff --git a/builtin/providers/cloudstack/provider_test.go b/builtin/providers/cloudstack/provider_test.go index c9da7dc8a..8d684a673 100644 --- a/builtin/providers/cloudstack/provider_test.go +++ b/builtin/providers/cloudstack/provider_test.go @@ -82,6 +82,8 @@ var CLOUDSTACK_VPC_OFFERING = "" var CLOUDSTACK_VPC_NETWORK_CIDR = "" var CLOUDSTACK_VPC_NETWORK_OFFERING = "" var CLOUDSTACK_PUBLIC_IPADDRESS = "" +var CLOUDSTACK_SSH_KEYPAIR = "" +var CLOUDSTACK_SSH_PUBLIC_KEY = "" var CLOUDSTACK_TEMPLATE = "" var CLOUDSTACK_TEMPLATE_FORMAT = "" var CLOUDSTACK_TEMPLATE_URL = "" diff --git a/builtin/providers/cloudstack/resource_cloudstack_instance.go b/builtin/providers/cloudstack/resource_cloudstack_instance.go index c07678f3e..59079b7de 100644 --- a/builtin/providers/cloudstack/resource_cloudstack_instance.go +++ b/builtin/providers/cloudstack/resource_cloudstack_instance.go @@ -62,6 +62,11 @@ func resourceCloudStackInstance() *schema.Resource { ForceNew: true, }, + "keypair": &schema.Schema{ + Type: schema.TypeString, + Optional: true, + }, + "user_data": &schema.Schema{ Type: schema.TypeString, Optional: true, @@ -136,6 +141,10 @@ func resourceCloudStackInstanceCreate(d *schema.ResourceData, meta interface{}) p.SetIpaddress(ipaddres.(string)) } + if keypair, ok := d.GetOk("keypair"); ok { + p.SetKeypair(keypair.(string)) + } + // If the user data contains any info, it needs to be base64 encoded and // added to the parameter struct if userData, ok := d.GetOk("user_data"); ok { @@ -186,6 +195,7 @@ func resourceCloudStackInstanceRead(d *schema.ResourceData, meta interface{}) er d.Set("display_name", vm.Displayname) d.Set("ipaddress", vm.Nic[0].Ipaddress) d.Set("zone", vm.Zonename) + //NB cloudstack sometimes sends back the wrong keypair name, so dont update it setValueOrUUID(d, "network", vm.Nic[0].Networkname, vm.Nic[0].Networkid) setValueOrUUID(d, "service_offering", vm.Serviceofferingname, vm.Serviceofferingid) @@ -220,41 +230,58 @@ func resourceCloudStackInstanceUpdate(d *schema.ResourceData, meta interface{}) d.SetPartial("display_name") } - // Check if the service offering is changed and if so, update the offering - if d.HasChange("service_offering") { - log.Printf("[DEBUG] Service offering changed for %s, starting update", name) - - // Retrieve the service_offering UUID - serviceofferingid, e := retrieveUUID(cs, "service_offering", d.Get("service_offering").(string)) - if e != nil { - return e.Error() - } - - // Create a new parameter struct - p := cs.VirtualMachine.NewChangeServiceForVirtualMachineParams(d.Id(), serviceofferingid) - - // Before we can actually change the service offering, the virtual machine must be stopped + // Attributes that require reboot to update + if d.HasChange("service_offering") || d.HasChange("keypair") { + // Before we can actually make these changes, the virtual machine must be stopped _, err := cs.VirtualMachine.StopVirtualMachine(cs.VirtualMachine.NewStopVirtualMachineParams(d.Id())) if err != nil { return fmt.Errorf( - "Error stopping instance %s before changing service offering: %s", name, err) + "Error stopping instance %s before making changes: %s", name, err) } - // Change the service offering - _, err = cs.VirtualMachine.ChangeServiceForVirtualMachine(p) - if err != nil { - return fmt.Errorf( - "Error changing the service offering for instance %s: %s", name, err) + + // Check if the service offering is changed and if so, update the offering + if d.HasChange("service_offering") { + log.Printf("[DEBUG] Service offering changed for %s, starting update", name) + + // Retrieve the service_offering UUID + serviceofferingid, e := retrieveUUID(cs, "service_offering", d.Get("service_offering").(string)) + if e != nil { + return e.Error() + } + + // Create a new parameter struct + p := cs.VirtualMachine.NewChangeServiceForVirtualMachineParams(d.Id(), serviceofferingid) + + // Change the service offering + _, err = cs.VirtualMachine.ChangeServiceForVirtualMachine(p) + if err != nil { + return fmt.Errorf( + "Error changing the service offering for instance %s: %s", name, err) + } + d.SetPartial("service_offering") } + + if d.HasChange("keypair") { + log.Printf("[DEBUG] SSH keypair changed for %s, starting update", name) + + p := cs.SSH.NewResetSSHKeyForVirtualMachineParams(d.Id(), d.Get("keypair").(string)) + + // Change the ssh keypair + _, err = cs.SSH.ResetSSHKeyForVirtualMachine(p) + if err != nil { + return fmt.Errorf( + "Error changing the SSH keypair for instance %s: %s", name, err) + } + d.SetPartial("keypair") + } + // Start the virtual machine again _, err = cs.VirtualMachine.StartVirtualMachine(cs.VirtualMachine.NewStartVirtualMachineParams(d.Id())) if err != nil { return fmt.Errorf( - "Error starting instance %s after changing service offering: %s", name, err) + "Error starting instance %s after making changes", name) } - - d.SetPartial("service_offering") } - d.Partial(false) return resourceCloudStackInstanceRead(d, meta) } diff --git a/builtin/providers/cloudstack/resource_cloudstack_instance_test.go b/builtin/providers/cloudstack/resource_cloudstack_instance_test.go index 2d1be9c53..d5ff3fe59 100644 --- a/builtin/providers/cloudstack/resource_cloudstack_instance_test.go +++ b/builtin/providers/cloudstack/resource_cloudstack_instance_test.go @@ -27,6 +27,10 @@ func TestAccCloudStackInstance_basic(t *testing.T) { "cloudstack_instance.foobar", "user_data", "0cf3dcdc356ec8369494cb3991985ecd5296cdd5"), + resource.TestCheckResourceAttr( + "cloudstack_instance.foobar", + "keypair", + CLOUDSTACK_SSH_KEYPAIR), ), }, }, @@ -47,6 +51,14 @@ func TestAccCloudStackInstance_update(t *testing.T) { testAccCheckCloudStackInstanceExists( "cloudstack_instance.foobar", &instance), testAccCheckCloudStackInstanceAttributes(&instance), + resource.TestCheckResourceAttr( + "cloudstack_instance.foobar", + "user_data", + "0cf3dcdc356ec8369494cb3991985ecd5296cdd5"), + resource.TestCheckResourceAttr( + "cloudstack_instance.foobar", + "keypair", + CLOUDSTACK_SSH_KEYPAIR), ), }, @@ -193,13 +205,15 @@ resource "cloudstack_instance" "foobar" { network = "%s" template = "%s" zone = "%s" + keypair = "%s" user_data = "foobar\nfoo\nbar" expunge = true }`, CLOUDSTACK_SERVICE_OFFERING_1, CLOUDSTACK_NETWORK_1, CLOUDSTACK_TEMPLATE, - CLOUDSTACK_ZONE) + CLOUDSTACK_ZONE, + CLOUDSTACK_SSH_KEYPAIR) var testAccCloudStackInstance_renameAndResize = fmt.Sprintf(` resource "cloudstack_instance" "foobar" { @@ -209,13 +223,15 @@ resource "cloudstack_instance" "foobar" { network = "%s" template = "%s" zone = "%s" + keypair = "%s" user_data = "foobar\nfoo\nbar" expunge = true }`, CLOUDSTACK_SERVICE_OFFERING_2, CLOUDSTACK_NETWORK_1, CLOUDSTACK_TEMPLATE, - CLOUDSTACK_ZONE) + CLOUDSTACK_ZONE, + CLOUDSTACK_SSH_KEYPAIR) var testAccCloudStackInstance_fixedIP = fmt.Sprintf(` resource "cloudstack_instance" "foobar" { diff --git a/builtin/providers/cloudstack/resource_cloudstack_ssh_keypair.go b/builtin/providers/cloudstack/resource_cloudstack_ssh_keypair.go new file mode 100644 index 000000000..12a7f1b38 --- /dev/null +++ b/builtin/providers/cloudstack/resource_cloudstack_ssh_keypair.go @@ -0,0 +1,122 @@ +package cloudstack + +import ( + "fmt" + "log" + "strings" + + "github.com/hashicorp/terraform/helper/schema" + "github.com/xanzy/go-cloudstack/cloudstack" +) + +func resourceCloudStackSSHKeyPair() *schema.Resource { + return &schema.Resource{ + Create: resourceCloudStackSSHKeyPairCreate, + Read: resourceCloudStackSSHKeyPairRead, + Delete: resourceCloudStackSSHKeyPairDelete, + + Schema: map[string]*schema.Schema{ + "name": &schema.Schema{ + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "public_key": &schema.Schema{ + Type: schema.TypeString, + Optional: true, + ForceNew: true, + }, + + "private_key": &schema.Schema{ + Type: schema.TypeString, + Computed: true, + }, + + "fingerprint": &schema.Schema{ + Type: schema.TypeString, + Computed: true, + }, + }, + } +} + +func resourceCloudStackSSHKeyPairCreate(d *schema.ResourceData, meta interface{}) error { + cs := meta.(*cloudstack.CloudStackClient) + + name := d.Get("name").(string) + publicKey := d.Get("public_key").(string) + + if publicKey != "" { + //register key supplied + p := cs.SSH.NewRegisterSSHKeyPairParams(name, publicKey) + r, err := cs.SSH.RegisterSSHKeyPair(p) + if err != nil { + return err + } + log.Printf("[DEBUG] RegisterSSHKeyPair response: %+v\n", r) + log.Printf("[DEBUG] Key pair successfully registered at Cloudstack") + d.SetId(name) + } else { + //no key supplied, must create one and return the private key + p := cs.SSH.NewCreateSSHKeyPairParams(name) + r, err := cs.SSH.CreateSSHKeyPair(p) + if err != nil { + return err + } + log.Printf("[DEBUG] CreateSSHKeyPair response: %+v\n", r) + log.Printf("[DEBUG] Key pair successfully generated at Cloudstack") + log.Printf("[DEBUG] Private key returned: %s", r.Privatekey) + d.Set("private_key", r.Privatekey) + d.SetId(name) + } + + return resourceCloudStackSSHKeyPairRead(d, meta) +} + +func resourceCloudStackSSHKeyPairRead(d *schema.ResourceData, meta interface{}) error { + cs := meta.(*cloudstack.CloudStackClient) + + log.Printf("[DEBUG] looking for ssh key %s with name %s", d.Id(), d.Get("name").(string)) + + p := cs.SSH.NewListSSHKeyPairsParams() + p.SetName(d.Get("name").(string)) + + r, err := cs.SSH.ListSSHKeyPairs(p) + if err != nil { + return err + } + if r.Count == 0 { + log.Printf("[DEBUG] Key pair %s does not exist", d.Get("name").(string)) + d.Set("name", "") + return nil + } + + //SSHKeyPair name is unique in a cloudstack account so dont need to check for multiple + d.Set("name", r.SSHKeyPairs[0].Name) + d.Set("fingerprint", r.SSHKeyPairs[0].Fingerprint) + log.Printf("[DEBUG] Read ssh key pair %+v\n", d) + + return nil +} + +func resourceCloudStackSSHKeyPairDelete(d *schema.ResourceData, meta interface{}) error { + cs := meta.(*cloudstack.CloudStackClient) + + // Create a new parameter struct + p := cs.SSH.NewDeleteSSHKeyPairParams(d.Get("name").(string)) + + // Remove the SSH Keypair + _, err := cs.SSH.DeleteSSHKeyPair(p) + if err != nil { + // This is a very poor way to be told the UUID does no longer exist :( + if strings.Contains(err.Error(), fmt.Sprintf( + "A key pair with name '%s' does not exist for account", d.Get("name").(string))) { + return nil + } + + return fmt.Errorf("Error deleting SSH Keypair: %s", err) + } + + return nil +} diff --git a/builtin/providers/cloudstack/resource_cloudstack_ssh_keypair_test.go b/builtin/providers/cloudstack/resource_cloudstack_ssh_keypair_test.go new file mode 100644 index 000000000..06c34f853 --- /dev/null +++ b/builtin/providers/cloudstack/resource_cloudstack_ssh_keypair_test.go @@ -0,0 +1,160 @@ +package cloudstack + +import ( + "fmt" + "log" + "strings" + "testing" + + "github.com/hashicorp/terraform/helper/resource" + "github.com/hashicorp/terraform/terraform" + "github.com/xanzy/go-cloudstack/cloudstack" +) + +func TestAccCloudStackSSHKeyPair_create(t *testing.T) { + var sshkey cloudstack.SSHKeyPair + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckCloudStackSSHKeyPairDestroy, + Steps: []resource.TestStep{ + resource.TestStep{ + Config: testAccCloudStackSSHKeyPair_create, + Check: resource.ComposeTestCheckFunc( + testAccCheckCloudStackSSHKeyPairExists("cloudstack_ssh_keypair.foo", &sshkey), + testAccCheckCloudStackSSHKeyPairAttributes(&sshkey), + testAccCheckCloudStackSSHKeyPairCreateAttributes("cloudstack_ssh_keypair.foo"), + ), + }, + }, + }) +} + +func TestAccCloudStackSSHKeyPair_register(t *testing.T) { + var sshkey cloudstack.SSHKeyPair + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckCloudStackSSHKeyPairDestroy, + Steps: []resource.TestStep{ + resource.TestStep{ + Config: testAccCloudStackSSHKeyPair_register, + Check: resource.ComposeTestCheckFunc( + testAccCheckCloudStackSSHKeyPairExists("cloudstack_ssh_keypair.foo", &sshkey), + testAccCheckCloudStackSSHKeyPairAttributes(&sshkey), + resource.TestCheckResourceAttr( + "cloudstack_ssh_keypair.foo", + "public_key", + CLOUDSTACK_SSH_PUBLIC_KEY), + ), + }, + }, + }) +} + +func testAccCheckCloudStackSSHKeyPairExists(n string, sshkey *cloudstack.SSHKeyPair) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[n] + if !ok { + return fmt.Errorf("Not found: %s", n) + } + + if rs.Primary.Attributes["name"] == "" { + return fmt.Errorf("No ssh key name is set") + } + + cs := testAccProvider.Meta().(*cloudstack.CloudStackClient) + p := cs.SSH.NewListSSHKeyPairsParams() + p.SetName(rs.Primary.Attributes["name"]) + list, err := cs.SSH.ListSSHKeyPairs(p) + + if err != nil { + return err + } + + if list.Count == 1 && list.SSHKeyPairs[0].Name == rs.Primary.Attributes["name"] { + //ssh key exists + *sshkey = *list.SSHKeyPairs[0] + return nil + } + + return fmt.Errorf("SSH key not found") + } +} + +func testAccCheckCloudStackSSHKeyPairAttributes( + sshkey *cloudstack.SSHKeyPair) resource.TestCheckFunc { + return func(s *terraform.State) error { + + fingerprintLen := len(sshkey.Fingerprint) + if fingerprintLen != 47 { + return fmt.Errorf( + "SSH key: Attribute private_key expected length 47, got %d", + fingerprintLen) + } + + return nil + } +} + +func testAccCheckCloudStackSSHKeyPairCreateAttributes( + name string) resource.TestCheckFunc { + return func(s *terraform.State) error { + ms := s.RootModule() + rs, ok := ms.Resources[name] + if !ok { + return fmt.Errorf("Not found: %s", name) + } + + is := rs.Primary + if is == nil { + return fmt.Errorf("No primary instance: %s", name) + } + + log.Printf("Private key calculated: %s", is.Attributes["private_key"]) + if !strings.Contains(is.Attributes["private_key"], "PRIVATE KEY") { + return fmt.Errorf( + "SSH key: Attribute private_key expected 'PRIVATE KEY' to be present, got %s", + is.Attributes["private_key"]) + } + return nil + } +} + +func testAccCheckCloudStackSSHKeyPairDestroy(s *terraform.State) error { + cs := testAccProvider.Meta().(*cloudstack.CloudStackClient) + + for _, rs := range s.RootModule().Resources { + if rs.Type != "cloudstack_ssh_keypair" { + continue + } + + if rs.Primary.Attributes["name"] == "" { + return fmt.Errorf("No ssh key name is set") + } + + p := cs.SSH.NewDeleteSSHKeyPairParams(rs.Primary.Attributes["name"]) + _, err := cs.SSH.DeleteSSHKeyPair(p) + + if err != nil { + return fmt.Errorf( + "Error deleting ssh key (%s): %s", + rs.Primary.Attributes["name"], err) + } + } + + return nil +} + +var testAccCloudStackSSHKeyPair_create = fmt.Sprintf(` +resource "cloudstack_ssh_keypair" "foo" { + name = "terraform-testacc" +}`) + +var testAccCloudStackSSHKeyPair_register = fmt.Sprintf(` +resource "cloudstack_ssh_keypair" "foo" { + name = "terraform-testacc" + public_key = "%s" +}`, CLOUDSTACK_SSH_PUBLIC_KEY) From 50fc6106043f98852748dff3f35f9e0ca1ec25f8 Mon Sep 17 00:00:00 2001 From: Jack Pearkes Date: Tue, 2 Jun 2015 13:26:28 -0400 Subject: [PATCH 27/91] website: atlas artifact type is amazon.ami no aws.ami --- website/source/docs/providers/atlas/r/artifact.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/source/docs/providers/atlas/r/artifact.html.markdown b/website/source/docs/providers/atlas/r/artifact.html.markdown index 889413f21..3dee419f7 100644 --- a/website/source/docs/providers/atlas/r/artifact.html.markdown +++ b/website/source/docs/providers/atlas/r/artifact.html.markdown @@ -24,7 +24,7 @@ to this artifact will trigger a change to that instance. # Read the AMI resource "atlas_artifact" "web" { name = "hashicorp/web" - type = "aws.ami" + type = "amazon.ami" build = "latest" metadata { arch = "386" From 3939236f8792f84f1b4d59bc2b2f7e943cb2b846 Mon Sep 17 00:00:00 2001 From: Joel Date: Tue, 2 Jun 2015 14:05:55 -0500 Subject: [PATCH 28/91] Let people know elbs support tags --- website/source/docs/providers/aws/r/elb.html.markdown | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/website/source/docs/providers/aws/r/elb.html.markdown b/website/source/docs/providers/aws/r/elb.html.markdown index 1f4a0b507..9c63788d3 100644 --- a/website/source/docs/providers/aws/r/elb.html.markdown +++ b/website/source/docs/providers/aws/r/elb.html.markdown @@ -46,6 +46,10 @@ resource "aws_elb" "bar" { idle_timeout = 400 connection_draining = true connection_draining_timeout = 400 + + tags { + Name = "foobar-terraform-elb" + } } ``` @@ -65,6 +69,7 @@ The following arguments are supported: * `idle_timeout` - (Optional) The time in seconds that the connection is allowed to be idle. Default: 60. * `connection_draining` - (Optional) Boolean to enable connection draining. * `connection_draining_timeout` - (Optional) The time in seconds to allow for connections to drain. +* `tags` - (Optional) A mapping of tags to assign to the resource. Exactly one of `availability_zones` or `subnets` must be specified: this determines if the ELB exists in a VPC or in EC2-classic. From 7e388bb07882924cc2fae85de98979e987f54939 Mon Sep 17 00:00:00 2001 From: Sander van Harmelen Date: Tue, 2 Jun 2015 21:08:14 +0200 Subject: [PATCH 29/91] Make sure we expand the homedir If a tilde is used in the path, this makes sure we expand it to a full path. --- builtin/providers/azure/provider.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/builtin/providers/azure/provider.go b/builtin/providers/azure/provider.go index bba65fcfd..beafc3587 100644 --- a/builtin/providers/azure/provider.go +++ b/builtin/providers/azure/provider.go @@ -5,6 +5,7 @@ import ( "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/terraform" + "github.com/mitchellh/go-homedir" ) // Provider returns a terraform.ResourceProvider. @@ -42,8 +43,13 @@ func Provider() terraform.ResourceProvider { } func providerConfigure(d *schema.ResourceData) (interface{}, error) { + settingsFile, err := homedir.Expand(d.Get("settings_file").(string)) + if err != nil { + return nil, err + } + config := Config{ - SettingsFile: d.Get("settings_file").(string), + SettingsFile: settingsFile, SubscriptionID: d.Get("subscription_id").(string), Certificate: []byte(d.Get("certificate").(string)), } From 03514b7d5ac37ed0adc9fd3b4464d05ecfa4fd49 Mon Sep 17 00:00:00 2001 From: Clint Date: Tue, 2 Jun 2015 14:31:43 -0500 Subject: [PATCH 30/91] Update CHANGELOG.md --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1b9964a52..b339850c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ ## 0.6.0 (Unreleased) +IMPROVEMENTS: + + * provider/aws: ElastiCache Subnet Groups can be updated + without destroying first [GH-#2191] + + ## 0.5.3 (June 1, 2015) IMPROVEMENTS: From 51d6592f3ec5dfa3ed387ceb5f60e1bbc4f78774 Mon Sep 17 00:00:00 2001 From: Clint Date: Tue, 2 Jun 2015 14:34:09 -0500 Subject: [PATCH 31/91] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b339850c0..32d547298 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ IMPROVEMENTS: * provider/aws: ElastiCache Subnet Groups can be updated - without destroying first [GH-#2191] + without destroying first [GH-2191] ## 0.5.3 (June 1, 2015) From fdd19a55ef8da188370d6ec217c6924cc6e40330 Mon Sep 17 00:00:00 2001 From: Paul Hinze Date: Tue, 2 Jun 2015 14:35:26 -0500 Subject: [PATCH 32/91] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 32d547298..b9cd237b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## 0.6.0 (Unreleased) +FEATURES: + + * **New provider: `azure`** [GH-2053] + IMPROVEMENTS: * provider/aws: ElastiCache Subnet Groups can be updated From b781c6c446ed78c61c1f06d597b07cfe07578866 Mon Sep 17 00:00:00 2001 From: Paul Hinze Date: Tue, 2 Jun 2015 16:48:38 -0500 Subject: [PATCH 33/91] core: keys() and values() funcs for map variables they work on maps with both keys and values that are string types, which AFAICT are the only types of maps we have right now. closes #1915 --- config/interpolate_funcs.go | 71 +++++++++++++++++++++++ config/interpolate_funcs_test.go | 98 ++++++++++++++++++++++++++++++++ config/raw_config.go | 2 + 3 files changed, 171 insertions(+) diff --git a/config/interpolate_funcs.go b/config/interpolate_funcs.go index 7c4d76619..2249a9928 100644 --- a/config/interpolate_funcs.go +++ b/config/interpolate_funcs.go @@ -6,6 +6,7 @@ import ( "fmt" "io/ioutil" "regexp" + "sort" "strconv" "strings" @@ -278,3 +279,73 @@ func interpolationFuncElement() ast.Function { }, } } + +// interpolationFuncKeys implements the "keys" function that yields a list of +// keys of map types within a Terraform configuration. +func interpolationFuncKeys(vs map[string]ast.Variable) ast.Function { + return ast.Function{ + ArgTypes: []ast.Type{ast.TypeString}, + ReturnType: ast.TypeString, + Callback: func(args []interface{}) (interface{}, error) { + // Prefix must include ending dot to be a map + prefix := fmt.Sprintf("var.%s.", args[0].(string)) + keys := make([]string, 0, len(vs)) + for k, _ := range vs { + if !strings.HasPrefix(k, prefix) { + continue + } + keys = append(keys, k[len(prefix):]) + } + + if len(keys) <= 0 { + return "", fmt.Errorf( + "failed to find map '%s'", + args[0].(string)) + } + + sort.Strings(keys) + + return strings.Join(keys, InterpSplitDelim), nil + }, + } +} + +// interpolationFuncValues implements the "values" function that yields a list of +// keys of map types within a Terraform configuration. +func interpolationFuncValues(vs map[string]ast.Variable) ast.Function { + return ast.Function{ + ArgTypes: []ast.Type{ast.TypeString}, + ReturnType: ast.TypeString, + Callback: func(args []interface{}) (interface{}, error) { + // Prefix must include ending dot to be a map + prefix := fmt.Sprintf("var.%s.", args[0].(string)) + keys := make([]string, 0, len(vs)) + for k, _ := range vs { + if !strings.HasPrefix(k, prefix) { + continue + } + keys = append(keys, k) + } + + if len(keys) <= 0 { + return "", fmt.Errorf( + "failed to find map '%s'", + args[0].(string)) + } + + sort.Strings(keys) + + vals := make([]string, 0, len(keys)) + + for _, k := range keys { + v := vs[k] + if v.Type != ast.TypeString { + return "", fmt.Errorf("values(): %q has bad type %s", k, v.Type) + } + vals = append(vals, vs[k].Value.(string)) + } + + return strings.Join(vals, InterpSplitDelim), nil + }, + } +} diff --git a/config/interpolate_funcs_test.go b/config/interpolate_funcs_test.go index 5432cdbd7..9b8726a3e 100644 --- a/config/interpolate_funcs_test.go +++ b/config/interpolate_funcs_test.go @@ -384,6 +384,104 @@ func TestInterpolateFuncLookup(t *testing.T) { }) } +func TestInterpolateFuncKeys(t *testing.T) { + testFunction(t, testFunctionConfig{ + Vars: map[string]ast.Variable{ + "var.foo.bar": ast.Variable{ + Value: "baz", + Type: ast.TypeString, + }, + "var.foo.qux": ast.Variable{ + Value: "quack", + Type: ast.TypeString, + }, + "var.str": ast.Variable{ + Value: "astring", + Type: ast.TypeString, + }, + }, + Cases: []testFunctionCase{ + { + `${keys("foo")}`, + fmt.Sprintf( + "bar%squx", + InterpSplitDelim), + false, + }, + + // Invalid key + { + `${keys("not")}`, + nil, + true, + }, + + // Too many args + { + `${keys("foo", "bar")}`, + nil, + true, + }, + + // Not a map + { + `${keys("str")}`, + nil, + true, + }, + }, + }) +} + +func TestInterpolateFuncValues(t *testing.T) { + testFunction(t, testFunctionConfig{ + Vars: map[string]ast.Variable{ + "var.foo.bar": ast.Variable{ + Value: "quack", + Type: ast.TypeString, + }, + "var.foo.qux": ast.Variable{ + Value: "baz", + Type: ast.TypeString, + }, + "var.str": ast.Variable{ + Value: "astring", + Type: ast.TypeString, + }, + }, + Cases: []testFunctionCase{ + { + `${values("foo")}`, + fmt.Sprintf( + "quack%sbaz", + InterpSplitDelim), + false, + }, + + // Invalid key + { + `${values("not")}`, + nil, + true, + }, + + // Too many args + { + `${values("foo", "bar")}`, + nil, + true, + }, + + // Not a map + { + `${values("str")}`, + nil, + true, + }, + }, + }) +} + func TestInterpolateFuncElement(t *testing.T) { testFunction(t, testFunctionConfig{ Cases: []testFunctionCase{ diff --git a/config/raw_config.go b/config/raw_config.go index d51578e0b..ebb9f18dc 100644 --- a/config/raw_config.go +++ b/config/raw_config.go @@ -304,6 +304,8 @@ func langEvalConfig(vs map[string]ast.Variable) *lang.EvalConfig { funcMap[k] = v } funcMap["lookup"] = interpolationFuncLookup(vs) + funcMap["keys"] = interpolationFuncKeys(vs) + funcMap["values"] = interpolationFuncValues(vs) return &lang.EvalConfig{ GlobalScope: &ast.BasicScope{ From 0b2b9e844f9042f2c5b0d36a852ce4cb7d55ed2f Mon Sep 17 00:00:00 2001 From: Paul Hinze Date: Tue, 2 Jun 2015 17:23:51 -0500 Subject: [PATCH 34/91] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b9cd237b6..6c6117c8d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ FEATURES: * **New provider: `azure`** [GH-2053] + * core: keys() and values() funcs for map variables [GH-2198] IMPROVEMENTS: From f3a86114ae2fa6a7a63b08c85789550c4c5dd3ed Mon Sep 17 00:00:00 2001 From: Thordur Bjornsson Date: Wed, 3 Jun 2015 11:01:54 +0200 Subject: [PATCH 35/91] Fixup aws_security_group doc example. Both to_ and from_ port must be zero to use protocol -1. --- .../source/docs/providers/aws/r/security_group.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/source/docs/providers/aws/r/security_group.html.markdown b/website/source/docs/providers/aws/r/security_group.html.markdown index c3f74dba5..ebd21bc73 100644 --- a/website/source/docs/providers/aws/r/security_group.html.markdown +++ b/website/source/docs/providers/aws/r/security_group.html.markdown @@ -28,7 +28,7 @@ resource "aws_security_group" "allow_all" { ingress { from_port = 0 - to_port = 65535 + to_port = 0 protocol = "-1" cidr_blocks = ["0.0.0.0/0"] } From e0b9961d939133867167149d2eea59a77a01e4f8 Mon Sep 17 00:00:00 2001 From: Benjamin Vickers Date: Wed, 3 Jun 2015 11:40:53 +0100 Subject: [PATCH 36/91] Update docs for Cloudstack with SSH keypair and timeout --- .../providers/cloudstack/index.html.markdown | 5 +++ .../cloudstack/r/instance.html.markdown | 2 ++ .../cloudstack/r/ssh_keypair.html.markdown | 36 +++++++++++++++++++ website/source/layouts/cloudstack.erb | 4 +++ 4 files changed, 47 insertions(+) create mode 100644 website/source/docs/providers/cloudstack/r/ssh_keypair.html.markdown diff --git a/website/source/docs/providers/cloudstack/index.html.markdown b/website/source/docs/providers/cloudstack/index.html.markdown index 3fe42b98a..0738370b6 100644 --- a/website/source/docs/providers/cloudstack/index.html.markdown +++ b/website/source/docs/providers/cloudstack/index.html.markdown @@ -43,3 +43,8 @@ The following arguments are supported: * `secret_key` - (Required) This is the CloudStack secret key. It must be provided, but it can also be sourced from the `CLOUDSTACK_SECRET_KEY` environment variable. + +* `timeout` - (Optional) A value in seconds. This is the time allowed for Cloudstack + to complete each asynchronous job triggered. If unset, this can be sourced from the + `CLOUDSTACK_TIMEOUT` environment variable. Otherwise, this will default to 300 + seconds. diff --git a/website/source/docs/providers/cloudstack/r/instance.html.markdown b/website/source/docs/providers/cloudstack/r/instance.html.markdown index e09cd6c6e..403c64d4b 100644 --- a/website/source/docs/providers/cloudstack/r/instance.html.markdown +++ b/website/source/docs/providers/cloudstack/r/instance.html.markdown @@ -48,6 +48,8 @@ The following arguments are supported: * `user_data` - (Optional) The user data to provide when launching the instance. +* `keypair` - (Optional) The name of the SSH keypair that will be used to access this instance. + * `expunge` - (Optional) This determines if the instance is expunged when it is destroyed (defaults false) diff --git a/website/source/docs/providers/cloudstack/r/ssh_keypair.html.markdown b/website/source/docs/providers/cloudstack/r/ssh_keypair.html.markdown new file mode 100644 index 000000000..4ad95c702 --- /dev/null +++ b/website/source/docs/providers/cloudstack/r/ssh_keypair.html.markdown @@ -0,0 +1,36 @@ +--- +layout: "cloudstack" +page_title: "CloudStack: cloudstack_ssh_keypair" +sidebar_current: "docs-cloudstack-resource-ssh-keypair" +description: |- + Creates or registers an SSH keypair. +--- + +# cloudstack\_ssh\_keypair + +Creates or registers an SSH keypair. + +## Example Usage + +``` +resource "cloudstack_ssh_keypair" "myKey" { + name = "myKey" +} +``` + +## Argument Reference + +The following arguments are supported: + +* `name` - (Required) The name to give the SSH keypair. This is a unique value within a Cloudstack account. + +* `public_key` - (Optional) The full public key text of this keypair. If this is omitted, Cloudstack + will generate a new keypair. + +## Attributes Reference + +The following attributes are exported: + +* `id` - The keypair ID. This is set to the keypair `name` argument. +* `fingerprint` - The fingerprint of the public key specified or calculated. +* `private_key` - This is returned only if Cloudstack generated the keypair. diff --git a/website/source/layouts/cloudstack.erb b/website/source/layouts/cloudstack.erb index d9830586c..c2051b1b7 100644 --- a/website/source/layouts/cloudstack.erb +++ b/website/source/layouts/cloudstack.erb @@ -53,6 +53,10 @@ cloudstack_port_forward + > + cloudstack_ssh_keypair + + > cloudstack_template From 4f6e610ff98b5bab9df936d90598612b96ac5d84 Mon Sep 17 00:00:00 2001 From: Sander van Harmelen Date: Wed, 3 Jun 2015 14:45:30 +0200 Subject: [PATCH 37/91] Improve the decoding logic to prevent parameter not found errors We need to decode both the Raw config and the parsed Config to make sure all set keys are visible. Otherwise keys that will need to be interpolated later, will be missing causing the validation to fail. --- builtin/providers/azure/provider.go | 2 +- .../provisioners/chef/resource_provisioner.go | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/builtin/providers/azure/provider.go b/builtin/providers/azure/provider.go index beafc3587..eef0ca49c 100644 --- a/builtin/providers/azure/provider.go +++ b/builtin/providers/azure/provider.go @@ -45,7 +45,7 @@ func Provider() terraform.ResourceProvider { func providerConfigure(d *schema.ResourceData) (interface{}, error) { settingsFile, err := homedir.Expand(d.Get("settings_file").(string)) if err != nil { - return nil, err + return nil, fmt.Errorf("Error expanding the settings file path: %s", err) } config := Config{ diff --git a/builtin/provisioners/chef/resource_provisioner.go b/builtin/provisioners/chef/resource_provisioner.go index 2a8e0def6..cb5f5d6ea 100644 --- a/builtin/provisioners/chef/resource_provisioner.go +++ b/builtin/provisioners/chef/resource_provisioner.go @@ -17,6 +17,7 @@ import ( "github.com/hashicorp/terraform/communicator" "github.com/hashicorp/terraform/communicator/remote" "github.com/hashicorp/terraform/terraform" + "github.com/mitchellh/go-homedir" "github.com/mitchellh/go-linereader" "github.com/mitchellh/mapstructure" ) @@ -182,6 +183,15 @@ func (r *ResourceProvisioner) decodeConfig(c *terraform.ResourceConfig) (*Provis return nil, err } + // We need to decode this twice. Once for the Raw config and once + // for the parsed Config. This makes sure that all values are there + // even if some still need to be interpolated later on. + // Without this the validation will fail when using a variable for + // a required parameter (the node_name for example). + if err := dec.Decode(c.Raw); err != nil { + return nil, err + } + if err := dec.Decode(c.Config); err != nil { return nil, err } @@ -190,6 +200,14 @@ func (r *ResourceProvisioner) decodeConfig(c *terraform.ResourceConfig) (*Provis p.Environment = defaultEnv } + if p.ValidationKeyPath != "" { + keyPath, err := homedir.Expand(p.ValidationKeyPath) + if err != nil { + return nil, fmt.Errorf("Error expanding the validation key path: %v", err) + } + p.ValidationKeyPath = keyPath + } + if attrs, ok := c.Config["attributes"]; ok { p.Attributes, err = rawToJSON(attrs) if err != nil { From 78e7519efa2d34ea69aa388be17f8e8487347f17 Mon Sep 17 00:00:00 2001 From: Clint Shryock Date: Wed, 3 Jun 2015 08:37:57 -0500 Subject: [PATCH 38/91] Updates from go generate --- helper/schema/valuetype_string.go | 2 +- terraform/graphnodeconfigtype_string.go | 2 +- terraform/instancetype_string.go | 2 +- terraform/walkoperation_string.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/helper/schema/valuetype_string.go b/helper/schema/valuetype_string.go index fec00944e..42442a46b 100644 --- a/helper/schema/valuetype_string.go +++ b/helper/schema/valuetype_string.go @@ -9,7 +9,7 @@ const _ValueType_name = "TypeInvalidTypeBoolTypeIntTypeFloatTypeStringTypeListTy var _ValueType_index = [...]uint8{0, 11, 19, 26, 35, 45, 53, 60, 67, 77} func (i ValueType) String() string { - if i < 0 || i+1 >= ValueType(len(_ValueType_index)) { + if i < 0 || i >= ValueType(len(_ValueType_index)-1) { return fmt.Sprintf("ValueType(%d)", i) } return _ValueType_name[_ValueType_index[i]:_ValueType_index[i+1]] diff --git a/terraform/graphnodeconfigtype_string.go b/terraform/graphnodeconfigtype_string.go index de24c2dcd..d8c1724f4 100644 --- a/terraform/graphnodeconfigtype_string.go +++ b/terraform/graphnodeconfigtype_string.go @@ -9,7 +9,7 @@ const _GraphNodeConfigType_name = "GraphNodeConfigTypeInvalidGraphNodeConfigType var _GraphNodeConfigType_index = [...]uint8{0, 26, 53, 80, 105, 130, 157} func (i GraphNodeConfigType) String() string { - if i < 0 || i+1 >= GraphNodeConfigType(len(_GraphNodeConfigType_index)) { + if i < 0 || i >= GraphNodeConfigType(len(_GraphNodeConfigType_index)-1) { return fmt.Sprintf("GraphNodeConfigType(%d)", i) } return _GraphNodeConfigType_name[_GraphNodeConfigType_index[i]:_GraphNodeConfigType_index[i+1]] diff --git a/terraform/instancetype_string.go b/terraform/instancetype_string.go index fc8697644..3114bc157 100644 --- a/terraform/instancetype_string.go +++ b/terraform/instancetype_string.go @@ -9,7 +9,7 @@ const _InstanceType_name = "TypeInvalidTypePrimaryTypeTaintedTypeDeposed" var _InstanceType_index = [...]uint8{0, 11, 22, 33, 44} func (i InstanceType) String() string { - if i < 0 || i+1 >= InstanceType(len(_InstanceType_index)) { + if i < 0 || i >= InstanceType(len(_InstanceType_index)-1) { return fmt.Sprintf("InstanceType(%d)", i) } return _InstanceType_name[_InstanceType_index[i]:_InstanceType_index[i+1]] diff --git a/terraform/walkoperation_string.go b/terraform/walkoperation_string.go index ddd894f53..423793c3c 100644 --- a/terraform/walkoperation_string.go +++ b/terraform/walkoperation_string.go @@ -9,7 +9,7 @@ const _walkOperation_name = "walkInvalidwalkInputwalkApplywalkPlanwalkPlanDestro var _walkOperation_index = [...]uint8{0, 11, 20, 29, 37, 52, 63, 75} func (i walkOperation) String() string { - if i+1 >= walkOperation(len(_walkOperation_index)) { + if i >= walkOperation(len(_walkOperation_index)-1) { return fmt.Sprintf("walkOperation(%d)", i) } return _walkOperation_name[_walkOperation_index[i]:_walkOperation_index[i+1]] From de141fe1cc7b524ce0828679a7301e4707fab517 Mon Sep 17 00:00:00 2001 From: Clint Shryock Date: Wed, 3 Jun 2015 08:46:03 -0500 Subject: [PATCH 39/91] provider/aws: Updates to SNS / SQS resources after upstream change --- .../providers/aws/resource_aws_sns_topic.go | 35 +++++++-------- .../resource_aws_sns_topic_subscription.go | 45 +++++++++---------- .../providers/aws/resource_aws_sqs_queue.go | 8 ++-- .../aws/resource_aws_sqs_queue_test.go | 4 +- 4 files changed, 45 insertions(+), 47 deletions(-) diff --git a/builtin/providers/aws/resource_aws_sns_topic.go b/builtin/providers/aws/resource_aws_sns_topic.go index 780ff2f38..5a1905dd7 100644 --- a/builtin/providers/aws/resource_aws_sns_topic.go +++ b/builtin/providers/aws/resource_aws_sns_topic.go @@ -12,12 +12,11 @@ import ( // Mutable attributes var SNSAttributeMap = map[string]string{ - "display_name" : "DisplayName", - "policy" : "Policy", + "display_name": "DisplayName", + "policy": "Policy", "delivery_policy": "DeliveryPolicy", } - func resourceAwsSnsTopic() *schema.Resource { return &schema.Resource{ Create: resourceAwsSnsTopicCreate, @@ -32,20 +31,20 @@ func resourceAwsSnsTopic() *schema.Resource { ForceNew: true, }, "display_name": &schema.Schema{ - Type: schema.TypeString, - Optional: true, - ForceNew: false, + Type: schema.TypeString, + Optional: true, + ForceNew: false, }, "policy": &schema.Schema{ - Type: schema.TypeString, - Optional: true, - ForceNew: false, - Computed: true, + Type: schema.TypeString, + Optional: true, + ForceNew: false, + Computed: true, }, "delivery_policy": &schema.Schema{ - Type: schema.TypeString, - Optional: true, - ForceNew: false, + Type: schema.TypeString, + Optional: true, + ForceNew: false, }, "arn": &schema.Schema{ Type: schema.TypeString, @@ -93,8 +92,8 @@ func resourceAwsSnsTopicUpdate(d *schema.ResourceData, meta interface{}) error { if !(k == "policy" && n == "") { // Make API call to update attributes req := &sns.SetTopicAttributesInput{ - TopicARN: aws.String(d.Id()), - AttributeName: aws.String(attrKey), + TopicARN: aws.String(d.Id()), + AttributeName: aws.String(attrKey), AttributeValue: aws.String(n.(string)), } snsconn.SetTopicAttributes(req) @@ -117,8 +116,8 @@ func resourceAwsSnsTopicRead(d *schema.ResourceData, meta interface{}) error { return err } - if attributeOutput.Attributes != nil && len(*attributeOutput.Attributes) > 0 { - attrmap := *attributeOutput.Attributes + if attributeOutput.Attributes != nil && len(attributeOutput.Attributes) > 0 { + attrmap := attributeOutput.Attributes resource := *resourceAwsSnsTopic() // iKey = internal struct key, oKey = AWS Attribute Map key for iKey, oKey := range SNSAttributeMap { @@ -150,4 +149,4 @@ func resourceAwsSnsTopicDelete(d *schema.ResourceData, meta interface{}) error { return err } return nil -} \ No newline at end of file +} diff --git a/builtin/providers/aws/resource_aws_sns_topic_subscription.go b/builtin/providers/aws/resource_aws_sns_topic_subscription.go index fd8c67604..e11ee0a6c 100644 --- a/builtin/providers/aws/resource_aws_sns_topic_subscription.go +++ b/builtin/providers/aws/resource_aws_sns_topic_subscription.go @@ -10,7 +10,6 @@ import ( "github.com/awslabs/aws-sdk-go/service/sns" ) - func resourceAwsSnsTopicSubscription() *schema.Resource { return &schema.Resource{ Create: resourceAwsSnsTopicSubscriptionCreate, @@ -25,29 +24,29 @@ func resourceAwsSnsTopicSubscription() *schema.Resource { ForceNew: false, }, "endpoint": &schema.Schema{ - Type: schema.TypeString, - Required: true, - ForceNew: false, + Type: schema.TypeString, + Required: true, + ForceNew: false, }, "topic_arn": &schema.Schema{ - Type: schema.TypeString, - Required: true, - ForceNew: false, + Type: schema.TypeString, + Required: true, + ForceNew: false, }, "delivery_policy": &schema.Schema{ - Type: schema.TypeString, - Optional: true, - ForceNew: false, + Type: schema.TypeString, + Optional: true, + ForceNew: false, }, "raw_message_delivery": &schema.Schema{ - Type: schema.TypeBool, - Optional: true, - ForceNew: false, - Default: false, + Type: schema.TypeBool, + Optional: true, + ForceNew: false, + Default: false, }, "arn": &schema.Schema{ - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, }, }, } @@ -56,7 +55,7 @@ func resourceAwsSnsTopicSubscription() *schema.Resource { func resourceAwsSnsTopicSubscriptionCreate(d *schema.ResourceData, meta interface{}) error { snsconn := meta.(*AWSClient).snsconn - if(d.Get("protocol") == "email") { + if d.Get("protocol") == "email" { return fmt.Errorf("Email endpoints are not supported!") } @@ -107,8 +106,8 @@ func resourceAwsSnsTopicSubscriptionUpdate(d *schema.ResourceData, meta interfac req := &sns.SetSubscriptionAttributesInput{ SubscriptionARN: aws.String(d.Id()), - AttributeName: aws.String("RawMessageDelivery"), - AttributeValue: aws.String(attrValue), + AttributeName: aws.String("RawMessageDelivery"), + AttributeValue: aws.String(attrValue), } _, err := snsconn.SetSubscriptionAttributes(req) @@ -132,8 +131,8 @@ func resourceAwsSnsTopicSubscriptionRead(d *schema.ResourceData, meta interface{ return err } - if attributeOutput.Attributes != nil && len(*attributeOutput.Attributes) > 0 { - attrHash := *attributeOutput.Attributes + if attributeOutput.Attributes != nil && len(attributeOutput.Attributes) > 0 { + attrHash := attributeOutput.Attributes log.Printf("[DEBUG] raw message delivery: %s", *attrHash["RawMessageDelivery"]) if *attrHash["RawMessageDelivery"] == "true" { d.Set("raw_message_delivery", true) @@ -158,7 +157,7 @@ func resourceAwsSnsTopicSubscriptionDelete(d *schema.ResourceData, meta interfac return nil } -func subscribeToSNSTopic(d *schema.ResourceData, snsconn *sns.SNS) (output *sns.SubscribeOutput, err error) { +func subscribeToSNSTopic(d *schema.ResourceData, snsconn *sns.SNS) (output *sns.SubscribeOutput, err error) { protocol := d.Get("protocol").(string) endpoint := d.Get("endpoint").(string) topic_arn := d.Get("topic_arn").(string) @@ -178,4 +177,4 @@ func subscribeToSNSTopic(d *schema.ResourceData, snsconn *sns.SNS) (output *sns. log.Printf("[DEBUG] Created new subscription!") return output, nil -} \ No newline at end of file +} diff --git a/builtin/providers/aws/resource_aws_sqs_queue.go b/builtin/providers/aws/resource_aws_sqs_queue.go index 7c7473f04..a24f5a16d 100644 --- a/builtin/providers/aws/resource_aws_sqs_queue.go +++ b/builtin/providers/aws/resource_aws_sqs_queue.go @@ -108,7 +108,7 @@ func resourceAwsSqsQueueCreate(d *schema.ResourceData, meta interface{}) error { } if len(attributes) > 0 { - req.Attributes = &attributes + req.Attributes = attributes } output, err := sqsconn.CreateQueue(req) @@ -144,7 +144,7 @@ func resourceAwsSqsQueueUpdate(d *schema.ResourceData, meta interface{}) error { if len(attributes) > 0 { req := &sqs.SetQueueAttributesInput{ QueueURL: aws.String(d.Id()), - Attributes: &attributes, + Attributes: attributes, } sqsconn.SetQueueAttributes(req) } @@ -164,8 +164,8 @@ func resourceAwsSqsQueueRead(d *schema.ResourceData, meta interface{}) error { return err } - if attributeOutput.Attributes != nil && len(*attributeOutput.Attributes) > 0 { - attrmap := *attributeOutput.Attributes + if attributeOutput.Attributes != nil && len(attributeOutput.Attributes) > 0 { + attrmap := attributeOutput.Attributes resource := *resourceAwsSqsQueue() // iKey = internal struct key, oKey = AWS Attribute Map key for iKey, oKey := range AttributeMap { diff --git a/builtin/providers/aws/resource_aws_sqs_queue_test.go b/builtin/providers/aws/resource_aws_sqs_queue_test.go index f6d990c3a..28587a875 100644 --- a/builtin/providers/aws/resource_aws_sqs_queue_test.go +++ b/builtin/providers/aws/resource_aws_sqs_queue_test.go @@ -84,7 +84,7 @@ func testAccCheckAWSSQSExistsWithDefaults(n string) resource.TestCheckFunc { } // checking if attributes are defaults - for k, v := range *resp.Attributes { + for k, v := range resp.Attributes { if k == "VisibilityTimeout" && *v != "30" { return fmt.Errorf("VisibilityTimeout (%s) was not set to 30", *v) } @@ -134,7 +134,7 @@ func testAccCheckAWSSQSExistsWithOverrides(n string) resource.TestCheckFunc { } // checking if attributes match our overrides - for k, v := range *resp.Attributes { + for k, v := range resp.Attributes { if k == "VisibilityTimeout" && *v != "60" { return fmt.Errorf("VisibilityTimeout (%s) was not set to 60", *v) } From 61c6817df6510dc38a0ced29c4e9f9d21d67dda3 Mon Sep 17 00:00:00 2001 From: Paul Hinze Date: Wed, 3 Jun 2015 08:57:55 -0500 Subject: [PATCH 40/91] Update README.md --- examples/aws-two-tier/README.md | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/examples/aws-two-tier/README.md b/examples/aws-two-tier/README.md index d79b6588e..dcdf7d1c4 100644 --- a/examples/aws-two-tier/README.md +++ b/examples/aws-two-tier/README.md @@ -18,11 +18,15 @@ To run, configure your AWS provider as described in https://www.terraform.io/docs/providers/aws/index.html -Running the example +Run with a command like this: -run `terraform apply -var 'key_name={your_aws_Key_name}' -var 'key_path={location_of_your_key_in_your_local_machine}'` +``` +terraform apply -var 'key_name={your_aws_key_name}' \ + -var 'key_path={location_of_your_key_in_your_local_machine}'` +``` -example - -terraform apply -var 'key_name=terraform' -var 'key_path=/Users/jsmith/.ssh/terraform.pem +For example: +``` +terraform apply -var 'key_name=terraform' -var 'key_path=/Users/jsmith/.ssh/terraform.pem' +``` From aa39dc71de4e70a10aad15a11fcc4ad615b0bad2 Mon Sep 17 00:00:00 2001 From: Paul Hinze Date: Wed, 3 Jun 2015 09:24:20 -0500 Subject: [PATCH 41/91] command/output: fix error msg typo --- command/output.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/command/output.go b/command/output.go index 9e99cce5f..1f48d8877 100644 --- a/command/output.go +++ b/command/output.go @@ -55,7 +55,7 @@ func (c *OutputCommand) Run(args []string) int { if mod == nil { c.Ui.Error(fmt.Sprintf( - "The module %s could not be found. There is nothing to taint.", + "The module %s could not be found. There is nothing to output.", module)) return 1 } From e5150148ada2e9e056bdc8b9d7cfe2f12375a2fd Mon Sep 17 00:00:00 2001 From: Paul Hinze Date: Wed, 3 Jun 2015 09:25:11 -0500 Subject: [PATCH 42/91] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c6117c8d..ab4c64851 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ FEATURES: * **New provider: `azure`** [GH-2053] + * command/output: support display of module outputs [GH-2102] * core: keys() and values() funcs for map variables [GH-2198] IMPROVEMENTS: From bfcf5cd3d14aaaf10d6b2b4e17d3652511bcd134 Mon Sep 17 00:00:00 2001 From: benjvi Date: Wed, 3 Jun 2015 16:46:56 +0100 Subject: [PATCH 43/91] Cloudstack - allow OVA template upload --- builtin/providers/cloudstack/resource_cloudstack_template.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/providers/cloudstack/resource_cloudstack_template.go b/builtin/providers/cloudstack/resource_cloudstack_template.go index f50316027..15c6ebec4 100644 --- a/builtin/providers/cloudstack/resource_cloudstack_template.go +++ b/builtin/providers/cloudstack/resource_cloudstack_template.go @@ -292,9 +292,9 @@ func resourceCloudStackTemplateDelete(d *schema.ResourceData, meta interface{}) func verifyTemplateParams(d *schema.ResourceData) error { format := d.Get("format").(string) - if format != "QCOW2" && format != "RAW" && format != "VHD" && format != "VMDK" { + if format != "OVA" && format != "QCOW2" && format != "RAW" && format != "VHD" && format != "VMDK" { return fmt.Errorf( - "%s is not a valid format. Valid options are 'QCOW2', 'RAW', 'VHD' and 'VMDK'", format) + "%s is not a valid format. Valid options are 'OVA','QCOW2', 'RAW', 'VHD' and 'VMDK'", format) } return nil From b71fa3d0aec11afdea940023e07d258984c8938a Mon Sep 17 00:00:00 2001 From: Paul Hinze Date: Wed, 3 Jun 2015 13:36:57 -0500 Subject: [PATCH 44/91] provider/aws: handle upstream aws-sdk-go repo move `awslabs/aws-sdk-go => aws/aws-sdk-go` Congrats to upstream on the promotion. :) --- builtin/providers/aws/autoscaling_tags.go | 4 +-- .../providers/aws/autoscaling_tags_test.go | 2 +- builtin/providers/aws/config.go | 26 +++++++++---------- builtin/providers/aws/network_acl_entry.go | 4 +-- .../providers/aws/network_acl_entry_test.go | 4 +-- ...source_aws_app_cookie_stickiness_policy.go | 6 ++--- ...e_aws_app_cookie_stickiness_policy_test.go | 4 +-- .../aws/resource_aws_autoscaling_group.go | 8 +++--- .../resource_aws_autoscaling_group_test.go | 6 ++--- .../aws/resource_aws_customer_gateway.go | 6 ++--- .../aws/resource_aws_customer_gateway_test.go | 4 +-- .../providers/aws/resource_aws_db_instance.go | 8 +++--- .../aws/resource_aws_db_instance_test.go | 6 ++--- .../aws/resource_aws_db_parameter_group.go | 6 ++--- .../resource_aws_db_parameter_group_test.go | 6 ++--- .../aws/resource_aws_db_security_group.go | 6 ++--- .../resource_aws_db_security_group_test.go | 6 ++--- .../aws/resource_aws_db_subnet_group.go | 6 ++--- .../aws/resource_aws_db_subnet_group_test.go | 6 ++--- .../providers/aws/resource_aws_ebs_volume.go | 6 ++--- .../aws/resource_aws_ebs_volume_test.go | 4 +-- builtin/providers/aws/resource_aws_eip.go | 6 ++--- .../providers/aws/resource_aws_eip_test.go | 6 ++--- .../aws/resource_aws_elasticache_cluster.go | 8 +++--- .../resource_aws_elasticache_cluster_test.go | 4 +-- ...resource_aws_elasticache_security_group.go | 6 ++--- ...rce_aws_elasticache_security_group_test.go | 4 +-- .../resource_aws_elasticache_subnet_group.go | 6 ++--- ...ource_aws_elasticache_subnet_group_test.go | 4 +-- builtin/providers/aws/resource_aws_elb.go | 6 ++--- .../providers/aws/resource_aws_elb_test.go | 6 ++--- .../aws/resource_aws_iam_access_key.go | 6 ++--- .../aws/resource_aws_iam_access_key_test.go | 6 ++--- .../providers/aws/resource_aws_iam_group.go | 6 ++--- .../aws/resource_aws_iam_group_policy.go | 6 ++--- .../aws/resource_aws_iam_group_policy_test.go | 4 +-- .../aws/resource_aws_iam_group_test.go | 6 ++--- .../aws/resource_aws_iam_instance_profile.go | 6 ++--- .../providers/aws/resource_aws_iam_policy.go | 6 ++--- .../providers/aws/resource_aws_iam_role.go | 6 ++--- .../aws/resource_aws_iam_role_policy.go | 6 ++--- .../aws/resource_aws_iam_role_policy_test.go | 4 +-- .../aws/resource_aws_iam_role_test.go | 6 ++--- .../resource_aws_iam_server_certificate.go | 6 ++--- ...esource_aws_iam_server_certificate_test.go | 4 +-- .../providers/aws/resource_aws_iam_user.go | 6 ++--- .../aws/resource_aws_iam_user_policy.go | 6 ++--- .../aws/resource_aws_iam_user_policy_test.go | 4 +-- .../aws/resource_aws_iam_user_test.go | 6 ++--- .../providers/aws/resource_aws_instance.go | 6 ++--- .../aws/resource_aws_instance_test.go | 6 ++--- .../aws/resource_aws_internet_gateway.go | 6 ++--- .../aws/resource_aws_internet_gateway_test.go | 6 ++--- .../providers/aws/resource_aws_key_pair.go | 6 ++--- .../aws/resource_aws_key_pair_test.go | 6 ++--- .../aws/resource_aws_kinesis_stream.go | 6 ++--- .../aws/resource_aws_kinesis_stream_test.go | 4 +-- .../aws/resource_aws_launch_configuration.go | 8 +++--- .../resource_aws_launch_configuration_test.go | 6 ++--- ...esource_aws_lb_cookie_stickiness_policy.go | 6 ++--- ...ce_aws_lb_cookie_stickiness_policy_test.go | 4 +-- ...source_aws_main_route_table_association.go | 4 +-- .../providers/aws/resource_aws_network_acl.go | 6 ++--- .../aws/resource_aws_network_acl_test.go | 6 ++--- .../aws/resource_aws_network_interface.go | 6 ++--- .../resource_aws_network_interface_test.go | 6 ++--- .../aws/resource_aws_proxy_protocol_policy.go | 4 +-- .../aws/resource_aws_route53_record.go | 6 ++--- .../aws/resource_aws_route53_record_test.go | 4 +-- .../aws/resource_aws_route53_zone.go | 6 ++--- .../resource_aws_route53_zone_association.go | 6 ++--- ...ource_aws_route53_zone_association_test.go | 4 +-- .../aws/resource_aws_route53_zone_test.go | 4 +-- .../providers/aws/resource_aws_route_table.go | 6 ++--- .../resource_aws_route_table_association.go | 6 ++--- ...source_aws_route_table_association_test.go | 6 ++--- .../aws/resource_aws_route_table_test.go | 6 ++--- .../providers/aws/resource_aws_s3_bucket.go | 6 ++--- .../aws/resource_aws_s3_bucket_test.go | 4 +-- .../aws/resource_aws_security_group.go | 6 ++--- .../aws/resource_aws_security_group_rule.go | 6 ++--- .../resource_aws_security_group_rule_test.go | 6 ++--- .../aws/resource_aws_security_group_test.go | 6 ++--- .../providers/aws/resource_aws_sns_topic.go | 4 +-- .../resource_aws_sns_topic_subscription.go | 4 +-- ...esource_aws_sns_topic_subscription_test.go | 8 +++--- .../aws/resource_aws_sns_topic_test.go | 8 +++--- .../providers/aws/resource_aws_sqs_queue.go | 4 +-- .../aws/resource_aws_sqs_queue_test.go | 6 ++--- builtin/providers/aws/resource_aws_subnet.go | 6 ++--- .../providers/aws/resource_aws_subnet_test.go | 6 ++--- .../aws/resource_aws_volume_attachment.go | 6 ++--- .../resource_aws_volume_attachment_test.go | 2 +- builtin/providers/aws/resource_aws_vpc.go | 6 ++--- .../aws/resource_aws_vpc_dhcp_options.go | 6 ++--- ...source_aws_vpc_dhcp_options_association.go | 4 +-- ...e_aws_vpc_dhcp_options_association_test.go | 2 +- .../aws/resource_aws_vpc_dhcp_options_test.go | 6 ++--- .../resource_aws_vpc_peering_connection.go | 6 ++--- ...esource_aws_vpc_peering_connection_test.go | 4 +-- .../providers/aws/resource_aws_vpc_test.go | 6 ++--- .../aws/resource_aws_vpn_connection.go | 6 ++--- .../aws/resource_aws_vpn_connection_test.go | 4 +-- .../providers/aws/resource_aws_vpn_gateway.go | 6 ++--- .../aws/resource_aws_vpn_gateway_test.go | 6 ++--- .../aws/resource_vpn_connection_route.go | 6 ++--- .../aws/resource_vpn_connection_route_test.go | 4 +-- builtin/providers/aws/s3_tags.go | 6 ++--- builtin/providers/aws/s3_tags_test.go | 2 +- builtin/providers/aws/structure.go | 10 +++---- builtin/providers/aws/structure_test.go | 10 +++---- builtin/providers/aws/tags.go | 4 +-- builtin/providers/aws/tagsEC.go | 4 +-- builtin/providers/aws/tagsEC_test.go | 2 +- builtin/providers/aws/tagsELB.go | 4 +-- builtin/providers/aws/tagsELB_test.go | 2 +- builtin/providers/aws/tagsRDS.go | 4 +-- builtin/providers/aws/tagsRDS_test.go | 2 +- builtin/providers/aws/tags_route53.go | 4 +-- builtin/providers/aws/tags_route53_test.go | 2 +- builtin/providers/aws/tags_test.go | 2 +- state/remote/s3.go | 8 +++--- state/remote/s3_test.go | 2 +- .../aws/r/vpc_dhcp_options.html.markdown | 2 +- 124 files changed, 338 insertions(+), 338 deletions(-) diff --git a/builtin/providers/aws/autoscaling_tags.go b/builtin/providers/aws/autoscaling_tags.go index ee4724852..9a41a3291 100644 --- a/builtin/providers/aws/autoscaling_tags.go +++ b/builtin/providers/aws/autoscaling_tags.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/service/autoscaling" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/autoscaling" "github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/helper/schema" ) diff --git a/builtin/providers/aws/autoscaling_tags_test.go b/builtin/providers/aws/autoscaling_tags_test.go index c14e366ce..b401fa2e4 100644 --- a/builtin/providers/aws/autoscaling_tags_test.go +++ b/builtin/providers/aws/autoscaling_tags_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/awslabs/aws-sdk-go/service/autoscaling" + "github.com/aws/aws-sdk-go/service/autoscaling" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) diff --git a/builtin/providers/aws/config.go b/builtin/providers/aws/config.go index 9d8397aef..7908daf16 100644 --- a/builtin/providers/aws/config.go +++ b/builtin/providers/aws/config.go @@ -7,19 +7,19 @@ import ( "github.com/hashicorp/terraform/helper/multierror" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/credentials" - "github.com/awslabs/aws-sdk-go/service/autoscaling" - "github.com/awslabs/aws-sdk-go/service/ec2" - "github.com/awslabs/aws-sdk-go/service/elasticache" - "github.com/awslabs/aws-sdk-go/service/elb" - "github.com/awslabs/aws-sdk-go/service/iam" - "github.com/awslabs/aws-sdk-go/service/kinesis" - "github.com/awslabs/aws-sdk-go/service/rds" - "github.com/awslabs/aws-sdk-go/service/route53" - "github.com/awslabs/aws-sdk-go/service/s3" - "github.com/awslabs/aws-sdk-go/service/sns" - "github.com/awslabs/aws-sdk-go/service/sqs" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/credentials" + "github.com/aws/aws-sdk-go/service/autoscaling" + "github.com/aws/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/service/elasticache" + "github.com/aws/aws-sdk-go/service/elb" + "github.com/aws/aws-sdk-go/service/iam" + "github.com/aws/aws-sdk-go/service/kinesis" + "github.com/aws/aws-sdk-go/service/rds" + "github.com/aws/aws-sdk-go/service/route53" + "github.com/aws/aws-sdk-go/service/s3" + "github.com/aws/aws-sdk-go/service/sns" + "github.com/aws/aws-sdk-go/service/sqs" ) type Config struct { diff --git a/builtin/providers/aws/network_acl_entry.go b/builtin/providers/aws/network_acl_entry.go index e328d1ae4..4d5b2c22c 100644 --- a/builtin/providers/aws/network_acl_entry.go +++ b/builtin/providers/aws/network_acl_entry.go @@ -5,8 +5,8 @@ import ( "net" "strconv" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/ec2" ) func expandNetworkAclEntries(configured []interface{}, entryType string) ([]*ec2.NetworkACLEntry, error) { diff --git a/builtin/providers/aws/network_acl_entry_test.go b/builtin/providers/aws/network_acl_entry_test.go index 95fa69dae..c34b7dfc3 100644 --- a/builtin/providers/aws/network_acl_entry_test.go +++ b/builtin/providers/aws/network_acl_entry_test.go @@ -4,8 +4,8 @@ import ( "reflect" "testing" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/ec2" ) func Test_expandNetworkACLEntry(t *testing.T) { diff --git a/builtin/providers/aws/resource_aws_app_cookie_stickiness_policy.go b/builtin/providers/aws/resource_aws_app_cookie_stickiness_policy.go index 66c240826..ca459ead7 100644 --- a/builtin/providers/aws/resource_aws_app_cookie_stickiness_policy.go +++ b/builtin/providers/aws/resource_aws_app_cookie_stickiness_policy.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/elb" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/elb" "github.com/hashicorp/terraform/helper/schema" ) diff --git a/builtin/providers/aws/resource_aws_app_cookie_stickiness_policy_test.go b/builtin/providers/aws/resource_aws_app_cookie_stickiness_policy_test.go index 3e99ab71d..46baca6e3 100644 --- a/builtin/providers/aws/resource_aws_app_cookie_stickiness_policy_test.go +++ b/builtin/providers/aws/resource_aws_app_cookie_stickiness_policy_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/service/elb" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/elb" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" diff --git a/builtin/providers/aws/resource_aws_autoscaling_group.go b/builtin/providers/aws/resource_aws_autoscaling_group.go index 60f3cba85..10e6377f1 100644 --- a/builtin/providers/aws/resource_aws_autoscaling_group.go +++ b/builtin/providers/aws/resource_aws_autoscaling_group.go @@ -9,10 +9,10 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/autoscaling" - "github.com/awslabs/aws-sdk-go/service/elb" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/autoscaling" + "github.com/aws/aws-sdk-go/service/elb" ) func resourceAwsAutoscalingGroup() *schema.Resource { diff --git a/builtin/providers/aws/resource_aws_autoscaling_group_test.go b/builtin/providers/aws/resource_aws_autoscaling_group_test.go index 49897c4f0..cc3cdf6e5 100644 --- a/builtin/providers/aws/resource_aws_autoscaling_group_test.go +++ b/builtin/providers/aws/resource_aws_autoscaling_group_test.go @@ -6,9 +6,9 @@ import ( "strings" "testing" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/autoscaling" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/autoscaling" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) diff --git a/builtin/providers/aws/resource_aws_customer_gateway.go b/builtin/providers/aws/resource_aws_customer_gateway.go index 6fa1d39ab..fa4322304 100644 --- a/builtin/providers/aws/resource_aws_customer_gateway.go +++ b/builtin/providers/aws/resource_aws_customer_gateway.go @@ -5,9 +5,9 @@ import ( "log" "time" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" diff --git a/builtin/providers/aws/resource_aws_customer_gateway_test.go b/builtin/providers/aws/resource_aws_customer_gateway_test.go index 2a51eb112..c0af5100e 100644 --- a/builtin/providers/aws/resource_aws_customer_gateway_test.go +++ b/builtin/providers/aws/resource_aws_customer_gateway_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" diff --git a/builtin/providers/aws/resource_aws_db_instance.go b/builtin/providers/aws/resource_aws_db_instance.go index c832c67bb..705b773f9 100644 --- a/builtin/providers/aws/resource_aws_db_instance.go +++ b/builtin/providers/aws/resource_aws_db_instance.go @@ -6,10 +6,10 @@ import ( "strings" "time" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/iam" - "github.com/awslabs/aws-sdk-go/service/rds" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/iam" + "github.com/aws/aws-sdk-go/service/rds" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" diff --git a/builtin/providers/aws/resource_aws_db_instance_test.go b/builtin/providers/aws/resource_aws_db_instance_test.go index b6d31f75e..638f04d31 100644 --- a/builtin/providers/aws/resource_aws_db_instance_test.go +++ b/builtin/providers/aws/resource_aws_db_instance_test.go @@ -9,9 +9,9 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/rds" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/rds" ) func TestAccAWSDBInstance(t *testing.T) { diff --git a/builtin/providers/aws/resource_aws_db_parameter_group.go b/builtin/providers/aws/resource_aws_db_parameter_group.go index 57758ae5b..9489394dc 100644 --- a/builtin/providers/aws/resource_aws_db_parameter_group.go +++ b/builtin/providers/aws/resource_aws_db_parameter_group.go @@ -11,9 +11,9 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/rds" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/rds" ) func resourceAwsDbParameterGroup() *schema.Resource { diff --git a/builtin/providers/aws/resource_aws_db_parameter_group_test.go b/builtin/providers/aws/resource_aws_db_parameter_group_test.go index 57400fb0c..780ef6dad 100644 --- a/builtin/providers/aws/resource_aws_db_parameter_group_test.go +++ b/builtin/providers/aws/resource_aws_db_parameter_group_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/rds" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/rds" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) diff --git a/builtin/providers/aws/resource_aws_db_security_group.go b/builtin/providers/aws/resource_aws_db_security_group.go index 94d87e370..be535713d 100644 --- a/builtin/providers/aws/resource_aws_db_security_group.go +++ b/builtin/providers/aws/resource_aws_db_security_group.go @@ -6,9 +6,9 @@ import ( "log" "time" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/rds" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/rds" "github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/helper/multierror" "github.com/hashicorp/terraform/helper/resource" diff --git a/builtin/providers/aws/resource_aws_db_security_group_test.go b/builtin/providers/aws/resource_aws_db_security_group_test.go index a2065114a..8ef227283 100644 --- a/builtin/providers/aws/resource_aws_db_security_group_test.go +++ b/builtin/providers/aws/resource_aws_db_security_group_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/rds" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/rds" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) diff --git a/builtin/providers/aws/resource_aws_db_subnet_group.go b/builtin/providers/aws/resource_aws_db_subnet_group.go index 598d291c4..5d49e9151 100644 --- a/builtin/providers/aws/resource_aws_db_subnet_group.go +++ b/builtin/providers/aws/resource_aws_db_subnet_group.go @@ -6,9 +6,9 @@ import ( "strings" "time" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/rds" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/rds" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" ) diff --git a/builtin/providers/aws/resource_aws_db_subnet_group_test.go b/builtin/providers/aws/resource_aws_db_subnet_group_test.go index 06e9e92c4..b43f42cb8 100644 --- a/builtin/providers/aws/resource_aws_db_subnet_group_test.go +++ b/builtin/providers/aws/resource_aws_db_subnet_group_test.go @@ -7,9 +7,9 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/rds" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/rds" ) func TestAccAWSDBSubnetGroup(t *testing.T) { diff --git a/builtin/providers/aws/resource_aws_ebs_volume.go b/builtin/providers/aws/resource_aws_ebs_volume.go index 9382605f8..d225f26ce 100644 --- a/builtin/providers/aws/resource_aws_ebs_volume.go +++ b/builtin/providers/aws/resource_aws_ebs_volume.go @@ -5,9 +5,9 @@ import ( "log" "time" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" diff --git a/builtin/providers/aws/resource_aws_ebs_volume_test.go b/builtin/providers/aws/resource_aws_ebs_volume_test.go index 7fb669707..7008b7f67 100644 --- a/builtin/providers/aws/resource_aws_ebs_volume_test.go +++ b/builtin/providers/aws/resource_aws_ebs_volume_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) diff --git a/builtin/providers/aws/resource_aws_eip.go b/builtin/providers/aws/resource_aws_eip.go index f184cad78..2b9125944 100644 --- a/builtin/providers/aws/resource_aws_eip.go +++ b/builtin/providers/aws/resource_aws_eip.go @@ -6,9 +6,9 @@ import ( "strings" "time" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" ) diff --git a/builtin/providers/aws/resource_aws_eip_test.go b/builtin/providers/aws/resource_aws_eip_test.go index 7509d71cc..fd28fe257 100644 --- a/builtin/providers/aws/resource_aws_eip_test.go +++ b/builtin/providers/aws/resource_aws_eip_test.go @@ -5,9 +5,9 @@ import ( "strings" "testing" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) diff --git a/builtin/providers/aws/resource_aws_elasticache_cluster.go b/builtin/providers/aws/resource_aws_elasticache_cluster.go index 1095a9307..8c0a3bdb0 100644 --- a/builtin/providers/aws/resource_aws_elasticache_cluster.go +++ b/builtin/providers/aws/resource_aws_elasticache_cluster.go @@ -7,10 +7,10 @@ import ( "strings" "time" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/elasticache" - "github.com/awslabs/aws-sdk-go/service/iam" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/elasticache" + "github.com/aws/aws-sdk-go/service/iam" "github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" diff --git a/builtin/providers/aws/resource_aws_elasticache_cluster_test.go b/builtin/providers/aws/resource_aws_elasticache_cluster_test.go index fde8bc56e..20bfe4f41 100644 --- a/builtin/providers/aws/resource_aws_elasticache_cluster_test.go +++ b/builtin/providers/aws/resource_aws_elasticache_cluster_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/service/elasticache" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/elasticache" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) diff --git a/builtin/providers/aws/resource_aws_elasticache_security_group.go b/builtin/providers/aws/resource_aws_elasticache_security_group.go index 4fb47f85b..293747031 100644 --- a/builtin/providers/aws/resource_aws_elasticache_security_group.go +++ b/builtin/providers/aws/resource_aws_elasticache_security_group.go @@ -5,9 +5,9 @@ import ( "log" "time" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/elasticache" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/elasticache" "github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" diff --git a/builtin/providers/aws/resource_aws_elasticache_security_group_test.go b/builtin/providers/aws/resource_aws_elasticache_security_group_test.go index 61464936a..a16c5a7e9 100644 --- a/builtin/providers/aws/resource_aws_elasticache_security_group_test.go +++ b/builtin/providers/aws/resource_aws_elasticache_security_group_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/service/elasticache" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/elasticache" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) diff --git a/builtin/providers/aws/resource_aws_elasticache_subnet_group.go b/builtin/providers/aws/resource_aws_elasticache_subnet_group.go index b245a4bfa..6d1a713f2 100644 --- a/builtin/providers/aws/resource_aws_elasticache_subnet_group.go +++ b/builtin/providers/aws/resource_aws_elasticache_subnet_group.go @@ -5,9 +5,9 @@ import ( "log" "time" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/elasticache" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/elasticache" "github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" diff --git a/builtin/providers/aws/resource_aws_elasticache_subnet_group_test.go b/builtin/providers/aws/resource_aws_elasticache_subnet_group_test.go index 94ecdf340..d54a4d610 100644 --- a/builtin/providers/aws/resource_aws_elasticache_subnet_group_test.go +++ b/builtin/providers/aws/resource_aws_elasticache_subnet_group_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/service/elasticache" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/elasticache" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) diff --git a/builtin/providers/aws/resource_aws_elb.go b/builtin/providers/aws/resource_aws_elb.go index 0afcba888..a613cbd80 100644 --- a/builtin/providers/aws/resource_aws_elb.go +++ b/builtin/providers/aws/resource_aws_elb.go @@ -5,9 +5,9 @@ import ( "fmt" "log" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/elb" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/elb" "github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/helper/schema" ) diff --git a/builtin/providers/aws/resource_aws_elb_test.go b/builtin/providers/aws/resource_aws_elb_test.go index 6c5b685ac..aca375e06 100644 --- a/builtin/providers/aws/resource_aws_elb_test.go +++ b/builtin/providers/aws/resource_aws_elb_test.go @@ -7,9 +7,9 @@ import ( "sort" "testing" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/elb" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/elb" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) diff --git a/builtin/providers/aws/resource_aws_iam_access_key.go b/builtin/providers/aws/resource_aws_iam_access_key.go index 491e547fc..943a22edb 100644 --- a/builtin/providers/aws/resource_aws_iam_access_key.go +++ b/builtin/providers/aws/resource_aws_iam_access_key.go @@ -3,9 +3,9 @@ package aws import ( "fmt" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/iam" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/iam" "github.com/hashicorp/terraform/helper/schema" ) diff --git a/builtin/providers/aws/resource_aws_iam_access_key_test.go b/builtin/providers/aws/resource_aws_iam_access_key_test.go index ef6e49de1..75ee714c4 100644 --- a/builtin/providers/aws/resource_aws_iam_access_key_test.go +++ b/builtin/providers/aws/resource_aws_iam_access_key_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/iam" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/iam" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) diff --git a/builtin/providers/aws/resource_aws_iam_group.go b/builtin/providers/aws/resource_aws_iam_group.go index 98a5354fe..6909ee259 100644 --- a/builtin/providers/aws/resource_aws_iam_group.go +++ b/builtin/providers/aws/resource_aws_iam_group.go @@ -3,9 +3,9 @@ package aws import ( "fmt" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/iam" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/iam" "github.com/hashicorp/terraform/helper/schema" ) diff --git a/builtin/providers/aws/resource_aws_iam_group_policy.go b/builtin/providers/aws/resource_aws_iam_group_policy.go index cf34faaa1..2c16fe1c6 100644 --- a/builtin/providers/aws/resource_aws_iam_group_policy.go +++ b/builtin/providers/aws/resource_aws_iam_group_policy.go @@ -5,9 +5,9 @@ import ( "net/url" "strings" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/iam" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/iam" "github.com/hashicorp/terraform/helper/schema" ) diff --git a/builtin/providers/aws/resource_aws_iam_group_policy_test.go b/builtin/providers/aws/resource_aws_iam_group_policy_test.go index 1778d5216..2daef0e04 100644 --- a/builtin/providers/aws/resource_aws_iam_group_policy_test.go +++ b/builtin/providers/aws/resource_aws_iam_group_policy_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/service/iam" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/iam" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) diff --git a/builtin/providers/aws/resource_aws_iam_group_test.go b/builtin/providers/aws/resource_aws_iam_group_test.go index 4200cdbe0..b1448f27a 100644 --- a/builtin/providers/aws/resource_aws_iam_group_test.go +++ b/builtin/providers/aws/resource_aws_iam_group_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/iam" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/iam" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) diff --git a/builtin/providers/aws/resource_aws_iam_instance_profile.go b/builtin/providers/aws/resource_aws_iam_instance_profile.go index 4d3e10ae6..90591fa69 100644 --- a/builtin/providers/aws/resource_aws_iam_instance_profile.go +++ b/builtin/providers/aws/resource_aws_iam_instance_profile.go @@ -3,9 +3,9 @@ package aws import ( "fmt" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/iam" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/iam" "github.com/hashicorp/terraform/helper/schema" ) diff --git a/builtin/providers/aws/resource_aws_iam_policy.go b/builtin/providers/aws/resource_aws_iam_policy.go index c0a435fdb..46bf745b0 100644 --- a/builtin/providers/aws/resource_aws_iam_policy.go +++ b/builtin/providers/aws/resource_aws_iam_policy.go @@ -3,9 +3,9 @@ package aws import ( "fmt" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/iam" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/iam" "github.com/hashicorp/terraform/helper/schema" ) diff --git a/builtin/providers/aws/resource_aws_iam_role.go b/builtin/providers/aws/resource_aws_iam_role.go index f8ec7b358..382057e7a 100644 --- a/builtin/providers/aws/resource_aws_iam_role.go +++ b/builtin/providers/aws/resource_aws_iam_role.go @@ -3,9 +3,9 @@ package aws import ( "fmt" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/iam" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/iam" "github.com/hashicorp/terraform/helper/schema" ) diff --git a/builtin/providers/aws/resource_aws_iam_role_policy.go b/builtin/providers/aws/resource_aws_iam_role_policy.go index d3f7dbae3..a219d7f24 100644 --- a/builtin/providers/aws/resource_aws_iam_role_policy.go +++ b/builtin/providers/aws/resource_aws_iam_role_policy.go @@ -5,9 +5,9 @@ import ( "net/url" "strings" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/iam" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/iam" "github.com/hashicorp/terraform/helper/schema" ) diff --git a/builtin/providers/aws/resource_aws_iam_role_policy_test.go b/builtin/providers/aws/resource_aws_iam_role_policy_test.go index a43fe94c8..5ee7b5f18 100644 --- a/builtin/providers/aws/resource_aws_iam_role_policy_test.go +++ b/builtin/providers/aws/resource_aws_iam_role_policy_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/service/iam" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/iam" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) diff --git a/builtin/providers/aws/resource_aws_iam_role_test.go b/builtin/providers/aws/resource_aws_iam_role_test.go index cbb75c3c4..6571e115f 100644 --- a/builtin/providers/aws/resource_aws_iam_role_test.go +++ b/builtin/providers/aws/resource_aws_iam_role_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/iam" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/iam" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) diff --git a/builtin/providers/aws/resource_aws_iam_server_certificate.go b/builtin/providers/aws/resource_aws_iam_server_certificate.go index b1d876337..5b5fde9c3 100644 --- a/builtin/providers/aws/resource_aws_iam_server_certificate.go +++ b/builtin/providers/aws/resource_aws_iam_server_certificate.go @@ -6,9 +6,9 @@ import ( "fmt" "strings" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/iam" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/iam" "github.com/hashicorp/terraform/helper/schema" ) diff --git a/builtin/providers/aws/resource_aws_iam_server_certificate_test.go b/builtin/providers/aws/resource_aws_iam_server_certificate_test.go index 31c9d97f4..aff97f998 100644 --- a/builtin/providers/aws/resource_aws_iam_server_certificate_test.go +++ b/builtin/providers/aws/resource_aws_iam_server_certificate_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/service/iam" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/iam" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) diff --git a/builtin/providers/aws/resource_aws_iam_user.go b/builtin/providers/aws/resource_aws_iam_user.go index 3fffd2665..100197c5f 100644 --- a/builtin/providers/aws/resource_aws_iam_user.go +++ b/builtin/providers/aws/resource_aws_iam_user.go @@ -3,9 +3,9 @@ package aws import ( "fmt" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/iam" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/iam" "github.com/hashicorp/terraform/helper/schema" ) diff --git a/builtin/providers/aws/resource_aws_iam_user_policy.go b/builtin/providers/aws/resource_aws_iam_user_policy.go index 80cb044ff..24d107867 100644 --- a/builtin/providers/aws/resource_aws_iam_user_policy.go +++ b/builtin/providers/aws/resource_aws_iam_user_policy.go @@ -5,9 +5,9 @@ import ( "net/url" "strings" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/iam" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/iam" "github.com/hashicorp/terraform/helper/schema" ) diff --git a/builtin/providers/aws/resource_aws_iam_user_policy_test.go b/builtin/providers/aws/resource_aws_iam_user_policy_test.go index 2a2147e56..4b729b8d4 100644 --- a/builtin/providers/aws/resource_aws_iam_user_policy_test.go +++ b/builtin/providers/aws/resource_aws_iam_user_policy_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/service/iam" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/iam" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) diff --git a/builtin/providers/aws/resource_aws_iam_user_test.go b/builtin/providers/aws/resource_aws_iam_user_test.go index 7db0ae670..aeda07abf 100644 --- a/builtin/providers/aws/resource_aws_iam_user_test.go +++ b/builtin/providers/aws/resource_aws_iam_user_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/iam" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/iam" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) diff --git a/builtin/providers/aws/resource_aws_instance.go b/builtin/providers/aws/resource_aws_instance.go index 674aca709..42656214f 100644 --- a/builtin/providers/aws/resource_aws_instance.go +++ b/builtin/providers/aws/resource_aws_instance.go @@ -10,9 +10,9 @@ import ( "strings" "time" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" diff --git a/builtin/providers/aws/resource_aws_instance_test.go b/builtin/providers/aws/resource_aws_instance_test.go index b90cf436a..253632a9a 100644 --- a/builtin/providers/aws/resource_aws_instance_test.go +++ b/builtin/providers/aws/resource_aws_instance_test.go @@ -5,9 +5,9 @@ import ( "reflect" "testing" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/terraform" diff --git a/builtin/providers/aws/resource_aws_internet_gateway.go b/builtin/providers/aws/resource_aws_internet_gateway.go index d0bcd47b5..e1597b4fd 100644 --- a/builtin/providers/aws/resource_aws_internet_gateway.go +++ b/builtin/providers/aws/resource_aws_internet_gateway.go @@ -5,9 +5,9 @@ import ( "log" "time" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" ) diff --git a/builtin/providers/aws/resource_aws_internet_gateway_test.go b/builtin/providers/aws/resource_aws_internet_gateway_test.go index 23aeb1e2e..6698de6ea 100644 --- a/builtin/providers/aws/resource_aws_internet_gateway_test.go +++ b/builtin/providers/aws/resource_aws_internet_gateway_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) diff --git a/builtin/providers/aws/resource_aws_key_pair.go b/builtin/providers/aws/resource_aws_key_pair.go index 036c35fe8..e747fbfc5 100644 --- a/builtin/providers/aws/resource_aws_key_pair.go +++ b/builtin/providers/aws/resource_aws_key_pair.go @@ -6,9 +6,9 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/ec2" ) func resourceAwsKeyPair() *schema.Resource { diff --git a/builtin/providers/aws/resource_aws_key_pair_test.go b/builtin/providers/aws/resource_aws_key_pair_test.go index 874c74406..811f27cca 100644 --- a/builtin/providers/aws/resource_aws_key_pair_test.go +++ b/builtin/providers/aws/resource_aws_key_pair_test.go @@ -5,9 +5,9 @@ import ( "strings" "testing" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) diff --git a/builtin/providers/aws/resource_aws_kinesis_stream.go b/builtin/providers/aws/resource_aws_kinesis_stream.go index ea01d7b16..f4c84f803 100644 --- a/builtin/providers/aws/resource_aws_kinesis_stream.go +++ b/builtin/providers/aws/resource_aws_kinesis_stream.go @@ -4,9 +4,9 @@ import ( "fmt" "time" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/kinesis" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/kinesis" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" ) diff --git a/builtin/providers/aws/resource_aws_kinesis_stream_test.go b/builtin/providers/aws/resource_aws_kinesis_stream_test.go index 8a265577f..01d14d3d0 100644 --- a/builtin/providers/aws/resource_aws_kinesis_stream_test.go +++ b/builtin/providers/aws/resource_aws_kinesis_stream_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/service/kinesis" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/kinesis" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) diff --git a/builtin/providers/aws/resource_aws_launch_configuration.go b/builtin/providers/aws/resource_aws_launch_configuration.go index 0ba78aa72..c5521496e 100644 --- a/builtin/providers/aws/resource_aws_launch_configuration.go +++ b/builtin/providers/aws/resource_aws_launch_configuration.go @@ -9,10 +9,10 @@ import ( "log" "time" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/autoscaling" - "github.com/awslabs/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/autoscaling" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" diff --git a/builtin/providers/aws/resource_aws_launch_configuration_test.go b/builtin/providers/aws/resource_aws_launch_configuration_test.go index 86c970c32..70caa9b0a 100644 --- a/builtin/providers/aws/resource_aws_launch_configuration_test.go +++ b/builtin/providers/aws/resource_aws_launch_configuration_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/autoscaling" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/autoscaling" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) diff --git a/builtin/providers/aws/resource_aws_lb_cookie_stickiness_policy.go b/builtin/providers/aws/resource_aws_lb_cookie_stickiness_policy.go index 7907e3df4..fdc8ec303 100644 --- a/builtin/providers/aws/resource_aws_lb_cookie_stickiness_policy.go +++ b/builtin/providers/aws/resource_aws_lb_cookie_stickiness_policy.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/elb" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/elb" "github.com/hashicorp/terraform/helper/schema" ) diff --git a/builtin/providers/aws/resource_aws_lb_cookie_stickiness_policy_test.go b/builtin/providers/aws/resource_aws_lb_cookie_stickiness_policy_test.go index 6a43496de..e91149d68 100644 --- a/builtin/providers/aws/resource_aws_lb_cookie_stickiness_policy_test.go +++ b/builtin/providers/aws/resource_aws_lb_cookie_stickiness_policy_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/service/elb" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/elb" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" diff --git a/builtin/providers/aws/resource_aws_main_route_table_association.go b/builtin/providers/aws/resource_aws_main_route_table_association.go index 097dc1888..48008c61a 100644 --- a/builtin/providers/aws/resource_aws_main_route_table_association.go +++ b/builtin/providers/aws/resource_aws_main_route_table_association.go @@ -4,8 +4,8 @@ import ( "fmt" "log" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform/helper/schema" ) diff --git a/builtin/providers/aws/resource_aws_network_acl.go b/builtin/providers/aws/resource_aws_network_acl.go index 78a72eb89..b689b9860 100644 --- a/builtin/providers/aws/resource_aws_network_acl.go +++ b/builtin/providers/aws/resource_aws_network_acl.go @@ -8,9 +8,9 @@ import ( "strconv" "time" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" diff --git a/builtin/providers/aws/resource_aws_network_acl_test.go b/builtin/providers/aws/resource_aws_network_acl_test.go index 812d66a7d..ad834cc66 100644 --- a/builtin/providers/aws/resource_aws_network_acl_test.go +++ b/builtin/providers/aws/resource_aws_network_acl_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) diff --git a/builtin/providers/aws/resource_aws_network_interface.go b/builtin/providers/aws/resource_aws_network_interface.go index ec029778f..430c5b992 100644 --- a/builtin/providers/aws/resource_aws_network_interface.go +++ b/builtin/providers/aws/resource_aws_network_interface.go @@ -7,9 +7,9 @@ import ( "strconv" "time" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" diff --git a/builtin/providers/aws/resource_aws_network_interface_test.go b/builtin/providers/aws/resource_aws_network_interface_test.go index d40802590..f83698abf 100644 --- a/builtin/providers/aws/resource_aws_network_interface_test.go +++ b/builtin/providers/aws/resource_aws_network_interface_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) diff --git a/builtin/providers/aws/resource_aws_proxy_protocol_policy.go b/builtin/providers/aws/resource_aws_proxy_protocol_policy.go index 1b428195d..4f878e444 100644 --- a/builtin/providers/aws/resource_aws_proxy_protocol_policy.go +++ b/builtin/providers/aws/resource_aws_proxy_protocol_policy.go @@ -6,8 +6,8 @@ import ( "strconv" "strings" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/service/elb" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/elb" "github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/helper/schema" ) diff --git a/builtin/providers/aws/resource_aws_route53_record.go b/builtin/providers/aws/resource_aws_route53_record.go index f506355a3..7796163bf 100644 --- a/builtin/providers/aws/resource_aws_route53_record.go +++ b/builtin/providers/aws/resource_aws_route53_record.go @@ -11,9 +11,9 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/route53" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/route53" ) func resourceAwsRoute53Record() *schema.Resource { diff --git a/builtin/providers/aws/resource_aws_route53_record_test.go b/builtin/providers/aws/resource_aws_route53_record_test.go index 724b452a8..eaa6abb7a 100644 --- a/builtin/providers/aws/resource_aws_route53_record_test.go +++ b/builtin/providers/aws/resource_aws_route53_record_test.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/service/route53" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/route53" ) func TestCleanRecordName(t *testing.T) { diff --git a/builtin/providers/aws/resource_aws_route53_zone.go b/builtin/providers/aws/resource_aws_route53_zone.go index 296dcbacc..8310ca91a 100644 --- a/builtin/providers/aws/resource_aws_route53_zone.go +++ b/builtin/providers/aws/resource_aws_route53_zone.go @@ -10,9 +10,9 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/route53" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/route53" ) func resourceAwsRoute53Zone() *schema.Resource { diff --git a/builtin/providers/aws/resource_aws_route53_zone_association.go b/builtin/providers/aws/resource_aws_route53_zone_association.go index 808b92912..1a0f86d7e 100644 --- a/builtin/providers/aws/resource_aws_route53_zone_association.go +++ b/builtin/providers/aws/resource_aws_route53_zone_association.go @@ -9,9 +9,9 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/route53" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/route53" ) func resourceAwsRoute53ZoneAssociation() *schema.Resource { diff --git a/builtin/providers/aws/resource_aws_route53_zone_association_test.go b/builtin/providers/aws/resource_aws_route53_zone_association_test.go index 8a734463d..e929d4d31 100644 --- a/builtin/providers/aws/resource_aws_route53_zone_association_test.go +++ b/builtin/providers/aws/resource_aws_route53_zone_association_test.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/terraform" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/service/route53" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/route53" ) func TestAccRoute53ZoneAssociation_basic(t *testing.T) { diff --git a/builtin/providers/aws/resource_aws_route53_zone_test.go b/builtin/providers/aws/resource_aws_route53_zone_test.go index 9eb6c0baf..92ab8a217 100644 --- a/builtin/providers/aws/resource_aws_route53_zone_test.go +++ b/builtin/providers/aws/resource_aws_route53_zone_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/terraform" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/service/route53" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/route53" ) func TestCleanPrefix(t *testing.T) { diff --git a/builtin/providers/aws/resource_aws_route_table.go b/builtin/providers/aws/resource_aws_route_table.go index 26248bac1..436feddc2 100644 --- a/builtin/providers/aws/resource_aws_route_table.go +++ b/builtin/providers/aws/resource_aws_route_table.go @@ -6,9 +6,9 @@ import ( "log" "time" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" diff --git a/builtin/providers/aws/resource_aws_route_table_association.go b/builtin/providers/aws/resource_aws_route_table_association.go index 3115363a9..6c63c9e23 100644 --- a/builtin/providers/aws/resource_aws_route_table_association.go +++ b/builtin/providers/aws/resource_aws_route_table_association.go @@ -4,9 +4,9 @@ import ( "fmt" "log" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform/helper/schema" ) diff --git a/builtin/providers/aws/resource_aws_route_table_association_test.go b/builtin/providers/aws/resource_aws_route_table_association_test.go index 19ddaae38..7f5fd6c58 100644 --- a/builtin/providers/aws/resource_aws_route_table_association_test.go +++ b/builtin/providers/aws/resource_aws_route_table_association_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) diff --git a/builtin/providers/aws/resource_aws_route_table_test.go b/builtin/providers/aws/resource_aws_route_table_test.go index 6020545ed..b83b9793d 100644 --- a/builtin/providers/aws/resource_aws_route_table_test.go +++ b/builtin/providers/aws/resource_aws_route_table_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) diff --git a/builtin/providers/aws/resource_aws_s3_bucket.go b/builtin/providers/aws/resource_aws_s3_bucket.go index 1c1de96ed..332c99569 100644 --- a/builtin/providers/aws/resource_aws_s3_bucket.go +++ b/builtin/providers/aws/resource_aws_s3_bucket.go @@ -7,9 +7,9 @@ import ( "github.com/hashicorp/terraform/helper/schema" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/s3" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/s3" ) func resourceAwsS3Bucket() *schema.Resource { diff --git a/builtin/providers/aws/resource_aws_s3_bucket_test.go b/builtin/providers/aws/resource_aws_s3_bucket_test.go index 8e601d279..171109559 100644 --- a/builtin/providers/aws/resource_aws_s3_bucket_test.go +++ b/builtin/providers/aws/resource_aws_s3_bucket_test.go @@ -12,8 +12,8 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/service/s3" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/s3" ) func TestAccAWSS3Bucket_basic(t *testing.T) { diff --git a/builtin/providers/aws/resource_aws_security_group.go b/builtin/providers/aws/resource_aws_security_group.go index 310e478d7..7e1f3cd2e 100644 --- a/builtin/providers/aws/resource_aws_security_group.go +++ b/builtin/providers/aws/resource_aws_security_group.go @@ -7,9 +7,9 @@ import ( "sort" "time" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" diff --git a/builtin/providers/aws/resource_aws_security_group_rule.go b/builtin/providers/aws/resource_aws_security_group_rule.go index 9e8c7c13d..06573c4bf 100644 --- a/builtin/providers/aws/resource_aws_security_group_rule.go +++ b/builtin/providers/aws/resource_aws_security_group_rule.go @@ -7,9 +7,9 @@ import ( "sort" "strings" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/helper/schema" ) diff --git a/builtin/providers/aws/resource_aws_security_group_rule_test.go b/builtin/providers/aws/resource_aws_security_group_rule_test.go index e02694ab0..6e26fd369 100644 --- a/builtin/providers/aws/resource_aws_security_group_rule_test.go +++ b/builtin/providers/aws/resource_aws_security_group_rule_test.go @@ -5,9 +5,9 @@ import ( "reflect" "testing" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) diff --git a/builtin/providers/aws/resource_aws_security_group_test.go b/builtin/providers/aws/resource_aws_security_group_test.go index e0e138cd8..8da0e7287 100644 --- a/builtin/providers/aws/resource_aws_security_group_test.go +++ b/builtin/providers/aws/resource_aws_security_group_test.go @@ -6,9 +6,9 @@ import ( "strings" "testing" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) diff --git a/builtin/providers/aws/resource_aws_sns_topic.go b/builtin/providers/aws/resource_aws_sns_topic.go index 5a1905dd7..33be03058 100644 --- a/builtin/providers/aws/resource_aws_sns_topic.go +++ b/builtin/providers/aws/resource_aws_sns_topic.go @@ -6,8 +6,8 @@ import ( "github.com/hashicorp/terraform/helper/schema" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/service/sns" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/sns" ) // Mutable attributes diff --git a/builtin/providers/aws/resource_aws_sns_topic_subscription.go b/builtin/providers/aws/resource_aws_sns_topic_subscription.go index e11ee0a6c..01926e895 100644 --- a/builtin/providers/aws/resource_aws_sns_topic_subscription.go +++ b/builtin/providers/aws/resource_aws_sns_topic_subscription.go @@ -6,8 +6,8 @@ import ( "github.com/hashicorp/terraform/helper/schema" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/service/sns" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/sns" ) func resourceAwsSnsTopicSubscription() *schema.Resource { diff --git a/builtin/providers/aws/resource_aws_sns_topic_subscription_test.go b/builtin/providers/aws/resource_aws_sns_topic_subscription_test.go index ada177ccd..5b10e811f 100644 --- a/builtin/providers/aws/resource_aws_sns_topic_subscription_test.go +++ b/builtin/providers/aws/resource_aws_sns_topic_subscription_test.go @@ -4,11 +4,11 @@ import ( "fmt" "testing" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/service/sns" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/sns" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "github.com/awslabs/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/aws/awserr" ) func TestAccAWSSNSTopicSubscription(t *testing.T) { @@ -100,4 +100,4 @@ resource "aws_sns_topic_subscription" "test_subscription" { protocol = "sqs" endpoint = "${aws_sqs_queue.test_queue.arn}" } -` \ No newline at end of file +` diff --git a/builtin/providers/aws/resource_aws_sns_topic_test.go b/builtin/providers/aws/resource_aws_sns_topic_test.go index f13c0b677..5cfb5384f 100644 --- a/builtin/providers/aws/resource_aws_sns_topic_test.go +++ b/builtin/providers/aws/resource_aws_sns_topic_test.go @@ -4,11 +4,11 @@ import ( "fmt" "testing" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/service/sns" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/sns" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "github.com/awslabs/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/aws/awserr" ) func TestAccAWSSNSTopic(t *testing.T) { @@ -86,4 +86,4 @@ const testAccAWSSNSTopicConfig = ` resource "aws_sns_topic" "test_topic" { name = "terraform-test-topic" } -` \ No newline at end of file +` diff --git a/builtin/providers/aws/resource_aws_sqs_queue.go b/builtin/providers/aws/resource_aws_sqs_queue.go index a24f5a16d..0e85f7cbe 100644 --- a/builtin/providers/aws/resource_aws_sqs_queue.go +++ b/builtin/providers/aws/resource_aws_sqs_queue.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/terraform/helper/schema" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/service/sqs" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/sqs" ) var AttributeMap = map[string]string{ diff --git a/builtin/providers/aws/resource_aws_sqs_queue_test.go b/builtin/providers/aws/resource_aws_sqs_queue_test.go index 28587a875..15b841aee 100644 --- a/builtin/providers/aws/resource_aws_sqs_queue_test.go +++ b/builtin/providers/aws/resource_aws_sqs_queue_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/sqs" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/sqs" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) diff --git a/builtin/providers/aws/resource_aws_subnet.go b/builtin/providers/aws/resource_aws_subnet.go index f6d56681a..326ddc28d 100644 --- a/builtin/providers/aws/resource_aws_subnet.go +++ b/builtin/providers/aws/resource_aws_subnet.go @@ -5,9 +5,9 @@ import ( "log" "time" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" ) diff --git a/builtin/providers/aws/resource_aws_subnet_test.go b/builtin/providers/aws/resource_aws_subnet_test.go index 206333d41..5c0cbadce 100644 --- a/builtin/providers/aws/resource_aws_subnet_test.go +++ b/builtin/providers/aws/resource_aws_subnet_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) diff --git a/builtin/providers/aws/resource_aws_volume_attachment.go b/builtin/providers/aws/resource_aws_volume_attachment.go index cb9374968..6822ebd28 100644 --- a/builtin/providers/aws/resource_aws_volume_attachment.go +++ b/builtin/providers/aws/resource_aws_volume_attachment.go @@ -6,9 +6,9 @@ import ( "log" "time" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" diff --git a/builtin/providers/aws/resource_aws_volume_attachment_test.go b/builtin/providers/aws/resource_aws_volume_attachment_test.go index 22df8c085..66807884f 100644 --- a/builtin/providers/aws/resource_aws_volume_attachment_test.go +++ b/builtin/providers/aws/resource_aws_volume_attachment_test.go @@ -5,7 +5,7 @@ import ( "log" "testing" - "github.com/awslabs/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) diff --git a/builtin/providers/aws/resource_aws_vpc.go b/builtin/providers/aws/resource_aws_vpc.go index b13c1521b..2ee2473b2 100644 --- a/builtin/providers/aws/resource_aws_vpc.go +++ b/builtin/providers/aws/resource_aws_vpc.go @@ -5,9 +5,9 @@ import ( "log" "time" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" ) diff --git a/builtin/providers/aws/resource_aws_vpc_dhcp_options.go b/builtin/providers/aws/resource_aws_vpc_dhcp_options.go index 4fd2d24f4..540c62802 100644 --- a/builtin/providers/aws/resource_aws_vpc_dhcp_options.go +++ b/builtin/providers/aws/resource_aws_vpc_dhcp_options.go @@ -6,9 +6,9 @@ import ( "strings" "time" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" ) diff --git a/builtin/providers/aws/resource_aws_vpc_dhcp_options_association.go b/builtin/providers/aws/resource_aws_vpc_dhcp_options_association.go index 46c447213..93ac4494e 100644 --- a/builtin/providers/aws/resource_aws_vpc_dhcp_options_association.go +++ b/builtin/providers/aws/resource_aws_vpc_dhcp_options_association.go @@ -3,8 +3,8 @@ package aws import ( "log" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform/helper/schema" ) diff --git a/builtin/providers/aws/resource_aws_vpc_dhcp_options_association_test.go b/builtin/providers/aws/resource_aws_vpc_dhcp_options_association_test.go index 1b00ce3dc..401c9993b 100644 --- a/builtin/providers/aws/resource_aws_vpc_dhcp_options_association_test.go +++ b/builtin/providers/aws/resource_aws_vpc_dhcp_options_association_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/awslabs/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) diff --git a/builtin/providers/aws/resource_aws_vpc_dhcp_options_test.go b/builtin/providers/aws/resource_aws_vpc_dhcp_options_test.go index 221ba99fc..5df853ff0 100644 --- a/builtin/providers/aws/resource_aws_vpc_dhcp_options_test.go +++ b/builtin/providers/aws/resource_aws_vpc_dhcp_options_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) diff --git a/builtin/providers/aws/resource_aws_vpc_peering_connection.go b/builtin/providers/aws/resource_aws_vpc_peering_connection.go index 9a277a92b..2be170682 100644 --- a/builtin/providers/aws/resource_aws_vpc_peering_connection.go +++ b/builtin/providers/aws/resource_aws_vpc_peering_connection.go @@ -5,9 +5,9 @@ import ( "log" "time" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" ) diff --git a/builtin/providers/aws/resource_aws_vpc_peering_connection_test.go b/builtin/providers/aws/resource_aws_vpc_peering_connection_test.go index a840288c9..fba2e1633 100644 --- a/builtin/providers/aws/resource_aws_vpc_peering_connection_test.go +++ b/builtin/providers/aws/resource_aws_vpc_peering_connection_test.go @@ -5,8 +5,8 @@ import ( "os" "testing" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) diff --git a/builtin/providers/aws/resource_aws_vpc_test.go b/builtin/providers/aws/resource_aws_vpc_test.go index 8ee7820aa..95121ec6f 100644 --- a/builtin/providers/aws/resource_aws_vpc_test.go +++ b/builtin/providers/aws/resource_aws_vpc_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) diff --git a/builtin/providers/aws/resource_aws_vpn_connection.go b/builtin/providers/aws/resource_aws_vpn_connection.go index 5780c887d..a97cd7559 100644 --- a/builtin/providers/aws/resource_aws_vpn_connection.go +++ b/builtin/providers/aws/resource_aws_vpn_connection.go @@ -6,9 +6,9 @@ import ( "log" "time" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/helper/resource" diff --git a/builtin/providers/aws/resource_aws_vpn_connection_test.go b/builtin/providers/aws/resource_aws_vpn_connection_test.go index 6b61d97e4..aeed5d8b7 100644 --- a/builtin/providers/aws/resource_aws_vpn_connection_test.go +++ b/builtin/providers/aws/resource_aws_vpn_connection_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" diff --git a/builtin/providers/aws/resource_aws_vpn_gateway.go b/builtin/providers/aws/resource_aws_vpn_gateway.go index b909a460d..1a331e946 100644 --- a/builtin/providers/aws/resource_aws_vpn_gateway.go +++ b/builtin/providers/aws/resource_aws_vpn_gateway.go @@ -5,9 +5,9 @@ import ( "log" "time" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" ) diff --git a/builtin/providers/aws/resource_aws_vpn_gateway_test.go b/builtin/providers/aws/resource_aws_vpn_gateway_test.go index 1643da86c..6b1d3fc48 100644 --- a/builtin/providers/aws/resource_aws_vpn_gateway_test.go +++ b/builtin/providers/aws/resource_aws_vpn_gateway_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) diff --git a/builtin/providers/aws/resource_vpn_connection_route.go b/builtin/providers/aws/resource_vpn_connection_route.go index 198f730d2..b7bd9bd8c 100644 --- a/builtin/providers/aws/resource_vpn_connection_route.go +++ b/builtin/providers/aws/resource_vpn_connection_route.go @@ -5,9 +5,9 @@ import ( "log" "strings" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform/helper/schema" ) diff --git a/builtin/providers/aws/resource_vpn_connection_route_test.go b/builtin/providers/aws/resource_vpn_connection_route_test.go index 55779898c..3b67e139e 100644 --- a/builtin/providers/aws/resource_vpn_connection_route_test.go +++ b/builtin/providers/aws/resource_vpn_connection_route_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" diff --git a/builtin/providers/aws/s3_tags.go b/builtin/providers/aws/s3_tags.go index 01782f238..5d620b132 100644 --- a/builtin/providers/aws/s3_tags.go +++ b/builtin/providers/aws/s3_tags.go @@ -3,9 +3,9 @@ package aws import ( "log" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/service/s3" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/s3" "github.com/hashicorp/terraform/helper/schema" ) diff --git a/builtin/providers/aws/s3_tags_test.go b/builtin/providers/aws/s3_tags_test.go index 70c76cf0d..3d4188c5f 100644 --- a/builtin/providers/aws/s3_tags_test.go +++ b/builtin/providers/aws/s3_tags_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/awslabs/aws-sdk-go/service/s3" + "github.com/aws/aws-sdk-go/service/s3" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) diff --git a/builtin/providers/aws/structure.go b/builtin/providers/aws/structure.go index 269734aa7..813a7d2d9 100644 --- a/builtin/providers/aws/structure.go +++ b/builtin/providers/aws/structure.go @@ -5,11 +5,11 @@ import ( "sort" "strings" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/service/ec2" - "github.com/awslabs/aws-sdk-go/service/elb" - "github.com/awslabs/aws-sdk-go/service/rds" - "github.com/awslabs/aws-sdk-go/service/route53" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/service/elb" + "github.com/aws/aws-sdk-go/service/rds" + "github.com/aws/aws-sdk-go/service/route53" "github.com/hashicorp/terraform/helper/schema" ) diff --git a/builtin/providers/aws/structure_test.go b/builtin/providers/aws/structure_test.go index ace216e6b..765776f76 100644 --- a/builtin/providers/aws/structure_test.go +++ b/builtin/providers/aws/structure_test.go @@ -4,11 +4,11 @@ import ( "reflect" "testing" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/service/ec2" - "github.com/awslabs/aws-sdk-go/service/elb" - "github.com/awslabs/aws-sdk-go/service/rds" - "github.com/awslabs/aws-sdk-go/service/route53" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/service/elb" + "github.com/aws/aws-sdk-go/service/rds" + "github.com/aws/aws-sdk-go/service/route53" "github.com/hashicorp/terraform/flatmap" "github.com/hashicorp/terraform/helper/schema" ) diff --git a/builtin/providers/aws/tags.go b/builtin/providers/aws/tags.go index 88934c799..4fc1b8d1d 100644 --- a/builtin/providers/aws/tags.go +++ b/builtin/providers/aws/tags.go @@ -3,8 +3,8 @@ package aws import ( "log" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform/helper/schema" ) diff --git a/builtin/providers/aws/tagsEC.go b/builtin/providers/aws/tagsEC.go index 55aa2c4e5..3a5ba1acf 100644 --- a/builtin/providers/aws/tagsEC.go +++ b/builtin/providers/aws/tagsEC.go @@ -3,8 +3,8 @@ package aws import ( "log" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/service/elasticache" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/elasticache" "github.com/hashicorp/terraform/helper/schema" ) diff --git a/builtin/providers/aws/tagsEC_test.go b/builtin/providers/aws/tagsEC_test.go index dc61bd0cc..11737ecea 100644 --- a/builtin/providers/aws/tagsEC_test.go +++ b/builtin/providers/aws/tagsEC_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/awslabs/aws-sdk-go/service/elasticache" + "github.com/aws/aws-sdk-go/service/elasticache" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) diff --git a/builtin/providers/aws/tagsELB.go b/builtin/providers/aws/tagsELB.go index 0513848cc..1b1a93488 100644 --- a/builtin/providers/aws/tagsELB.go +++ b/builtin/providers/aws/tagsELB.go @@ -3,8 +3,8 @@ package aws import ( "log" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/service/elb" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/elb" "github.com/hashicorp/terraform/helper/schema" ) diff --git a/builtin/providers/aws/tagsELB_test.go b/builtin/providers/aws/tagsELB_test.go index b2078a8d9..9ec6dd8db 100644 --- a/builtin/providers/aws/tagsELB_test.go +++ b/builtin/providers/aws/tagsELB_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/awslabs/aws-sdk-go/service/elb" + "github.com/aws/aws-sdk-go/service/elb" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) diff --git a/builtin/providers/aws/tagsRDS.go b/builtin/providers/aws/tagsRDS.go index 0a1a39670..3e4e0c700 100644 --- a/builtin/providers/aws/tagsRDS.go +++ b/builtin/providers/aws/tagsRDS.go @@ -3,8 +3,8 @@ package aws import ( "log" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/service/rds" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/rds" "github.com/hashicorp/terraform/helper/schema" ) diff --git a/builtin/providers/aws/tagsRDS_test.go b/builtin/providers/aws/tagsRDS_test.go index 764f23e23..2aa0a05b3 100644 --- a/builtin/providers/aws/tagsRDS_test.go +++ b/builtin/providers/aws/tagsRDS_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/awslabs/aws-sdk-go/service/rds" + "github.com/aws/aws-sdk-go/service/rds" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) diff --git a/builtin/providers/aws/tags_route53.go b/builtin/providers/aws/tags_route53.go index 66936d1f9..93847669e 100644 --- a/builtin/providers/aws/tags_route53.go +++ b/builtin/providers/aws/tags_route53.go @@ -3,8 +3,8 @@ package aws import ( "log" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/service/route53" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/route53" "github.com/hashicorp/terraform/helper/schema" ) diff --git a/builtin/providers/aws/tags_route53_test.go b/builtin/providers/aws/tags_route53_test.go index 428629076..a0b2c6410 100644 --- a/builtin/providers/aws/tags_route53_test.go +++ b/builtin/providers/aws/tags_route53_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/awslabs/aws-sdk-go/service/route53" + "github.com/aws/aws-sdk-go/service/route53" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) diff --git a/builtin/providers/aws/tags_test.go b/builtin/providers/aws/tags_test.go index 5bbc3b78f..8aac147fc 100644 --- a/builtin/providers/aws/tags_test.go +++ b/builtin/providers/aws/tags_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/awslabs/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) diff --git a/state/remote/s3.go b/state/remote/s3.go index 742bfac76..67f96f39b 100644 --- a/state/remote/s3.go +++ b/state/remote/s3.go @@ -6,10 +6,10 @@ import ( "io" "os" - "github.com/awslabs/aws-sdk-go/aws" - "github.com/awslabs/aws-sdk-go/aws/awserr" - "github.com/awslabs/aws-sdk-go/aws/credentials" - "github.com/awslabs/aws-sdk-go/service/s3" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/aws/credentials" + "github.com/aws/aws-sdk-go/service/s3" ) func s3Factory(conf map[string]string) (Client, error) { diff --git a/state/remote/s3_test.go b/state/remote/s3_test.go index ca7ec4879..172ed3a0a 100644 --- a/state/remote/s3_test.go +++ b/state/remote/s3_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/awslabs/aws-sdk-go/service/s3" + "github.com/aws/aws-sdk-go/service/s3" ) func TestS3Client_impl(t *testing.T) { diff --git a/website/source/docs/providers/aws/r/vpc_dhcp_options.html.markdown b/website/source/docs/providers/aws/r/vpc_dhcp_options.html.markdown index 3e595adcc..2fc2727f2 100644 --- a/website/source/docs/providers/aws/r/vpc_dhcp_options.html.markdown +++ b/website/source/docs/providers/aws/r/vpc_dhcp_options.html.markdown @@ -60,7 +60,7 @@ The following attributes are exported: * `id` - The ID of the DHCP Options Set. ## Known Issues -* https://github.com/awslabs/aws-sdk-go/issues/210 +* https://github.com/aws/aws-sdk-go/issues/210 You can find more technical documentation about DHCP Options Set in the official [AWS User Guide](http://docs.aws.amazon.com/AmazonVPC/latest/UserGuide/VPC_DHCP_Options.html). From 1caef3031bcd95e4b41fee38e74dbd1b61c89059 Mon Sep 17 00:00:00 2001 From: Paul Hinze Date: Wed, 3 Jun 2015 13:14:43 -0500 Subject: [PATCH 45/91] provider/aws: fix panic when route has no cidr_block While cidr_block is required for static route creation, there are apparently cases (involving some combination of VPNs, Customer Gateways, and automatic route propogation) where the cidr_block can come back nil. This means we cannot assume it's there in the set hash calculation. --- builtin/providers/aws/resource_aws_route_table.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/builtin/providers/aws/resource_aws_route_table.go b/builtin/providers/aws/resource_aws_route_table.go index 436feddc2..e85601c1f 100644 --- a/builtin/providers/aws/resource_aws_route_table.go +++ b/builtin/providers/aws/resource_aws_route_table.go @@ -361,7 +361,10 @@ func resourceAwsRouteTableDelete(d *schema.ResourceData, meta interface{}) error func resourceAwsRouteTableHash(v interface{}) int { var buf bytes.Buffer m := v.(map[string]interface{}) - buf.WriteString(fmt.Sprintf("%s-", m["cidr_block"].(string))) + + if v, ok := m["cidr_block"]; ok { + buf.WriteString(fmt.Sprintf("%s-", v.(string))) + } if v, ok := m["gateway_id"]; ok { buf.WriteString(fmt.Sprintf("%s-", v.(string))) From 7c7dc8a4cd3a92bafc355bea7b1f30778abc8d2a Mon Sep 17 00:00:00 2001 From: Paul Hinze Date: Wed, 3 Jun 2015 14:20:11 -0500 Subject: [PATCH 46/91] Update CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ab4c64851..b9f9f1a4b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,9 @@ IMPROVEMENTS: * provider/aws: ElastiCache Subnet Groups can be updated without destroying first [GH-2191] +BUG FIXES: + + * provider/aws: fix panic when route has no cidr_block [GH-2215] ## 0.5.3 (June 1, 2015) From fcd89828f9a10bcf4742e6249f07f4cdc20276c6 Mon Sep 17 00:00:00 2001 From: Clint Shryock Date: Wed, 3 Jun 2015 15:54:01 -0500 Subject: [PATCH 47/91] provider/aws: Correctly default Instance source_dest_check to true --- builtin/providers/aws/resource_aws_instance.go | 2 ++ builtin/providers/aws/resource_aws_instance_test.go | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/builtin/providers/aws/resource_aws_instance.go b/builtin/providers/aws/resource_aws_instance.go index 42656214f..6d7072886 100644 --- a/builtin/providers/aws/resource_aws_instance.go +++ b/builtin/providers/aws/resource_aws_instance.go @@ -85,6 +85,7 @@ func resourceAwsInstance() *schema.Resource { "source_dest_check": &schema.Schema{ Type: schema.TypeBool, Optional: true, + Default: true, }, "user_data": &schema.Schema{ @@ -641,6 +642,7 @@ func resourceAwsInstanceRead(d *schema.ResourceData, meta interface{}) error { d.Set("subnet_id", instance.SubnetID) } d.Set("ebs_optimized", instance.EBSOptimized) + d.Set("source_dest_check", instance.SourceDestCheck) d.Set("tags", tagsToMap(instance.Tags)) // Determine whether we're referring to security groups with diff --git a/builtin/providers/aws/resource_aws_instance_test.go b/builtin/providers/aws/resource_aws_instance_test.go index 253632a9a..9e443bd96 100644 --- a/builtin/providers/aws/resource_aws_instance_test.go +++ b/builtin/providers/aws/resource_aws_instance_test.go @@ -653,7 +653,6 @@ resource "aws_instance" "foo" { ami = "ami-4fccb37f" instance_type = "m1.small" subnet_id = "${aws_subnet.foo.id}" - source_dest_check = true } ` From ae5502b74490cca1d0d493e3ffe81f22f7732257 Mon Sep 17 00:00:00 2001 From: Radek Simko Date: Mon, 4 May 2015 22:48:09 +0100 Subject: [PATCH 48/91] provider/aws: Add new resource - aws_ecs_cluster --- builtin/providers/aws/config.go | 5 ++ builtin/providers/aws/provider.go | 1 + .../providers/aws/resource_aws_ecs_cluster.go | 80 +++++++++++++++++++ .../aws/resource_aws_ecs_cluster_test.go | 68 ++++++++++++++++ 4 files changed, 154 insertions(+) create mode 100644 builtin/providers/aws/resource_aws_ecs_cluster.go create mode 100644 builtin/providers/aws/resource_aws_ecs_cluster_test.go diff --git a/builtin/providers/aws/config.go b/builtin/providers/aws/config.go index 7908daf16..6a46b5fc9 100644 --- a/builtin/providers/aws/config.go +++ b/builtin/providers/aws/config.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go/aws/credentials" "github.com/aws/aws-sdk-go/service/autoscaling" "github.com/aws/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/service/ecs" "github.com/aws/aws-sdk-go/service/elasticache" "github.com/aws/aws-sdk-go/service/elb" "github.com/aws/aws-sdk-go/service/iam" @@ -35,6 +36,7 @@ type Config struct { type AWSClient struct { ec2conn *ec2.EC2 + ecsconn *ecs.ECS elbconn *elb.ELB autoscalingconn *autoscaling.AutoScaling s3conn *s3.S3 @@ -116,6 +118,9 @@ func (c *Config) Client() (interface{}, error) { log.Println("[INFO] Initializing EC2 Connection") client.ec2conn = ec2.New(awsConfig) + log.Println("[INFO] Initializing ECS Connection") + client.ecsconn = ecs.New(awsConfig) + // aws-sdk-go uses v4 for signing requests, which requires all global // endpoints to use 'us-east-1'. // See http://docs.aws.amazon.com/general/latest/gr/sigv4_changes.html diff --git a/builtin/providers/aws/provider.go b/builtin/providers/aws/provider.go index 9e0f928a4..2aa094d6d 100644 --- a/builtin/providers/aws/provider.go +++ b/builtin/providers/aws/provider.go @@ -91,6 +91,7 @@ func Provider() terraform.ResourceProvider { "aws_db_security_group": resourceAwsDbSecurityGroup(), "aws_db_subnet_group": resourceAwsDbSubnetGroup(), "aws_ebs_volume": resourceAwsEbsVolume(), + "aws_ecs_cluster": resourceAwsEcsCluster(), "aws_eip": resourceAwsEip(), "aws_elasticache_cluster": resourceAwsElasticacheCluster(), "aws_elasticache_security_group": resourceAwsElasticacheSecurityGroup(), diff --git a/builtin/providers/aws/resource_aws_ecs_cluster.go b/builtin/providers/aws/resource_aws_ecs_cluster.go new file mode 100644 index 000000000..30871f3dc --- /dev/null +++ b/builtin/providers/aws/resource_aws_ecs_cluster.go @@ -0,0 +1,80 @@ +package aws + +import ( + "log" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/ecs" + "github.com/hashicorp/terraform/helper/schema" +) + +func resourceAwsEcsCluster() *schema.Resource { + return &schema.Resource{ + Create: resourceAwsEcsClusterCreate, + Read: resourceAwsEcsClusterRead, + Delete: resourceAwsEcsClusterDelete, + + Schema: map[string]*schema.Schema{ + "name": &schema.Schema{ + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + }, + } +} + +func resourceAwsEcsClusterCreate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).ecsconn + + clusterName := d.Get("name").(string) + log.Printf("[DEBUG] Creating ECS cluster %s", clusterName) + + out, err := conn.CreateCluster(&ecs.CreateClusterInput{ + ClusterName: aws.String(clusterName), + }) + if err != nil { + return err + } + log.Printf("[DEBUG] ECS cluster %s created", *out.Cluster.ClusterARN) + + d.SetId(*out.Cluster.ClusterARN) + d.Set("name", *out.Cluster.ClusterName) + return nil +} + +func resourceAwsEcsClusterRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).ecsconn + + clusterName := d.Get("name").(string) + log.Printf("[DEBUG] Reading ECS cluster %s", clusterName) + out, err := conn.DescribeClusters(&ecs.DescribeClustersInput{ + Clusters: []*string{aws.String(clusterName)}, + }) + if err != nil { + return err + } + log.Printf("[DEBUG] Received ECS clusters: %#v", out.Clusters) + + d.SetId(*out.Clusters[0].ClusterARN) + d.Set("name", *out.Clusters[0].ClusterName) + + return nil +} + +func resourceAwsEcsClusterDelete(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).ecsconn + + log.Printf("[DEBUG] Deleting ECS cluster %s", d.Id()) + + // TODO: Handle ClientException: The Cluster cannot be deleted while Container Instances are active. + // TODO: Handle ClientException: The Cluster cannot be deleted while Services are active. + + out, err := conn.DeleteCluster(&ecs.DeleteClusterInput{ + Cluster: aws.String(d.Id()), + }) + + log.Printf("[DEBUG] ECS cluster %s deleted: %#v", d.Id(), out) + + return err +} diff --git a/builtin/providers/aws/resource_aws_ecs_cluster_test.go b/builtin/providers/aws/resource_aws_ecs_cluster_test.go new file mode 100644 index 000000000..0f5ab242a --- /dev/null +++ b/builtin/providers/aws/resource_aws_ecs_cluster_test.go @@ -0,0 +1,68 @@ +package aws + +import ( + "fmt" + "testing" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/ecs" + "github.com/hashicorp/terraform/helper/resource" + "github.com/hashicorp/terraform/terraform" +) + +func TestAccAWSEcsCluster(t *testing.T) { + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSEcsClusterDestroy, + Steps: []resource.TestStep{ + resource.TestStep{ + Config: testAccAWSEcsCluster, + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSEcsClusterExists("aws_ecs_cluster.foo"), + ), + }, + }, + }) +} + +func testAccCheckAWSEcsClusterDestroy(s *terraform.State) error { + conn := testAccProvider.Meta().(*AWSClient).ecsconn + + for _, rs := range s.RootModule().Resources { + if rs.Type != "aws_ecs_cluster" { + continue + } + + out, err := conn.DescribeClusters(&ecs.DescribeClustersInput{ + Clusters: []*string{aws.String(rs.Primary.ID)}, + }) + + if err == nil { + if len(out.Clusters) != 0 { + return fmt.Errorf("ECS cluster still exists:\n%#v", out.Clusters) + } + } + + return err + } + + return nil +} + +func testAccCheckAWSEcsClusterExists(name string) resource.TestCheckFunc { + return func(s *terraform.State) error { + _, ok := s.RootModule().Resources[name] + if !ok { + return fmt.Errorf("Not found: %s", name) + } + + return nil + } +} + +var testAccAWSEcsCluster = ` +resource "aws_ecs_cluster" "foo" { + name = "red-grapes" +} +` From 87faf855aa6d09343239df27d955e0b992753e5a Mon Sep 17 00:00:00 2001 From: Radek Simko Date: Sun, 3 May 2015 23:12:50 +0100 Subject: [PATCH 49/91] provider/aws: Add new resource - aws_ecs_task_definition --- builtin/providers/aws/provider.go | 1 + .../aws/resource_aws_ecs_task_definition.go | 158 ++++++++++++++++++ .../resource_aws_ecs_task_definition_test.go | 111 ++++++++++++ builtin/providers/aws/structure.go | 77 +++++++++ 4 files changed, 347 insertions(+) create mode 100644 builtin/providers/aws/resource_aws_ecs_task_definition.go create mode 100644 builtin/providers/aws/resource_aws_ecs_task_definition_test.go diff --git a/builtin/providers/aws/provider.go b/builtin/providers/aws/provider.go index 2aa094d6d..90b8d0cb6 100644 --- a/builtin/providers/aws/provider.go +++ b/builtin/providers/aws/provider.go @@ -92,6 +92,7 @@ func Provider() terraform.ResourceProvider { "aws_db_subnet_group": resourceAwsDbSubnetGroup(), "aws_ebs_volume": resourceAwsEbsVolume(), "aws_ecs_cluster": resourceAwsEcsCluster(), + "aws_ecs_task_definition": resourceAwsEcsTaskDefinition(), "aws_eip": resourceAwsEip(), "aws_elasticache_cluster": resourceAwsElasticacheCluster(), "aws_elasticache_security_group": resourceAwsElasticacheSecurityGroup(), diff --git a/builtin/providers/aws/resource_aws_ecs_task_definition.go b/builtin/providers/aws/resource_aws_ecs_task_definition.go new file mode 100644 index 000000000..bdc260a41 --- /dev/null +++ b/builtin/providers/aws/resource_aws_ecs_task_definition.go @@ -0,0 +1,158 @@ +package aws + +import ( + "bytes" + "crypto/sha1" + "encoding/hex" + "fmt" + "log" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/ecs" + "github.com/hashicorp/terraform/helper/hashcode" + "github.com/hashicorp/terraform/helper/schema" +) + +func resourceAwsEcsTaskDefinition() *schema.Resource { + return &schema.Resource{ + Create: resourceAwsEcsTaskDefinitionCreate, + Read: resourceAwsEcsTaskDefinitionRead, + Update: resourceAwsEcsTaskDefinitionUpdate, + Delete: resourceAwsEcsTaskDefinitionDelete, + + Schema: map[string]*schema.Schema{ + "arn": &schema.Schema{ + Type: schema.TypeString, + Computed: true, + }, + + "family": &schema.Schema{ + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "revision": &schema.Schema{ + Type: schema.TypeInt, + Computed: true, + }, + + "container_definitions": &schema.Schema{ + Type: schema.TypeString, + Required: true, + StateFunc: func(v interface{}) string { + hash := sha1.Sum([]byte(v.(string))) + return hex.EncodeToString(hash[:]) + }, + }, + + "volume": &schema.Schema{ + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "name": &schema.Schema{ + Type: schema.TypeString, + Required: true, + }, + + "host_path": &schema.Schema{ + Type: schema.TypeString, + Required: true, + }, + }, + }, + Set: resourceAwsEcsTaskDefinitionVolumeHash, + }, + }, + } +} + +func resourceAwsEcsTaskDefinitionCreate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).ecsconn + + rawDefinitions := d.Get("container_definitions").(string) + definitions, err := expandEcsContainerDefinitions(rawDefinitions) + if err != nil { + return err + } + + input := ecs.RegisterTaskDefinitionInput{ + ContainerDefinitions: definitions, + Family: aws.String(d.Get("family").(string)), + } + + if v, ok := d.GetOk("volume"); ok { + volumes, err := expandEcsVolumes(v.(*schema.Set).List()) + if err != nil { + return err + } + input.Volumes = volumes + } + + log.Printf("[DEBUG] Registering ECS task definition: %#v", input) + out, err := conn.RegisterTaskDefinition(&input) + if err != nil { + return err + } + + taskDefinition := *out.TaskDefinition + + log.Printf("[DEBUG] ECS task definition registered: %#v (rev. %d)", + *taskDefinition.TaskDefinitionARN, *taskDefinition.Revision) + + d.SetId(*taskDefinition.Family) + d.Set("arn", *taskDefinition.TaskDefinitionARN) + + return resourceAwsEcsTaskDefinitionRead(d, meta) +} + +func resourceAwsEcsTaskDefinitionRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).ecsconn + + log.Printf("[DEBUG] Reading task definition %s", d.Id()) + out, err := conn.DescribeTaskDefinition(&ecs.DescribeTaskDefinitionInput{ + TaskDefinition: aws.String(d.Get("arn").(string)), + }) + if err != nil { + return err + } + log.Printf("[DEBUG] Received task definition %#v", out) + + taskDefinition := out.TaskDefinition + + d.SetId(*taskDefinition.Family) + d.Set("arn", *taskDefinition.TaskDefinitionARN) + d.Set("family", *taskDefinition.Family) + d.Set("revision", *taskDefinition.Revision) + d.Set("container_definitions", taskDefinition.ContainerDefinitions) + d.Set("volumes", flattenEcsVolumes(taskDefinition.Volumes)) + + return nil +} + +func resourceAwsEcsTaskDefinitionUpdate(d *schema.ResourceData, meta interface{}) error { + return resourceAwsEcsTaskDefinitionCreate(d, meta) +} + +func resourceAwsEcsTaskDefinitionDelete(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).ecsconn + + // NOT YET IMPLEMENTED o_O + _, err := conn.DeregisterTaskDefinition(&ecs.DeregisterTaskDefinitionInput{ + TaskDefinition: aws.String(d.Id()), + }) + + log.Printf("[DEBUG] Deregistering task definition %s returned %#v", d.Id(), err) + + return nil +} + +func resourceAwsEcsTaskDefinitionVolumeHash(v interface{}) int { + var buf bytes.Buffer + m := v.(map[string]interface{}) + buf.WriteString(fmt.Sprintf("%s-", m["name"].(string))) + buf.WriteString(fmt.Sprintf("%s-", m["host_path"].(string))) + + return hashcode.String(buf.String()) +} diff --git a/builtin/providers/aws/resource_aws_ecs_task_definition_test.go b/builtin/providers/aws/resource_aws_ecs_task_definition_test.go new file mode 100644 index 000000000..f866f1fa3 --- /dev/null +++ b/builtin/providers/aws/resource_aws_ecs_task_definition_test.go @@ -0,0 +1,111 @@ +package aws + +import ( + "fmt" + "testing" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/ecs" + "github.com/hashicorp/terraform/helper/resource" + "github.com/hashicorp/terraform/terraform" +) + +func TestAccAWSEcsTaskDefinition(t *testing.T) { + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSEcsTaskDefinitionDestroy, + Steps: []resource.TestStep{ + resource.TestStep{ + Config: testAccAWSEcsTaskDefinition, + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSEcsTaskDefinitionExists("aws_ecs_task_definition.jenkins"), + ), + }, + }, + }) +} + +func testAccCheckAWSEcsTaskDefinitionDestroy(s *terraform.State) error { + conn := testAccProvider.Meta().(*AWSClient).ecsconn + + for _, rs := range s.RootModule().Resources { + if rs.Type != "aws_ecs_task_definition" { + continue + } + + out, err := conn.DescribeTaskDefinition(&ecs.DescribeTaskDefinitionInput{ + TaskDefinition: aws.String(rs.Primary.ID), + }) + + if err == nil { + if out.TaskDefinition != nil { + return fmt.Errorf("ECS task definition still exists:\n%#v", *out.TaskDefinition) + } + } + + return err + } + + return nil +} + +func testAccCheckAWSEcsTaskDefinitionExists(name string) resource.TestCheckFunc { + return func(s *terraform.State) error { + _, ok := s.RootModule().Resources[name] + if !ok { + return fmt.Errorf("Not found: %s", name) + } + + return nil + } +} + +var testAccAWSEcsTaskDefinition = ` +resource "aws_ecs_task_definition" "jenkins" { + family = "jenkins" + container_definitions = < Date: Mon, 4 May 2015 23:10:54 +0100 Subject: [PATCH 50/91] provider/aws: Add new resource - aws_ecs_service --- builtin/providers/aws/provider.go | 1 + .../providers/aws/resource_aws_ecs_service.go | 316 ++++++++++++++++++ .../aws/resource_aws_ecs_service_test.go | 276 +++++++++++++++ builtin/providers/aws/structure.go | 22 ++ 4 files changed, 615 insertions(+) create mode 100644 builtin/providers/aws/resource_aws_ecs_service.go create mode 100644 builtin/providers/aws/resource_aws_ecs_service_test.go diff --git a/builtin/providers/aws/provider.go b/builtin/providers/aws/provider.go index 90b8d0cb6..74d472bb6 100644 --- a/builtin/providers/aws/provider.go +++ b/builtin/providers/aws/provider.go @@ -92,6 +92,7 @@ func Provider() terraform.ResourceProvider { "aws_db_subnet_group": resourceAwsDbSubnetGroup(), "aws_ebs_volume": resourceAwsEbsVolume(), "aws_ecs_cluster": resourceAwsEcsCluster(), + "aws_ecs_service": resourceAwsEcsService(), "aws_ecs_task_definition": resourceAwsEcsTaskDefinition(), "aws_eip": resourceAwsEip(), "aws_elasticache_cluster": resourceAwsElasticacheCluster(), diff --git a/builtin/providers/aws/resource_aws_ecs_service.go b/builtin/providers/aws/resource_aws_ecs_service.go new file mode 100644 index 000000000..c93296f41 --- /dev/null +++ b/builtin/providers/aws/resource_aws_ecs_service.go @@ -0,0 +1,316 @@ +package aws + +import ( + "bytes" + "fmt" + "log" + "regexp" + "strings" + "time" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/ecs" + "github.com/aws/aws-sdk-go/service/iam" + "github.com/hashicorp/terraform/helper/hashcode" + "github.com/hashicorp/terraform/helper/resource" + "github.com/hashicorp/terraform/helper/schema" +) + +var taskDefinitionRE = regexp.MustCompile("^([a-zA-Z0-9_-]+):([0-9]+)$") + +func resourceAwsEcsService() *schema.Resource { + return &schema.Resource{ + Create: resourceAwsEcsServiceCreate, + Read: resourceAwsEcsServiceRead, + Update: resourceAwsEcsServiceUpdate, + Delete: resourceAwsEcsServiceDelete, + + Schema: map[string]*schema.Schema{ + "name": &schema.Schema{ + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "cluster": &schema.Schema{ + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + + "task_definition": &schema.Schema{ + Type: schema.TypeString, + Required: true, + }, + + "desired_count": &schema.Schema{ + Type: schema.TypeInt, + Optional: true, + }, + + "iam_role": &schema.Schema{ + Type: schema.TypeString, + Optional: true, + }, + + "load_balancer": &schema.Schema{ + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "elb_name": &schema.Schema{ + Type: schema.TypeString, + Required: true, + }, + + "container_name": &schema.Schema{ + Type: schema.TypeString, + Required: true, + }, + + "container_port": &schema.Schema{ + Type: schema.TypeInt, + Required: true, + }, + }, + }, + Set: resourceAwsEcsLoadBalancerHash, + }, + }, + } +} + +func resourceAwsEcsServiceCreate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).ecsconn + + input := ecs.CreateServiceInput{ + ServiceName: aws.String(d.Get("name").(string)), + TaskDefinition: aws.String(d.Get("task_definition").(string)), + DesiredCount: aws.Long(int64(d.Get("desired_count").(int))), + } + + if v, ok := d.GetOk("cluster"); ok { + input.Cluster = aws.String(v.(string)) + } + + loadBalancers := expandEcsLoadBalancers(d.Get("load_balancer").(*schema.Set).List()) + if len(loadBalancers) > 0 { + log.Printf("[DEBUG] Adding ECS load balancers: %#v", loadBalancers) + input.LoadBalancers = loadBalancers + } + if v, ok := d.GetOk("iam_role"); ok { + input.Role = aws.String(v.(string)) + } + + log.Printf("[DEBUG] Creating ECS service: %#v", input) + out, err := conn.CreateService(&input) + if err != nil { + return err + } + + service := *out.Service + + log.Printf("[DEBUG] ECS service created: %s", *service.ServiceARN) + d.SetId(*service.ServiceARN) + d.Set("cluster", *service.ClusterARN) + + return resourceAwsEcsServiceUpdate(d, meta) +} + +func resourceAwsEcsServiceRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).ecsconn + + log.Printf("[DEBUG] Reading ECS service %s", d.Id()) + input := ecs.DescribeServicesInput{ + Services: []*string{aws.String(d.Id())}, + Cluster: aws.String(d.Get("cluster").(string)), + } + + out, err := conn.DescribeServices(&input) + if err != nil { + return err + } + + service := out.Services[0] + log.Printf("[DEBUG] Received ECS service %#v", service) + + d.SetId(*service.ServiceARN) + d.Set("name", *service.ServiceName) + + // Save task definition in the same format + if strings.HasPrefix(d.Get("task_definition").(string), "arn:aws:ecs:") { + d.Set("task_definition", *service.TaskDefinition) + } else { + taskDefinition := buildFamilyAndRevisionFromARN(*service.TaskDefinition) + d.Set("task_definition", taskDefinition) + } + + d.Set("desired_count", *service.DesiredCount) + d.Set("cluster", *service.ClusterARN) + + if service.RoleARN != nil { + d.Set("iam_role", *service.RoleARN) + } + + if service.LoadBalancers != nil { + d.Set("load_balancers", flattenEcsLoadBalancers(service.LoadBalancers)) + } + + return nil +} + +func resourceAwsEcsServiceUpdate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).ecsconn + + log.Printf("[DEBUG] Updating ECS service %s", d.Id()) + input := ecs.UpdateServiceInput{ + Service: aws.String(d.Id()), + Cluster: aws.String(d.Get("cluster").(string)), + } + + if d.HasChange("desired_count") { + _, n := d.GetChange("desired_count") + input.DesiredCount = aws.Long(int64(n.(int))) + } + if d.HasChange("task_definition") { + _, n := d.GetChange("task_definition") + input.TaskDefinition = aws.String(n.(string)) + } + + out, err := conn.UpdateService(&input) + if err != nil { + return err + } + service := out.Service + log.Printf("[DEBUG] Updated ECS service %#v", service) + + return resourceAwsEcsServiceRead(d, meta) +} + +func resourceAwsEcsServiceDelete(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).ecsconn + + // Check if it's not already gone + resp, err := conn.DescribeServices(&ecs.DescribeServicesInput{ + Services: []*string{aws.String(d.Id())}, + Cluster: aws.String(d.Get("cluster").(string)), + }) + if err != nil { + return err + } + log.Printf("[DEBUG] ECS service %s is currently %s", d.Id(), *resp.Services[0].Status) + + if *resp.Services[0].Status == "INACTIVE" { + return nil + } + + // Drain the ECS service + if *resp.Services[0].Status != "DRAINING" { + log.Printf("[DEBUG] Draining ECS service %s", d.Id()) + _, err = conn.UpdateService(&ecs.UpdateServiceInput{ + Service: aws.String(d.Id()), + Cluster: aws.String(d.Get("cluster").(string)), + DesiredCount: aws.Long(int64(0)), + }) + if err != nil { + return err + } + } + + input := ecs.DeleteServiceInput{ + Service: aws.String(d.Id()), + Cluster: aws.String(d.Get("cluster").(string)), + } + + log.Printf("[DEBUG] Deleting ECS service %#v", input) + out, err := conn.DeleteService(&input) + if err != nil { + return err + } + + // Wait until it's deleted + wait := resource.StateChangeConf{ + Pending: []string{"DRAINING"}, + Target: "INACTIVE", + Timeout: 5 * time.Minute, + MinTimeout: 1 * time.Second, + Refresh: func() (interface{}, string, error) { + log.Printf("[DEBUG] Checking if ECS service %s is INACTIVE", d.Id()) + resp, err := conn.DescribeServices(&ecs.DescribeServicesInput{ + Services: []*string{aws.String(d.Id())}, + Cluster: aws.String(d.Get("cluster").(string)), + }) + if err != nil { + return resp, "FAILED", err + } + + return resp, *resp.Services[0].Status, nil + }, + } + + _, err = wait.WaitForState() + if err != nil { + return err + } + + log.Printf("[DEBUG] ECS service %s deleted.", *out.Service.ServiceARN) + return nil +} + +func resourceAwsEcsLoadBalancerHash(v interface{}) int { + var buf bytes.Buffer + m := v.(map[string]interface{}) + buf.WriteString(fmt.Sprintf("%s-", m["elb_name"].(string))) + buf.WriteString(fmt.Sprintf("%s-", m["container_name"].(string))) + buf.WriteString(fmt.Sprintf("%d-", m["container_port"].(int))) + + return hashcode.String(buf.String()) +} + +func buildFamilyAndRevisionFromARN(arn string) string { + return strings.Split(arn, "/")[1] +} + +func buildTaskDefinitionARN(taskDefinition string, meta interface{}) (string, error) { + // If it's already an ARN, just return it + if strings.HasPrefix(taskDefinition, "arn:aws:ecs:") { + return taskDefinition, nil + } + + // Parse out family & revision + family, revision, err := parseTaskDefinition(taskDefinition) + if err != nil { + return "", err + } + + iamconn := meta.(*AWSClient).iamconn + region := meta.(*AWSClient).region + + // An zero value GetUserInput{} defers to the currently logged in user + resp, err := iamconn.GetUser(&iam.GetUserInput{}) + if err != nil { + return "", fmt.Errorf("GetUser ERROR: %#v", err) + } + + // arn:aws:iam::0123456789:user/username + userARN := *resp.User.ARN + accountID := strings.Split(userARN, ":")[4] + + // arn:aws:ecs:us-west-2:01234567890:task-definition/mongodb:3 + arn := fmt.Sprintf("arn:aws:ecs:%s:%s:task-definition/%s:%s", + region, accountID, family, revision) + log.Printf("[DEBUG] Built task definition ARN: %s", arn) + return arn, nil +} + +func parseTaskDefinition(taskDefinition string) (string, string, error) { + matches := taskDefinitionRE.FindAllStringSubmatch(taskDefinition, 2) + + if len(matches) == 0 || len(matches[0]) != 3 { + return "", "", fmt.Errorf( + "Invalid task definition format, family:rev or ARN expected (%#v)", + taskDefinition) + } + + return matches[0][1], matches[0][2], nil +} diff --git a/builtin/providers/aws/resource_aws_ecs_service_test.go b/builtin/providers/aws/resource_aws_ecs_service_test.go new file mode 100644 index 000000000..4257fd365 --- /dev/null +++ b/builtin/providers/aws/resource_aws_ecs_service_test.go @@ -0,0 +1,276 @@ +package aws + +import ( + "fmt" + "testing" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/ecs" + "github.com/hashicorp/terraform/helper/resource" + "github.com/hashicorp/terraform/terraform" +) + +func TestParseTaskDefinition(t *testing.T) { + cases := map[string]map[string]interface{}{ + "invalid": map[string]interface{}{ + "family": "", + "revision": "", + "isValid": false, + }, + "invalidWithColon:": map[string]interface{}{ + "family": "", + "revision": "", + "isValid": false, + }, + "1234": map[string]interface{}{ + "family": "", + "revision": "", + "isValid": false, + }, + "invalid:aaa": map[string]interface{}{ + "family": "", + "revision": "", + "isValid": false, + }, + "invalid=family:1": map[string]interface{}{ + "family": "", + "revision": "", + "isValid": false, + }, + "invalid:name:1": map[string]interface{}{ + "family": "", + "revision": "", + "isValid": false, + }, + "valid:1": map[string]interface{}{ + "family": "valid", + "revision": "1", + "isValid": true, + }, + "abc12-def:54": map[string]interface{}{ + "family": "abc12-def", + "revision": "54", + "isValid": true, + }, + "lorem_ip-sum:123": map[string]interface{}{ + "family": "lorem_ip-sum", + "revision": "123", + "isValid": true, + }, + "lorem-ipsum:1": map[string]interface{}{ + "family": "lorem-ipsum", + "revision": "1", + "isValid": true, + }, + } + + for input, expectedOutput := range cases { + family, revision, err := parseTaskDefinition(input) + isValid := expectedOutput["isValid"].(bool) + if !isValid && err == nil { + t.Fatalf("Task definition %s should fail", input) + } + + expectedFamily := expectedOutput["family"].(string) + if family != expectedFamily { + t.Fatalf("Unexpected family (%#v) for task definition %s\n%#v", family, input, err) + } + expectedRevision := expectedOutput["revision"].(string) + if revision != expectedRevision { + t.Fatalf("Unexpected revision (%#v) for task definition %s\n%#v", revision, input, err) + } + } +} + +func TestAccAWSEcsServiceWithARN(t *testing.T) { + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSEcsServiceDestroy, + Steps: []resource.TestStep{ + resource.TestStep{ + Config: testAccAWSEcsService, + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSEcsServiceExists("aws_ecs_service.mongo"), + ), + }, + + resource.TestStep{ + Config: testAccAWSEcsServiceModified, + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSEcsServiceExists("aws_ecs_service.mongo"), + ), + }, + }, + }) +} + +func TestAccAWSEcsServiceWithFamilyAndRevision(t *testing.T) { + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSEcsServiceDestroy, + Steps: []resource.TestStep{ + resource.TestStep{ + Config: testAccAWSEcsServiceWithFamilyAndRevision, + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSEcsServiceExists("aws_ecs_service.jenkins"), + ), + }, + + resource.TestStep{ + Config: testAccAWSEcsServiceWithFamilyAndRevisionModified, + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSEcsServiceExists("aws_ecs_service.jenkins"), + ), + }, + }, + }) +} + +func testAccCheckAWSEcsServiceDestroy(s *terraform.State) error { + conn := testAccProvider.Meta().(*AWSClient).ecsconn + + for _, rs := range s.RootModule().Resources { + if rs.Type != "aws_ecs_service" { + continue + } + + out, err := conn.DescribeServices(&ecs.DescribeServicesInput{ + Services: []*string{aws.String(rs.Primary.ID)}, + }) + + if err == nil { + if len(out.Services) > 0 { + return fmt.Errorf("ECS service still exists:\n%#v", out.Services) + } + } + + return err + } + + return nil +} + +func testAccCheckAWSEcsServiceExists(name string) resource.TestCheckFunc { + return func(s *terraform.State) error { + _, ok := s.RootModule().Resources[name] + if !ok { + return fmt.Errorf("Not found: %s", name) + } + + return nil + } +} + +var testAccAWSEcsService = ` +resource "aws_ecs_cluster" "default" { + name = "terraformecstest1" +} + +resource "aws_ecs_task_definition" "mongo" { + family = "mongodb" + container_definitions = < Date: Mon, 4 May 2015 22:46:27 +0100 Subject: [PATCH 51/91] Add docs for new AWS ECS resources --- .../providers/aws/r/ecs_cluster.html.markdown | 32 ++++++++++ .../providers/aws/r/ecs_service.html.markdown | 59 +++++++++++++++++++ .../aws/r/ecs_task_definition.html.markdown | 50 ++++++++++++++++ website/source/layouts/aws.erb | 12 ++++ 4 files changed, 153 insertions(+) create mode 100644 website/source/docs/providers/aws/r/ecs_cluster.html.markdown create mode 100644 website/source/docs/providers/aws/r/ecs_service.html.markdown create mode 100644 website/source/docs/providers/aws/r/ecs_task_definition.html.markdown diff --git a/website/source/docs/providers/aws/r/ecs_cluster.html.markdown b/website/source/docs/providers/aws/r/ecs_cluster.html.markdown new file mode 100644 index 000000000..d00e05fab --- /dev/null +++ b/website/source/docs/providers/aws/r/ecs_cluster.html.markdown @@ -0,0 +1,32 @@ +--- +layout: "aws" +page_title: "AWS: aws_ecs_cluster" +sidebar_current: "docs-aws-resource-ecs-cluster" +description: |- + Provides an ECS cluster. +--- + +# aws\_ecs\_cluster + +Provides an ECS cluster. + +## Example Usage + +``` +resource "aws_ecs_cluster" "foo" { + name = "white-hart" +} +``` + +## Argument Reference + +The following arguments are supported: + +* `name` - (Required) The name of the cluster (up to 255 letters, numbers, hyphens, and underscores) + +## Attributes Reference + +The following attributes are exported: + +* `name` - The name of the cluster +* `id` - The Amazon Resource Name (ARN) that identifies the cluster diff --git a/website/source/docs/providers/aws/r/ecs_service.html.markdown b/website/source/docs/providers/aws/r/ecs_service.html.markdown new file mode 100644 index 000000000..cd45b788a --- /dev/null +++ b/website/source/docs/providers/aws/r/ecs_service.html.markdown @@ -0,0 +1,59 @@ +--- +layout: "aws" +page_title: "AWS: aws_ecs_service" +sidebar_current: "docs-aws-resource-ecs-service" +description: |- + Provides an ECS service. +--- + +# aws\_ecs\_service + +Provides an ECS service - effectively a task that is expected to run until an error occures or user terminates it (typically a webserver or a database). + +See [ECS Services section in AWS developer guide](http://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs_services.html). + +## Example Usage + +``` +resource "aws_ecs_service" "mongo" { + name = "mongodb" + cluster = "${aws_ecs_cluster.foo.id}" + task_definition = "${aws_ecs_task_definition.mongo.arn}" + desired_count = 3 + iam_role = "${aws_iam.foo.id}" + + load_balancer { + elb_name = "${aws_elb.foo.id}" + container_name = "mongo" + container_port = 8080 + } +} +``` + +## Argument Reference + +The following arguments are supported: + +* `name` - (Required) The name of the service (up to 255 letters, numbers, hyphens, and underscores) +* `task_definition` - (Required) The family and revision (`family:revision`) or full ARN of the task definition that you want to run in your service. +* `desired_count` - (Required) The number of instances of the task definition to place and keep running +* `cluster` - (Optional) ARN of an ECS cluster +* `iam_role` - (Optional) IAM role that allows your Amazon ECS container agent to make calls to your load balancer on your behalf. This parameter is only required if you are using a load balancer with your service. +* `load_balancer` - (Optional) A load balancer block. Load balancers documented below. + +Load balancers support the following: + +* `elb_name` - (Required) The name of the load balancer. +* `container_name` - (Required) The name of the container to associate with the load balancer (as it appears in a container definition). +* `container_port` - (Required) The port on the container to associate with the load balancer. + + +## Attributes Reference + +The following attributes are exported: + +* `id` - The Amazon Resource Name (ARN) that identifies the service +* `name` - The name of the service +* `cluster` - The Amazon Resource Name (ARN) of cluster which the service runs on +* `iam_role` - The ARN of IAM role used for ELB +* `desired_count` - The number of instances of the task definition diff --git a/website/source/docs/providers/aws/r/ecs_task_definition.html.markdown b/website/source/docs/providers/aws/r/ecs_task_definition.html.markdown new file mode 100644 index 000000000..0a265af4e --- /dev/null +++ b/website/source/docs/providers/aws/r/ecs_task_definition.html.markdown @@ -0,0 +1,50 @@ +--- +layout: "aws" +page_title: "AWS: aws_ecs_task_definition" +sidebar_current: "docs-aws-resource-ecs-task-definition" +description: |- + Provides an ECS task definition. +--- + +# aws\_ecs\_task\_definition + +Provides an ECS task definition to be used in `aws_ecs_service`. + +~> **NOTE:** There is currently no way to unregister +any previously registered task definition. +See related [thread in AWS forum](https://forums.aws.amazon.com/thread.jspa?threadID=170378&tstart=0). + +## Example Usage + +``` +resource "aws_ecs_task_definition" "jenkins" { + family = "jenkins" + container_definitions = "${file("task-definitions/jenkins.json")}" + + volume { + name = "jenkins-home" + host_path = "/ecs/jenkins-home" + } +} +``` + +## Argument Reference + +The following arguments are supported: + +* `family` - (Required) The family, unique name for your task definition. +* `container_definitions` - (Required) A list of container definitions in JSON format. See [AWS docs](http://docs.aws.amazon.com/AmazonECS/latest/developerguide/task_defintions.html) for syntax. +* `volume` - (Optional) A volume block. Volumes documented below. + +Volumes support the following: + +* `name` - (Required) The name of the volume. This name is referenced in the `sourceVolume` parameter of container definition `mountPoints`. +* `host_path` - (Required) The path on the host container instance that is presented to the container. + +## Attributes Reference + +The following attributes are exported: + +* `arn` - Full ARN of the task definition (including both `family` & `revision`) +* `family` - The family of the task definition. +* `revision` - The revision of the task in a particular family. diff --git a/website/source/layouts/aws.erb b/website/source/layouts/aws.erb index 219b3ed3c..ecbaddc80 100644 --- a/website/source/layouts/aws.erb +++ b/website/source/layouts/aws.erb @@ -41,6 +41,18 @@ aws_ebs_volume + > + aws_ecs_cluster + + + > + aws_ecs_service + + + > + aws_ecs_task_definition + + > aws_eip From 2a0dc4e2776a2eb7e9672b086f1c6bf20c4feb5a Mon Sep 17 00:00:00 2001 From: Clint Shryock Date: Wed, 3 Jun 2015 17:10:07 -0500 Subject: [PATCH 52/91] don't set this, it messes things up --- builtin/providers/aws/resource_aws_instance.go | 1 - 1 file changed, 1 deletion(-) diff --git a/builtin/providers/aws/resource_aws_instance.go b/builtin/providers/aws/resource_aws_instance.go index 6d7072886..c9074fb5b 100644 --- a/builtin/providers/aws/resource_aws_instance.go +++ b/builtin/providers/aws/resource_aws_instance.go @@ -642,7 +642,6 @@ func resourceAwsInstanceRead(d *schema.ResourceData, meta interface{}) error { d.Set("subnet_id", instance.SubnetID) } d.Set("ebs_optimized", instance.EBSOptimized) - d.Set("source_dest_check", instance.SourceDestCheck) d.Set("tags", tagsToMap(instance.Tags)) // Determine whether we're referring to security groups with From fc2f97ca89a232847b42b112532108b9779541fe Mon Sep 17 00:00:00 2001 From: Colin Moller Date: Wed, 3 Jun 2015 17:09:02 -0700 Subject: [PATCH 53/91] Add a boolean flag to http remote that disables cert validity checking (for e.g. self-signed certs) --- state/remote/http.go | 48 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 42 insertions(+), 6 deletions(-) diff --git a/state/remote/http.go b/state/remote/http.go index 8b410fb3d..a5233c04a 100644 --- a/state/remote/http.go +++ b/state/remote/http.go @@ -8,6 +8,8 @@ import ( "io" "net/http" "net/url" + "crypto/tls" + "strconv" ) func httpFactory(conf map[string]string) (Client, error) { @@ -24,18 +26,41 @@ func httpFactory(conf map[string]string) (Client, error) { return nil, fmt.Errorf("address must be HTTP or HTTPS") } + skip_cert_verification := false + skip_cert_config_string, ok := conf["skip_cert_verification"] + if !ok { + // config wasn't specified + // use the default - check cert validity + } else { + skip_cert_verification, err = strconv.ParseBool(skip_cert_config_string) + if err != nil { + return nil, fmt.Errorf("skip_cert_verification must be boolean (true/false)") + } + // skip_cert_verification should now be set to true or false + } + return &HTTPClient{ URL: url, + skipCertVerify: skip_cert_verification, }, nil } -// HTTPClient is a remote client that stores data in Consul. +// HTTPClient is a remote client that stores data in Consul or HTTP REST. type HTTPClient struct { URL *url.URL + skipCertVerify bool } func (c *HTTPClient) Get() (*Payload, error) { - resp, err := http.Get(c.URL.String()) + + // Build the HTTP client + tr := &http.Transport{ + TLSClientConfig: &tls.Config{InsecureSkipVerify: c.skipCertVerify}, + } + + client := &http.Client{Transport: tr} + + resp, err := client.Get(c.URL.String()) if err != nil { return nil, err } @@ -110,7 +135,13 @@ func (c *HTTPClient) Put(data []byte) error { } */ - // Make the HTTP client and request + // Build the HTTP client and request + tr := &http.Transport{ + TLSClientConfig: &tls.Config{InsecureSkipVerify: c.skipCertVerify}, + } + + client := &http.Client{Transport: tr} + req, err := http.NewRequest("POST", base.String(), bytes.NewReader(data)) if err != nil { return fmt.Errorf("Failed to make HTTP request: %s", err) @@ -122,7 +153,7 @@ func (c *HTTPClient) Put(data []byte) error { req.ContentLength = int64(len(data)) // Make the request - resp, err := http.DefaultClient.Do(req) + resp, err := client.Do(req) if err != nil { return fmt.Errorf("Failed to upload state: %v", err) } @@ -138,14 +169,19 @@ func (c *HTTPClient) Put(data []byte) error { } func (c *HTTPClient) Delete() error { - // Make the HTTP request + // Build the HTTP request + tr := &http.Transport{ + TLSClientConfig: &tls.Config{InsecureSkipVerify: c.skipCertVerify}, + } + + client := &http.Client{Transport: tr} req, err := http.NewRequest("DELETE", c.URL.String(), nil) if err != nil { return fmt.Errorf("Failed to make HTTP request: %s", err) } // Make the request - resp, err := http.DefaultClient.Do(req) + resp, err := client.Do(req) if err != nil { return fmt.Errorf("Failed to delete state: %s", err) } From e7130e9c85e739d7a3e9295f7ef76b3a9aef9190 Mon Sep 17 00:00:00 2001 From: Colin Moller Date: Wed, 3 Jun 2015 17:23:45 -0700 Subject: [PATCH 54/91] go fmt --- state/remote/http.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/state/remote/http.go b/state/remote/http.go index a5233c04a..121cb8c89 100644 --- a/state/remote/http.go +++ b/state/remote/http.go @@ -3,12 +3,12 @@ package remote import ( "bytes" "crypto/md5" + "crypto/tls" "encoding/base64" "fmt" "io" "net/http" "net/url" - "crypto/tls" "strconv" ) @@ -40,14 +40,14 @@ func httpFactory(conf map[string]string) (Client, error) { } return &HTTPClient{ - URL: url, + URL: url, skipCertVerify: skip_cert_verification, }, nil } // HTTPClient is a remote client that stores data in Consul or HTTP REST. type HTTPClient struct { - URL *url.URL + URL *url.URL skipCertVerify bool } From 31d6c403d291f7d11ec62cd47849b5fabd4e09dc Mon Sep 17 00:00:00 2001 From: Joel Handwell Date: Thu, 4 Jun 2015 06:12:49 -0400 Subject: [PATCH 55/91] De-duplicate Openstack Provider sidebar entry --- website/source/layouts/openstack.erb | 3 --- 1 file changed, 3 deletions(-) diff --git a/website/source/layouts/openstack.erb b/website/source/layouts/openstack.erb index 318c5875e..052d03cf1 100644 --- a/website/source/layouts/openstack.erb +++ b/website/source/layouts/openstack.erb @@ -31,9 +31,6 @@ > openstack_fw_firewall_v1 - > - openstack_fw_firewall_v1 - > openstack_fw_policy_v1 From b9a437658eff7492b4556909630b53b80ef7dc1d Mon Sep 17 00:00:00 2001 From: Julian Schneider Date: Thu, 4 Jun 2015 12:57:38 +0200 Subject: [PATCH 56/91] Add privileged option to docker container resource --- builtin/providers/docker/resource_docker_container.go | 6 ++++++ builtin/providers/docker/resource_docker_container_funcs.go | 1 + .../source/docs/providers/docker/r/container.html.markdown | 1 + 3 files changed, 8 insertions(+) diff --git a/builtin/providers/docker/resource_docker_container.go b/builtin/providers/docker/resource_docker_container.go index 10481b268..59e65b9c1 100644 --- a/builtin/providers/docker/resource_docker_container.go +++ b/builtin/providers/docker/resource_docker_container.go @@ -136,6 +136,12 @@ func resourceDockerContainer() *schema.Resource { Type: schema.TypeString, Computed: true, }, + + "privileged": &schema.Schema{ + Type: schema.TypeBool, + Optional: true, + ForceNew: true, + }, }, } } diff --git a/builtin/providers/docker/resource_docker_container_funcs.go b/builtin/providers/docker/resource_docker_container_funcs.go index c6bd9dea8..4f642d6dd 100644 --- a/builtin/providers/docker/resource_docker_container_funcs.go +++ b/builtin/providers/docker/resource_docker_container_funcs.go @@ -85,6 +85,7 @@ func resourceDockerContainerCreate(d *schema.ResourceData, meta interface{}) err d.SetId(retContainer.ID) hostConfig := &dc.HostConfig{ + Privileged: d.Get("privileged").(bool), PublishAllPorts: d.Get("publish_all_ports").(bool), } diff --git a/website/source/docs/providers/docker/r/container.html.markdown b/website/source/docs/providers/docker/r/container.html.markdown index d5a4c823e..8da348ec2 100644 --- a/website/source/docs/providers/docker/r/container.html.markdown +++ b/website/source/docs/providers/docker/r/container.html.markdown @@ -46,6 +46,7 @@ The following arguments are supported: kept running. If false, then as long as the container exists, Terraform assumes it is successful. * `ports` - (Optional) See [Ports](#ports) below for details. +* `privileged` - (Optional, bool) Run container in privileged mode. * `publish_all_ports` - (Optional, bool) Publish all ports of the container. * `volumes` - (Optional) See [Volumes](#volumes) below for details. From 6f60913814242b957c2155746eb6b46eb59c9b02 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Thu, 4 Jun 2015 16:15:54 +0200 Subject: [PATCH 57/91] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b9f9f1a4b..f3421bf89 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,8 @@ IMPROVEMENTS: * provider/aws: ElastiCache Subnet Groups can be updated without destroying first [GH-2191] + * provider/docker: `docker_container` has the `privileged` + option. [GH-2227] BUG FIXES: From 69736f67a688858f9dc714101622719869fc7b53 Mon Sep 17 00:00:00 2001 From: Sander van Harmelen Date: Thu, 4 Jun 2015 17:11:07 +0200 Subject: [PATCH 58/91] Update/fix the CheckDestroy functions in the tests --- .../azure/resource_azure_data_disk_test.go | 13 ++++++------- .../azure/resource_azure_instance_test.go | 13 ++++++------- .../azure/resource_azure_security_group_test.go | 13 ++++++------- .../resource_azure_virtual_network_test.go | 17 ++--------------- 4 files changed, 20 insertions(+), 36 deletions(-) diff --git a/builtin/providers/azure/resource_azure_data_disk_test.go b/builtin/providers/azure/resource_azure_data_disk_test.go index 2aa5e474c..d2582876c 100644 --- a/builtin/providers/azure/resource_azure_data_disk_test.go +++ b/builtin/providers/azure/resource_azure_data_disk_test.go @@ -8,6 +8,7 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" + "github.com/svanharmelen/azure-sdk-for-go/management" "github.com/svanharmelen/azure-sdk-for-go/management/virtualmachinedisk" ) @@ -155,15 +156,13 @@ func testAccCheckAzureDataDiskDestroy(s *terraform.State) error { return err } - req, err := virtualmachinedisk.NewClient(mc).DeleteDataDisk(vm, vm, vm, lun, true) - if err != nil { - return fmt.Errorf("Error deleting Data Disk (%s): %s", rs.Primary.ID, err) + _, err = virtualmachinedisk.NewClient(mc).GetDataDisk(vm, vm, vm, lun) + if err == nil { + return fmt.Errorf("Resource %s still exists", rs.Primary.ID) } - // Wait until the data disk is deleted - if err := mc.WaitForOperation(req, nil); err != nil { - return fmt.Errorf( - "Error deleting Data Disk (%s): %s", rs.Primary.ID, err) + if !management.IsResourceNotFoundError(err) { + return err } } diff --git a/builtin/providers/azure/resource_azure_instance_test.go b/builtin/providers/azure/resource_azure_instance_test.go index d6c92fe72..0d4c9b043 100644 --- a/builtin/providers/azure/resource_azure_instance_test.go +++ b/builtin/providers/azure/resource_azure_instance_test.go @@ -7,6 +7,7 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" + "github.com/svanharmelen/azure-sdk-for-go/management" "github.com/svanharmelen/azure-sdk-for-go/management/hostedservice" "github.com/svanharmelen/azure-sdk-for-go/management/virtualmachine" ) @@ -294,15 +295,13 @@ func testAccCheckAzureInstanceDestroy(s *terraform.State) error { return fmt.Errorf("No instance ID is set") } - req, err := hostedservice.NewClient(mc).DeleteHostedService(rs.Primary.ID, true) - if err != nil { - return fmt.Errorf("Error deleting instance (%s): %s", rs.Primary.ID, err) + _, err := hostedservice.NewClient(mc).GetHostedService(rs.Primary.ID) + if err == nil { + return fmt.Errorf("Resource %s still exists", rs.Primary.ID) } - // Wait until the instance is deleted - if err := mc.WaitForOperation(req, nil); err != nil { - return fmt.Errorf( - "Error deleting instance (%s): %s", rs.Primary.ID, err) + if !management.IsResourceNotFoundError(err) { + return err } } diff --git a/builtin/providers/azure/resource_azure_security_group_test.go b/builtin/providers/azure/resource_azure_security_group_test.go index b4e79ebb9..a3ce2dd53 100644 --- a/builtin/providers/azure/resource_azure_security_group_test.go +++ b/builtin/providers/azure/resource_azure_security_group_test.go @@ -6,6 +6,7 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" + "github.com/svanharmelen/azure-sdk-for-go/management" "github.com/svanharmelen/azure-sdk-for-go/management/networksecuritygroup" ) @@ -214,15 +215,13 @@ func testAccCheckAzureSecurityGroupDestroy(s *terraform.State) error { return fmt.Errorf("No Network Security Group ID is set") } - req, err := networksecuritygroup.NewClient(mc).DeleteNetworkSecurityGroup(rs.Primary.ID) - if err != nil { - return fmt.Errorf("Error deleting Network Security Group (%s): %s", rs.Primary.ID, err) + _, err := networksecuritygroup.NewClient(mc).GetNetworkSecurityGroup(rs.Primary.ID) + if err == nil { + return fmt.Errorf("Resource %s still exists", rs.Primary.ID) } - // Wait until the instance is deleted - if err := mc.WaitForOperation(req, nil); err != nil { - return fmt.Errorf( - "Error deleting Network Security Group (%s): %s", rs.Primary.ID, err) + if !management.IsResourceNotFoundError(err) { + return err } } diff --git a/builtin/providers/azure/resource_azure_virtual_network_test.go b/builtin/providers/azure/resource_azure_virtual_network_test.go index c6787f3fe..69a0362a5 100644 --- a/builtin/providers/azure/resource_azure_virtual_network_test.go +++ b/builtin/providers/azure/resource_azure_virtual_network_test.go @@ -188,24 +188,11 @@ func testAccCheckAzureVirtualNetworkDestroy(s *terraform.State) error { return fmt.Errorf("Error retrieving Virtual Network Configuration: %s", err) } - filtered := nc.Configuration.VirtualNetworkSites[:0] for _, n := range nc.Configuration.VirtualNetworkSites { - if n.Name != rs.Primary.ID { - filtered = append(filtered, n) + if n.Name == rs.Primary.ID { + return fmt.Errorf("Resource %s still exists", rs.Primary.ID) } } - - nc.Configuration.VirtualNetworkSites = filtered - - req, err := virtualnetwork.NewClient(mc).SetVirtualNetworkConfiguration(nc) - if err != nil { - return fmt.Errorf("Error deleting Virtual Network %s: %s", rs.Primary.ID, err) - } - - // Wait until the virtual network is deleted - if err := mc.WaitForOperation(req, nil); err != nil { - return fmt.Errorf("Error waiting for Virtual Network %s to be deleted: %s", rs.Primary.ID, err) - } } return nil From aed17f865864baa7ff7f3cf10a51f54e8cc148dc Mon Sep 17 00:00:00 2001 From: justnom Date: Thu, 4 Jun 2015 11:44:33 -0400 Subject: [PATCH 59/91] Fixing bugs with `aws_network_interface` and added docs. When a user tried to create an `aws_network_interface` resource without specifying the `private_ips` or `security_groups` attributes the API call to AWS would fail with a 500 HTTP error. Length checks have been put in place for both of these attributes before they are added to the `ec2.CreateNetworkInterfaceInput` struct. Documentation was also added for the `aws_network_interface` resource. --- .../aws/resource_aws_network_interface.go | 14 +++-- .../aws/r/network_interface.markdown | 51 +++++++++++++++++++ 2 files changed, 62 insertions(+), 3 deletions(-) create mode 100644 website/source/docs/providers/aws/r/network_interface.markdown diff --git a/builtin/providers/aws/resource_aws_network_interface.go b/builtin/providers/aws/resource_aws_network_interface.go index 430c5b992..aee50f0aa 100644 --- a/builtin/providers/aws/resource_aws_network_interface.go +++ b/builtin/providers/aws/resource_aws_network_interface.go @@ -78,9 +78,17 @@ func resourceAwsNetworkInterfaceCreate(d *schema.ResourceData, meta interface{}) conn := meta.(*AWSClient).ec2conn request := &ec2.CreateNetworkInterfaceInput{ - Groups: expandStringList(d.Get("security_groups").(*schema.Set).List()), - SubnetID: aws.String(d.Get("subnet_id").(string)), - PrivateIPAddresses: expandPrivateIPAddesses(d.Get("private_ips").(*schema.Set).List()), + SubnetID: aws.String(d.Get("subnet_id").(string)), + } + + security_groups := d.Get("security_groups").(*schema.Set).List() + if len(security_groups) != 0 { + request.Groups = expandStringList(security_groups) + } + + private_ips := d.Get("private_ips").(*schema.Set).List() + if len(private_ips) != 0 { + request.PrivateIPAddresses = expandPrivateIPAddesses(private_ips) } log.Printf("[DEBUG] Creating network interface") diff --git a/website/source/docs/providers/aws/r/network_interface.markdown b/website/source/docs/providers/aws/r/network_interface.markdown new file mode 100644 index 000000000..8144d8f0f --- /dev/null +++ b/website/source/docs/providers/aws/r/network_interface.markdown @@ -0,0 +1,51 @@ +--- +layout: "aws" +page_title: "AWS: aws_network_interface" +sidebar_current: "docs-aws-resource-network-interface" +description: |- + Provides an Elastic network interface (ENI) resource. +--- + +# aws\_network\_interface + +Provides an Elastic network interface (ENI) resource. + +## Example Usage + +``` +resource "aws_network_interface" "test" { + subnet_id = "${aws_subnet.public_a.id}" + private_ips = ["10.0.0.50"] + security_groups = ["${aws_security_group.web.name}"] + attachment { + instance = "${aws_instance.test.id}" + device_index = 1 + } +} +``` + +## Argument Reference + +The following arguments are supported: + +* `subnet_id` - (Required) Subnet ID to create the ENI in. +* `private_ips` - (Optional) List of private IPs to assign to the ENI. +* `security_groups` - (Optional) List of security group IDs to assign to the ENI. +* `attachment` - (Required) Block to define the attachment of the ENI. Documented below. +* `tags` - (Optional) A mapping of tags to assign to the resource. + +The `attachment` block supports: + +* `instance` - (Required) ID of the instance to attach to. +* `device_index` - (Required) Integer to define the devices index. + +## Attributes Reference + +The following attributes are exported: + +* `subnet_id` - Subnet ID the ENI is in. +* `private_ips` - List of private IPs assigned to the ENI. +* `security_groups` - List of security groups attached to the ENI. +* `attachment` - Block defining the attachment of the ENI. +* `tags` - Tags assigned to the ENI. + From 7fe29efc1df568018200fd7dd2ec851795eb5da8 Mon Sep 17 00:00:00 2001 From: Travis Truman Date: Thu, 4 Jun 2015 14:27:18 -0400 Subject: [PATCH 60/91] Fixes #2212 by allowing OS_AUTH_TOKEN to set api_key config value --- builtin/providers/openstack/provider.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/providers/openstack/provider.go b/builtin/providers/openstack/provider.go index 188beadd7..2d68d82ec 100644 --- a/builtin/providers/openstack/provider.go +++ b/builtin/providers/openstack/provider.go @@ -44,7 +44,7 @@ func Provider() terraform.ResourceProvider { "api_key": &schema.Schema{ Type: schema.TypeString, Optional: true, - Default: "", + DefaultFunc: envDefaultFunc("OS_AUTH_TOKEN"), }, "domain_id": &schema.Schema{ Type: schema.TypeString, From 943bf3c00a0ab7868d5e9e74beb78cc697c92619 Mon Sep 17 00:00:00 2001 From: Svend Sorensen Date: Thu, 4 Jun 2015 13:03:01 -0700 Subject: [PATCH 61/91] Use name of function in comment string Name of function is Difference, not Differences. --- helper/schema/set.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helper/schema/set.go b/helper/schema/set.go index 7176b8630..8d21866df 100644 --- a/helper/schema/set.go +++ b/helper/schema/set.go @@ -74,7 +74,7 @@ func (s *Set) List() []interface{} { return result } -// Differences performs a set difference of the two sets, returning +// Difference performs a set difference of the two sets, returning // a new third set that has only the elements unique to this set. func (s *Set) Difference(other *Set) *Set { result := &Set{F: s.F} From 5e6b0166afdff8f78d77da2ecd3dfdc1924030d5 Mon Sep 17 00:00:00 2001 From: Clint Shryock Date: Thu, 4 Jun 2015 15:01:04 -0500 Subject: [PATCH 62/91] provider/aws: Add ASG SNS Notification top level resource - works with multiple asgs --- builtin/providers/aws/provider.go | 1 + .../resource_aws_autoscaling_notification.go | 224 +++++++++++++++ ...ource_aws_autoscaling_notification_test.go | 256 ++++++++++++++++++ 3 files changed, 481 insertions(+) create mode 100644 builtin/providers/aws/resource_aws_autoscaling_notification.go create mode 100644 builtin/providers/aws/resource_aws_autoscaling_notification_test.go diff --git a/builtin/providers/aws/provider.go b/builtin/providers/aws/provider.go index 9e0f928a4..f287ca681 100644 --- a/builtin/providers/aws/provider.go +++ b/builtin/providers/aws/provider.go @@ -85,6 +85,7 @@ func Provider() terraform.ResourceProvider { ResourcesMap: map[string]*schema.Resource{ "aws_app_cookie_stickiness_policy": resourceAwsAppCookieStickinessPolicy(), "aws_autoscaling_group": resourceAwsAutoscalingGroup(), + "aws_autoscaling_notification": resourceAwsAutoscalingNotification(), "aws_customer_gateway": resourceAwsCustomerGateway(), "aws_db_instance": resourceAwsDbInstance(), "aws_db_parameter_group": resourceAwsDbParameterGroup(), diff --git a/builtin/providers/aws/resource_aws_autoscaling_notification.go b/builtin/providers/aws/resource_aws_autoscaling_notification.go new file mode 100644 index 000000000..1eedeef75 --- /dev/null +++ b/builtin/providers/aws/resource_aws_autoscaling_notification.go @@ -0,0 +1,224 @@ +package aws + +import ( + "fmt" + "sort" + "strings" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/aws-sdk-go/service/autoscaling" + "github.com/hashicorp/terraform/helper/schema" +) + +func resourceAwsAutoscalingNotification() *schema.Resource { + return &schema.Resource{ + Create: resourceAwsAutoscalingNotificationCreate, + Read: resourceAwsAutoscalingNotificationRead, + Update: resourceAwsAutoscalingNotificationUpdate, + Delete: resourceAwsAutoscalingNotificationDelete, + + Schema: map[string]*schema.Schema{ + "topic_arn": &schema.Schema{ + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "group_names": &schema.Schema{ + Type: schema.TypeSet, + Required: true, + Elem: &schema.Schema{Type: schema.TypeString}, + Set: schema.HashString, + }, + + "notifications": &schema.Schema{ + Type: schema.TypeList, + Required: true, + Elem: &schema.Schema{Type: schema.TypeString}, + Set: schema.HashString, + }, + }, + } +} + +func resourceAwsAutoscalingNotificationCreate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).autoscalingconn + gl := d.Get("group_names").(*schema.Set).List() + var groups []interface{} + for _, g := range gl { + groups = append(groups, g) + } + + nl := getNofiticationList(d.Get("notifications").([]interface{})) + + topic := d.Get("topic_arn").(string) + if err := addNotificationConfigToGroupsWithTopic(conn, groups, nl, topic); err != nil { + return err + } + + // ARNs are unique, and these notifications are per ARN, so we re-use the ARN + // here as the ID + d.SetId(topic) + return resourceAwsAutoscalingNotificationRead(d, meta) +} + +func resourceAwsAutoscalingNotificationRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).autoscalingconn + gl := d.Get("group_names").(*schema.Set).List() + var groups []*string + for _, g := range gl { + groups = append(groups, aws.String(g.(string))) + } + + opts := &autoscaling.DescribeNotificationConfigurationsInput{ + AutoScalingGroupNames: groups, + } + + resp, err := conn.DescribeNotificationConfigurations(opts) + if err != nil { + return fmt.Errorf("Error describing notifications") + } + + // grab all applicable notifcation configurations for this Topic + gRaw := make(map[string]bool) + nRaw := make(map[string]bool) + topic := d.Get("topic_arn").(string) + for _, n := range resp.NotificationConfigurations { + if *n.TopicARN == topic { + gRaw[*n.AutoScalingGroupName] = true + nRaw[*n.NotificationType] = true + } + } + + var gList []string + for k, _ := range gRaw { + gList = append(gList, k) + } + var nList []string + for k, _ := range nRaw { + nList = append(nList, k) + } + + sort.Strings(gList) + sort.Strings(nList) + + if err := d.Set("group_names", gList); err != nil { + return err + } + if err := d.Set("notifications", nList); err != nil { + return err + } + + return nil +} + +func resourceAwsAutoscalingNotificationUpdate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).autoscalingconn + + nl := getNofiticationList(d.Get("notifications").([]interface{})) + + o, n := d.GetChange("group_names") + if o == nil { + o = new(schema.Set) + } + if n == nil { + n = new(schema.Set) + } + + os := o.(*schema.Set) + ns := n.(*schema.Set) + remove := os.Difference(ns).List() + add := ns.Difference(os).List() + + topic := d.Get("topic_arn").(string) + + if err := removeNotificationConfigToGroupsWithTopic(conn, remove, topic); err != nil { + return err + } + + var update []interface{} + if d.HasChange("notifications") { + for _, g := range d.Get("group_names").(*schema.Set).List() { + update = append(update, g) + } + } else { + update = add + } + + if err := addNotificationConfigToGroupsWithTopic(conn, update, nl, topic); err != nil { + return err + } + + return resourceAwsAutoscalingNotificationRead(d, meta) +} + +func addNotificationConfigToGroupsWithTopic(conn *autoscaling.AutoScaling, groups []interface{}, nl []*string, topic string) error { + for _, a := range groups { + opts := &autoscaling.PutNotificationConfigurationInput{ + AutoScalingGroupName: aws.String(a.(string)), + NotificationTypes: nl, + TopicARN: aws.String(topic), + } + + _, err := conn.PutNotificationConfiguration(opts) + if err != nil { + if awsErr, ok := err.(awserr.Error); ok { + return fmt.Errorf("[WARN] Error creating Autoscaling Group Notification for Group %s, error: \"%s\", code: \"%s\"", a.(string), awsErr.Message(), awsErr.Code()) + } + return err + } + } + return nil +} + +func removeNotificationConfigToGroupsWithTopic(conn *autoscaling.AutoScaling, groups []interface{}, topic string) error { + for _, r := range groups { + opts := &autoscaling.DeleteNotificationConfigurationInput{ + AutoScalingGroupName: aws.String(r.(string)), + TopicARN: aws.String(topic), + } + + _, err := conn.DeleteNotificationConfiguration(opts) + if err != nil { + return fmt.Errorf("[WARN] Error deleting notification configuration for ASG \"%s\", Topic ARN \"%s\"", r.(string), topic) + } + } + return nil +} + +func resourceAwsAutoscalingNotificationDelete(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).autoscalingconn + gl := d.Get("group_names").(*schema.Set).List() + var groups []interface{} + for _, g := range gl { + groups = append(groups, g) + } + + topic := d.Get("topic_arn").(string) + if err := removeNotificationConfigToGroupsWithTopic(conn, groups, topic); err != nil { + return err + } + + return nil +} + +func buildNotificationTypesSlice(l []string) (nl []*string) { + for _, n := range l { + if !strings.HasPrefix(n, "autoscaling:") { + nl = append(nl, aws.String("autoscaling:"+n)) + } else { + nl = append(nl, aws.String(n)) + } + } + return nl +} + +func getNofiticationList(l []interface{}) (nl []*string) { + var notifications []string + for _, n := range l { + notifications = append(notifications, n.(string)) + } + + return buildNotificationTypesSlice(notifications) +} diff --git a/builtin/providers/aws/resource_aws_autoscaling_notification_test.go b/builtin/providers/aws/resource_aws_autoscaling_notification_test.go new file mode 100644 index 000000000..4b2ceed56 --- /dev/null +++ b/builtin/providers/aws/resource_aws_autoscaling_notification_test.go @@ -0,0 +1,256 @@ +package aws + +import ( + "fmt" + "strconv" + "testing" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/autoscaling" + "github.com/hashicorp/terraform/helper/resource" + "github.com/hashicorp/terraform/terraform" +) + +func TestBuildNotificationSlice(t *testing.T) { + a := "autoscaling:one" + b := "autoscaling:two" + + cases := []struct { + Input []string + Output []*string + }{ + {[]string{"one", "two"}, []*string{&a, &b}}, + {[]string{"autoscaling:one", "two"}, []*string{&a, &b}}, + } + + for _, tc := range cases { + actual := buildNotificationTypesSlice(tc.Input) + for i, a := range actual { + if *tc.Output[i] != *a { + t.Fatalf("bad converstion:\n\tinput: %s\n\toutput: %s", *tc.Output[i], *a) + } + } + } +} + +func TestAccASGNotification_basic(t *testing.T) { + var asgn autoscaling.DescribeNotificationConfigurationsOutput + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckASGNDestroy, + Steps: []resource.TestStep{ + resource.TestStep{ + Config: testAccASGNotificationConfig_basic, + Check: resource.ComposeTestCheckFunc( + testAccCheckASGNotificationExists("aws_autoscaling_notification.example", &asgn), + testAccCheckAWSASGNotificationAttributes("aws_autoscaling_notification.example", &asgn), + ), + }, + }, + }) +} + +func TestAccASGNotification_update(t *testing.T) { + var asgn autoscaling.DescribeNotificationConfigurationsOutput + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckASGNDestroy, + Steps: []resource.TestStep{ + resource.TestStep{ + Config: testAccASGNotificationConfig_basic, + Check: resource.ComposeTestCheckFunc( + testAccCheckASGNotificationExists("aws_autoscaling_notification.example", &asgn), + testAccCheckAWSASGNotificationAttributes("aws_autoscaling_notification.example", &asgn), + ), + }, + + resource.TestStep{ + Config: testAccASGNotificationConfig_update, + Check: resource.ComposeTestCheckFunc( + testAccCheckASGNotificationExists("aws_autoscaling_notification.example", &asgn), + testAccCheckAWSASGNotificationAttributes("aws_autoscaling_notification.example", &asgn), + ), + }, + }, + }) +} + +func testAccCheckASGNotificationExists(n string, asgn *autoscaling.DescribeNotificationConfigurationsOutput) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[n] + if !ok { + return fmt.Errorf("Not found: %s", n) + } + + if rs.Primary.ID == "" { + return fmt.Errorf("No ASG Notification ID is set") + } + + // var groups []*string + // groupCount, _ := strconv.Atoi(rs.Primary.Attributes["group_names.#"]) + // for i := 0; i < groupCount; i++ { + // key := fmt.Sprintf("group_names.%d", i) + // groups = append(groups, aws.String(rs.Primary.Attributes[key])) + // } + groups := []*string{aws.String("foobar1-terraform-test")} + + conn := testAccProvider.Meta().(*AWSClient).autoscalingconn + opts := &autoscaling.DescribeNotificationConfigurationsInput{ + AutoScalingGroupNames: groups, + } + + resp, err := conn.DescribeNotificationConfigurations(opts) + if err != nil { + return fmt.Errorf("Error describing notifications") + } + + *asgn = *resp + + return nil + } +} + +func testAccCheckASGNDestroy(s *terraform.State) error { + for _, rs := range s.RootModule().Resources { + if rs.Type != "aws_autoscaling_notification" { + continue + } + + groups := []*string{aws.String("foobar1-terraform-test")} + conn := testAccProvider.Meta().(*AWSClient).autoscalingconn + opts := &autoscaling.DescribeNotificationConfigurationsInput{ + AutoScalingGroupNames: groups, + } + + resp, err := conn.DescribeNotificationConfigurations(opts) + if err != nil { + return fmt.Errorf("Error describing notifications") + } + + if len(resp.NotificationConfigurations) != 0 { + fmt.Errorf("Error finding notification descriptions") + } + + } + return nil +} + +func testAccCheckAWSASGNotificationAttributes(n string, asgn *autoscaling.DescribeNotificationConfigurationsOutput) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[n] + if !ok { + return fmt.Errorf("Not found: %s", n) + } + + if rs.Primary.ID == "" { + return fmt.Errorf("No ASG Notification ID is set") + } + + if len(asgn.NotificationConfigurations) == 0 { + return fmt.Errorf("Error: no ASG Notifications found") + } + + var notifications []*autoscaling.NotificationConfiguration + for _, n := range asgn.NotificationConfigurations { + if *n.TopicARN == rs.Primary.Attributes["topic_arn"] { + notifications = append(notifications, n) + } + } + + typeCount, _ := strconv.Atoi(rs.Primary.Attributes["notifications.#"]) + + if len(notifications) != typeCount { + return fmt.Errorf("Error: Bad ASG Notification count, expected (%d), got (%d)", typeCount, len(notifications)) + } + + return nil + } +} + +const testAccASGNotificationConfig_basic = ` +resource "aws_sns_topic" "topic_example" { + name = "user-updates-topic" +} + +resource "aws_launch_configuration" "foobar" { + name = "foobarautoscaling-terraform-test" + image_id = "ami-21f78e11" + instance_type = "t1.micro" +} + +resource "aws_autoscaling_group" "bar" { + availability_zones = ["us-west-2a"] + name = "foobar1-terraform-test" + max_size = 1 + min_size = 1 + health_check_grace_period = 100 + health_check_type = "ELB" + desired_capacity = 1 + force_delete = true + termination_policies = ["OldestInstance"] + launch_configuration = "${aws_launch_configuration.foobar.name}" +} + +resource "aws_autoscaling_notification" "example" { + group_names = ["${aws_autoscaling_group.bar.name}"] + notifications = [ + "autoscaling:EC2_INSTANCE_LAUNCH", + "autoscaling:EC2_INSTANCE_TERMINATE", + ] + topic_arn = "${aws_sns_topic.topic_example.arn}" +} +` + +const testAccASGNotificationConfig_update = ` +resource "aws_sns_topic" "user_updates" { + name = "user-updates-topic" +} + +resource "aws_launch_configuration" "foobar" { + name = "foobarautoscaling-terraform-test" + image_id = "ami-21f78e11" + instance_type = "t1.micro" +} + +resource "aws_autoscaling_group" "bar" { + availability_zones = ["us-west-2a"] + name = "foobar1-terraform-test" + max_size = 1 + min_size = 1 + health_check_grace_period = 100 + health_check_type = "ELB" + desired_capacity = 1 + force_delete = true + termination_policies = ["OldestInstance"] + launch_configuration = "${aws_launch_configuration.foobar.name}" +} + +resource "aws_autoscaling_group" "foo" { + availability_zones = ["us-west-2b"] + name = "barfoo-terraform-test" + max_size = 1 + min_size = 1 + health_check_grace_period = 200 + health_check_type = "ELB" + desired_capacity = 1 + force_delete = true + termination_policies = ["OldestInstance"] + launch_configuration = "${aws_launch_configuration.foobar.name}" +} + +resource "aws_autoscaling_notification" "example" { + group_names = [ + "${aws_autoscaling_group.bar.name}", + "${aws_autoscaling_group.foo.name}", + ] + notifications = [ + "EC2_INSTANCE_LAUNCH", + "EC2_INSTANCE_TERMINATE", + "EC2_INSTANCE_LAUNCH_ERROR" + ] + topic_arn = "${aws_sns_topic.user_updates.arn}" +}` From d65c8a421a957b9d157350a608bec9c0f9ba44b1 Mon Sep 17 00:00:00 2001 From: Clint Shryock Date: Fri, 5 Jun 2015 10:00:39 -0500 Subject: [PATCH 63/91] refactor the internals of this --- .../resource_aws_autoscaling_notification.go | 88 +++++++------------ ...ource_aws_autoscaling_notification_test.go | 86 +++++++++--------- 2 files changed, 73 insertions(+), 101 deletions(-) diff --git a/builtin/providers/aws/resource_aws_autoscaling_notification.go b/builtin/providers/aws/resource_aws_autoscaling_notification.go index 1eedeef75..07adaa676 100644 --- a/builtin/providers/aws/resource_aws_autoscaling_notification.go +++ b/builtin/providers/aws/resource_aws_autoscaling_notification.go @@ -2,8 +2,6 @@ package aws import ( "fmt" - "sort" - "strings" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" @@ -33,7 +31,7 @@ func resourceAwsAutoscalingNotification() *schema.Resource { }, "notifications": &schema.Schema{ - Type: schema.TypeList, + Type: schema.TypeSet, Required: true, Elem: &schema.Schema{Type: schema.TypeString}, Set: schema.HashString, @@ -44,16 +42,11 @@ func resourceAwsAutoscalingNotification() *schema.Resource { func resourceAwsAutoscalingNotificationCreate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).autoscalingconn - gl := d.Get("group_names").(*schema.Set).List() - var groups []interface{} - for _, g := range gl { - groups = append(groups, g) - } - - nl := getNofiticationList(d.Get("notifications").([]interface{})) + gl := convertSetToList(d.Get("group_names").(*schema.Set)) + nl := convertSetToList(d.Get("notifications").(*schema.Set)) topic := d.Get("topic_arn").(string) - if err := addNotificationConfigToGroupsWithTopic(conn, groups, nl, topic); err != nil { + if err := addNotificationConfigToGroupsWithTopic(conn, gl, nl, topic); err != nil { return err } @@ -65,14 +58,10 @@ func resourceAwsAutoscalingNotificationCreate(d *schema.ResourceData, meta inter func resourceAwsAutoscalingNotificationRead(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).autoscalingconn - gl := d.Get("group_names").(*schema.Set).List() - var groups []*string - for _, g := range gl { - groups = append(groups, aws.String(g.(string))) - } + gl := convertSetToList(d.Get("group_names").(*schema.Set)) opts := &autoscaling.DescribeNotificationConfigurationsInput{ - AutoScalingGroupNames: groups, + AutoScalingGroupNames: gl, } resp, err := conn.DescribeNotificationConfigurations(opts) @@ -80,10 +69,12 @@ func resourceAwsAutoscalingNotificationRead(d *schema.ResourceData, meta interfa return fmt.Errorf("Error describing notifications") } - // grab all applicable notifcation configurations for this Topic + topic := d.Get("topic_arn").(string) + // Grab all applicable notifcation configurations for this Topic. + // Each NotificationType will have a record, so 1 Group with 3 Types results + // in 3 records, all with the same Group name gRaw := make(map[string]bool) nRaw := make(map[string]bool) - topic := d.Get("topic_arn").(string) for _, n := range resp.NotificationConfigurations { if *n.TopicARN == topic { gRaw[*n.AutoScalingGroupName] = true @@ -91,18 +82,18 @@ func resourceAwsAutoscalingNotificationRead(d *schema.ResourceData, meta interfa } } + // Grab the keys here as the list of Groups var gList []string for k, _ := range gRaw { gList = append(gList, k) } + + // Grab the keys here as the list of Types var nList []string for k, _ := range nRaw { nList = append(nList, k) } - sort.Strings(gList) - sort.Strings(nList) - if err := d.Set("group_names", gList); err != nil { return err } @@ -116,7 +107,9 @@ func resourceAwsAutoscalingNotificationRead(d *schema.ResourceData, meta interfa func resourceAwsAutoscalingNotificationUpdate(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).autoscalingconn - nl := getNofiticationList(d.Get("notifications").([]interface{})) + // Notifications API call is a PUT, so we don't need to diff the list, just + // push whatever it is and AWS sorts it out + nl := convertSetToList(d.Get("notifications").(*schema.Set)) o, n := d.GetChange("group_names") if o == nil { @@ -128,8 +121,8 @@ func resourceAwsAutoscalingNotificationUpdate(d *schema.ResourceData, meta inter os := o.(*schema.Set) ns := n.(*schema.Set) - remove := os.Difference(ns).List() - add := ns.Difference(os).List() + remove := convertSetToList(os.Difference(ns)) + add := convertSetToList(ns.Difference(os)) topic := d.Get("topic_arn").(string) @@ -137,11 +130,9 @@ func resourceAwsAutoscalingNotificationUpdate(d *schema.ResourceData, meta inter return err } - var update []interface{} + var update []*string if d.HasChange("notifications") { - for _, g := range d.Get("group_names").(*schema.Set).List() { - update = append(update, g) - } + update = convertSetToList(d.Get("group_names").(*schema.Set)) } else { update = add } @@ -153,10 +144,10 @@ func resourceAwsAutoscalingNotificationUpdate(d *schema.ResourceData, meta inter return resourceAwsAutoscalingNotificationRead(d, meta) } -func addNotificationConfigToGroupsWithTopic(conn *autoscaling.AutoScaling, groups []interface{}, nl []*string, topic string) error { +func addNotificationConfigToGroupsWithTopic(conn *autoscaling.AutoScaling, groups []*string, nl []*string, topic string) error { for _, a := range groups { opts := &autoscaling.PutNotificationConfigurationInput{ - AutoScalingGroupName: aws.String(a.(string)), + AutoScalingGroupName: a, NotificationTypes: nl, TopicARN: aws.String(topic), } @@ -164,7 +155,7 @@ func addNotificationConfigToGroupsWithTopic(conn *autoscaling.AutoScaling, group _, err := conn.PutNotificationConfiguration(opts) if err != nil { if awsErr, ok := err.(awserr.Error); ok { - return fmt.Errorf("[WARN] Error creating Autoscaling Group Notification for Group %s, error: \"%s\", code: \"%s\"", a.(string), awsErr.Message(), awsErr.Code()) + return fmt.Errorf("[WARN] Error creating Autoscaling Group Notification for Group %s, error: \"%s\", code: \"%s\"", *a, awsErr.Message(), awsErr.Code()) } return err } @@ -172,16 +163,16 @@ func addNotificationConfigToGroupsWithTopic(conn *autoscaling.AutoScaling, group return nil } -func removeNotificationConfigToGroupsWithTopic(conn *autoscaling.AutoScaling, groups []interface{}, topic string) error { +func removeNotificationConfigToGroupsWithTopic(conn *autoscaling.AutoScaling, groups []*string, topic string) error { for _, r := range groups { opts := &autoscaling.DeleteNotificationConfigurationInput{ - AutoScalingGroupName: aws.String(r.(string)), + AutoScalingGroupName: r, TopicARN: aws.String(topic), } _, err := conn.DeleteNotificationConfiguration(opts) if err != nil { - return fmt.Errorf("[WARN] Error deleting notification configuration for ASG \"%s\", Topic ARN \"%s\"", r.(string), topic) + return fmt.Errorf("[WARN] Error deleting notification configuration for ASG \"%s\", Topic ARN \"%s\"", *r, topic) } } return nil @@ -189,36 +180,21 @@ func removeNotificationConfigToGroupsWithTopic(conn *autoscaling.AutoScaling, gr func resourceAwsAutoscalingNotificationDelete(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).autoscalingconn - gl := d.Get("group_names").(*schema.Set).List() - var groups []interface{} - for _, g := range gl { - groups = append(groups, g) - } + gl := convertSetToList(d.Get("group_names").(*schema.Set)) topic := d.Get("topic_arn").(string) - if err := removeNotificationConfigToGroupsWithTopic(conn, groups, topic); err != nil { + if err := removeNotificationConfigToGroupsWithTopic(conn, gl, topic); err != nil { return err } return nil } -func buildNotificationTypesSlice(l []string) (nl []*string) { +func convertSetToList(s *schema.Set) (nl []*string) { + l := s.List() for _, n := range l { - if !strings.HasPrefix(n, "autoscaling:") { - nl = append(nl, aws.String("autoscaling:"+n)) - } else { - nl = append(nl, aws.String(n)) - } + nl = append(nl, aws.String(n.(string))) } + return nl } - -func getNofiticationList(l []interface{}) (nl []*string) { - var notifications []string - for _, n := range l { - notifications = append(notifications, n.(string)) - } - - return buildNotificationTypesSlice(notifications) -} diff --git a/builtin/providers/aws/resource_aws_autoscaling_notification_test.go b/builtin/providers/aws/resource_aws_autoscaling_notification_test.go index 4b2ceed56..a9b078a6e 100644 --- a/builtin/providers/aws/resource_aws_autoscaling_notification_test.go +++ b/builtin/providers/aws/resource_aws_autoscaling_notification_test.go @@ -11,28 +11,6 @@ import ( "github.com/hashicorp/terraform/terraform" ) -func TestBuildNotificationSlice(t *testing.T) { - a := "autoscaling:one" - b := "autoscaling:two" - - cases := []struct { - Input []string - Output []*string - }{ - {[]string{"one", "two"}, []*string{&a, &b}}, - {[]string{"autoscaling:one", "two"}, []*string{&a, &b}}, - } - - for _, tc := range cases { - actual := buildNotificationTypesSlice(tc.Input) - for i, a := range actual { - if *tc.Output[i] != *a { - t.Fatalf("bad converstion:\n\tinput: %s\n\toutput: %s", *tc.Output[i], *a) - } - } - } -} - func TestAccASGNotification_basic(t *testing.T) { var asgn autoscaling.DescribeNotificationConfigurationsOutput @@ -44,7 +22,7 @@ func TestAccASGNotification_basic(t *testing.T) { resource.TestStep{ Config: testAccASGNotificationConfig_basic, Check: resource.ComposeTestCheckFunc( - testAccCheckASGNotificationExists("aws_autoscaling_notification.example", &asgn), + testAccCheckASGNotificationExists("aws_autoscaling_notification.example", []string{"foobar1-terraform-test"}, &asgn), testAccCheckAWSASGNotificationAttributes("aws_autoscaling_notification.example", &asgn), ), }, @@ -63,7 +41,7 @@ func TestAccASGNotification_update(t *testing.T) { resource.TestStep{ Config: testAccASGNotificationConfig_basic, Check: resource.ComposeTestCheckFunc( - testAccCheckASGNotificationExists("aws_autoscaling_notification.example", &asgn), + testAccCheckASGNotificationExists("aws_autoscaling_notification.example", []string{"foobar1-terraform-test"}, &asgn), testAccCheckAWSASGNotificationAttributes("aws_autoscaling_notification.example", &asgn), ), }, @@ -71,7 +49,7 @@ func TestAccASGNotification_update(t *testing.T) { resource.TestStep{ Config: testAccASGNotificationConfig_update, Check: resource.ComposeTestCheckFunc( - testAccCheckASGNotificationExists("aws_autoscaling_notification.example", &asgn), + testAccCheckASGNotificationExists("aws_autoscaling_notification.example", []string{"foobar1-terraform-test", "barfoo-terraform-test"}, &asgn), testAccCheckAWSASGNotificationAttributes("aws_autoscaling_notification.example", &asgn), ), }, @@ -79,7 +57,7 @@ func TestAccASGNotification_update(t *testing.T) { }) } -func testAccCheckASGNotificationExists(n string, asgn *autoscaling.DescribeNotificationConfigurationsOutput) resource.TestCheckFunc { +func testAccCheckASGNotificationExists(n string, groups []string, asgn *autoscaling.DescribeNotificationConfigurationsOutput) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] if !ok { @@ -90,17 +68,14 @@ func testAccCheckASGNotificationExists(n string, asgn *autoscaling.DescribeNotif return fmt.Errorf("No ASG Notification ID is set") } - // var groups []*string - // groupCount, _ := strconv.Atoi(rs.Primary.Attributes["group_names.#"]) - // for i := 0; i < groupCount; i++ { - // key := fmt.Sprintf("group_names.%d", i) - // groups = append(groups, aws.String(rs.Primary.Attributes[key])) - // } - groups := []*string{aws.String("foobar1-terraform-test")} + var gl []*string + for _, g := range groups { + gl = append(gl, aws.String(g)) + } conn := testAccProvider.Meta().(*AWSClient).autoscalingconn opts := &autoscaling.DescribeNotificationConfigurationsInput{ - AutoScalingGroupNames: groups, + AutoScalingGroupNames: gl, } resp, err := conn.DescribeNotificationConfigurations(opts) @@ -154,17 +129,38 @@ func testAccCheckAWSASGNotificationAttributes(n string, asgn *autoscaling.Descri return fmt.Errorf("Error: no ASG Notifications found") } - var notifications []*autoscaling.NotificationConfiguration + // build a unique list of groups, notification types + gRaw := make(map[string]bool) + nRaw := make(map[string]bool) for _, n := range asgn.NotificationConfigurations { if *n.TopicARN == rs.Primary.Attributes["topic_arn"] { - notifications = append(notifications, n) + gRaw[*n.AutoScalingGroupName] = true + nRaw[*n.NotificationType] = true } } + // Grab the keys here as the list of Groups + var gList []string + for k, _ := range gRaw { + gList = append(gList, k) + } + + // Grab the keys here as the list of Types + var nList []string + for k, _ := range nRaw { + nList = append(nList, k) + } + typeCount, _ := strconv.Atoi(rs.Primary.Attributes["notifications.#"]) - if len(notifications) != typeCount { - return fmt.Errorf("Error: Bad ASG Notification count, expected (%d), got (%d)", typeCount, len(notifications)) + if len(nList) != typeCount { + return fmt.Errorf("Error: Bad ASG Notification count, expected (%d), got (%d)", typeCount, len(nList)) + } + + groupCount, _ := strconv.Atoi(rs.Primary.Attributes["group_names.#"]) + + if len(gList) != groupCount { + return fmt.Errorf("Error: Bad ASG Group count, expected (%d), got (%d)", typeCount, len(gList)) } return nil @@ -243,14 +239,14 @@ resource "aws_autoscaling_group" "foo" { } resource "aws_autoscaling_notification" "example" { - group_names = [ + group_names = [ "${aws_autoscaling_group.bar.name}", "${aws_autoscaling_group.foo.name}", ] - notifications = [ - "EC2_INSTANCE_LAUNCH", - "EC2_INSTANCE_TERMINATE", - "EC2_INSTANCE_LAUNCH_ERROR" - ] - topic_arn = "${aws_sns_topic.user_updates.arn}" + notifications = [ + "autoscaling:EC2_INSTANCE_LAUNCH", + "autoscaling:EC2_INSTANCE_TERMINATE", + "autoscaling:EC2_INSTANCE_LAUNCH_ERROR" + ] + topic_arn = "${aws_sns_topic.user_updates.arn}" }` From 3858ee0adedb47d181a365e6da68812f89d8c7ef Mon Sep 17 00:00:00 2001 From: Clint Shryock Date: Fri, 5 Jun 2015 10:14:24 -0500 Subject: [PATCH 64/91] add docs for asg notifications --- .../r/autoscaling_notification.html.markdown | 65 +++++++++++++++++++ website/source/layouts/aws.erb | 4 ++ 2 files changed, 69 insertions(+) create mode 100644 website/source/docs/providers/aws/r/autoscaling_notification.html.markdown diff --git a/website/source/docs/providers/aws/r/autoscaling_notification.html.markdown b/website/source/docs/providers/aws/r/autoscaling_notification.html.markdown new file mode 100644 index 000000000..620ef5490 --- /dev/null +++ b/website/source/docs/providers/aws/r/autoscaling_notification.html.markdown @@ -0,0 +1,65 @@ +--- +layout: "aws" +page_title: "AWS: aws_vpc" +sidebar_current: "docs-aws-resource-autoscaling-notification" +description: |- + Provides an AutoScaling Group with Notification support +--- + +# aws\_vpc + +Provides an AutoScaling Group with Notification support, via SNS Topics + +## Example Usage + +Basic usage: + +``` +resource "aws_autoscaling_notification" "example_notifications" { + group_names = [ + "${aws_autoscaling_group.bar.name}", + "${aws_autoscaling_group.foo.name}", + ] + notifications = [ + "autoscaling:EC2_INSTANCE_LAUNCH", + "autoscaling:EC2_INSTANCE_TERMINATE", + "autoscaling:EC2_INSTANCE_LAUNCH_ERROR" + ] + topic_arn = "${aws_sns_topic.example.arn}" +} + +resource "aws_sns_topic" "example" { + name = "example-topic" + # arn is an exported attribute +} + +resource "aws_autoscaling_group" "bar" { + name = "foobar1-terraform-test" + [... ASG attributes ...] +} + +resource "aws_autoscaling_group" "foo" { + name = "barfoo-terraform-test" + [... ASG attributes ...] +} +``` + +## Argument Reference + +The following arguments are supported: + +* `group_names` - (Required) A list of AutoScaling Group Names +* `notifications` - (Required) A list of Notification Types that trigger +notifications. Acceptable are documented [in the AWS documentation here][1] +* `topic_arn` - (Required) The Topic ARN for notifications to be sent through + +## Attributes Reference + +The following attributes are exported: + +* `group_names` +* `notifications` +* `topic_arn` + + +[1]: http://docs.aws.amazon.com/AutoScaling/latest/APIReference/API_NotificationConfiguration.html diff --git a/website/source/layouts/aws.erb b/website/source/layouts/aws.erb index 219b3ed3c..3e7e9ed42 100644 --- a/website/source/layouts/aws.erb +++ b/website/source/layouts/aws.erb @@ -17,6 +17,10 @@ aws_autoscaling_group + > + aws_autoscaling_notification + + > aws_customer_gateway From f65cce478b9233bc8556bcd9a488947566bffa5f Mon Sep 17 00:00:00 2001 From: Paul Hinze Date: Fri, 5 Jun 2015 10:12:32 -0500 Subject: [PATCH 65/91] provider/aws: fix case in ELB listener protocols fixes #2242 --- builtin/providers/aws/resource_aws_elb.go | 7 ++-- .../providers/aws/resource_aws_elb_test.go | 36 ++++++++++++++++++- 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/builtin/providers/aws/resource_aws_elb.go b/builtin/providers/aws/resource_aws_elb.go index a613cbd80..ebc45c941 100644 --- a/builtin/providers/aws/resource_aws_elb.go +++ b/builtin/providers/aws/resource_aws_elb.go @@ -4,6 +4,7 @@ import ( "bytes" "fmt" "log" + "strings" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" @@ -541,9 +542,11 @@ func resourceAwsElbListenerHash(v interface{}) int { var buf bytes.Buffer m := v.(map[string]interface{}) buf.WriteString(fmt.Sprintf("%d-", m["instance_port"].(int))) - buf.WriteString(fmt.Sprintf("%s-", m["instance_protocol"].(string))) + buf.WriteString(fmt.Sprintf("%s-", + strings.ToLower(m["instance_protocol"].(string)))) buf.WriteString(fmt.Sprintf("%d-", m["lb_port"].(int))) - buf.WriteString(fmt.Sprintf("%s-", m["lb_protocol"].(string))) + buf.WriteString(fmt.Sprintf("%s-", + strings.ToLower(m["lb_protocol"].(string)))) if v, ok := m["ssl_certificate_id"]; ok { buf.WriteString(fmt.Sprintf("%s-", v.(string))) diff --git a/builtin/providers/aws/resource_aws_elb_test.go b/builtin/providers/aws/resource_aws_elb_test.go index aca375e06..f4cdc3a96 100644 --- a/builtin/providers/aws/resource_aws_elb_test.go +++ b/builtin/providers/aws/resource_aws_elb_test.go @@ -362,6 +362,39 @@ func TestAccAWSELB_SecurityGroups(t *testing.T) { }) } +// Unit test for listeners hash +func TestResourceAwsElbListenerHash(t *testing.T) { + cases := map[string]struct { + Left map[string]interface{} + Right map[string]interface{} + Match bool + }{ + "protocols are case insensitive": { + map[string]interface{}{ + "instance_port": 80, + "instance_protocol": "TCP", + "lb_port": 80, + "lb_protocol": "TCP", + }, + map[string]interface{}{ + "instance_port": 80, + "instance_protocol": "Tcp", + "lb_port": 80, + "lb_protocol": "tcP", + }, + true, + }, + } + + for tn, tc := range cases { + leftHash := resourceAwsElbListenerHash(tc.Left) + rightHash := resourceAwsElbListenerHash(tc.Right) + if (leftHash == rightHash) != tc.Match { + t.Fatalf("%s: expected match: %t, but did not get it", tn, tc.Match) + } + } +} + func testAccCheckAWSELBDestroy(s *terraform.State) error { conn := testAccProvider.Meta().(*AWSClient).elbconn @@ -513,7 +546,8 @@ resource "aws_elb" "bar" { instance_port = 8000 instance_protocol = "http" lb_port = 80 - lb_protocol = "http" + // Protocol should be case insensitive + lb_protocol = "HttP" } tags { From 09bac2384e454cba3d280b6f685d8a5ebfa79306 Mon Sep 17 00:00:00 2001 From: justnom Date: Fri, 5 Jun 2015 12:31:19 -0400 Subject: [PATCH 66/91] Adding `aws_network_interface` to sidebar. --- website/source/layouts/aws.erb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/website/source/layouts/aws.erb b/website/source/layouts/aws.erb index 219b3ed3c..331c409ce 100644 --- a/website/source/layouts/aws.erb +++ b/website/source/layouts/aws.erb @@ -133,6 +133,10 @@ aws_network_acl + > + aws_network_acl + + > aws_proxy_protocol_policy From 4ce65e5707e73719b4c201034031b4ccfe46b08c Mon Sep 17 00:00:00 2001 From: Paul Hinze Date: Fri, 5 Jun 2015 13:11:07 -0500 Subject: [PATCH 67/91] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f3421bf89..417e1e349 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,8 @@ IMPROVEMENTS: BUG FIXES: * provider/aws: fix panic when route has no cidr_block [GH-2215] + * provider/aws: fix issue causing perpetual diff on ELB listeners + when non-lowercase protocol strings were used [GH-2246] ## 0.5.3 (June 1, 2015) From f7a309a8bff3e66619ef4d4d19719eced8e73591 Mon Sep 17 00:00:00 2001 From: Paul Hinze Date: Fri, 5 Jun 2015 13:13:05 -0500 Subject: [PATCH 68/91] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 417e1e349..7cdd5f820 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,8 @@ IMPROVEMENTS: without destroying first [GH-2191] * provider/docker: `docker_container` has the `privileged` option. [GH-2227] + * provider/openstack: allow `OS_AUTH_TOKEN` environment variable + to set the openstack `api_key` field [GH-2234] BUG FIXES: From 9cfa1d5e5f0e4f32d194383b7d9cc1fd951b59c2 Mon Sep 17 00:00:00 2001 From: George Hartzell Date: Fri, 5 Jun 2015 12:05:21 -0700 Subject: [PATCH 69/91] Implement OpenStack/Swift remote Rework devcamcar's OpenStack Swift remote [pull request](https://github.com/hashicorp/terraform/pull/942) to work with Terraform's new `state/remote` and Gophercloud's current implementation. `Get()` changed up a bit from devcamcar's version (using different Gopercloud functionality resulted in less fussing around to figure out the error case). Otherwise this is a transliteration/remix of his ideas. --- state/remote/remote.go | 1 + state/remote/swift.go | 114 +++++++++++++++++++++++++++++++++++++ state/remote/swift_test.go | 25 ++++++++ 3 files changed, 140 insertions(+) create mode 100644 state/remote/swift.go create mode 100644 state/remote/swift_test.go diff --git a/state/remote/remote.go b/state/remote/remote.go index cb525e6a3..7ebea3222 100644 --- a/state/remote/remote.go +++ b/state/remote/remote.go @@ -40,6 +40,7 @@ var BuiltinClients = map[string]Factory{ "consul": consulFactory, "http": httpFactory, "s3": s3Factory, + "swift": swiftFactory, // This is used for development purposes only. "_local": fileFactory, diff --git a/state/remote/swift.go b/state/remote/swift.go new file mode 100644 index 000000000..a4293f737 --- /dev/null +++ b/state/remote/swift.go @@ -0,0 +1,114 @@ +package remote + +import ( + "bytes" + "crypto/md5" + "fmt" + "os" + "strings" + + "github.com/rackspace/gophercloud" + "github.com/rackspace/gophercloud/openstack" + "github.com/rackspace/gophercloud/openstack/objectstorage/v1/containers" + "github.com/rackspace/gophercloud/openstack/objectstorage/v1/objects" +) + +const TFSTATE_NAME = "tfstate.tf" + +// SwiftClient implements the Client interface for an Openstack Swift server. +type SwiftClient struct { + client *gophercloud.ServiceClient + path string +} + +func swiftFactory(conf map[string]string) (Client, error) { + client := &SwiftClient{} + + if err := client.validateConfig(conf); err != nil { + return nil, err + } + + return client, nil +} + +func (c *SwiftClient) validateConfig(conf map[string]string) (err error) { + if val := os.Getenv("OS_AUTH_URL"); val == "" { + return fmt.Errorf("missing OS_AUTH_URL environment variable") + } + if val := os.Getenv("OS_USERNAME"); val == "" { + return fmt.Errorf("missing OS_USERNAME environment variable") + } + if val := os.Getenv("OS_TENANT_NAME"); val == "" { + return fmt.Errorf("missing OS_TENANT_NAME environment variable") + } + if val := os.Getenv("OS_PASSWORD"); val == "" { + return fmt.Errorf("missing OS_PASSWORD environment variable") + } + path, ok := conf["path"] + if !ok || path == "" { + return fmt.Errorf("missing 'path' configuration") + } + + provider, err := openstack.AuthenticatedClient(gophercloud.AuthOptions{ + IdentityEndpoint: os.Getenv("OS_AUTH_URL"), + Username: os.Getenv("OS_USERNAME"), + TenantName: os.Getenv("OS_TENANT_NAME"), + Password: os.Getenv("OS_PASSWORD"), + }) + + if err != nil { + return err + } + + c.path = path + c.client, err = openstack.NewObjectStorageV1(provider, gophercloud.EndpointOpts{ + Region: os.Getenv("OS_REGION_NAME"), + }) + + return err +} + +func (c *SwiftClient) Get() (*Payload, error) { + result := objects.Download(c.client, c.path, TFSTATE_NAME, nil) + bytes, err := result.ExtractContent() + + if err != nil { + if strings.Contains(err.Error(), "but got 404 instead") { + return nil, nil + } + return nil, err + } + + hash := md5.Sum(bytes) + payload := &Payload{ + Data: bytes, + MD5: hash[:md5.Size], + } + + return payload, nil +} + +func (c *SwiftClient) Put(data []byte) error { + if err := c.ensureContainerExists(); err != nil { + return err + } + + reader := bytes.NewReader(data) + result := objects.Create(c.client, c.path, TFSTATE_NAME, reader, nil) + + return result.Err +} + +func (c *SwiftClient) Delete() error { + result := objects.Delete(c.client, c.path, TFSTATE_NAME, nil) + return result.Err +} + +func (c *SwiftClient) ensureContainerExists() error { + result := containers.Create(c.client, c.path, nil) + if result.Err != nil { + return result.Err + } + + return nil +} diff --git a/state/remote/swift_test.go b/state/remote/swift_test.go new file mode 100644 index 000000000..54666ca29 --- /dev/null +++ b/state/remote/swift_test.go @@ -0,0 +1,25 @@ +package remote + +import ( + "net/http" + "testing" +) + +func TestSwiftClient_impl(t *testing.T) { + var _ Client = new(SwiftClient) +} + +func TestSwiftClient(t *testing.T) { + if _, err := http.Get("http://google.com"); err != nil { + t.Skipf("skipping, internet seems to not be available: %s", err) + } + + client, err := swiftFactory(map[string]string{ + "path": "swift_test", + }) + if err != nil { + t.Fatalf("bad: %s", err) + } + + testClient(t, client) +} From c02b53dadc9f67aaec8c0a9c471343a5a2a66238 Mon Sep 17 00:00:00 2001 From: Clint Date: Fri, 5 Jun 2015 15:28:54 -0500 Subject: [PATCH 70/91] Update CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7cdd5f820..3404950c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,9 @@ FEATURES: * **New provider: `azure`** [GH-2053] + * **New resource: `aws_ecs_cluster`** [GH-1803] + * **New resource: `aws_ecs_service`** [GH-1803] + * **New resource: `aws_ecs_task_definition`** [GH-1803] * command/output: support display of module outputs [GH-2102] * core: keys() and values() funcs for map variables [GH-2198] From f8eb5e4b11d1df21b08dab733b969eefd5b32812 Mon Sep 17 00:00:00 2001 From: Clint Shryock Date: Fri, 5 Jun 2015 15:42:04 -0500 Subject: [PATCH 71/91] clarify docs --- .../providers/aws/r/autoscaling_notification.html.markdown | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/website/source/docs/providers/aws/r/autoscaling_notification.html.markdown b/website/source/docs/providers/aws/r/autoscaling_notification.html.markdown index 620ef5490..33a33a3d7 100644 --- a/website/source/docs/providers/aws/r/autoscaling_notification.html.markdown +++ b/website/source/docs/providers/aws/r/autoscaling_notification.html.markdown @@ -8,7 +8,9 @@ description: |- # aws\_vpc -Provides an AutoScaling Group with Notification support, via SNS Topics +Provides an AutoScaling Group with Notification support, via SNS Topics. Each of +the `notifications` map to a [Notification Configuration][2] inside Amazon Web +Services, and are applied to each AutoScaling Group you supply. ## Example Usage @@ -63,3 +65,4 @@ The following attributes are exported: [1]: http://docs.aws.amazon.com/AutoScaling/latest/APIReference/API_NotificationConfiguration.html +[2]: http://docs.aws.amazon.com/AutoScaling/latest/APIReference/API_DescribeNotificationConfigurations.html From f75488ed0090d60f0b6be8863bb04a5e0adeacdc Mon Sep 17 00:00:00 2001 From: Clint Date: Fri, 5 Jun 2015 16:04:59 -0500 Subject: [PATCH 72/91] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3404950c0..3b2283aca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ FEATURES: * **New provider: `azure`** [GH-2053] + * **New resource: `aws_autoscaling_notification`** [GH-2197] * **New resource: `aws_ecs_cluster`** [GH-1803] * **New resource: `aws_ecs_service`** [GH-1803] * **New resource: `aws_ecs_task_definition`** [GH-1803] From 6c29671561e5d2ddd8518228aea09c788557b3f4 Mon Sep 17 00:00:00 2001 From: Jack Pearkes Date: Fri, 5 Jun 2015 17:14:21 -0400 Subject: [PATCH 73/91] provider/aws: clarify scaling timeout error This just gives the user a better hint to why their scaling may have timed out. --- builtin/providers/aws/resource_aws_autoscaling_group.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/providers/aws/resource_aws_autoscaling_group.go b/builtin/providers/aws/resource_aws_autoscaling_group.go index 10e6377f1..0fc62b4b2 100644 --- a/builtin/providers/aws/resource_aws_autoscaling_group.go +++ b/builtin/providers/aws/resource_aws_autoscaling_group.go @@ -462,7 +462,7 @@ func waitForASGCapacity(d *schema.ResourceData, meta interface{}) error { return nil } - return fmt.Errorf("Still need to wait for more healthy instances.") + return fmt.Errorf("Still need to wait for more healthy instances. This could mean instances failed to launch. See Scaling History for more information.") }) } From 2df0e734ae8b54fccf4ea669164f47c0bfd8f8e0 Mon Sep 17 00:00:00 2001 From: Radek Simko Date: Fri, 5 Jun 2015 23:47:50 +0200 Subject: [PATCH 74/91] docs: Fix wrong title (aws_autoscaling_notification) --- .../providers/aws/r/autoscaling_notification.html.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/source/docs/providers/aws/r/autoscaling_notification.html.markdown b/website/source/docs/providers/aws/r/autoscaling_notification.html.markdown index 33a33a3d7..e47d337c6 100644 --- a/website/source/docs/providers/aws/r/autoscaling_notification.html.markdown +++ b/website/source/docs/providers/aws/r/autoscaling_notification.html.markdown @@ -1,12 +1,12 @@ --- layout: "aws" -page_title: "AWS: aws_vpc" +page_title: "AWS: aws_autoscaling_notification" sidebar_current: "docs-aws-resource-autoscaling-notification" description: |- Provides an AutoScaling Group with Notification support --- -# aws\_vpc +# aws\_autoscaling\_notification Provides an AutoScaling Group with Notification support, via SNS Topics. Each of the `notifications` map to a [Notification Configuration][2] inside Amazon Web From 4bbe93552a4ff80cdcc4292224e2e16761d99083 Mon Sep 17 00:00:00 2001 From: ketzacoatl Date: Fri, 5 Jun 2015 19:20:23 -0400 Subject: [PATCH 75/91] Minor correction to aws_s3_bucket docs --- website/source/docs/providers/aws/r/s3_bucket.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/source/docs/providers/aws/r/s3_bucket.html.markdown b/website/source/docs/providers/aws/r/s3_bucket.html.markdown index c0ecd91c7..01a6a47b5 100644 --- a/website/source/docs/providers/aws/r/s3_bucket.html.markdown +++ b/website/source/docs/providers/aws/r/s3_bucket.html.markdown @@ -32,7 +32,7 @@ resource "aws_s3_bucket" "b" { resource "aws_s3_bucket" "b" { bucket = "s3-website-test.hashicorp.com" acl = "public-read" - policy = "#{file("policy.json")}" + policy = "${file("policy.json")}" website { index_document = "index.html" From 258b1a426321dbfe31089579a8943b217e4e966e Mon Sep 17 00:00:00 2001 From: George Hartzell Date: Fri, 5 Jun 2015 12:05:21 -0700 Subject: [PATCH 76/91] Implement OpenStack/Swift remote Rework devcamcar's OpenStack Swift remote [pull request](https://github.com/hashicorp/terraform/pull/942) to work with Terraform's new `state/remote` and Gophercloud's current implementation. `Get()` changed up a bit from devcamcar's version (using different Gopercloud functionality resulted in less fussing around to figure out the error case). Otherwise this is a transliteration/remix of his ideas. --- state/remote/remote.go | 1 + state/remote/swift.go | 114 +++++++++++++++++++++++++++++++++++++ state/remote/swift_test.go | 25 ++++++++ 3 files changed, 140 insertions(+) create mode 100644 state/remote/swift.go create mode 100644 state/remote/swift_test.go diff --git a/state/remote/remote.go b/state/remote/remote.go index cb525e6a3..7ebea3222 100644 --- a/state/remote/remote.go +++ b/state/remote/remote.go @@ -40,6 +40,7 @@ var BuiltinClients = map[string]Factory{ "consul": consulFactory, "http": httpFactory, "s3": s3Factory, + "swift": swiftFactory, // This is used for development purposes only. "_local": fileFactory, diff --git a/state/remote/swift.go b/state/remote/swift.go new file mode 100644 index 000000000..a4293f737 --- /dev/null +++ b/state/remote/swift.go @@ -0,0 +1,114 @@ +package remote + +import ( + "bytes" + "crypto/md5" + "fmt" + "os" + "strings" + + "github.com/rackspace/gophercloud" + "github.com/rackspace/gophercloud/openstack" + "github.com/rackspace/gophercloud/openstack/objectstorage/v1/containers" + "github.com/rackspace/gophercloud/openstack/objectstorage/v1/objects" +) + +const TFSTATE_NAME = "tfstate.tf" + +// SwiftClient implements the Client interface for an Openstack Swift server. +type SwiftClient struct { + client *gophercloud.ServiceClient + path string +} + +func swiftFactory(conf map[string]string) (Client, error) { + client := &SwiftClient{} + + if err := client.validateConfig(conf); err != nil { + return nil, err + } + + return client, nil +} + +func (c *SwiftClient) validateConfig(conf map[string]string) (err error) { + if val := os.Getenv("OS_AUTH_URL"); val == "" { + return fmt.Errorf("missing OS_AUTH_URL environment variable") + } + if val := os.Getenv("OS_USERNAME"); val == "" { + return fmt.Errorf("missing OS_USERNAME environment variable") + } + if val := os.Getenv("OS_TENANT_NAME"); val == "" { + return fmt.Errorf("missing OS_TENANT_NAME environment variable") + } + if val := os.Getenv("OS_PASSWORD"); val == "" { + return fmt.Errorf("missing OS_PASSWORD environment variable") + } + path, ok := conf["path"] + if !ok || path == "" { + return fmt.Errorf("missing 'path' configuration") + } + + provider, err := openstack.AuthenticatedClient(gophercloud.AuthOptions{ + IdentityEndpoint: os.Getenv("OS_AUTH_URL"), + Username: os.Getenv("OS_USERNAME"), + TenantName: os.Getenv("OS_TENANT_NAME"), + Password: os.Getenv("OS_PASSWORD"), + }) + + if err != nil { + return err + } + + c.path = path + c.client, err = openstack.NewObjectStorageV1(provider, gophercloud.EndpointOpts{ + Region: os.Getenv("OS_REGION_NAME"), + }) + + return err +} + +func (c *SwiftClient) Get() (*Payload, error) { + result := objects.Download(c.client, c.path, TFSTATE_NAME, nil) + bytes, err := result.ExtractContent() + + if err != nil { + if strings.Contains(err.Error(), "but got 404 instead") { + return nil, nil + } + return nil, err + } + + hash := md5.Sum(bytes) + payload := &Payload{ + Data: bytes, + MD5: hash[:md5.Size], + } + + return payload, nil +} + +func (c *SwiftClient) Put(data []byte) error { + if err := c.ensureContainerExists(); err != nil { + return err + } + + reader := bytes.NewReader(data) + result := objects.Create(c.client, c.path, TFSTATE_NAME, reader, nil) + + return result.Err +} + +func (c *SwiftClient) Delete() error { + result := objects.Delete(c.client, c.path, TFSTATE_NAME, nil) + return result.Err +} + +func (c *SwiftClient) ensureContainerExists() error { + result := containers.Create(c.client, c.path, nil) + if result.Err != nil { + return result.Err + } + + return nil +} diff --git a/state/remote/swift_test.go b/state/remote/swift_test.go new file mode 100644 index 000000000..54666ca29 --- /dev/null +++ b/state/remote/swift_test.go @@ -0,0 +1,25 @@ +package remote + +import ( + "net/http" + "testing" +) + +func TestSwiftClient_impl(t *testing.T) { + var _ Client = new(SwiftClient) +} + +func TestSwiftClient(t *testing.T) { + if _, err := http.Get("http://google.com"); err != nil { + t.Skipf("skipping, internet seems to not be available: %s", err) + } + + client, err := swiftFactory(map[string]string{ + "path": "swift_test", + }) + if err != nil { + t.Fatalf("bad: %s", err) + } + + testClient(t, client) +} From 4fc6dd0141f6d482866b66c9a057c894477f78a0 Mon Sep 17 00:00:00 2001 From: George Hartzell Date: Sat, 6 Jun 2015 10:19:25 -0700 Subject: [PATCH 77/91] Only run Swift tests when Swift is available Only run the Swift remote tests when OpenStack seems to have been set up and when the autho host is reachable. --- state/remote/swift_test.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/state/remote/swift_test.go b/state/remote/swift_test.go index 54666ca29..6ed4fd596 100644 --- a/state/remote/swift_test.go +++ b/state/remote/swift_test.go @@ -3,6 +3,7 @@ package remote import ( "net/http" "testing" + "os" ) func TestSwiftClient_impl(t *testing.T) { @@ -10,8 +11,13 @@ func TestSwiftClient_impl(t *testing.T) { } func TestSwiftClient(t *testing.T) { - if _, err := http.Get("http://google.com"); err != nil { - t.Skipf("skipping, internet seems to not be available: %s", err) + os_auth_url := os.Getenv("OS_AUTH_URL") + if os_auth_url == "" { + t.Skipf("skipping, OS_AUTH_URL and friends must be set") + } + + if _, err := http.Get(os_auth_url); err != nil { + t.Skipf("skipping, unable to reach %s: %s", os_auth_url, err) } client, err := swiftFactory(map[string]string{ From 52a21f3fb03f6c7561c1db23039c5c2d18f9457c Mon Sep 17 00:00:00 2001 From: Alexander Ekdahl Date: Sun, 7 Jun 2015 11:39:18 +0200 Subject: [PATCH 78/91] Corrected Frankfurt S3 Website Endpoint fixes #2258 --- .../providers/aws/resource_aws_s3_bucket.go | 7 +++++ .../aws/website_endpoint_url_test.go | 29 +++++++++++++------ 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/builtin/providers/aws/resource_aws_s3_bucket.go b/builtin/providers/aws/resource_aws_s3_bucket.go index 332c99569..93bf24390 100644 --- a/builtin/providers/aws/resource_aws_s3_bucket.go +++ b/builtin/providers/aws/resource_aws_s3_bucket.go @@ -433,6 +433,13 @@ func websiteEndpoint(s3conn *s3.S3, d *schema.ResourceData) (string, error) { func WebsiteEndpointUrl(bucket string, region string) string { region = normalizeRegion(region) + + // Frankfurt(and probably future) regions uses different syntax for website endpoints + // http://docs.aws.amazon.com/AmazonS3/latest/dev/WebsiteEndpoints.html + if region == "eu-central-1" { + return fmt.Sprintf("%s.s3-website.%s.amazonaws.com", bucket, region) + } + return fmt.Sprintf("%s.s3-website-%s.amazonaws.com", bucket, region) } diff --git a/builtin/providers/aws/website_endpoint_url_test.go b/builtin/providers/aws/website_endpoint_url_test.go index 38b11d329..2f4ce5249 100644 --- a/builtin/providers/aws/website_endpoint_url_test.go +++ b/builtin/providers/aws/website_endpoint_url_test.go @@ -2,16 +2,27 @@ package aws import "testing" -func TestWebsiteEndpointUrl_withoutRegion(t *testing.T) { - u := WebsiteEndpointUrl("buck.et", "") - if u != "buck.et.s3-website-us-east-1.amazonaws.com" { - t.Fatalf("bad: %s", u) - } +// http://docs.aws.amazon.com/AmazonS3/latest/dev/WebsiteEndpoints.html +var websiteEndpoints = []struct { + in string + out string +}{ + {"", "bucket-name.s3-website-us-east-1.amazonaws.com"}, + {"us-west-2", "bucket-name.s3-website-us-west-2.amazonaws.com"}, + {"us-west-1", "bucket-name.s3-website-us-west-1.amazonaws.com"}, + {"eu-west-1", "bucket-name.s3-website-eu-west-1.amazonaws.com"}, + {"eu-central-1", "bucket-name.s3-website.eu-central-1.amazonaws.com"}, + {"ap-southeast-1", "bucket-name.s3-website-ap-southeast-1.amazonaws.com"}, + {"ap-northeast-1", "bucket-name.s3-website-ap-northeast-1.amazonaws.com"}, + {"ap-southeast-2", "bucket-name.s3-website-ap-southeast-2.amazonaws.com"}, + {"sa-east-1", "bucket-name.s3-website-sa-east-1.amazonaws.com"}, } -func TestWebsiteEndpointUrl_withRegion(t *testing.T) { - u := WebsiteEndpointUrl("buck.et", "us-west-1") - if u != "buck.et.s3-website-us-west-1.amazonaws.com" { - t.Fatalf("bad: %s", u) +func TestWebsiteEndpointUrl(t *testing.T) { + for _, tt := range websiteEndpoints { + s := WebsiteEndpointUrl("bucket-name", tt.in) + if s != tt.out { + t.Errorf("WebsiteEndpointUrl(\"bucket-name\", %q) => %q, want %q", tt.in, s, tt.out) + } } } From 5f129f1b9dd61f19e64ad53d00014a401bd23f27 Mon Sep 17 00:00:00 2001 From: Paul Hinze Date: Sun, 7 Jun 2015 09:07:00 -0500 Subject: [PATCH 79/91] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b2283aca..f0370bf84 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ BUG FIXES: * provider/aws: fix panic when route has no cidr_block [GH-2215] * provider/aws: fix issue causing perpetual diff on ELB listeners when non-lowercase protocol strings were used [GH-2246] + * provider/aws: corrected frankfurt S3 website region [GH-2259] ## 0.5.3 (June 1, 2015) From 20558fcf70d367c782cb1b137517c4be132c18ec Mon Sep 17 00:00:00 2001 From: Ian MacLeod Date: Sun, 7 Jun 2015 12:42:38 -0700 Subject: [PATCH 80/91] Fix page title for aws_elasticache_cluster --- .../docs/providers/aws/r/elasticache_cluster.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/source/docs/providers/aws/r/elasticache_cluster.html.markdown b/website/source/docs/providers/aws/r/elasticache_cluster.html.markdown index 74ccd1481..25c6baf00 100644 --- a/website/source/docs/providers/aws/r/elasticache_cluster.html.markdown +++ b/website/source/docs/providers/aws/r/elasticache_cluster.html.markdown @@ -1,6 +1,6 @@ --- layout: "aws" -page_title: "AWS: aws_subnet" +page_title: "AWS: aws_elasticache_cluster" sidebar_current: "docs-aws-resource-elasticache-cluster" description: |- Provides an VPC subnet resource. From e04a6cacc57d1aebabc643e5564a78e1c18e44c6 Mon Sep 17 00:00:00 2001 From: Guillaume Giamarchi Date: Sun, 7 Jun 2015 22:57:55 +0200 Subject: [PATCH 81/91] Enpoint type configuration for OpenStack provider Add the possibility to specify the endpoint type (public, admin, internal). The default remains the same (public). --- builtin/providers/openstack/config.go | 32 ++++++++++++++++--- builtin/providers/openstack/provider.go | 6 ++++ .../providers/openstack/index.html.markdown | 4 +++ 3 files changed, 38 insertions(+), 4 deletions(-) diff --git a/builtin/providers/openstack/config.go b/builtin/providers/openstack/config.go index 903345fb6..f18465538 100644 --- a/builtin/providers/openstack/config.go +++ b/builtin/providers/openstack/config.go @@ -2,6 +2,7 @@ package openstack import ( "crypto/tls" + "fmt" "net/http" "github.com/rackspace/gophercloud" @@ -19,11 +20,20 @@ type Config struct { DomainID string DomainName string Insecure bool + EndpointType string osClient *gophercloud.ProviderClient } func (c *Config) loadAndValidate() error { + + if c.EndpointType != "internal" && c.EndpointType != "internalURL" && + c.EndpointType != "admin" && c.EndpointType != "adminURL" && + c.EndpointType != "public" && c.EndpointType != "publicURL" && + c.EndpointType != "" { + return fmt.Errorf("Invalid endpoint type provided") + } + ao := gophercloud.AuthOptions{ Username: c.Username, UserID: c.UserID, @@ -60,24 +70,38 @@ func (c *Config) loadAndValidate() error { func (c *Config) blockStorageV1Client(region string) (*gophercloud.ServiceClient, error) { return openstack.NewBlockStorageV1(c.osClient, gophercloud.EndpointOpts{ - Region: region, + Region: region, + Availability: c.getEndpointType(), }) } func (c *Config) computeV2Client(region string) (*gophercloud.ServiceClient, error) { return openstack.NewComputeV2(c.osClient, gophercloud.EndpointOpts{ - Region: region, + Region: region, + Availability: c.getEndpointType(), }) } func (c *Config) networkingV2Client(region string) (*gophercloud.ServiceClient, error) { return openstack.NewNetworkV2(c.osClient, gophercloud.EndpointOpts{ - Region: region, + Region: region, + Availability: c.getEndpointType(), }) } func (c *Config) objectStorageV1Client(region string) (*gophercloud.ServiceClient, error) { return openstack.NewObjectStorageV1(c.osClient, gophercloud.EndpointOpts{ - Region: region, + Region: region, + Availability: c.getEndpointType(), }) } + +func (c *Config) getEndpointType() gophercloud.Availability { + if c.EndpointType == "internal" || c.EndpointType == "internalURL" { + return gophercloud.AvailabilityInternal + } + if c.EndpointType == "admin" || c.EndpointType == "adminURL" { + return gophercloud.AvailabilityAdmin + } + return gophercloud.AvailabilityPublic +} diff --git a/builtin/providers/openstack/provider.go b/builtin/providers/openstack/provider.go index 2d68d82ec..d7cea0979 100644 --- a/builtin/providers/openstack/provider.go +++ b/builtin/providers/openstack/provider.go @@ -61,6 +61,11 @@ func Provider() terraform.ResourceProvider { Optional: true, Default: false, }, + "endpoint_type": &schema.Schema{ + Type: schema.TypeString, + Optional: true, + DefaultFunc: envDefaultFunc("OS_ENDPOINT_TYPE"), + }, }, ResourcesMap: map[string]*schema.Resource{ @@ -99,6 +104,7 @@ func configureProvider(d *schema.ResourceData) (interface{}, error) { DomainID: d.Get("domain_id").(string), DomainName: d.Get("domain_name").(string), Insecure: d.Get("insecure").(bool), + EndpointType: d.Get("endpoint_type").(string), } if err := config.loadAndValidate(); err != nil { diff --git a/website/source/docs/providers/openstack/index.html.markdown b/website/source/docs/providers/openstack/index.html.markdown index 808b71d1e..be918a465 100644 --- a/website/source/docs/providers/openstack/index.html.markdown +++ b/website/source/docs/providers/openstack/index.html.markdown @@ -60,6 +60,10 @@ The following arguments are supported: * `insecure` - (Optional) Explicitly allow the provider to perform "insecure" SSL requests. If omitted, default value is `false` +* `endpoint_type` - (Optional) Specify which type of endpoint to use from the + service catalog. It can be set using the OS_ENDPOINT_TYPE environment + variable. If not set, public endpoints is used. + ## Testing In order to run the Acceptance Tests for development, the following environment From 8d26e10aba0be08e8ab01c280f1cb6896c136b19 Mon Sep 17 00:00:00 2001 From: Guillaume Giamarchi Date: Sun, 7 Jun 2015 23:01:00 +0200 Subject: [PATCH 82/91] go fmt --- builtin/providers/openstack/provider.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/providers/openstack/provider.go b/builtin/providers/openstack/provider.go index d7cea0979..4a21d69e2 100644 --- a/builtin/providers/openstack/provider.go +++ b/builtin/providers/openstack/provider.go @@ -42,8 +42,8 @@ func Provider() terraform.ResourceProvider { DefaultFunc: envDefaultFunc("OS_PASSWORD"), }, "api_key": &schema.Schema{ - Type: schema.TypeString, - Optional: true, + Type: schema.TypeString, + Optional: true, DefaultFunc: envDefaultFunc("OS_AUTH_TOKEN"), }, "domain_id": &schema.Schema{ From 66c51d44f6b7cd50d620e7327f2a8d729ee7b12a Mon Sep 17 00:00:00 2001 From: Paul Hinze Date: Sun, 7 Jun 2015 18:04:38 -0500 Subject: [PATCH 83/91] aws/provider convert _normal tests to _basic For consistency! --- builtin/providers/aws/resource_aws_eip_test.go | 2 +- builtin/providers/aws/resource_aws_iam_access_key_test.go | 2 +- builtin/providers/aws/resource_aws_iam_group_test.go | 2 +- builtin/providers/aws/resource_aws_iam_role_test.go | 2 +- builtin/providers/aws/resource_aws_iam_user_test.go | 2 +- builtin/providers/aws/resource_aws_instance_test.go | 2 +- builtin/providers/aws/resource_aws_key_pair_test.go | 2 +- builtin/providers/aws/resource_aws_route_table_test.go | 2 +- builtin/providers/aws/resource_aws_security_group_test.go | 2 +- .../providers/aws/resource_aws_vpc_peering_connection_test.go | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/builtin/providers/aws/resource_aws_eip_test.go b/builtin/providers/aws/resource_aws_eip_test.go index fd28fe257..0fe42667a 100644 --- a/builtin/providers/aws/resource_aws_eip_test.go +++ b/builtin/providers/aws/resource_aws_eip_test.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/terraform/terraform" ) -func TestAccAWSEIP_normal(t *testing.T) { +func TestAccAWSEIP_basic(t *testing.T) { var conf ec2.Address resource.Test(t, resource.TestCase{ diff --git a/builtin/providers/aws/resource_aws_iam_access_key_test.go b/builtin/providers/aws/resource_aws_iam_access_key_test.go index 75ee714c4..1d62b93b9 100644 --- a/builtin/providers/aws/resource_aws_iam_access_key_test.go +++ b/builtin/providers/aws/resource_aws_iam_access_key_test.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform/terraform" ) -func TestAccAWSAccessKey_normal(t *testing.T) { +func TestAccAWSAccessKey_basic(t *testing.T) { var conf iam.AccessKeyMetadata resource.Test(t, resource.TestCase{ diff --git a/builtin/providers/aws/resource_aws_iam_group_test.go b/builtin/providers/aws/resource_aws_iam_group_test.go index b1448f27a..67a72733a 100644 --- a/builtin/providers/aws/resource_aws_iam_group_test.go +++ b/builtin/providers/aws/resource_aws_iam_group_test.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform/terraform" ) -func TestAccAWSIAMGroup_normal(t *testing.T) { +func TestAccAWSIAMGroup_basic(t *testing.T) { var conf iam.GetGroupOutput resource.Test(t, resource.TestCase{ diff --git a/builtin/providers/aws/resource_aws_iam_role_test.go b/builtin/providers/aws/resource_aws_iam_role_test.go index 6571e115f..89d8c6526 100644 --- a/builtin/providers/aws/resource_aws_iam_role_test.go +++ b/builtin/providers/aws/resource_aws_iam_role_test.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform/terraform" ) -func TestAccAWSRole_normal(t *testing.T) { +func TestAccAWSRole_basic(t *testing.T) { var conf iam.GetRoleOutput resource.Test(t, resource.TestCase{ diff --git a/builtin/providers/aws/resource_aws_iam_user_test.go b/builtin/providers/aws/resource_aws_iam_user_test.go index aeda07abf..0dd2530a1 100644 --- a/builtin/providers/aws/resource_aws_iam_user_test.go +++ b/builtin/providers/aws/resource_aws_iam_user_test.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform/terraform" ) -func TestAccAWSUser_normal(t *testing.T) { +func TestAccAWSUser_basic(t *testing.T) { var conf iam.GetUserOutput resource.Test(t, resource.TestCase{ diff --git a/builtin/providers/aws/resource_aws_instance_test.go b/builtin/providers/aws/resource_aws_instance_test.go index 9e443bd96..eb52289bd 100644 --- a/builtin/providers/aws/resource_aws_instance_test.go +++ b/builtin/providers/aws/resource_aws_instance_test.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/terraform/terraform" ) -func TestAccAWSInstance_normal(t *testing.T) { +func TestAccAWSInstance_basic(t *testing.T) { var v ec2.Instance var vol *ec2.Volume diff --git a/builtin/providers/aws/resource_aws_key_pair_test.go b/builtin/providers/aws/resource_aws_key_pair_test.go index 811f27cca..cb0b28639 100644 --- a/builtin/providers/aws/resource_aws_key_pair_test.go +++ b/builtin/providers/aws/resource_aws_key_pair_test.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/terraform/terraform" ) -func TestAccAWSKeyPair_normal(t *testing.T) { +func TestAccAWSKeyPair_basic(t *testing.T) { var conf ec2.KeyPairInfo resource.Test(t, resource.TestCase{ diff --git a/builtin/providers/aws/resource_aws_route_table_test.go b/builtin/providers/aws/resource_aws_route_table_test.go index b83b9793d..ff340ae0b 100644 --- a/builtin/providers/aws/resource_aws_route_table_test.go +++ b/builtin/providers/aws/resource_aws_route_table_test.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform/terraform" ) -func TestAccAWSRouteTable_normal(t *testing.T) { +func TestAccAWSRouteTable_basic(t *testing.T) { var v ec2.RouteTable testCheck := func(*terraform.State) error { diff --git a/builtin/providers/aws/resource_aws_security_group_test.go b/builtin/providers/aws/resource_aws_security_group_test.go index 8da0e7287..d3a55da5a 100644 --- a/builtin/providers/aws/resource_aws_security_group_test.go +++ b/builtin/providers/aws/resource_aws_security_group_test.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/terraform/terraform" ) -func TestAccAWSSecurityGroup_normal(t *testing.T) { +func TestAccAWSSecurityGroup_basic(t *testing.T) { var group ec2.SecurityGroup resource.Test(t, resource.TestCase{ diff --git a/builtin/providers/aws/resource_aws_vpc_peering_connection_test.go b/builtin/providers/aws/resource_aws_vpc_peering_connection_test.go index fba2e1633..3b7896e40 100644 --- a/builtin/providers/aws/resource_aws_vpc_peering_connection_test.go +++ b/builtin/providers/aws/resource_aws_vpc_peering_connection_test.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform/terraform" ) -func TestAccAWSVPCPeeringConnection_normal(t *testing.T) { +func TestAccAWSVPCPeeringConnection_basic(t *testing.T) { var connection ec2.VPCPeeringConnection resource.Test(t, resource.TestCase{ From 84afeb73b1ecf69a83ce244bbd23c550d2a99b0c Mon Sep 17 00:00:00 2001 From: Paul Hinze Date: Sun, 7 Jun 2015 18:18:14 -0500 Subject: [PATCH 84/91] acc tests: ensure each resource has a _basic test Helpful for breadth first acc test sweeps `-run '_basic$'` --- ...e_aws_app_cookie_stickiness_policy_test.go | 2 +- .../aws/resource_aws_customer_gateway_test.go | 2 +- .../aws/resource_aws_db_instance_test.go | 2 +- .../resource_aws_db_parameter_group_test.go | 2 +- .../resource_aws_db_security_group_test.go | 2 +- .../aws/resource_aws_db_subnet_group_test.go | 2 +- .../aws/resource_aws_ebs_volume_test.go | 2 +- .../aws/resource_aws_ecs_cluster_test.go | 2 +- .../resource_aws_ecs_task_definition_test.go | 2 +- ...rce_aws_elasticache_security_group_test.go | 2 +- .../aws/resource_aws_iam_group_policy_test.go | 2 +- .../resource_aws_iam_instance_profile_test.go | 2 +- .../aws/resource_aws_iam_role_policy_test.go | 2 +- .../aws/resource_aws_iam_user_policy_test.go | 2 +- .../resource_aws_launch_configuration_test.go | 40 +++++++++---------- ...ce_aws_lb_cookie_stickiness_policy_test.go | 2 +- ...e_aws_main_route_table_association_test.go | 2 +- ...resource_aws_proxy_protocol_policy_test.go | 2 +- ...source_aws_route_table_association_test.go | 2 +- ...esource_aws_sns_topic_subscription_test.go | 2 +- .../aws/resource_aws_sns_topic_test.go | 2 +- .../aws/resource_aws_sqs_queue_test.go | 2 +- .../providers/aws/resource_aws_subnet_test.go | 2 +- ...e_aws_vpc_dhcp_options_association_test.go | 2 +- .../aws/resource_aws_vpc_dhcp_options_test.go | 2 +- .../aws/resource_aws_vpn_connection_test.go | 2 +- .../aws/resource_vpn_connection_route_test.go | 2 +- .../resource_cloudstack_ssh_keypair_test.go | 2 +- .../consul/resource_consul_keys_test.go | 2 +- .../providers/dme/resource_dme_record_test.go | 2 +- .../google/resource_storage_bucket_test.go | 4 +- .../resource_openstack_fw_firewall_v1_test.go | 2 +- .../resource_openstack_fw_rule_v1_test.go | 2 +- 33 files changed, 53 insertions(+), 53 deletions(-) diff --git a/builtin/providers/aws/resource_aws_app_cookie_stickiness_policy_test.go b/builtin/providers/aws/resource_aws_app_cookie_stickiness_policy_test.go index 46baca6e3..ff13da285 100644 --- a/builtin/providers/aws/resource_aws_app_cookie_stickiness_policy_test.go +++ b/builtin/providers/aws/resource_aws_app_cookie_stickiness_policy_test.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform/terraform" ) -func TestAccAWSAppCookieStickinessPolicy(t *testing.T) { +func TestAccAWSAppCookieStickinessPolicy_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, diff --git a/builtin/providers/aws/resource_aws_customer_gateway_test.go b/builtin/providers/aws/resource_aws_customer_gateway_test.go index c0af5100e..33e370946 100644 --- a/builtin/providers/aws/resource_aws_customer_gateway_test.go +++ b/builtin/providers/aws/resource_aws_customer_gateway_test.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform/terraform" ) -func TestAccCustomerGateway(t *testing.T) { +func TestAccCustomerGateway_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, diff --git a/builtin/providers/aws/resource_aws_db_instance_test.go b/builtin/providers/aws/resource_aws_db_instance_test.go index 638f04d31..ef1931b03 100644 --- a/builtin/providers/aws/resource_aws_db_instance_test.go +++ b/builtin/providers/aws/resource_aws_db_instance_test.go @@ -14,7 +14,7 @@ import ( "github.com/aws/aws-sdk-go/service/rds" ) -func TestAccAWSDBInstance(t *testing.T) { +func TestAccAWSDBInstance_basic(t *testing.T) { var v rds.DBInstance resource.Test(t, resource.TestCase{ diff --git a/builtin/providers/aws/resource_aws_db_parameter_group_test.go b/builtin/providers/aws/resource_aws_db_parameter_group_test.go index 780ef6dad..93e74bb74 100644 --- a/builtin/providers/aws/resource_aws_db_parameter_group_test.go +++ b/builtin/providers/aws/resource_aws_db_parameter_group_test.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform/terraform" ) -func TestAccAWSDBParameterGroup(t *testing.T) { +func TestAccAWSDBParameterGroup_basic(t *testing.T) { var v rds.DBParameterGroup resource.Test(t, resource.TestCase{ diff --git a/builtin/providers/aws/resource_aws_db_security_group_test.go b/builtin/providers/aws/resource_aws_db_security_group_test.go index 8ef227283..bf1db6e37 100644 --- a/builtin/providers/aws/resource_aws_db_security_group_test.go +++ b/builtin/providers/aws/resource_aws_db_security_group_test.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform/terraform" ) -func TestAccAWSDBSecurityGroup(t *testing.T) { +func TestAccAWSDBSecurityGroup_basic(t *testing.T) { var v rds.DBSecurityGroup resource.Test(t, resource.TestCase{ diff --git a/builtin/providers/aws/resource_aws_db_subnet_group_test.go b/builtin/providers/aws/resource_aws_db_subnet_group_test.go index b43f42cb8..5a07652fe 100644 --- a/builtin/providers/aws/resource_aws_db_subnet_group_test.go +++ b/builtin/providers/aws/resource_aws_db_subnet_group_test.go @@ -12,7 +12,7 @@ import ( "github.com/aws/aws-sdk-go/service/rds" ) -func TestAccAWSDBSubnetGroup(t *testing.T) { +func TestAccAWSDBSubnetGroup_basic(t *testing.T) { var v rds.DBSubnetGroup testCheck := func(*terraform.State) error { diff --git a/builtin/providers/aws/resource_aws_ebs_volume_test.go b/builtin/providers/aws/resource_aws_ebs_volume_test.go index 7008b7f67..729fbc151 100644 --- a/builtin/providers/aws/resource_aws_ebs_volume_test.go +++ b/builtin/providers/aws/resource_aws_ebs_volume_test.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform/terraform" ) -func TestAccAWSEBSVolume(t *testing.T) { +func TestAccAWSEBSVolume_basic(t *testing.T) { var v ec2.Volume resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, diff --git a/builtin/providers/aws/resource_aws_ecs_cluster_test.go b/builtin/providers/aws/resource_aws_ecs_cluster_test.go index 0f5ab242a..308085d1d 100644 --- a/builtin/providers/aws/resource_aws_ecs_cluster_test.go +++ b/builtin/providers/aws/resource_aws_ecs_cluster_test.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform/terraform" ) -func TestAccAWSEcsCluster(t *testing.T) { +func TestAccAWSEcsCluster_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, diff --git a/builtin/providers/aws/resource_aws_ecs_task_definition_test.go b/builtin/providers/aws/resource_aws_ecs_task_definition_test.go index f866f1fa3..df37eba4e 100644 --- a/builtin/providers/aws/resource_aws_ecs_task_definition_test.go +++ b/builtin/providers/aws/resource_aws_ecs_task_definition_test.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform/terraform" ) -func TestAccAWSEcsTaskDefinition(t *testing.T) { +func TestAccAWSEcsTaskDefinition_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, diff --git a/builtin/providers/aws/resource_aws_elasticache_security_group_test.go b/builtin/providers/aws/resource_aws_elasticache_security_group_test.go index a16c5a7e9..87644242f 100644 --- a/builtin/providers/aws/resource_aws_elasticache_security_group_test.go +++ b/builtin/providers/aws/resource_aws_elasticache_security_group_test.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform/terraform" ) -func TestAccAWSElasticacheSecurityGroup(t *testing.T) { +func TestAccAWSElasticacheSecurityGroup_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, diff --git a/builtin/providers/aws/resource_aws_iam_group_policy_test.go b/builtin/providers/aws/resource_aws_iam_group_policy_test.go index 2daef0e04..ac7a3baaa 100644 --- a/builtin/providers/aws/resource_aws_iam_group_policy_test.go +++ b/builtin/providers/aws/resource_aws_iam_group_policy_test.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform/terraform" ) -func TestAccAWSIAMGroupPolicy(t *testing.T) { +func TestAccAWSIAMGroupPolicy_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, diff --git a/builtin/providers/aws/resource_aws_iam_instance_profile_test.go b/builtin/providers/aws/resource_aws_iam_instance_profile_test.go index ae1d66c90..985729aad 100644 --- a/builtin/providers/aws/resource_aws_iam_instance_profile_test.go +++ b/builtin/providers/aws/resource_aws_iam_instance_profile_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform/helper/resource" ) -func TestAccAWSIAMInstanceProfile(t *testing.T) { +func TestAccAWSIAMInstanceProfile_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, diff --git a/builtin/providers/aws/resource_aws_iam_role_policy_test.go b/builtin/providers/aws/resource_aws_iam_role_policy_test.go index 5ee7b5f18..219c676eb 100644 --- a/builtin/providers/aws/resource_aws_iam_role_policy_test.go +++ b/builtin/providers/aws/resource_aws_iam_role_policy_test.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform/terraform" ) -func TestAccAWSIAMRolePolicy(t *testing.T) { +func TestAccAWSIAMRolePolicy_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, diff --git a/builtin/providers/aws/resource_aws_iam_user_policy_test.go b/builtin/providers/aws/resource_aws_iam_user_policy_test.go index 4b729b8d4..f5c520180 100644 --- a/builtin/providers/aws/resource_aws_iam_user_policy_test.go +++ b/builtin/providers/aws/resource_aws_iam_user_policy_test.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform/terraform" ) -func TestAccAWSIAMUserPolicy(t *testing.T) { +func TestAccAWSIAMUserPolicy_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, diff --git a/builtin/providers/aws/resource_aws_launch_configuration_test.go b/builtin/providers/aws/resource_aws_launch_configuration_test.go index 70caa9b0a..bb008baaa 100644 --- a/builtin/providers/aws/resource_aws_launch_configuration_test.go +++ b/builtin/providers/aws/resource_aws_launch_configuration_test.go @@ -14,6 +14,26 @@ import ( "github.com/hashicorp/terraform/terraform" ) +func TestAccAWSLaunchConfiguration_basic(t *testing.T) { + var conf autoscaling.LaunchConfiguration + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSLaunchConfigurationDestroy, + Steps: []resource.TestStep{ + resource.TestStep{ + Config: testAccAWSLaunchConfigurationNoNameConfig, + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSLaunchConfigurationExists("aws_launch_configuration.bar", &conf), + testAccCheckAWSLaunchConfigurationGeneratedNamePrefix( + "aws_launch_configuration.bar", "terraform-"), + ), + }, + }, + }) +} + func TestAccAWSLaunchConfiguration_withBlockDevices(t *testing.T) { var conf autoscaling.LaunchConfiguration @@ -61,26 +81,6 @@ func TestAccAWSLaunchConfiguration_withSpotPrice(t *testing.T) { }) } -func TestAccAWSLaunchConfiguration_withGeneratedName(t *testing.T) { - var conf autoscaling.LaunchConfiguration - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckAWSLaunchConfigurationDestroy, - Steps: []resource.TestStep{ - resource.TestStep{ - Config: testAccAWSLaunchConfigurationNoNameConfig, - Check: resource.ComposeTestCheckFunc( - testAccCheckAWSLaunchConfigurationExists("aws_launch_configuration.bar", &conf), - testAccCheckAWSLaunchConfigurationGeneratedNamePrefix( - "aws_launch_configuration.bar", "terraform-"), - ), - }, - }, - }) -} - func testAccCheckAWSLaunchConfigurationGeneratedNamePrefix( resource, prefix string) resource.TestCheckFunc { return func(s *terraform.State) error { diff --git a/builtin/providers/aws/resource_aws_lb_cookie_stickiness_policy_test.go b/builtin/providers/aws/resource_aws_lb_cookie_stickiness_policy_test.go index e91149d68..e1073e5e8 100644 --- a/builtin/providers/aws/resource_aws_lb_cookie_stickiness_policy_test.go +++ b/builtin/providers/aws/resource_aws_lb_cookie_stickiness_policy_test.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform/terraform" ) -func TestAccAwsLBCookieStickinessPolicy(t *testing.T) { +func TestAccAwsLBCookieStickinessPolicy_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, diff --git a/builtin/providers/aws/resource_aws_main_route_table_association_test.go b/builtin/providers/aws/resource_aws_main_route_table_association_test.go index 81f87a901..344df82f6 100644 --- a/builtin/providers/aws/resource_aws_main_route_table_association_test.go +++ b/builtin/providers/aws/resource_aws_main_route_table_association_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform/terraform" ) -func TestAccAWSMainRouteTableAssociation(t *testing.T) { +func TestAccAWSMainRouteTableAssociation_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, diff --git a/builtin/providers/aws/resource_aws_proxy_protocol_policy_test.go b/builtin/providers/aws/resource_aws_proxy_protocol_policy_test.go index d03cfd7eb..945a62d48 100644 --- a/builtin/providers/aws/resource_aws_proxy_protocol_policy_test.go +++ b/builtin/providers/aws/resource_aws_proxy_protocol_policy_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform/terraform" ) -func TestAccAWSProxyProtocolPolicy(t *testing.T) { +func TestAccAWSProxyProtocolPolicy_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, diff --git a/builtin/providers/aws/resource_aws_route_table_association_test.go b/builtin/providers/aws/resource_aws_route_table_association_test.go index 7f5fd6c58..368bc829f 100644 --- a/builtin/providers/aws/resource_aws_route_table_association_test.go +++ b/builtin/providers/aws/resource_aws_route_table_association_test.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform/terraform" ) -func TestAccAWSRouteTableAssociation(t *testing.T) { +func TestAccAWSRouteTableAssociation_basic(t *testing.T) { var v, v2 ec2.RouteTable resource.Test(t, resource.TestCase{ diff --git a/builtin/providers/aws/resource_aws_sns_topic_subscription_test.go b/builtin/providers/aws/resource_aws_sns_topic_subscription_test.go index 5b10e811f..3ab538bcd 100644 --- a/builtin/providers/aws/resource_aws_sns_topic_subscription_test.go +++ b/builtin/providers/aws/resource_aws_sns_topic_subscription_test.go @@ -11,7 +11,7 @@ import ( "github.com/aws/aws-sdk-go/aws/awserr" ) -func TestAccAWSSNSTopicSubscription(t *testing.T) { +func TestAccAWSSNSTopicSubscription_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, diff --git a/builtin/providers/aws/resource_aws_sns_topic_test.go b/builtin/providers/aws/resource_aws_sns_topic_test.go index 5cfb5384f..c716d4fb6 100644 --- a/builtin/providers/aws/resource_aws_sns_topic_test.go +++ b/builtin/providers/aws/resource_aws_sns_topic_test.go @@ -11,7 +11,7 @@ import ( "github.com/aws/aws-sdk-go/aws/awserr" ) -func TestAccAWSSNSTopic(t *testing.T) { +func TestAccAWSSNSTopic_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, diff --git a/builtin/providers/aws/resource_aws_sqs_queue_test.go b/builtin/providers/aws/resource_aws_sqs_queue_test.go index 15b841aee..e340a05b9 100644 --- a/builtin/providers/aws/resource_aws_sqs_queue_test.go +++ b/builtin/providers/aws/resource_aws_sqs_queue_test.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform/terraform" ) -func TestAccAWSSQSQueue(t *testing.T) { +func TestAccAWSSQSQueue_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, diff --git a/builtin/providers/aws/resource_aws_subnet_test.go b/builtin/providers/aws/resource_aws_subnet_test.go index 5c0cbadce..78dbf2d9f 100644 --- a/builtin/providers/aws/resource_aws_subnet_test.go +++ b/builtin/providers/aws/resource_aws_subnet_test.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform/terraform" ) -func TestAccAWSSubnet(t *testing.T) { +func TestAccAWSSubnet_basic(t *testing.T) { var v ec2.Subnet testCheck := func(*terraform.State) error { diff --git a/builtin/providers/aws/resource_aws_vpc_dhcp_options_association_test.go b/builtin/providers/aws/resource_aws_vpc_dhcp_options_association_test.go index 401c9993b..f40f1a06e 100644 --- a/builtin/providers/aws/resource_aws_vpc_dhcp_options_association_test.go +++ b/builtin/providers/aws/resource_aws_vpc_dhcp_options_association_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform/terraform" ) -func TestAccAWSDHCPOptionsAssociation(t *testing.T) { +func TestAccAWSDHCPOptionsAssociation_basic(t *testing.T) { var v ec2.VPC var d ec2.DHCPOptions diff --git a/builtin/providers/aws/resource_aws_vpc_dhcp_options_test.go b/builtin/providers/aws/resource_aws_vpc_dhcp_options_test.go index 5df853ff0..988c8b3c4 100644 --- a/builtin/providers/aws/resource_aws_vpc_dhcp_options_test.go +++ b/builtin/providers/aws/resource_aws_vpc_dhcp_options_test.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform/terraform" ) -func TestAccDHCPOptions(t *testing.T) { +func TestAccDHCPOptions_basic(t *testing.T) { var d ec2.DHCPOptions resource.Test(t, resource.TestCase{ diff --git a/builtin/providers/aws/resource_aws_vpn_connection_test.go b/builtin/providers/aws/resource_aws_vpn_connection_test.go index aeed5d8b7..55dbb447c 100644 --- a/builtin/providers/aws/resource_aws_vpn_connection_test.go +++ b/builtin/providers/aws/resource_aws_vpn_connection_test.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform/terraform" ) -func TestAccAwsVpnConnection(t *testing.T) { +func TestAccAwsVpnConnection_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, diff --git a/builtin/providers/aws/resource_vpn_connection_route_test.go b/builtin/providers/aws/resource_vpn_connection_route_test.go index 3b67e139e..955aa5f1a 100644 --- a/builtin/providers/aws/resource_vpn_connection_route_test.go +++ b/builtin/providers/aws/resource_vpn_connection_route_test.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/terraform/terraform" ) -func TestAccAwsVpnConnectionRoute(t *testing.T) { +func TestAccAwsVpnConnectionRoute_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, diff --git a/builtin/providers/cloudstack/resource_cloudstack_ssh_keypair_test.go b/builtin/providers/cloudstack/resource_cloudstack_ssh_keypair_test.go index 06c34f853..45fbc2c06 100644 --- a/builtin/providers/cloudstack/resource_cloudstack_ssh_keypair_test.go +++ b/builtin/providers/cloudstack/resource_cloudstack_ssh_keypair_test.go @@ -11,7 +11,7 @@ import ( "github.com/xanzy/go-cloudstack/cloudstack" ) -func TestAccCloudStackSSHKeyPair_create(t *testing.T) { +func TestAccCloudStackSSHKeyPair_basic(t *testing.T) { var sshkey cloudstack.SSHKeyPair resource.Test(t, resource.TestCase{ diff --git a/builtin/providers/consul/resource_consul_keys_test.go b/builtin/providers/consul/resource_consul_keys_test.go index e1a959b7d..97890335c 100644 --- a/builtin/providers/consul/resource_consul_keys_test.go +++ b/builtin/providers/consul/resource_consul_keys_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform/terraform" ) -func TestAccConsulKeys(t *testing.T) { +func TestAccConsulKeys_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() {}, Providers: testAccProviders, diff --git a/builtin/providers/dme/resource_dme_record_test.go b/builtin/providers/dme/resource_dme_record_test.go index 284ab0ad9..430afacb2 100644 --- a/builtin/providers/dme/resource_dme_record_test.go +++ b/builtin/providers/dme/resource_dme_record_test.go @@ -13,7 +13,7 @@ import ( var _ = fmt.Sprintf("dummy") // dummy var _ = os.DevNull // dummy -func TestAccDMERecordA(t *testing.T) { +func TestAccDMERecord_basic(t *testing.T) { var record dnsmadeeasy.Record domainid := os.Getenv("DME_DOMAINID") diff --git a/builtin/providers/google/resource_storage_bucket_test.go b/builtin/providers/google/resource_storage_bucket_test.go index e33cd5cb7..a7b59c61a 100644 --- a/builtin/providers/google/resource_storage_bucket_test.go +++ b/builtin/providers/google/resource_storage_bucket_test.go @@ -1,9 +1,9 @@ package google import ( + "bytes" "fmt" "math/rand" - "bytes" "testing" "time" @@ -14,7 +14,7 @@ import ( storage "google.golang.org/api/storage/v1" ) -func TestAccStorageDefaults(t *testing.T) { +func TestAccStorage_basic(t *testing.T) { var bucketName string resource.Test(t, resource.TestCase{ diff --git a/builtin/providers/openstack/resource_openstack_fw_firewall_v1_test.go b/builtin/providers/openstack/resource_openstack_fw_firewall_v1_test.go index 34112f778..43318db19 100644 --- a/builtin/providers/openstack/resource_openstack_fw_firewall_v1_test.go +++ b/builtin/providers/openstack/resource_openstack_fw_firewall_v1_test.go @@ -11,7 +11,7 @@ import ( "github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/firewalls" ) -func TestAccFWFirewallV1(t *testing.T) { +func TestAccFWFirewallV1_basic(t *testing.T) { var policyID *string diff --git a/builtin/providers/openstack/resource_openstack_fw_rule_v1_test.go b/builtin/providers/openstack/resource_openstack_fw_rule_v1_test.go index ba96bb8b1..677e7cd01 100644 --- a/builtin/providers/openstack/resource_openstack_fw_rule_v1_test.go +++ b/builtin/providers/openstack/resource_openstack_fw_rule_v1_test.go @@ -12,7 +12,7 @@ import ( "github.com/rackspace/gophercloud/openstack/networking/v2/extensions/fwaas/rules" ) -func TestAccFWRuleV1(t *testing.T) { +func TestAccFWRuleV1_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, From f4f5139f22cf12a46cd934c632ad241f492929ee Mon Sep 17 00:00:00 2001 From: Paul Hinze Date: Sun, 7 Jun 2015 20:56:41 -0500 Subject: [PATCH 85/91] provider/aws: improve iam_policy err msgs Turns out `%s` outputs nicer than `%#v` here. Closes #2247 --- builtin/providers/aws/resource_aws_iam_policy.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/builtin/providers/aws/resource_aws_iam_policy.go b/builtin/providers/aws/resource_aws_iam_policy.go index 46bf745b0..9ace92b21 100644 --- a/builtin/providers/aws/resource_aws_iam_policy.go +++ b/builtin/providers/aws/resource_aws_iam_policy.go @@ -59,7 +59,7 @@ func resourceAwsIamPolicyCreate(d *schema.ResourceData, meta interface{}) error response, err := iamconn.CreatePolicy(request) if err != nil { - return fmt.Errorf("Error creating IAM policy %s: %#v", name, err) + return fmt.Errorf("Error creating IAM policy %s: %s", name, err) } return readIamPolicy(d, response.Policy) @@ -78,7 +78,7 @@ func resourceAwsIamPolicyRead(d *schema.ResourceData, meta interface{}) error { d.SetId("") return nil } - return fmt.Errorf("Error reading IAM policy %s: %#v", d.Id(), err) + return fmt.Errorf("Error reading IAM policy %s: %s", d.Id(), err) } return readIamPolicy(d, response.Policy) @@ -101,7 +101,7 @@ func resourceAwsIamPolicyUpdate(d *schema.ResourceData, meta interface{}) error } if _, err := iamconn.CreatePolicyVersion(request); err != nil { - return fmt.Errorf("Error updating IAM policy %s: %#v", d.Id(), err) + return fmt.Errorf("Error updating IAM policy %s: %s", d.Id(), err) } return nil } @@ -187,7 +187,7 @@ func iamPolicyDeleteVersion(arn, versionID string, iamconn *iam.IAM) error { _, err := iamconn.DeletePolicyVersion(request) if err != nil { - return fmt.Errorf("Error deleting version %s from IAM policy %s: %#v", versionID, arn, err) + return fmt.Errorf("Error deleting version %s from IAM policy %s: %s", versionID, arn, err) } return nil } @@ -199,7 +199,7 @@ func iamPolicyListVersions(arn string, iamconn *iam.IAM) ([]*iam.PolicyVersion, response, err := iamconn.ListPolicyVersions(request) if err != nil { - return nil, fmt.Errorf("Error listing versions for IAM policy %s: %#v", arn, err) + return nil, fmt.Errorf("Error listing versions for IAM policy %s: %s", arn, err) } return response.Versions, nil } From 18924d24feb5248cbba8673380a3e779ce2b8fc5 Mon Sep 17 00:00:00 2001 From: Paul Hinze Date: Sun, 7 Jun 2015 21:32:00 -0500 Subject: [PATCH 86/91] command/apply: flatten multierrors Before: ``` Error applying plan: 1 error(s) occurred: * 1 error(s) occurred: * 1 error(s) occurred: * 1 error(s) occurred: * Error creating ... ``` After: ``` Error applying plan: 1 error(s) occurred: * Error creating ... ``` Muuuch better! :D --- command/apply.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/command/apply.go b/command/apply.go index 529d6e701..7664fc0e8 100644 --- a/command/apply.go +++ b/command/apply.go @@ -7,6 +7,7 @@ import ( "sort" "strings" + "github.com/hashicorp/go-multierror" "github.com/hashicorp/terraform/config/module" "github.com/hashicorp/terraform/terraform" ) @@ -207,7 +208,7 @@ func (c *ApplyCommand) Run(args []string) int { "Instead, your Terraform state file has been partially updated with\n"+ "any resources that successfully completed. Please address the error\n"+ "above and apply again to incrementally change your infrastructure.", - applyErr)) + multierror.Flatten(applyErr))) return 1 } From dd7413f4f7a0031fdec8223ec84858d7291b807b Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Sun, 7 Jun 2015 22:13:02 -0700 Subject: [PATCH 87/91] update CHANGELOG --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f0370bf84..84644b4b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,8 @@ IMPROVEMENTS: option. [GH-2227] * provider/openstack: allow `OS_AUTH_TOKEN` environment variable to set the openstack `api_key` field [GH-2234] + * provider/openstack: Can now configure endpoint type (public, admin, + internal) [GH-2262] BUG FIXES: From b7c5deeb240af6b3c3b5c879cf0b5455d42163f5 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Sun, 7 Jun 2015 22:15:12 -0700 Subject: [PATCH 88/91] update CHANGELOG --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 84644b4b2..eb8883dab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ FEATURES: * **New resource: `aws_ecs_cluster`** [GH-1803] * **New resource: `aws_ecs_service`** [GH-1803] * **New resource: `aws_ecs_task_definition`** [GH-1803] + * **New remote state backend: `swift`**: You can now store remote state in + a OpenStack Swift. [GH-2254] * command/output: support display of module outputs [GH-2102] * core: keys() and values() funcs for map variables [GH-2198] From 76d920f5042c78eb5553fdb0a02f74ba95cdf1ae Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Sun, 7 Jun 2015 22:24:31 -0700 Subject: [PATCH 89/91] state/remote: more canonical Go for skip TLS verify /cc @LeftyBC - Hope this helps! Some basic point: * Idiomatic Go is to use thisCasingStyle and not this_casing_style * Less repetitive to just create an http.Client once and re-use, also more flexible for later. * The empty `if ok {}` was kind of awkward, replace with proper check --- state/remote/http.go | 58 ++++++++++++++------------------------- state/remote/http_test.go | 2 +- 2 files changed, 22 insertions(+), 38 deletions(-) diff --git a/state/remote/http.go b/state/remote/http.go index 121cb8c89..1aca7652f 100644 --- a/state/remote/http.go +++ b/state/remote/http.go @@ -26,41 +26,38 @@ func httpFactory(conf map[string]string) (Client, error) { return nil, fmt.Errorf("address must be HTTP or HTTPS") } - skip_cert_verification := false - skip_cert_config_string, ok := conf["skip_cert_verification"] - if !ok { - // config wasn't specified - // use the default - check cert validity - } else { - skip_cert_verification, err = strconv.ParseBool(skip_cert_config_string) + client := &http.Client{} + if skipRaw, ok := conf["skip_cert_verification"]; ok { + skip, err := strconv.ParseBool(skipRaw) if err != nil { - return nil, fmt.Errorf("skip_cert_verification must be boolean (true/false)") + return nil, fmt.Errorf("skip_cert_verification must be boolean") + } + if skip { + // Replace the client with one that ignores TLS verification + client = &http.Client{ + Transport: &http.Transport{ + TLSClientConfig: &tls.Config{ + InsecureSkipVerify: true, + }, + }, + } } - // skip_cert_verification should now be set to true or false } return &HTTPClient{ - URL: url, - skipCertVerify: skip_cert_verification, + URL: url, + Client: client, }, nil } // HTTPClient is a remote client that stores data in Consul or HTTP REST. type HTTPClient struct { - URL *url.URL - skipCertVerify bool + URL *url.URL + Client *http.Client } func (c *HTTPClient) Get() (*Payload, error) { - - // Build the HTTP client - tr := &http.Transport{ - TLSClientConfig: &tls.Config{InsecureSkipVerify: c.skipCertVerify}, - } - - client := &http.Client{Transport: tr} - - resp, err := client.Get(c.URL.String()) + resp, err := c.Client.Get(c.URL.String()) if err != nil { return nil, err } @@ -135,13 +132,6 @@ func (c *HTTPClient) Put(data []byte) error { } */ - // Build the HTTP client and request - tr := &http.Transport{ - TLSClientConfig: &tls.Config{InsecureSkipVerify: c.skipCertVerify}, - } - - client := &http.Client{Transport: tr} - req, err := http.NewRequest("POST", base.String(), bytes.NewReader(data)) if err != nil { return fmt.Errorf("Failed to make HTTP request: %s", err) @@ -153,7 +143,7 @@ func (c *HTTPClient) Put(data []byte) error { req.ContentLength = int64(len(data)) // Make the request - resp, err := client.Do(req) + resp, err := c.Client.Do(req) if err != nil { return fmt.Errorf("Failed to upload state: %v", err) } @@ -169,19 +159,13 @@ func (c *HTTPClient) Put(data []byte) error { } func (c *HTTPClient) Delete() error { - // Build the HTTP request - tr := &http.Transport{ - TLSClientConfig: &tls.Config{InsecureSkipVerify: c.skipCertVerify}, - } - - client := &http.Client{Transport: tr} req, err := http.NewRequest("DELETE", c.URL.String(), nil) if err != nil { return fmt.Errorf("Failed to make HTTP request: %s", err) } // Make the request - resp, err := client.Do(req) + resp, err := c.Client.Do(req) if err != nil { return fmt.Errorf("Failed to delete state: %s", err) } diff --git a/state/remote/http_test.go b/state/remote/http_test.go index e5cdbed88..e6e7297c1 100644 --- a/state/remote/http_test.go +++ b/state/remote/http_test.go @@ -24,7 +24,7 @@ func TestHTTPClient(t *testing.T) { t.Fatalf("err: %s", err) } - client := &HTTPClient{URL: url} + client := &HTTPClient{URL: url, Client: http.DefaultClient} testClient(t, client) } From 788528d2260b31cf69b3891f1db7ced6eeaad642 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Sun, 7 Jun 2015 22:26:31 -0700 Subject: [PATCH 90/91] update CHANGELOG --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb8883dab..90ec81fc1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,8 @@ FEATURES: IMPROVEMENTS: + * core: HTTP remote state now accepts `skip_cert_verification` + option to ignore TLS cert verification. [GH-2214] * provider/aws: ElastiCache Subnet Groups can be updated without destroying first [GH-2191] * provider/docker: `docker_container` has the `privileged` From 2cee26bfe5c3ac1b6e1cf8aebcf7067ff6abccee Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Sun, 7 Jun 2015 22:28:25 -0700 Subject: [PATCH 91/91] update CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90ec81fc1..7b70bdf62 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,7 @@ BUG FIXES: * provider/aws: fix issue causing perpetual diff on ELB listeners when non-lowercase protocol strings were used [GH-2246] * provider/aws: corrected frankfurt S3 website region [GH-2259] + * provider/aws: `aws_elasticache_cluster` port is required [GH-2160] ## 0.5.3 (June 1, 2015)