From 2802d319d29893e5b7b882590a16294cceddbc49 Mon Sep 17 00:00:00 2001 From: Chris Marchesi Date: Wed, 19 Apr 2017 16:56:54 -0700 Subject: [PATCH 01/49] core: Move CountBoundaryTransformer to the plan graph builder This fixes interpolation issues on grandchild data sources that have multiple instances (ie: counts). For example, baz depends on bar, which depends on foo. In this instance, after an initial TF run is done and state is saved, the next refresh/plan is not properly transformed, and instead of the graph/state coming through as data.x.bar.0, it comes through as data.x.bar. This breaks interpolations that rely on splat operators - ie: data.x.bar.*.out. --- builtin/providers/test/data_source_test.go | 56 ++++++++++++++++++++++ terraform/graph_builder_apply.go | 3 -- terraform/graph_builder_plan.go | 3 ++ 3 files changed, 59 insertions(+), 3 deletions(-) diff --git a/builtin/providers/test/data_source_test.go b/builtin/providers/test/data_source_test.go index 3f4e5ada6..44622c0c5 100644 --- a/builtin/providers/test/data_source_test.go +++ b/builtin/providers/test/data_source_test.go @@ -99,3 +99,59 @@ resource "test_resource" "foo" { }, }) } + +// Test that a grandchild data source that is based off of count works, ie: +// dependency chain foo -> bar -> baz. This was failing because +// CountBoundaryTransformer is being run during apply instead of plan, which +// meant that it wasn't firing after data sources were potentially changing +// state and causing diff/interpolation issues. +// +// This happens after the initial apply, after state is saved. +func TestDataSource_dataSourceCountGrandChild(t *testing.T) { + resource.UnitTest(t, resource.TestCase{ + Providers: testAccProviders, + CheckDestroy: func(s *terraform.State) error { + return nil + }, + Steps: []resource.TestStep{ + { + Config: dataSourceCountGrandChildConfig, + }, + { + Config: dataSourceCountGrandChildConfig, + Check: func(s *terraform.State) error { + for _, v := range []string{"foo", "bar", "baz"} { + count := 0 + for k := range s.RootModule().Resources { + if strings.HasPrefix(k, fmt.Sprintf("data.test_data_source.%s.", v)) { + count++ + } + } + + if count != 2 { + return fmt.Errorf("bad count for data.test_data_source.%s: %d", v, count) + } + } + return nil + }, + }, + }, + }) +} + +const dataSourceCountGrandChildConfig = ` +data "test_data_source" "foo" { + count = 2 + input = "one" +} + +data "test_data_source" "bar" { + count = "${length(data.test_data_source.foo.*.id)}" + input = "${data.test_data_source.foo.*.output[count.index]}" +} + +data "test_data_source" "baz" { + count = "${length(data.test_data_source.bar.*.id)}" + input = "${data.test_data_source.bar.*.output[count.index]}" +} +` diff --git a/terraform/graph_builder_apply.go b/terraform/graph_builder_apply.go index 38a90f277..251b517e1 100644 --- a/terraform/graph_builder_apply.go +++ b/terraform/graph_builder_apply.go @@ -117,9 +117,6 @@ func (b *ApplyGraphBuilder) Steps() []GraphTransformer { // Connect references so ordering is correct &ReferenceTransformer{}, - // Add the node to fix the state count boundaries - &CountBoundaryTransformer{}, - // Target &TargetsTransformer{Targets: b.Targets}, diff --git a/terraform/graph_builder_plan.go b/terraform/graph_builder_plan.go index 02d869700..b8ba4da10 100644 --- a/terraform/graph_builder_plan.go +++ b/terraform/graph_builder_plan.go @@ -120,6 +120,9 @@ func (b *PlanGraphBuilder) Steps() []GraphTransformer { &CloseProviderTransformer{}, &CloseProvisionerTransformer{}, + // Add the node to fix the state count boundaries + &CountBoundaryTransformer{}, + // Single root &RootTransformer{}, } From d41b80678958f9b448acfc4dfd12ffe5d288ce9e Mon Sep 17 00:00:00 2001 From: Chris Marchesi Date: Wed, 19 Apr 2017 22:23:52 -0700 Subject: [PATCH 02/49] core: Restore CountBoundaryTransformer to apply, add/adjust tests Moving the transformer wholesale looks like it broke some tests, with some actually doing legit work in normalizing singular resources from a foo.0 notation to just foo. Adjusted the TestPlanGraphBuilder to account for the extra meta.count-boundary nodes in the graph output now, as well as added another context test that tests this case. It appears the issue happens during validate, as this is where the state can be altered to a broken state if things are not properly transformed in the plan graph. --- builtin/providers/test/data_source_test.go | 10 +- terraform/context_plan_test.go | 142 ++++++++++++++++++ terraform/graph_builder_apply.go | 3 + terraform/graph_builder_plan.go | 6 +- terraform/graph_builder_plan_test.go | 11 +- .../nested-resource-count-plan/main.tf | 11 ++ 6 files changed, 174 insertions(+), 9 deletions(-) create mode 100644 terraform/test-fixtures/nested-resource-count-plan/main.tf diff --git a/builtin/providers/test/data_source_test.go b/builtin/providers/test/data_source_test.go index 44622c0c5..77e235f3d 100644 --- a/builtin/providers/test/data_source_test.go +++ b/builtin/providers/test/data_source_test.go @@ -100,11 +100,11 @@ resource "test_resource" "foo" { }) } -// Test that a grandchild data source that is based off of count works, ie: -// dependency chain foo -> bar -> baz. This was failing because -// CountBoundaryTransformer is being run during apply instead of plan, which -// meant that it wasn't firing after data sources were potentially changing -// state and causing diff/interpolation issues. +// TestDataSource_dataSourceCountGrandChild tests that a grandchild data source +// that is based off of count works, ie: dependency chain foo -> bar -> baz. +// This was failing because CountBoundaryTransformer is being run during apply +// instead of plan, which meant that it wasn't firing after data sources were +// potentially changing state and causing diff/interpolation issues. // // This happens after the initial apply, after state is saved. func TestDataSource_dataSourceCountGrandChild(t *testing.T) { diff --git a/terraform/context_plan_test.go b/terraform/context_plan_test.go index 7064f6465..4d9e35430 100644 --- a/terraform/context_plan_test.go +++ b/terraform/context_plan_test.go @@ -3146,3 +3146,145 @@ func TestContext2Plan_ignoreChangesWithFlatmaps(t *testing.T) { t.Fatalf("bad:\n%s\n\nexpected\n\n%s", actual, expected) } } + +// TestContext2Plan_resourceNestedCount ensures resource sets that depend on +// the count of another resource set (ie: count of a data source that depends +// on another data source's instance count - data.x.foo.*.id) get properly +// normalized to the indexes they should be. This case comes up when there is +// an existing state (after an initial apply). +func TestContext2Plan_resourceNestedCount(t *testing.T) { + m := testModule(t, "nested-resource-count-plan") + p := testProvider("aws") + p.DiffFn = testDiffFn + p.RefreshFn = func(i *InstanceInfo, is *InstanceState) (*InstanceState, error) { + return is, nil + } + s := &State{ + Modules: []*ModuleState{ + &ModuleState{ + Path: rootModulePath, + Resources: map[string]*ResourceState{ + "aws_instance.foo.0": &ResourceState{ + Type: "aws_instance", + Primary: &InstanceState{ + ID: "foo0", + Attributes: map[string]string{ + "id": "foo0", + }, + }, + }, + "aws_instance.foo.1": &ResourceState{ + Type: "aws_instance", + Primary: &InstanceState{ + ID: "foo1", + Attributes: map[string]string{ + "id": "foo1", + }, + }, + }, + "aws_instance.bar.0": &ResourceState{ + Type: "aws_instance", + Dependencies: []string{"aws_instance.foo.*"}, + Primary: &InstanceState{ + ID: "bar0", + Attributes: map[string]string{ + "id": "bar0", + }, + }, + }, + "aws_instance.bar.1": &ResourceState{ + Type: "aws_instance", + Dependencies: []string{"aws_instance.foo.*"}, + Primary: &InstanceState{ + ID: "bar1", + Attributes: map[string]string{ + "id": "bar1", + }, + }, + }, + "aws_instance.baz.0": &ResourceState{ + Type: "aws_instance", + Dependencies: []string{"aws_instance.bar.*"}, + Primary: &InstanceState{ + ID: "baz0", + Attributes: map[string]string{ + "id": "baz0", + }, + }, + }, + "aws_instance.baz.1": &ResourceState{ + Type: "aws_instance", + Dependencies: []string{"aws_instance.bar.*"}, + Primary: &InstanceState{ + ID: "baz1", + Attributes: map[string]string{ + "id": "baz1", + }, + }, + }, + }, + }, + }, + } + ctx := testContext2(t, &ContextOpts{ + Module: m, + Providers: map[string]ResourceProviderFactory{ + "aws": testProviderFuncFixed(p), + }, + State: s, + }) + + _, e := ctx.Validate() + if len(e) > 0 { + for _, err := range e { + t.Errorf("bad: %s", err) + } + } + + _, err := ctx.Refresh() + if err != nil { + t.Fatalf("refresh err: %s", err) + } + + plan, err := ctx.Plan() + if err != nil { + t.Fatalf("plan err: %s", err) + } + + actual := strings.TrimSpace(plan.String()) + expected := strings.TrimSpace(` +DIFF: + + + +STATE: + +aws_instance.bar.0: + ID = bar0 + + Dependencies: + aws_instance.foo.* +aws_instance.bar.1: + ID = bar1 + + Dependencies: + aws_instance.foo.* +aws_instance.baz.0: + ID = baz0 + + Dependencies: + aws_instance.bar.* +aws_instance.baz.1: + ID = baz1 + + Dependencies: + aws_instance.bar.* +aws_instance.foo.0: + ID = foo0 +aws_instance.foo.1: + ID = foo1 +`) + if actual != expected { + t.Fatalf("bad:\n%s\n\nexpected\n\n%s", actual, expected) + } +} diff --git a/terraform/graph_builder_apply.go b/terraform/graph_builder_apply.go index 251b517e1..38a90f277 100644 --- a/terraform/graph_builder_apply.go +++ b/terraform/graph_builder_apply.go @@ -117,6 +117,9 @@ func (b *ApplyGraphBuilder) Steps() []GraphTransformer { // Connect references so ordering is correct &ReferenceTransformer{}, + // Add the node to fix the state count boundaries + &CountBoundaryTransformer{}, + // Target &TargetsTransformer{Targets: b.Targets}, diff --git a/terraform/graph_builder_plan.go b/terraform/graph_builder_plan.go index b8ba4da10..a6a3a90d4 100644 --- a/terraform/graph_builder_plan.go +++ b/terraform/graph_builder_plan.go @@ -113,6 +113,9 @@ func (b *PlanGraphBuilder) Steps() []GraphTransformer { // have to connect again later for providers and so on. &ReferenceTransformer{}, + // Add the node to fix the state count boundaries + &CountBoundaryTransformer{}, + // Target &TargetsTransformer{Targets: b.Targets}, @@ -120,9 +123,6 @@ func (b *PlanGraphBuilder) Steps() []GraphTransformer { &CloseProviderTransformer{}, &CloseProvisionerTransformer{}, - // Add the node to fix the state count boundaries - &CountBoundaryTransformer{}, - // Single root &RootTransformer{}, } diff --git a/terraform/graph_builder_plan_test.go b/terraform/graph_builder_plan_test.go index 23526a9ac..25578ebaf 100644 --- a/terraform/graph_builder_plan_test.go +++ b/terraform/graph_builder_plan_test.go @@ -29,7 +29,7 @@ func TestPlanGraphBuilder(t *testing.T) { actual := strings.TrimSpace(g.String()) expected := strings.TrimSpace(testPlanGraphBuilderStr) if actual != expected { - t.Fatalf("bad: %s", actual) + t.Fatalf("expected:\n%s\n\ngot:\n%s", expected, actual) } } @@ -61,6 +61,14 @@ aws_load_balancer.weblb provider.aws aws_security_group.firewall provider.aws +meta.count-boundary (count boundary fixup) + aws_instance.web + aws_load_balancer.weblb + aws_security_group.firewall + openstack_floating_ip.random + provider.aws + provider.openstack + var.foo openstack_floating_ip.random provider.openstack provider.aws @@ -75,6 +83,7 @@ provider.openstack (close) openstack_floating_ip.random provider.openstack root + meta.count-boundary (count boundary fixup) provider.aws (close) provider.openstack (close) var.foo diff --git a/terraform/test-fixtures/nested-resource-count-plan/main.tf b/terraform/test-fixtures/nested-resource-count-plan/main.tf new file mode 100644 index 000000000..f803fd1f6 --- /dev/null +++ b/terraform/test-fixtures/nested-resource-count-plan/main.tf @@ -0,0 +1,11 @@ +resource "aws_instance" "foo" { + count = 2 +} + +resource "aws_instance" "bar" { + count = "${length(aws_instance.foo.*.id)}" +} + +resource "aws_instance" "baz" { + count = "${length(aws_instance.bar.*.id)}" +} From 744727a28a502710fe0f41a1ef2790be13faae97 Mon Sep 17 00:00:00 2001 From: Chris Marchesi Date: Thu, 20 Apr 2017 07:31:44 -0700 Subject: [PATCH 03/49] core: Trap warnings as well as errors on resourceNestedCount test --- terraform/context_plan_test.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/terraform/context_plan_test.go b/terraform/context_plan_test.go index 4d9e35430..16f0d16e9 100644 --- a/terraform/context_plan_test.go +++ b/terraform/context_plan_test.go @@ -3234,11 +3234,12 @@ func TestContext2Plan_resourceNestedCount(t *testing.T) { State: s, }) - _, e := ctx.Validate() + w, e := ctx.Validate() + if len(w) > 0 { + t.Fatalf("warnings generated on validate: %#v", w) + } if len(e) > 0 { - for _, err := range e { - t.Errorf("bad: %s", err) - } + t.Fatalf("errors generated on validate: %#v", e) } _, err := ctx.Refresh() From ad604d91dc380d1c41c08a442017f8fbb8cdd55a Mon Sep 17 00:00:00 2001 From: Pete Wildsmith Date: Tue, 25 Apr 2017 23:11:24 +0100 Subject: [PATCH 04/49] Add TLS options to Nomad provider schema --- builtin/providers/nomad/provider.go | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/builtin/providers/nomad/provider.go b/builtin/providers/nomad/provider.go index d23c4ad97..abefb3ce8 100644 --- a/builtin/providers/nomad/provider.go +++ b/builtin/providers/nomad/provider.go @@ -24,6 +24,24 @@ func Provider() terraform.ResourceProvider { DefaultFunc: schema.EnvDefaultFunc("NOMAD_REGION", ""), Description: "Region of the target Nomad agent.", }, + "ca_file": &schema.Schema{ + Type: schema.TypeString, + Optional: true, + DefaultFunc: schema.EnvDefaultFunc("NOMAD_CACERT", ""), + Description: "A path to a PEM-encoded certificate authority used to verify the remote agent's certificate.", + }, + "cert_file": &schema.Schema{ + Type: schema.TypeString, + Optional: true, + DefaultFunc: schema.EnvDefaultFunc("NOMAD_CLIENT_CERT", ""), + Description: "A path to a PEM-encoded certificate provided to the remote agent; requires use of key_file.", + }, + "key_file": &schema.Schema{ + Type: schema.TypeString, + Optional: true, + DefaultFunc: schema.EnvDefaultFunc("NOMAD_CLIENT_KEY", ""), + Description: "A path to a PEM-encoded private key, required if cert_file is specified.", + }, }, ConfigureFunc: providerConfigure, @@ -38,6 +56,9 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) { config := api.DefaultConfig() config.Address = d.Get("address").(string) config.Region = d.Get("region").(string) + config.TLSConfig.CACert = d.Get("ca_file").(string) + config.TLSConfig.ClientCert = d.Get("cert_file").(string) + config.TLSConfig.ClientKey = d.Get("key_file").(string) client, err := api.NewClient(config) if err != nil { From b1c03e93df06ff8f00e332e2d4c188c2dab43456 Mon Sep 17 00:00:00 2001 From: Pete Wildsmith Date: Tue, 25 Apr 2017 23:17:32 +0100 Subject: [PATCH 05/49] Document TLS options in Nomad provider --- website/source/docs/providers/nomad/index.html.markdown | 3 +++ 1 file changed, 3 insertions(+) diff --git a/website/source/docs/providers/nomad/index.html.markdown b/website/source/docs/providers/nomad/index.html.markdown index acf696d2e..129a9540b 100644 --- a/website/source/docs/providers/nomad/index.html.markdown +++ b/website/source/docs/providers/nomad/index.html.markdown @@ -34,3 +34,6 @@ The following arguments are supported: * `address` - (Optional) The HTTP(S) API address of the Nomad agent to use. Defaults to `http://127.0.0.1:4646`. The `NOMAD_ADDR` environment variable can also be used. * `region` - (Optional) The Nomad region to target. The `NOMAD_REGION` environment variable can also be used. +* `ca_file` - (Optional) A path to a PEM-encoded certificate authority used to verify the remote agent's certificate. The `NOMAD_CACERT` environment variable can also be used. +* `cert_file` - (Optional) A path to a PEM-encoded certificate provided to the remote agent; requires use of `key_file`. The `NOMAD_CLIENT_CERT` environment variable can also be used. +* `key_file`- (Optional) A path to a PEM-encoded private key, required if `cert_file` is specified. The `NOMAD_CLIENT_KEY` environment variable can also be used. From d3687fc9e9a09f2081ea7ce82c50e63c505db95e Mon Sep 17 00:00:00 2001 From: Josh VanderLinden Date: Wed, 26 Apr 2017 05:22:01 +0000 Subject: [PATCH 06/49] Expose any dynamically-assigned private IP address --- .../azurerm/resource_arm_loadbalancer.go | 18 +++++++++++++++++- .../azurerm/r/loadbalancer.html.markdown | 1 + 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/builtin/providers/azurerm/resource_arm_loadbalancer.go b/builtin/providers/azurerm/resource_arm_loadbalancer.go index 60bb95990..22ea3359f 100644 --- a/builtin/providers/azurerm/resource_arm_loadbalancer.go +++ b/builtin/providers/azurerm/resource_arm_loadbalancer.go @@ -92,6 +92,11 @@ func resourceArmLoadBalancer() *schema.Resource { }, }, + "private_ip_address": { + Type: schema.TypeString, + Computed: true, + }, + "tags": tagsSchema(), }, } @@ -172,7 +177,18 @@ func resourecArmLoadBalancerRead(d *schema.ResourceData, meta interface{}) error d.Set("resource_group_name", id.ResourceGroup) if loadBalancer.LoadBalancerPropertiesFormat != nil && loadBalancer.LoadBalancerPropertiesFormat.FrontendIPConfigurations != nil { - d.Set("frontend_ip_configuration", flattenLoadBalancerFrontendIpConfiguration(loadBalancer.LoadBalancerPropertiesFormat.FrontendIPConfigurations)) + ipconfig := flattenLoadBalancerFrontendIpConfiguration(loadBalancer.LoadBalancerPropertiesFormat.FrontendIPConfigurations) + d.Set("frontend_ip_configuration", ipconfig) + + for _, config := range ipconfig { + cfg := config.(map[string]interface{}) + if priv_ip, ok := cfg["private_ip_address"]; ok { + d.Set("private_ip_address", priv_ip) + + // set the private IP address at most once + break + } + } } flattenAndSetTags(d, loadBalancer.Tags) diff --git a/website/source/docs/providers/azurerm/r/loadbalancer.html.markdown b/website/source/docs/providers/azurerm/r/loadbalancer.html.markdown index e659bf2ec..7753a5ca5 100644 --- a/website/source/docs/providers/azurerm/r/loadbalancer.html.markdown +++ b/website/source/docs/providers/azurerm/r/loadbalancer.html.markdown @@ -60,6 +60,7 @@ The following arguments are supported: The following attributes are exported: * `id` - The LoadBalancer ID. +* `private_ip_address` - The private IP address assigned to the load balancer, if any. ## Import From 790874b372ae52d14efcaa4aefd883fa96b448ce Mon Sep 17 00:00:00 2001 From: Josh VanderLinden Date: Wed, 26 Apr 2017 15:03:42 +0000 Subject: [PATCH 07/49] Iterate over loadBalancer.LoadBalancerPropertiesFormat.FrontendIPConfigurations directly --- .../providers/azurerm/resource_arm_loadbalancer.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/builtin/providers/azurerm/resource_arm_loadbalancer.go b/builtin/providers/azurerm/resource_arm_loadbalancer.go index 22ea3359f..940b3fb98 100644 --- a/builtin/providers/azurerm/resource_arm_loadbalancer.go +++ b/builtin/providers/azurerm/resource_arm_loadbalancer.go @@ -177,13 +177,12 @@ func resourecArmLoadBalancerRead(d *schema.ResourceData, meta interface{}) error d.Set("resource_group_name", id.ResourceGroup) if loadBalancer.LoadBalancerPropertiesFormat != nil && loadBalancer.LoadBalancerPropertiesFormat.FrontendIPConfigurations != nil { - ipconfig := flattenLoadBalancerFrontendIpConfiguration(loadBalancer.LoadBalancerPropertiesFormat.FrontendIPConfigurations) - d.Set("frontend_ip_configuration", ipconfig) + ipconfigs := loadBalancer.LoadBalancerPropertiesFormat.FrontendIPConfigurations + d.Set("frontend_ip_configuration", flattenLoadBalancerFrontendIpConfiguration(ipconfigs)) - for _, config := range ipconfig { - cfg := config.(map[string]interface{}) - if priv_ip, ok := cfg["private_ip_address"]; ok { - d.Set("private_ip_address", priv_ip) + for _, config := range *ipconfigs { + if config.FrontendIPConfigurationPropertiesFormat.PrivateIPAddress != nil { + d.Set("private_ip_address", config.FrontendIPConfigurationPropertiesFormat.PrivateIPAddress) // set the private IP address at most once break From 5d40be32091a2c0d8ff342dfd8434ca20766120a Mon Sep 17 00:00:00 2001 From: Pete Wildsmith Date: Wed, 26 Apr 2017 18:48:57 +0100 Subject: [PATCH 08/49] reformat incorrectly formatted file --- builtin/providers/nomad/provider.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/builtin/providers/nomad/provider.go b/builtin/providers/nomad/provider.go index abefb3ce8..61f8603bc 100644 --- a/builtin/providers/nomad/provider.go +++ b/builtin/providers/nomad/provider.go @@ -25,22 +25,22 @@ func Provider() terraform.ResourceProvider { Description: "Region of the target Nomad agent.", }, "ca_file": &schema.Schema{ - Type: schema.TypeString, + Type: schema.TypeString, Optional: true, DefaultFunc: schema.EnvDefaultFunc("NOMAD_CACERT", ""), - Description: "A path to a PEM-encoded certificate authority used to verify the remote agent's certificate.", + Description: "A path to a PEM-encoded certificate authority used to verify the remote agent's certificate.", }, "cert_file": &schema.Schema{ - Type: schema.TypeString, + Type: schema.TypeString, Optional: true, DefaultFunc: schema.EnvDefaultFunc("NOMAD_CLIENT_CERT", ""), - Description: "A path to a PEM-encoded certificate provided to the remote agent; requires use of key_file.", + Description: "A path to a PEM-encoded certificate provided to the remote agent; requires use of key_file.", }, "key_file": &schema.Schema{ - Type: schema.TypeString, + Type: schema.TypeString, Optional: true, DefaultFunc: schema.EnvDefaultFunc("NOMAD_CLIENT_KEY", ""), - Description: "A path to a PEM-encoded private key, required if cert_file is specified.", + Description: "A path to a PEM-encoded private key, required if cert_file is specified.", }, }, From 05a76297e72710a38fdfb70a0351b74182c1ef0f Mon Sep 17 00:00:00 2001 From: Maciej Skierkowski Date: Wed, 26 Apr 2017 15:49:36 -0700 Subject: [PATCH 09/49] Removing reference to remote state pushing in TFE --- .../docs/enterprise/state/pushing.html.md | 23 ------------------- website/source/layouts/enterprise.erb | 3 --- 2 files changed, 26 deletions(-) delete mode 100755 website/source/docs/enterprise/state/pushing.html.md diff --git a/website/source/docs/enterprise/state/pushing.html.md b/website/source/docs/enterprise/state/pushing.html.md deleted file mode 100755 index 4e9545fda..000000000 --- a/website/source/docs/enterprise/state/pushing.html.md +++ /dev/null @@ -1,23 +0,0 @@ ---- -layout: "enterprise" -page_title: "Pushing - State - Terraform Enterprise" -sidebar_current: "docs-enterprise-state-pushing" -description: |- - Pushing remote states. ---- - -# Pushing Terraform Remote State to Terraform Enterprise - -Terraform Enterprise is one of a few options to store [remote state](/docs/enterprise/state). - -Remote state gives you the ability to version and collaborate on Terraform -changes. It stores information about the changes Terraform makes based on -configuration. - -To use Terraform Enterprise to store remote state, you'll first need to have the -`ATLAS_TOKEN` environment variable set and run the following command. - -```shell -$ terraform remote config \ - -backend-config="name=$USERNAME/product" -``` diff --git a/website/source/layouts/enterprise.erb b/website/source/layouts/enterprise.erb index 127074249..3aaf4cc1d 100644 --- a/website/source/layouts/enterprise.erb +++ b/website/source/layouts/enterprise.erb @@ -79,9 +79,6 @@ > State
    - > - Pushing State - > Resolving Conflicts From 9e791ad35711522952f2b73e231eb4faa45b4591 Mon Sep 17 00:00:00 2001 From: Maciej Skierkowski Date: Wed, 26 Apr 2017 15:50:15 -0700 Subject: [PATCH 10/49] Update steps per new state management commands --- .../state/resolving-conflicts.html.md | 32 ++++++------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/website/source/docs/enterprise/state/resolving-conflicts.html.md b/website/source/docs/enterprise/state/resolving-conflicts.html.md index 0de4069d6..e31a7fafa 100755 --- a/website/source/docs/enterprise/state/resolving-conflicts.html.md +++ b/website/source/docs/enterprise/state/resolving-conflicts.html.md @@ -35,36 +35,22 @@ operation. ### Using Terraform Locally -Another way to resolve remote state conflicts is to merge and conflicted copies -locally by inspecting the raw state available in the path -`.terraform/terraform.tfstate`. +Another way to resolve remote state conflicts is by manual intervention of the +state file. -When making state changes, it's important to make backup copies in order to -avoid losing any data. +Use the [`state pull`](/docs/commands/state/pull.html) subcommand to pull the +remote state into a local state file. -Any state that is pushed with a serial that is lower than the known serial when -the MD5 of the state does not match will be rejected. - -The serial is embedded in the state file: - -```json -{ - "version": 1, - "serial": 555, - "remote": { - "type": "atlas", - "config": { - "name": "my-username/production" - } - } -} +```shell +$ terraform state pull > example.tfstate ``` Once a conflict has been resolved locally by editing the state file, the serial -can be incremented past the current version and pushed: +can be incremented past the current version and pushed with the +[`state push`](/docs/commands/state/push.html) subcommand: ```shell -$ terraform remote push +$ terraform state push example.tfstate ``` This will upload the manually resolved state and set it as the head version. From 94ed759663e09d2870df9dce9219d6b0b5d294a9 Mon Sep 17 00:00:00 2001 From: Maciej Skierkowski Date: Wed, 26 Apr 2017 15:51:25 -0700 Subject: [PATCH 11/49] Updating guide to reference runs and applies instead of remote state push --- .../docs/enterprise/state/collaborating.html.md | 7 +++---- .../source/docs/enterprise/state/index.html.md | 16 ++++++++-------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/website/source/docs/enterprise/state/collaborating.html.md b/website/source/docs/enterprise/state/collaborating.html.md index a5e799f47..417887e5a 100755 --- a/website/source/docs/enterprise/state/collaborating.html.md +++ b/website/source/docs/enterprise/state/collaborating.html.md @@ -8,7 +8,7 @@ description: |- # Collaborating on Terraform Remote State -Terraform Enterprise is one of a few options to store [remote state](/docs/enterprise/state). +Terraform Enterprise is one of a few options to store [remote state](/docs/state/remote.html). Remote state gives you the ability to version and collaborate on Terraform changes. It stores information about the changes Terraform makes based on @@ -18,6 +18,5 @@ In order to collaborate safely on remote state, we recommend [creating an organization](/docs/enterprise/organizations/create.html) to manage teams of users. -Then, following a [remote state push](/docs/enterprise/state) you can view state -versions in the changes tab of the environment created under the same name as -the remote state. +Then, following a [Terraform Enterprise Run](/docs/enterprise/runs) or [`apply`](/docs/commands/apply.html) +you can view state versions in the `States` list of the environment. diff --git a/website/source/docs/enterprise/state/index.html.md b/website/source/docs/enterprise/state/index.html.md index 047cfee28..3b8a0589b 100755 --- a/website/source/docs/enterprise/state/index.html.md +++ b/website/source/docs/enterprise/state/index.html.md @@ -8,17 +8,17 @@ description: |- # State -Terraform stores the state of your managed infrastructure from the last time -Terraform was run. By default this state is stored in a local file named -`terraform.tfstate`, but it can also be stored remotely, which works better in a -team environment. - -Terraform Enterprise is a remote state provider, allowing you to store, version -and collaborate on states. +Terraform Enterprise stores the state of your managed infrastructure from the +last time Terraform was run. The state is stored remotely, which works better in a +team environment, allowing you to store, version and collaborate on state. Remote state gives you more than just easier version control and safer storage. It also allows you to delegate the outputs to other teams. This allows your infrastructure to be more easily broken down into components that multiple teams can access. -Read [more about remote state](https://www.terraform.io/docs/state/remote.html). +Remote state is automatically updated when you run [`apply`](/docs/commands/apply.html) +locally. It is also updated when an `apply` is executed in a [Terraform Enterprise +Run](/docs/enterprise/runs/index.html). + +Read [more about remote state](/docs/state/remote.html). From 89fba0c34efcb9a1e617e70ec3fda373dd5afad4 Mon Sep 17 00:00:00 2001 From: Paddy Date: Wed, 26 Apr 2017 15:52:49 -0700 Subject: [PATCH 12/49] Make global forwarding rule docs clearer for IP addresses. Update our docs for `google_compute_forwarding_rule` to clarify that the `ip_address` field expects a literal IP address and will not accept the `self_link` property of a `google_compute_address` resource. Prompted by #13375 --- .../google/r/compute_global_forwarding_rule.html.markdown | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/website/source/docs/providers/google/r/compute_global_forwarding_rule.html.markdown b/website/source/docs/providers/google/r/compute_global_forwarding_rule.html.markdown index df04a6935..bc5607da0 100644 --- a/website/source/docs/providers/google/r/compute_global_forwarding_rule.html.markdown +++ b/website/source/docs/providers/google/r/compute_global_forwarding_rule.html.markdown @@ -80,7 +80,9 @@ The following arguments are supported: * `description` - (Optional) Textual description field. * `ip_address` - (Optional) The static IP. (if not set, an ephemeral IP is - used). + used). This should be the literal IP address to be used, not the `self_link` + to a `google_compute_address` resource. (If using a `google_compute_address` + resource, use the `address` property instead of the `self_link` property.) * `ip_protocol` - (Optional) The IP protocol to route, one of "TCP" "UDP" "AH" "ESP" or "SCTP". (default "TCP"). From 3f7a1171481c8d65f6ba0a0ee6f71036be532f7b Mon Sep 17 00:00:00 2001 From: Christoph Blecker Date: Wed, 26 Apr 2017 18:51:22 -0700 Subject: [PATCH 13/49] build: Fix Travis vet issues (#14010) * Use latest in go 1.8 branch for travis * Fix ongoing vet issues Move vet step after the testing step in travis Correct Makefile vet step to check correct files --- .travis.yml | 4 ++-- Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 04cc6f309..04a959936 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ dist: trusty sudo: false language: go go: -- 1.8 +- 1.8.x # add TF_CONSUL_TEST=1 to run consul tests # they were causing timouts in travis @@ -25,7 +25,7 @@ install: - bash scripts/gogetcookie.sh - go get github.com/kardianos/govendor script: -- make vet vendor-status test +- make vendor-status test vet - GOOS=windows go build branches: only: diff --git a/Makefile b/Makefile index 319492ef1..0eba369dc 100644 --- a/Makefile +++ b/Makefile @@ -75,8 +75,8 @@ cover: # vet runs the Go source code static analysis tool `vet` to find # any common errors. vet: - @echo "go vet ." - @go vet $$(go list ./... | grep -v vendor/) ; if [ $$? -eq 1 ]; then \ + @echo 'go vet $$(go list ./... | grep -v /terraform/vendor/)' + @go vet $$(go list ./... | grep -v /terraform/vendor/) ; if [ $$? -eq 1 ]; then \ echo ""; \ echo "Vet found suspicious constructs. Please check the reported constructs"; \ echo "and fix them if necessary before submitting the code for review."; \ From a3e775cb94ffc5ef651614f8296e7ef47f6ce41e Mon Sep 17 00:00:00 2001 From: Julien Pivotto Date: Thu, 27 Apr 2017 12:11:57 +0200 Subject: [PATCH 14/49] Rename datasource_digitalocea{l,n}_image.go (#14025) refs #13787 Signed-off-by: Julien Pivotto --- ...rce_digitaloceal_image.go => datasource_digitalocean_image.go} | 0 ...loceal_image_test.go => datasource_digitalocean_image_test.go} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename builtin/providers/digitalocean/{datasource_digitaloceal_image.go => datasource_digitalocean_image.go} (100%) rename builtin/providers/digitalocean/{datasource_digitaloceal_image_test.go => datasource_digitalocean_image_test.go} (100%) diff --git a/builtin/providers/digitalocean/datasource_digitaloceal_image.go b/builtin/providers/digitalocean/datasource_digitalocean_image.go similarity index 100% rename from builtin/providers/digitalocean/datasource_digitaloceal_image.go rename to builtin/providers/digitalocean/datasource_digitalocean_image.go diff --git a/builtin/providers/digitalocean/datasource_digitaloceal_image_test.go b/builtin/providers/digitalocean/datasource_digitalocean_image_test.go similarity index 100% rename from builtin/providers/digitalocean/datasource_digitaloceal_image_test.go rename to builtin/providers/digitalocean/datasource_digitalocean_image_test.go From d615332d802fb5805c0ded5654de01ed2ec10c80 Mon Sep 17 00:00:00 2001 From: Tom Harvey Date: Thu, 27 Apr 2017 11:20:41 +0100 Subject: [PATCH 15/49] Updating to include #13965 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7793d2a25..270c3f7ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ FEATURES: IMPROVEMENTS: * provider/aws: Add support for CustomOrigin timeouts to aws_cloudfront_distribution [GH-13367] +* provider/azurerm: Expose the Private IP Address for a Load Balancer, if available [GH-13965] * provider/dnsimple: Add support for import for dnsimple_records [GH-9130] * provider/triton: Add support for reading provider configuration from `TRITON_*` environment variables in addition to `SDC_*`[GH-14000] From c6ad44de10af0e54864a17d742ca725f2068fb47 Mon Sep 17 00:00:00 2001 From: Justin LaRose Date: Thu, 27 Apr 2017 06:22:30 -0400 Subject: [PATCH 16/49] update error response when env does not exist (#14009) --- command/env_command.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/command/env_command.go b/command/env_command.go index 9548122a1..f29c9456f 100644 --- a/command/env_command.go +++ b/command/env_command.go @@ -57,7 +57,7 @@ const ( envDoesNotExist = ` Environment %q doesn't exist! -You can create this environment with the "-new" option.` +You can create this environment with the "new" option.` envChanged = `[reset][green]Switched to environment %q!` From 238beaea33aef2d268d7ef29bd456f227c0e3f82 Mon Sep 17 00:00:00 2001 From: Dominik-K Date: Thu, 27 Apr 2017 12:27:16 +0200 Subject: [PATCH 17/49] Docs: `dir` flag in `get` cmd -> root module def. in `modules/index.html` (#13940) --- website/source/docs/commands/get.html.markdown | 3 ++- website/source/docs/modules/index.html.markdown | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/website/source/docs/commands/get.html.markdown b/website/source/docs/commands/get.html.markdown index 4666626cb..a7eb32ad6 100644 --- a/website/source/docs/commands/get.html.markdown +++ b/website/source/docs/commands/get.html.markdown @@ -9,7 +9,7 @@ description: |- # Command: get The `terraform get` command is used to download and update -[modules](/docs/modules/index.html). +[modules](/docs/modules/index.html) mentioned in the root module. ## Usage @@ -28,3 +28,4 @@ The command-line flags are all optional. The list of available flags are: * `-update` - If specified, modules that are already downloaded will be checked for updates and the updates will be downloaded if present. +* `dir` - Sets the path of the [root module](/docs/modules/index.html#definitions). diff --git a/website/source/docs/modules/index.html.markdown b/website/source/docs/modules/index.html.markdown index cacccf847..96db65043 100644 --- a/website/source/docs/modules/index.html.markdown +++ b/website/source/docs/modules/index.html.markdown @@ -15,3 +15,8 @@ in Terraform as well as for basic code organization. Modules are very easy to both use and create. Depending on what you're looking to do first, use the navigation on the left to dive into how modules work. + +## Definitions +**Root module** +That is the current working directory when you run [`terraform apply`](/docs/commands/apply.html) or [`get`](/docs/commands/get.html), holding the Terraform [configuration files](/docs/configuration/index.html). +It is itself a valid module. From 42c7d00568615fe1d00b790e9a98df5291de95fa Mon Sep 17 00:00:00 2001 From: Radek Simko Date: Thu, 27 Apr 2017 11:55:25 +0100 Subject: [PATCH 18/49] docs/digitalocean: Add image data source to sidebar (#14030) --- website/source/layouts/digitalocean.erb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/website/source/layouts/digitalocean.erb b/website/source/layouts/digitalocean.erb index 0d91752a4..c124499a2 100644 --- a/website/source/layouts/digitalocean.erb +++ b/website/source/layouts/digitalocean.erb @@ -10,6 +10,15 @@ DigitalOcean Provider + > + Data Sources + + + > Resources
      From 086af4bd62cc738c24b25774ff17216686f495a4 Mon Sep 17 00:00:00 2001 From: Radek Simko Date: Thu, 27 Apr 2017 12:42:36 +0100 Subject: [PATCH 19/49] provider/aws: Retry setting KMS key rotation on DisabledException (#14029) --- builtin/providers/aws/resource_aws_kms_key.go | 38 +++++++++++++------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/builtin/providers/aws/resource_aws_kms_key.go b/builtin/providers/aws/resource_aws_kms_key.go index 2fa8e3287..f95f76d95 100644 --- a/builtin/providers/aws/resource_aws_kms_key.go +++ b/builtin/providers/aws/resource_aws_kms_key.go @@ -320,19 +320,33 @@ func updateKmsKeyStatus(conn *kms.KMS, id string, shouldBeEnabled bool) error { } func updateKmsKeyRotationStatus(conn *kms.KMS, d *schema.ResourceData) error { - var err error shouldEnableRotation := d.Get("enable_key_rotation").(bool) - if shouldEnableRotation { - log.Printf("[DEBUG] Enabling key rotation for KMS key %q", d.Id()) - _, err = conn.EnableKeyRotation(&kms.EnableKeyRotationInput{ - KeyId: aws.String(d.Id()), - }) - } else { - log.Printf("[DEBUG] Disabling key rotation for KMS key %q", d.Id()) - _, err = conn.DisableKeyRotation(&kms.DisableKeyRotationInput{ - KeyId: aws.String(d.Id()), - }) - } + + err := resource.Retry(5*time.Minute, func() *resource.RetryError { + var err error + if shouldEnableRotation { + log.Printf("[DEBUG] Enabling key rotation for KMS key %q", d.Id()) + _, err = conn.EnableKeyRotation(&kms.EnableKeyRotationInput{ + KeyId: aws.String(d.Id()), + }) + } else { + log.Printf("[DEBUG] Disabling key rotation for KMS key %q", d.Id()) + _, err = conn.DisableKeyRotation(&kms.DisableKeyRotationInput{ + KeyId: aws.String(d.Id()), + }) + } + + if err != nil { + awsErr, ok := err.(awserr.Error) + if ok && awsErr.Code() == "DisabledException" { + return resource.RetryableError(err) + } + + return resource.NonRetryableError(err) + } + + return nil + }) if err != nil { return fmt.Errorf("Failed to set key rotation for %q to %t: %q", From bfc1008b4d1ba90a35346c802aff4a68da11f4f0 Mon Sep 17 00:00:00 2001 From: Julien Pivotto Date: Thu, 27 Apr 2017 15:46:42 +0200 Subject: [PATCH 20/49] provider/digitalocean: Remove unneeded droplet test (#14034) Reverts #13883. Quoting @radeksimko: "We actually refresh the state as part of every test step, so this is not necessary" Signed-off-by: Julien Pivotto --- .../digitalocean/resource_digitalocean_droplet_test.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/builtin/providers/digitalocean/resource_digitalocean_droplet_test.go b/builtin/providers/digitalocean/resource_digitalocean_droplet_test.go index 3f813c953..1daa64787 100644 --- a/builtin/providers/digitalocean/resource_digitalocean_droplet_test.go +++ b/builtin/providers/digitalocean/resource_digitalocean_droplet_test.go @@ -41,11 +41,6 @@ func TestAccDigitalOceanDroplet_Basic(t *testing.T) { resource.TestCheckResourceAttr( "digitalocean_droplet.foobar", "user_data", "foobar"), ), - Destroy: false, - }, - { - Config: testAccCheckDigitalOceanDropletConfig_basic(rInt), - PlanOnly: true, }, }, }) From 2af1bd9fe0acf7b305bdd7c605915bba3cbb81c5 Mon Sep 17 00:00:00 2001 From: Jake Champlin Date: Thu, 27 Apr 2017 10:44:38 -0400 Subject: [PATCH 21/49] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 270c3f7ee..88f98121f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ IMPROVEMENTS: * provider/aws: Add support for CustomOrigin timeouts to aws_cloudfront_distribution [GH-13367] * provider/azurerm: Expose the Private IP Address for a Load Balancer, if available [GH-13965] * provider/dnsimple: Add support for import for dnsimple_records [GH-9130] +* provider/nomad: Add TLS options [GH-13956] * provider/triton: Add support for reading provider configuration from `TRITON_*` environment variables in addition to `SDC_*`[GH-14000] BUG FIXES: From e495c6bacc46cd1ce86997ec4323ac90074a8b24 Mon Sep 17 00:00:00 2001 From: Dan Peterson Date: Thu, 27 Apr 2017 11:55:07 -0300 Subject: [PATCH 22/49] providers/heroku: add heroku_app_feature resource (#14035) --- builtin/providers/heroku/provider.go | 24 +++- .../heroku/resource_heroku_app_feature.go | 101 +++++++++++++ .../resource_heroku_app_feature_test.go | 135 ++++++++++++++++++ .../heroku/r/app_feature.html.markdown | 28 ++++ 4 files changed, 282 insertions(+), 6 deletions(-) create mode 100644 builtin/providers/heroku/resource_heroku_app_feature.go create mode 100644 builtin/providers/heroku/resource_heroku_app_feature_test.go create mode 100644 website/source/docs/providers/heroku/r/app_feature.html.markdown diff --git a/builtin/providers/heroku/provider.go b/builtin/providers/heroku/provider.go index 6a8c9b986..08432ac98 100644 --- a/builtin/providers/heroku/provider.go +++ b/builtin/providers/heroku/provider.go @@ -1,7 +1,9 @@ package heroku import ( + "fmt" "log" + "strings" "github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/terraform" @@ -25,12 +27,13 @@ func Provider() terraform.ResourceProvider { }, ResourcesMap: map[string]*schema.Resource{ - "heroku_addon": resourceHerokuAddon(), - "heroku_app": resourceHerokuApp(), - "heroku_cert": resourceHerokuCert(), - "heroku_domain": resourceHerokuDomain(), - "heroku_drain": resourceHerokuDrain(), - "heroku_space": resourceHerokuSpace(), + "heroku_addon": resourceHerokuAddon(), + "heroku_app": resourceHerokuApp(), + "heroku_app_feature": resourceHerokuAppFeature(), + "heroku_cert": resourceHerokuCert(), + "heroku_domain": resourceHerokuDomain(), + "heroku_drain": resourceHerokuDrain(), + "heroku_space": resourceHerokuSpace(), }, ConfigureFunc: providerConfigure, @@ -46,3 +49,12 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) { log.Println("[INFO] Initializing Heroku client") return config.Client() } + +func buildCompositeID(a, b string) string { + return fmt.Sprintf("%s:%s", a, b) +} + +func parseCompositeID(id string) (string, string) { + parts := strings.SplitN(id, ":", 2) + return parts[0], parts[1] +} diff --git a/builtin/providers/heroku/resource_heroku_app_feature.go b/builtin/providers/heroku/resource_heroku_app_feature.go new file mode 100644 index 000000000..c93ef968c --- /dev/null +++ b/builtin/providers/heroku/resource_heroku_app_feature.go @@ -0,0 +1,101 @@ +package heroku + +import ( + "context" + "log" + + heroku "github.com/cyberdelia/heroku-go/v3" + "github.com/hashicorp/terraform/helper/schema" +) + +func resourceHerokuAppFeature() *schema.Resource { + return &schema.Resource{ + Create: resourceAppFeatureCreate, + Update: resourceAppFeatureUpdate, + Read: resourceAppFeatureRead, + Delete: resourceAppFeatureDelete, + + Schema: map[string]*schema.Schema{ + "app": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "enabled": { + Type: schema.TypeBool, + Optional: true, + Default: true, + }, + }, + } +} + +func resourceAppFeatureRead(d *schema.ResourceData, meta interface{}) error { + client := meta.(*heroku.Service) + + app, id := parseCompositeID(d.Id()) + + feature, err := client.AppFeatureInfo(context.TODO(), app, id) + if err != nil { + return err + } + + d.Set("app", app) + d.Set("name", feature.Name) + d.Set("enabled", feature.Enabled) + + return nil +} + +func resourceAppFeatureCreate(d *schema.ResourceData, meta interface{}) error { + client := meta.(*heroku.Service) + + app := d.Get("app").(string) + featureName := d.Get("name").(string) + enabled := d.Get("enabled").(bool) + + opts := heroku.AppFeatureUpdateOpts{Enabled: enabled} + + log.Printf("[DEBUG] Feature set configuration: %#v, %#v", featureName, opts) + + feature, err := client.AppFeatureUpdate(context.TODO(), app, featureName, opts) + if err != nil { + return err + } + + d.SetId(buildCompositeID(app, feature.ID)) + + return resourceAppFeatureRead(d, meta) +} + +func resourceAppFeatureUpdate(d *schema.ResourceData, meta interface{}) error { + if d.HasChange("enabled") { + return resourceAppFeatureCreate(d, meta) + } + + return resourceAppFeatureRead(d, meta) +} + +func resourceAppFeatureDelete(d *schema.ResourceData, meta interface{}) error { + client := meta.(*heroku.Service) + + app, id := parseCompositeID(d.Id()) + featureName := d.Get("name").(string) + + log.Printf("[INFO] Deleting app feature %s (%s) for app %s", featureName, id, app) + opts := heroku.AppFeatureUpdateOpts{Enabled: false} + _, err := client.AppFeatureUpdate(context.TODO(), app, id, opts) + if err != nil { + return err + } + + d.SetId("") + return nil +} diff --git a/builtin/providers/heroku/resource_heroku_app_feature_test.go b/builtin/providers/heroku/resource_heroku_app_feature_test.go new file mode 100644 index 000000000..870216ae9 --- /dev/null +++ b/builtin/providers/heroku/resource_heroku_app_feature_test.go @@ -0,0 +1,135 @@ +package heroku + +import ( + "context" + "fmt" + "testing" + + heroku "github.com/cyberdelia/heroku-go/v3" + "github.com/hashicorp/terraform/helper/acctest" + "github.com/hashicorp/terraform/helper/resource" + "github.com/hashicorp/terraform/terraform" +) + +func TestAccHerokuAppFeature(t *testing.T) { + var feature heroku.AppFeatureInfoResult + appName := fmt.Sprintf("tftest-%s", acctest.RandString(10)) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckHerokuFeatureDestroy, + Steps: []resource.TestStep{ + { + Config: testAccCheckHerokuFeature_basic(appName), + Check: resource.ComposeTestCheckFunc( + testAccCheckHerokuFeatureExists("heroku_app_feature.runtime_metrics", &feature), + testAccCheckHerokuFeatureEnabled(&feature, true), + resource.TestCheckResourceAttr( + "heroku_app_feature.runtime_metrics", "enabled", "true", + ), + ), + }, + { + Config: testAccCheckHerokuFeature_disabled(appName), + Check: resource.ComposeTestCheckFunc( + testAccCheckHerokuFeatureExists("heroku_app_feature.runtime_metrics", &feature), + testAccCheckHerokuFeatureEnabled(&feature, false), + resource.TestCheckResourceAttr( + "heroku_app_feature.runtime_metrics", "enabled", "false", + ), + ), + }, + }, + }) +} + +func testAccCheckHerokuFeatureDestroy(s *terraform.State) error { + client := testAccProvider.Meta().(*heroku.Service) + + for _, rs := range s.RootModule().Resources { + if rs.Type != "heroku_app_feature" { + continue + } + + _, err := client.AppFeatureInfo(context.TODO(), rs.Primary.Attributes["app"], rs.Primary.ID) + + if err == nil { + return fmt.Errorf("Feature still exists") + } + } + + return nil +} + +func testAccCheckHerokuFeatureExists(n string, feature *heroku.AppFeatureInfoResult) 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 feature ID is set") + } + + app, id := parseCompositeID(rs.Primary.ID) + if app != rs.Primary.Attributes["app"] { + return fmt.Errorf("Bad app: %s", app) + } + + client := testAccProvider.Meta().(*heroku.Service) + + foundFeature, err := client.AppFeatureInfo(context.TODO(), app, id) + if err != nil { + return err + } + + if foundFeature.ID != id { + return fmt.Errorf("Feature not found") + } + + *feature = *foundFeature + return nil + } +} + +func testAccCheckHerokuFeatureEnabled(feature *heroku.AppFeatureInfoResult, enabled bool) resource.TestCheckFunc { + return func(s *terraform.State) error { + if feature.Enabled != enabled { + return fmt.Errorf("Bad enabled: %v", feature.Enabled) + } + + return nil + } +} + +func testAccCheckHerokuFeature_basic(appName string) string { + return fmt.Sprintf(` +resource "heroku_app" "example" { + name = "%s" + region = "us" +} + +resource "heroku_app_feature" "runtime_metrics" { + app = "${heroku_app.example.name}" + name = "log-runtime-metrics" +} +`, appName) +} + +func testAccCheckHerokuFeature_disabled(appName string) string { + return fmt.Sprintf(` +resource "heroku_app" "example" { + name = "%s" + region = "us" +} + +resource "heroku_app_feature" "runtime_metrics" { + app = "${heroku_app.example.name}" + name = "log-runtime-metrics" + enabled = false +} +`, appName) +} diff --git a/website/source/docs/providers/heroku/r/app_feature.html.markdown b/website/source/docs/providers/heroku/r/app_feature.html.markdown new file mode 100644 index 000000000..c532b47d7 --- /dev/null +++ b/website/source/docs/providers/heroku/r/app_feature.html.markdown @@ -0,0 +1,28 @@ +--- +layout: "heroku" +page_title: "Heroku: heroku_app_feature" +sidebar_current: "docs-heroku-resource-app-feature" +description: |- + Provides a Heroku App Feature resource. This can be used to create and manage App Features on Heroku. +--- + +# heroku\_app\_feature + +Provides a Heroku App Feature resource. This can be used to create and manage App Features on Heroku. + +## Example Usage + +```hcl +resource "heroku_app_feature" "log_runtime_metrics" { + app = "test-app" + name = "log-runtime-metrics" +} +``` + +## Argument Reference + +The following arguments are supported: + +* `app` - (Required) The Heroku app to link to. +* `name` - (Required) The name of the App Feature to manage. +* `enabled` - (Optional) Whether to enable or disable the App Feature. The default value is true. From fed99cb30cc3634302cc37877150191722c9480f Mon Sep 17 00:00:00 2001 From: Clint Date: Thu, 27 Apr 2017 09:56:05 -0500 Subject: [PATCH 23/49] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 88f98121f..1799d4f1f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ BACKWARDS INCOMPATIBILITIES / NOTES: FEATURES: * **New Provider:** `gitlab` [GH-13898] +* **New Resource:** `heroku_app_feature` [GH-14035] IMPROVEMENTS: From d6560b96d72f5c5a5f582a5e01c8df14b199817e Mon Sep 17 00:00:00 2001 From: clint shryock Date: Thu, 27 Apr 2017 09:59:54 -0500 Subject: [PATCH 24/49] provider/heroku: Update docs to include heroku-app-feature --- website/source/docs/providers/heroku/r/app.html.markdown | 2 +- website/source/layouts/heroku.erb | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/website/source/docs/providers/heroku/r/app.html.markdown b/website/source/docs/providers/heroku/r/app.html.markdown index 0cf064e4f..9407eb779 100644 --- a/website/source/docs/providers/heroku/r/app.html.markdown +++ b/website/source/docs/providers/heroku/r/app.html.markdown @@ -1,7 +1,7 @@ --- layout: "heroku" page_title: "Heroku: heroku_app" -sidebar_current: "docs-heroku-resource-app" +sidebar_current: "docs-heroku-resource-app-x" description: |- Provides a Heroku App resource. This can be used to create and manage applications on Heroku. --- diff --git a/website/source/layouts/heroku.erb b/website/source/layouts/heroku.erb index 0957af9a0..6f7211c4f 100644 --- a/website/source/layouts/heroku.erb +++ b/website/source/layouts/heroku.erb @@ -17,10 +17,14 @@ heroku_addon - > + > heroku_app + > + heroku_app_feature + + > heroku_cert From 2dd7e72674c82897abaaf710cdf32d77dd1c3368 Mon Sep 17 00:00:00 2001 From: Brian Antonelli Date: Thu, 27 Apr 2017 11:24:53 -0400 Subject: [PATCH 25/49] Fix for getting partition for federated users (#13992) Federated users calling `iam:GetUser` will get the error code `InvalidClientTokenId` so this shouldn't bail out but instead continue on to try `sts:GetCallerIdentity`. --- builtin/providers/aws/auth_helpers.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/providers/aws/auth_helpers.go b/builtin/providers/aws/auth_helpers.go index 1a73c6e8b..e808d4d39 100644 --- a/builtin/providers/aws/auth_helpers.go +++ b/builtin/providers/aws/auth_helpers.go @@ -54,7 +54,7 @@ func GetAccountInfo(iamconn *iam.IAM, stsconn *sts.STS, authProviderName string) awsErr, ok := err.(awserr.Error) // AccessDenied and ValidationError can be raised // if credentials belong to federated profile, so we ignore these - if !ok || (awsErr.Code() != "AccessDenied" && awsErr.Code() != "ValidationError") { + if !ok || (awsErr.Code() != "AccessDenied" && awsErr.Code() != "ValidationError" && awsErr.Code() != "InvalidClientTokenId") { return "", "", fmt.Errorf("Failed getting account ID via 'iam:GetUser': %s", err) } log.Printf("[DEBUG] Getting account ID via iam:GetUser failed: %s", err) From e4861f8eee2a1c8bb93abba6edad6d905fe6d26b Mon Sep 17 00:00:00 2001 From: Clint Date: Thu, 27 Apr 2017 10:25:31 -0500 Subject: [PATCH 26/49] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1799d4f1f..fdba6493d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ BUG FIXES: * provider/aws: Update aws_ebs_volume when attached [GH-14005] * provider/aws: Set aws_instance volume_tags to be Computed [GH-14007] +* provider/aws: Fix issue getting partition for federated users [GH-13992] * providers/heroku: Configure buildpacks correctly for both Org Apps and non-org Apps [GH-13990] ## 0.9.4 (26th April 2017) From ece9f8598348fedfb689c7d9b5f3c45ff2993b66 Mon Sep 17 00:00:00 2001 From: Paddy Date: Thu, 27 Apr 2017 08:52:02 -0700 Subject: [PATCH 27/49] provider/google: randomize network data source test name. We have tests failing because we hard-coded the network name in our network data source test. By randomizing it, we don't fix the dangling resource problem, but do make the tests pass again. --- .../data_source_google_compute_network_test.go | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/builtin/providers/google/data_source_google_compute_network_test.go b/builtin/providers/google/data_source_google_compute_network_test.go index bbf70af67..fe0aac8fa 100644 --- a/builtin/providers/google/data_source_google_compute_network_test.go +++ b/builtin/providers/google/data_source_google_compute_network_test.go @@ -2,18 +2,21 @@ package google import ( "fmt" + "testing" + + "github.com/hashicorp/terraform/helper/acctest" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "testing" ) func TestAccDataSourceGoogleNetwork(t *testing.T) { + networkName := fmt.Sprintf("tf-test-%s", acctest.RandString(10)) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, Steps: []resource.TestStep{ resource.TestStep{ - Config: TestAccDataSourceGoogleNetworkConfig, + Config: testAccDataSourceGoogleNetworkConfig(networkName), Check: resource.ComposeTestCheckFunc( testAccDataSourceGoogleNetworkCheck("data.google_compute_network.my_network", "google_compute_network.foobar"), ), @@ -57,12 +60,14 @@ func testAccDataSourceGoogleNetworkCheck(data_source_name string, resource_name } } -var TestAccDataSourceGoogleNetworkConfig = ` +func testAccDataSourceGoogleNetworkConfig(name string) string { + return fmt.Sprintf(` resource "google_compute_network" "foobar" { - name = "network-test" + name = "%s" description = "my-description" } data "google_compute_network" "my_network" { name = "${google_compute_network.foobar.name}" -}` +}`, name) +} From 12e74124348928e45d30982232d852dd6ef07280 Mon Sep 17 00:00:00 2001 From: Radek Simko Date: Thu, 27 Apr 2017 17:14:37 +0100 Subject: [PATCH 28/49] provider/digitalocean: Log HTTP requests & responses in DEBUG+ level (#14039) --- builtin/providers/digitalocean/config.go | 33 ++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/builtin/providers/digitalocean/config.go b/builtin/providers/digitalocean/config.go index a0a9115ae..b32be5938 100644 --- a/builtin/providers/digitalocean/config.go +++ b/builtin/providers/digitalocean/config.go @@ -2,9 +2,12 @@ package digitalocean import ( "log" + "net/http" + "net/http/httputil" "time" "github.com/digitalocean/godo" + "github.com/hashicorp/terraform/helper/logging" "github.com/hashicorp/terraform/helper/resource" "golang.org/x/oauth2" ) @@ -21,11 +24,31 @@ func (c *Config) Client() (*godo.Client, error) { client := godo.NewClient(oauth2.NewClient(oauth2.NoContext, tokenSrc)) + if logging.IsDebugOrHigher() { + client.OnRequestCompleted(logRequestAndResponse) + } + log.Printf("[INFO] DigitalOcean Client configured for URL: %s", client.BaseURL.String()) return client, nil } +func logRequestAndResponse(req *http.Request, resp *http.Response) { + reqData, err := httputil.DumpRequest(req, true) + if err == nil { + log.Printf("[DEBUG] "+logReqMsg, string(reqData)) + } else { + log.Printf("[ERROR] DigitalOcean API Request error: %#v", err) + } + + respData, err := httputil.DumpResponse(resp, true) + if err == nil { + log.Printf("[DEBUG] "+logRespMsg, string(respData)) + } else { + log.Printf("[ERROR] DigitalOcean API Response error: %#v", err) + } +} + // waitForAction waits for the action to finish using the resource.StateChangeConf. func waitForAction(client *godo.Client, action *godo.Action) error { var ( @@ -61,3 +84,13 @@ func waitForAction(client *godo.Client, action *godo.Action) error { }).WaitForState() return err } + +const logReqMsg = `DigitalOcean API Request Details: +---[ REQUEST ]--------------------------------------- +%s +-----------------------------------------------------` + +const logRespMsg = `DigitalOcean API Response Details: +---[ RESPONSE ]-------------------------------------- +%s +-----------------------------------------------------` From 8aadf6ecdd49f7fc2352e1013cc44be07c49bc07 Mon Sep 17 00:00:00 2001 From: Paddy Date: Thu, 27 Apr 2017 10:28:31 -0700 Subject: [PATCH 29/49] provider/google: fix project metadata tests Update our project metadata tests to stand up their own projects, so they don't trample all over each other anymore. The fixes for this were more invasive than I had hoped they would be, but the tests all pass now (when run sequentially) and there's no reason for them not to pass when run in parallel. --- .../resource_compute_project_metadata_test.go | 229 +++++++++++++----- 1 file changed, 164 insertions(+), 65 deletions(-) diff --git a/builtin/providers/google/resource_compute_project_metadata_test.go b/builtin/providers/google/resource_compute_project_metadata_test.go index 7be3dfb26..93ab7ce31 100644 --- a/builtin/providers/google/resource_compute_project_metadata_test.go +++ b/builtin/providers/google/resource_compute_project_metadata_test.go @@ -2,8 +2,10 @@ package google import ( "fmt" + "os" "testing" + "github.com/hashicorp/terraform/helper/acctest" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" "google.golang.org/api/compute/v1" @@ -11,7 +13,16 @@ import ( // Add two key value pairs func TestAccComputeProjectMetadata_basic(t *testing.T) { + skipIfEnvNotSet(t, + []string{ + "GOOGLE_ORG", + "GOOGLE_BILLING_ACCOUNT", + }..., + ) + + billingId := os.Getenv("GOOGLE_BILLING_ACCOUNT") var project compute.Project + pid := "terrafom-test-" + acctest.RandString(10) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -19,13 +30,13 @@ func TestAccComputeProjectMetadata_basic(t *testing.T) { CheckDestroy: testAccCheckComputeProjectMetadataDestroy, Steps: []resource.TestStep{ resource.TestStep{ - Config: testAccComputeProject_basic0_metadata, + Config: testAccComputeProject_basic0_metadata(pid, pname, org, billingId), Check: resource.ComposeTestCheckFunc( testAccCheckComputeProjectExists( - "google_compute_project_metadata.fizzbuzz", &project), - testAccCheckComputeProjectMetadataContains(&project, "banana", "orange"), - testAccCheckComputeProjectMetadataContains(&project, "sofa", "darwinism"), - testAccCheckComputeProjectMetadataSize(&project, 2), + "google_compute_project_metadata.fizzbuzz", pid, &project), + testAccCheckComputeProjectMetadataContains(pid, "banana", "orange"), + testAccCheckComputeProjectMetadataContains(pid, "sofa", "darwinism"), + testAccCheckComputeProjectMetadataSize(pid, 2), ), }, }, @@ -34,7 +45,16 @@ func TestAccComputeProjectMetadata_basic(t *testing.T) { // Add three key value pairs, then replace one and modify a second func TestAccComputeProjectMetadata_modify_1(t *testing.T) { + skipIfEnvNotSet(t, + []string{ + "GOOGLE_ORG", + "GOOGLE_BILLING_ACCOUNT", + }..., + ) + + billingId := os.Getenv("GOOGLE_BILLING_ACCOUNT") var project compute.Project + pid := "terrafom-test-" + acctest.RandString(10) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -42,26 +62,26 @@ func TestAccComputeProjectMetadata_modify_1(t *testing.T) { CheckDestroy: testAccCheckComputeProjectMetadataDestroy, Steps: []resource.TestStep{ resource.TestStep{ - Config: testAccComputeProject_modify0_metadata, + Config: testAccComputeProject_modify0_metadata(pid, pname, org, billingId), Check: resource.ComposeTestCheckFunc( testAccCheckComputeProjectExists( - "google_compute_project_metadata.fizzbuzz", &project), - testAccCheckComputeProjectMetadataContains(&project, "paper", "pen"), - testAccCheckComputeProjectMetadataContains(&project, "genghis_khan", "french bread"), - testAccCheckComputeProjectMetadataContains(&project, "happy", "smiling"), - testAccCheckComputeProjectMetadataSize(&project, 3), + "google_compute_project_metadata.fizzbuzz", pid, &project), + testAccCheckComputeProjectMetadataContains(pid, "paper", "pen"), + testAccCheckComputeProjectMetadataContains(pid, "genghis_khan", "french bread"), + testAccCheckComputeProjectMetadataContains(pid, "happy", "smiling"), + testAccCheckComputeProjectMetadataSize(pid, 3), ), }, resource.TestStep{ - Config: testAccComputeProject_modify1_metadata, + Config: testAccComputeProject_modify1_metadata(pid, pname, org, billingId), Check: resource.ComposeTestCheckFunc( testAccCheckComputeProjectExists( - "google_compute_project_metadata.fizzbuzz", &project), - testAccCheckComputeProjectMetadataContains(&project, "paper", "pen"), - testAccCheckComputeProjectMetadataContains(&project, "paris", "french bread"), - testAccCheckComputeProjectMetadataContains(&project, "happy", "laughing"), - testAccCheckComputeProjectMetadataSize(&project, 3), + "google_compute_project_metadata.fizzbuzz", pid, &project), + testAccCheckComputeProjectMetadataContains(pid, "paper", "pen"), + testAccCheckComputeProjectMetadataContains(pid, "paris", "french bread"), + testAccCheckComputeProjectMetadataContains(pid, "happy", "laughing"), + testAccCheckComputeProjectMetadataSize(pid, 3), ), }, }, @@ -70,7 +90,16 @@ func TestAccComputeProjectMetadata_modify_1(t *testing.T) { // Add two key value pairs, and replace both func TestAccComputeProjectMetadata_modify_2(t *testing.T) { + skipIfEnvNotSet(t, + []string{ + "GOOGLE_ORG", + "GOOGLE_BILLING_ACCOUNT", + }..., + ) + + billingId := os.Getenv("GOOGLE_BILLING_ACCOUNT") var project compute.Project + pid := "terraform-test-" + acctest.RandString(10) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -78,24 +107,24 @@ func TestAccComputeProjectMetadata_modify_2(t *testing.T) { CheckDestroy: testAccCheckComputeProjectMetadataDestroy, Steps: []resource.TestStep{ resource.TestStep{ - Config: testAccComputeProject_basic0_metadata, + Config: testAccComputeProject_basic0_metadata(pid, pname, org, billingId), Check: resource.ComposeTestCheckFunc( testAccCheckComputeProjectExists( - "google_compute_project_metadata.fizzbuzz", &project), - testAccCheckComputeProjectMetadataContains(&project, "banana", "orange"), - testAccCheckComputeProjectMetadataContains(&project, "sofa", "darwinism"), - testAccCheckComputeProjectMetadataSize(&project, 2), + "google_compute_project_metadata.fizzbuzz", pid, &project), + testAccCheckComputeProjectMetadataContains(pid, "banana", "orange"), + testAccCheckComputeProjectMetadataContains(pid, "sofa", "darwinism"), + testAccCheckComputeProjectMetadataSize(pid, 2), ), }, resource.TestStep{ - Config: testAccComputeProject_basic1_metadata, + Config: testAccComputeProject_basic1_metadata(pid, pname, org, billingId), Check: resource.ComposeTestCheckFunc( testAccCheckComputeProjectExists( - "google_compute_project_metadata.fizzbuzz", &project), - testAccCheckComputeProjectMetadataContains(&project, "kiwi", "papaya"), - testAccCheckComputeProjectMetadataContains(&project, "finches", "darwinism"), - testAccCheckComputeProjectMetadataSize(&project, 2), + "google_compute_project_metadata.fizzbuzz", pid, &project), + testAccCheckComputeProjectMetadataContains(pid, "kiwi", "papaya"), + testAccCheckComputeProjectMetadataContains(pid, "finches", "darwinism"), + testAccCheckComputeProjectMetadataSize(pid, 2), ), }, }, @@ -105,15 +134,21 @@ func TestAccComputeProjectMetadata_modify_2(t *testing.T) { func testAccCheckComputeProjectMetadataDestroy(s *terraform.State) error { config := testAccProvider.Meta().(*Config) - project, err := config.clientCompute.Projects.Get(config.Project).Do() - if err == nil && len(project.CommonInstanceMetadata.Items) > 0 { - return fmt.Errorf("Error, metadata items still exist") + for _, rs := range s.RootModule().Resources { + if rs.Type != "google_compute_project_metadata" { + continue + } + + project, err := config.clientCompute.Projects.Get(rs.Primary.ID).Do() + if err == nil && len(project.CommonInstanceMetadata.Items) > 0 { + return fmt.Errorf("Error, metadata items still exist in %s", rs.Primary.ID) + } } return nil } -func testAccCheckComputeProjectExists(n string, project *compute.Project) resource.TestCheckFunc { +func testAccCheckComputeProjectExists(n, pid string, project *compute.Project) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] if !ok { @@ -127,7 +162,7 @@ func testAccCheckComputeProjectExists(n string, project *compute.Project) resour config := testAccProvider.Meta().(*Config) found, err := config.clientCompute.Projects.Get( - config.Project).Do() + pid).Do() if err != nil { return err } @@ -142,10 +177,10 @@ func testAccCheckComputeProjectExists(n string, project *compute.Project) resour } } -func testAccCheckComputeProjectMetadataContains(project *compute.Project, key string, value string) resource.TestCheckFunc { +func testAccCheckComputeProjectMetadataContains(pid, key, value string) resource.TestCheckFunc { return func(s *terraform.State) error { config := testAccProvider.Meta().(*Config) - project, err := config.clientCompute.Projects.Get(config.Project).Do() + project, err := config.clientCompute.Projects.Get(pid).Do() if err != nil { return fmt.Errorf("Error, failed to load project service for %s: %s", config.Project, err) } @@ -161,14 +196,14 @@ func testAccCheckComputeProjectMetadataContains(project *compute.Project, key st } } - return fmt.Errorf("Error, key %s not present", key) + return fmt.Errorf("Error, key %s not present in %s", key, project.SelfLink) } } -func testAccCheckComputeProjectMetadataSize(project *compute.Project, size int) resource.TestCheckFunc { +func testAccCheckComputeProjectMetadataSize(pid string, size int) resource.TestCheckFunc { return func(s *terraform.State) error { config := testAccProvider.Meta().(*Config) - project, err := config.clientCompute.Projects.Get(config.Project).Do() + project, err := config.clientCompute.Projects.Get(pid).Do() if err != nil { return fmt.Errorf("Error, failed to load project service for %s: %s", config.Project, err) } @@ -182,36 +217,100 @@ func testAccCheckComputeProjectMetadataSize(project *compute.Project, size int) } } -const testAccComputeProject_basic0_metadata = ` -resource "google_compute_project_metadata" "fizzbuzz" { - metadata { - banana = "orange" - sofa = "darwinism" - } -}` +func testAccComputeProject_basic0_metadata(pid, name, org, billing string) string { + return fmt.Sprintf(` +resource "google_project" "project" { + project_id = "%s" + name = "%s" + org_id = "%s" + billing_account = "%s" +} -const testAccComputeProject_basic1_metadata = ` -resource "google_compute_project_metadata" "fizzbuzz" { - metadata { - kiwi = "papaya" - finches = "darwinism" - } -}` +resource "google_project_services" "services" { + project = "${google_project.project.project_id}" + services = ["compute-component.googleapis.com"] +} -const testAccComputeProject_modify0_metadata = ` resource "google_compute_project_metadata" "fizzbuzz" { - metadata { - paper = "pen" - genghis_khan = "french bread" - happy = "smiling" - } -}` + project = "${google_project.project.project_id}" + metadata { + banana = "orange" + sofa = "darwinism" + } + depends_on = ["google_project_services.services"] +}`, pid, name, org, billing) +} + +func testAccComputeProject_basic1_metadata(pid, name, org, billing string) string { + return fmt.Sprintf(` +resource "google_project" "project" { + project_id = "%s" + name = "%s" + org_id = "%s" + billing_account = "%s" +} + +resource "google_project_services" "services" { + project = "${google_project.project.project_id}" + services = ["compute-component.googleapis.com"] +} -const testAccComputeProject_modify1_metadata = ` resource "google_compute_project_metadata" "fizzbuzz" { - metadata { - paper = "pen" - paris = "french bread" - happy = "laughing" - } -}` + project = "${google_project.project.project_id}" + metadata { + kiwi = "papaya" + finches = "darwinism" + } + depends_on = ["google_project_services.services"] +}`, pid, name, org, billing) +} + +func testAccComputeProject_modify0_metadata(pid, name, org, billing string) string { + return fmt.Sprintf(` +resource "google_project" "project" { + project_id = "%s" + name = "%s" + org_id = "%s" + billing_account = "%s" +} + +resource "google_project_services" "services" { + project = "${google_project.project.project_id}" + services = ["compute-component.googleapis.com"] +} + +resource "google_compute_project_metadata" "fizzbuzz" { + project = "${google_project.project.project_id}" + metadata { + paper = "pen" + genghis_khan = "french bread" + happy = "smiling" + } + depends_on = ["google_project_services.services"] +}`, pid, name, org, billing) +} + +func testAccComputeProject_modify1_metadata(pid, name, org, billing string) string { + return fmt.Sprintf(` +resource "google_project" "project" { + project_id = "%s" + name = "%s" + org_id = "%s" + billing_account = "%s" +} + +resource "google_project_services" "services" { + project = "${google_project.project.project_id}" + services = ["compute-component.googleapis.com"] +} + +resource "google_compute_project_metadata" "fizzbuzz" { + project = "${google_project.project.project_id}" + metadata { + paper = "pen" + paris = "french bread" + happy = "laughing" + } + depends_on = ["google_project_services.services"] +}`, pid, name, org, billing) +} From ccb34b702d43885ead76630c2351985b0597a9f2 Mon Sep 17 00:00:00 2001 From: Julien Pivotto Date: Thu, 27 Apr 2017 19:48:58 +0200 Subject: [PATCH 30/49] provider/digitalocean: prevent new resources when using ID's of images with slugs (#13879) When you specify the ID of an image that has a slug, terraform would store its slug to the state, hence it would always recreate the image. This commit fixes it by storing the image as an ID when it is specified by and ID by the user, ignoring the slug. Closes #12751. Fixes #12255. Signed-off-by: Julien Pivotto --- .../resource_digitalocean_droplet.go | 9 ++++-- .../resource_digitalocean_droplet_test.go | 31 +++++++++++++++++++ 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/builtin/providers/digitalocean/resource_digitalocean_droplet.go b/builtin/providers/digitalocean/resource_digitalocean_droplet.go index 48372d0e7..fdae4dd03 100644 --- a/builtin/providers/digitalocean/resource_digitalocean_droplet.go +++ b/builtin/providers/digitalocean/resource_digitalocean_droplet.go @@ -260,10 +260,13 @@ func resourceDigitalOceanDropletRead(d *schema.ResourceData, meta interface{}) e return fmt.Errorf("Error retrieving droplet: %s", err) } - if droplet.Image.Slug != "" { - d.Set("image", droplet.Image.Slug) - } else { + _, err = strconv.Atoi(d.Get("image").(string)) + if err == nil || droplet.Image.Slug == "" { + // The image field is provided as an ID (number), or + // the image bash no slug. In both cases we store it as an ID. d.Set("image", droplet.Image.ID) + } else { + d.Set("image", droplet.Image.Slug) } d.Set("name", droplet.Name) diff --git a/builtin/providers/digitalocean/resource_digitalocean_droplet_test.go b/builtin/providers/digitalocean/resource_digitalocean_droplet_test.go index 1daa64787..1d6f78042 100644 --- a/builtin/providers/digitalocean/resource_digitalocean_droplet_test.go +++ b/builtin/providers/digitalocean/resource_digitalocean_droplet_test.go @@ -46,6 +46,26 @@ func TestAccDigitalOceanDroplet_Basic(t *testing.T) { }) } +func TestAccDigitalOceanDroplet_WithID(t *testing.T) { + var droplet godo.Droplet + rInt := acctest.RandInt() + // TODO: not hardcode this as it will change over time + centosID := 22995941 + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckDigitalOceanDropletDestroy, + Steps: []resource.TestStep{ + { + Config: testAccCheckDigitalOceanDropletConfig_withID(centosID, rInt), + Check: resource.ComposeTestCheckFunc( + testAccCheckDigitalOceanDropletExists("digitalocean_droplet.foobar", &droplet), + ), + }, + }, + }) +} func TestAccDigitalOceanDroplet_withSSH(t *testing.T) { var droplet godo.Droplet rInt := acctest.RandInt() @@ -499,6 +519,17 @@ resource "digitalocean_droplet" "foobar" { }`, rInt) } +func testAccCheckDigitalOceanDropletConfig_withID(imageID, rInt int) string { + return fmt.Sprintf(` +resource "digitalocean_droplet" "foobar" { + name = "foo-%d" + size = "512mb" + image = "%d" + region = "nyc3" + user_data = "foobar" +}`, rInt, imageID) +} + func testAccCheckDigitalOceanDropletConfig_withSSH(rInt int) string { return fmt.Sprintf(` resource "digitalocean_ssh_key" "foobar" { From d8c839f643849fced049bd9288366674b365f02d Mon Sep 17 00:00:00 2001 From: Radek Simko Date: Thu, 27 Apr 2017 18:50:09 +0100 Subject: [PATCH 31/49] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fdba6493d..f47bcb04a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ BUG FIXES: * provider/aws: Update aws_ebs_volume when attached [GH-14005] * provider/aws: Set aws_instance volume_tags to be Computed [GH-14007] * provider/aws: Fix issue getting partition for federated users [GH-13992] +* provider/digitalocean: Prevent diffs when using IDs of images instead of slugs [GH-13879] * providers/heroku: Configure buildpacks correctly for both Org Apps and non-org Apps [GH-13990] ## 0.9.4 (26th April 2017) From 0317a244ebd43f417bb1dedeb5f512446d5fbb26 Mon Sep 17 00:00:00 2001 From: Paul Stack Date: Fri, 28 Apr 2017 05:50:51 +1200 Subject: [PATCH 32/49] provider/aws: aws_spot_instance_request not forcenew on volume_tags (#14046) The introduction of volume_tags was causing a ForceNew on spot_instance_requests This has now been treated the same way as tags ``` % make testacc TEST=./builtin/providers/aws TESTARGS='-run=TestAccAWSSpotInstanceRequest_' ==> Checking that code complies with gofmt requirements... go generate $(go list ./... | grep -v /terraform/vendor/) 2017/04/28 05:17:42 Generated command/internal_plugin_list.go TF_ACC=1 go test ./builtin/providers/aws -v -run=TestAccAWSSpotInstanceRequest_ -timeout 120m === RUN TestAccAWSSpotInstanceRequest_basic --- PASS: TestAccAWSSpotInstanceRequest_basic (213.75s) === RUN TestAccAWSSpotInstanceRequest_withBlockDuration --- PASS: TestAccAWSSpotInstanceRequest_withBlockDuration (212.14s) === RUN TestAccAWSSpotInstanceRequest_vpc --- PASS: TestAccAWSSpotInstanceRequest_vpc (130.44s) === RUN TestAccAWSSpotInstanceRequest_SubnetAndSG --- PASS: TestAccAWSSpotInstanceRequest_SubnetAndSG (234.43s) PASS ok github.com/hashicorp/terraform/builtin/providers/aws 790.791s ``` --- builtin/providers/aws/resource_aws_spot_instance_request.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/providers/aws/resource_aws_spot_instance_request.go b/builtin/providers/aws/resource_aws_spot_instance_request.go index c0e87e554..1de3b7121 100644 --- a/builtin/providers/aws/resource_aws_spot_instance_request.go +++ b/builtin/providers/aws/resource_aws_spot_instance_request.go @@ -25,7 +25,7 @@ func resourceAwsSpotInstanceRequest() *schema.Resource { // Everything on a spot instance is ForceNew except tags for k, v := range s { - if k == "tags" { + if k == "tags" || k == "volume_tags" { continue } v.ForceNew = true From 0f47cd47d8817b8f5cf790ba4762eb278520d1f7 Mon Sep 17 00:00:00 2001 From: Paul Stack Date: Fri, 28 Apr 2017 05:51:31 +1200 Subject: [PATCH 33/49] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f47bcb04a..489bf2ea4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ BUG FIXES: * provider/aws: Update aws_ebs_volume when attached [GH-14005] * provider/aws: Set aws_instance volume_tags to be Computed [GH-14007] * provider/aws: Fix issue getting partition for federated users [GH-13992] +* provider/aws: aws_spot_instance_request not forcenew on volume_tags [GH-14046] * provider/digitalocean: Prevent diffs when using IDs of images instead of slugs [GH-13879] * providers/heroku: Configure buildpacks correctly for both Org Apps and non-org Apps [GH-13990] From 9f3afb4ea72e745c98a86e157a5787575c1b220e Mon Sep 17 00:00:00 2001 From: Paddy Date: Thu, 27 Apr 2017 11:39:13 -0700 Subject: [PATCH 34/49] Fix both Radek & Dana's comments. Style nits, but clean code is happy code. --- .../resource_compute_project_metadata_test.go | 89 +++++++++---------- 1 file changed, 44 insertions(+), 45 deletions(-) diff --git a/builtin/providers/google/resource_compute_project_metadata_test.go b/builtin/providers/google/resource_compute_project_metadata_test.go index 93ab7ce31..b0bfa0ea1 100644 --- a/builtin/providers/google/resource_compute_project_metadata_test.go +++ b/builtin/providers/google/resource_compute_project_metadata_test.go @@ -22,7 +22,7 @@ func TestAccComputeProjectMetadata_basic(t *testing.T) { billingId := os.Getenv("GOOGLE_BILLING_ACCOUNT") var project compute.Project - pid := "terrafom-test-" + acctest.RandString(10) + projectID := "terrafom-test-" + acctest.RandString(10) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -30,13 +30,13 @@ func TestAccComputeProjectMetadata_basic(t *testing.T) { CheckDestroy: testAccCheckComputeProjectMetadataDestroy, Steps: []resource.TestStep{ resource.TestStep{ - Config: testAccComputeProject_basic0_metadata(pid, pname, org, billingId), + Config: testAccComputeProject_basic0_metadata(projectID, pname, org, billingId), Check: resource.ComposeTestCheckFunc( testAccCheckComputeProjectExists( - "google_compute_project_metadata.fizzbuzz", pid, &project), - testAccCheckComputeProjectMetadataContains(pid, "banana", "orange"), - testAccCheckComputeProjectMetadataContains(pid, "sofa", "darwinism"), - testAccCheckComputeProjectMetadataSize(pid, 2), + "google_compute_project_metadata.fizzbuzz", projectID, &project), + testAccCheckComputeProjectMetadataContains(projectID, "banana", "orange"), + testAccCheckComputeProjectMetadataContains(projectID, "sofa", "darwinism"), + testAccCheckComputeProjectMetadataSize(projectID, 2), ), }, }, @@ -54,7 +54,7 @@ func TestAccComputeProjectMetadata_modify_1(t *testing.T) { billingId := os.Getenv("GOOGLE_BILLING_ACCOUNT") var project compute.Project - pid := "terrafom-test-" + acctest.RandString(10) + projectID := "terrafom-test-" + acctest.RandString(10) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -62,26 +62,26 @@ func TestAccComputeProjectMetadata_modify_1(t *testing.T) { CheckDestroy: testAccCheckComputeProjectMetadataDestroy, Steps: []resource.TestStep{ resource.TestStep{ - Config: testAccComputeProject_modify0_metadata(pid, pname, org, billingId), + Config: testAccComputeProject_modify0_metadata(projectID, pname, org, billingId), Check: resource.ComposeTestCheckFunc( testAccCheckComputeProjectExists( - "google_compute_project_metadata.fizzbuzz", pid, &project), - testAccCheckComputeProjectMetadataContains(pid, "paper", "pen"), - testAccCheckComputeProjectMetadataContains(pid, "genghis_khan", "french bread"), - testAccCheckComputeProjectMetadataContains(pid, "happy", "smiling"), - testAccCheckComputeProjectMetadataSize(pid, 3), + "google_compute_project_metadata.fizzbuzz", projectID, &project), + testAccCheckComputeProjectMetadataContains(projectID, "paper", "pen"), + testAccCheckComputeProjectMetadataContains(projectID, "genghis_khan", "french bread"), + testAccCheckComputeProjectMetadataContains(projectID, "happy", "smiling"), + testAccCheckComputeProjectMetadataSize(projectID, 3), ), }, resource.TestStep{ - Config: testAccComputeProject_modify1_metadata(pid, pname, org, billingId), + Config: testAccComputeProject_modify1_metadata(projectID, pname, org, billingId), Check: resource.ComposeTestCheckFunc( testAccCheckComputeProjectExists( - "google_compute_project_metadata.fizzbuzz", pid, &project), - testAccCheckComputeProjectMetadataContains(pid, "paper", "pen"), - testAccCheckComputeProjectMetadataContains(pid, "paris", "french bread"), - testAccCheckComputeProjectMetadataContains(pid, "happy", "laughing"), - testAccCheckComputeProjectMetadataSize(pid, 3), + "google_compute_project_metadata.fizzbuzz", projectID, &project), + testAccCheckComputeProjectMetadataContains(projectID, "paper", "pen"), + testAccCheckComputeProjectMetadataContains(projectID, "paris", "french bread"), + testAccCheckComputeProjectMetadataContains(projectID, "happy", "laughing"), + testAccCheckComputeProjectMetadataSize(projectID, 3), ), }, }, @@ -99,7 +99,7 @@ func TestAccComputeProjectMetadata_modify_2(t *testing.T) { billingId := os.Getenv("GOOGLE_BILLING_ACCOUNT") var project compute.Project - pid := "terraform-test-" + acctest.RandString(10) + projectID := "terraform-test-" + acctest.RandString(10) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -107,24 +107,24 @@ func TestAccComputeProjectMetadata_modify_2(t *testing.T) { CheckDestroy: testAccCheckComputeProjectMetadataDestroy, Steps: []resource.TestStep{ resource.TestStep{ - Config: testAccComputeProject_basic0_metadata(pid, pname, org, billingId), + Config: testAccComputeProject_basic0_metadata(projectID, pname, org, billingId), Check: resource.ComposeTestCheckFunc( testAccCheckComputeProjectExists( - "google_compute_project_metadata.fizzbuzz", pid, &project), - testAccCheckComputeProjectMetadataContains(pid, "banana", "orange"), - testAccCheckComputeProjectMetadataContains(pid, "sofa", "darwinism"), - testAccCheckComputeProjectMetadataSize(pid, 2), + "google_compute_project_metadata.fizzbuzz", projectID, &project), + testAccCheckComputeProjectMetadataContains(projectID, "banana", "orange"), + testAccCheckComputeProjectMetadataContains(projectID, "sofa", "darwinism"), + testAccCheckComputeProjectMetadataSize(projectID, 2), ), }, resource.TestStep{ - Config: testAccComputeProject_basic1_metadata(pid, pname, org, billingId), + Config: testAccComputeProject_basic1_metadata(projectID, pname, org, billingId), Check: resource.ComposeTestCheckFunc( testAccCheckComputeProjectExists( - "google_compute_project_metadata.fizzbuzz", pid, &project), - testAccCheckComputeProjectMetadataContains(pid, "kiwi", "papaya"), - testAccCheckComputeProjectMetadataContains(pid, "finches", "darwinism"), - testAccCheckComputeProjectMetadataSize(pid, 2), + "google_compute_project_metadata.fizzbuzz", projectID, &project), + testAccCheckComputeProjectMetadataContains(projectID, "kiwi", "papaya"), + testAccCheckComputeProjectMetadataContains(projectID, "finches", "darwinism"), + testAccCheckComputeProjectMetadataSize(projectID, 2), ), }, }, @@ -148,7 +148,7 @@ func testAccCheckComputeProjectMetadataDestroy(s *terraform.State) error { return nil } -func testAccCheckComputeProjectExists(n, pid string, project *compute.Project) resource.TestCheckFunc { +func testAccCheckComputeProjectExists(n, projectID string, project *compute.Project) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] if !ok { @@ -161,8 +161,7 @@ func testAccCheckComputeProjectExists(n, pid string, project *compute.Project) r config := testAccProvider.Meta().(*Config) - found, err := config.clientCompute.Projects.Get( - pid).Do() + found, err := config.clientCompute.Projects.Get(projectID).Do() if err != nil { return err } @@ -177,10 +176,10 @@ func testAccCheckComputeProjectExists(n, pid string, project *compute.Project) r } } -func testAccCheckComputeProjectMetadataContains(pid, key, value string) resource.TestCheckFunc { +func testAccCheckComputeProjectMetadataContains(projectID, key, value string) resource.TestCheckFunc { return func(s *terraform.State) error { config := testAccProvider.Meta().(*Config) - project, err := config.clientCompute.Projects.Get(pid).Do() + project, err := config.clientCompute.Projects.Get(projectID).Do() if err != nil { return fmt.Errorf("Error, failed to load project service for %s: %s", config.Project, err) } @@ -200,10 +199,10 @@ func testAccCheckComputeProjectMetadataContains(pid, key, value string) resource } } -func testAccCheckComputeProjectMetadataSize(pid string, size int) resource.TestCheckFunc { +func testAccCheckComputeProjectMetadataSize(projectID string, size int) resource.TestCheckFunc { return func(s *terraform.State) error { config := testAccProvider.Meta().(*Config) - project, err := config.clientCompute.Projects.Get(pid).Do() + project, err := config.clientCompute.Projects.Get(projectID).Do() if err != nil { return fmt.Errorf("Error, failed to load project service for %s: %s", config.Project, err) } @@ -217,7 +216,7 @@ func testAccCheckComputeProjectMetadataSize(pid string, size int) resource.TestC } } -func testAccComputeProject_basic0_metadata(pid, name, org, billing string) string { +func testAccComputeProject_basic0_metadata(projectID, name, org, billing string) string { return fmt.Sprintf(` resource "google_project" "project" { project_id = "%s" @@ -238,10 +237,10 @@ resource "google_compute_project_metadata" "fizzbuzz" { sofa = "darwinism" } depends_on = ["google_project_services.services"] -}`, pid, name, org, billing) +}`, projectID, name, org, billing) } -func testAccComputeProject_basic1_metadata(pid, name, org, billing string) string { +func testAccComputeProject_basic1_metadata(projectID, name, org, billing string) string { return fmt.Sprintf(` resource "google_project" "project" { project_id = "%s" @@ -262,10 +261,10 @@ resource "google_compute_project_metadata" "fizzbuzz" { finches = "darwinism" } depends_on = ["google_project_services.services"] -}`, pid, name, org, billing) +}`, projectID, name, org, billing) } -func testAccComputeProject_modify0_metadata(pid, name, org, billing string) string { +func testAccComputeProject_modify0_metadata(projectID, name, org, billing string) string { return fmt.Sprintf(` resource "google_project" "project" { project_id = "%s" @@ -287,10 +286,10 @@ resource "google_compute_project_metadata" "fizzbuzz" { happy = "smiling" } depends_on = ["google_project_services.services"] -}`, pid, name, org, billing) +}`, projectID, name, org, billing) } -func testAccComputeProject_modify1_metadata(pid, name, org, billing string) string { +func testAccComputeProject_modify1_metadata(projectID, name, org, billing string) string { return fmt.Sprintf(` resource "google_project" "project" { project_id = "%s" @@ -312,5 +311,5 @@ resource "google_compute_project_metadata" "fizzbuzz" { happy = "laughing" } depends_on = ["google_project_services.services"] -}`, pid, name, org, billing) +}`, projectID, name, org, billing) } From 3b47f9439bbfd178f9ec8fcdfa887ddbb79eac7e Mon Sep 17 00:00:00 2001 From: Dan Peterson Date: Thu, 27 Apr 2017 16:18:55 -0300 Subject: [PATCH 35/49] providers/heroku: use resourceHerokuAppFeature prefix (#14051) Change eg resourceAppFeatureRead to resourceHerokuAppFeatureRead to conform to common style. --- .../heroku/resource_heroku_app_feature.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/builtin/providers/heroku/resource_heroku_app_feature.go b/builtin/providers/heroku/resource_heroku_app_feature.go index c93ef968c..9718fdc67 100644 --- a/builtin/providers/heroku/resource_heroku_app_feature.go +++ b/builtin/providers/heroku/resource_heroku_app_feature.go @@ -10,10 +10,10 @@ import ( func resourceHerokuAppFeature() *schema.Resource { return &schema.Resource{ - Create: resourceAppFeatureCreate, - Update: resourceAppFeatureUpdate, - Read: resourceAppFeatureRead, - Delete: resourceAppFeatureDelete, + Create: resourceHerokuAppFeatureCreate, + Update: resourceHerokuAppFeatureUpdate, + Read: resourceHerokuAppFeatureRead, + Delete: resourceHerokuAppFeatureDelete, Schema: map[string]*schema.Schema{ "app": { @@ -37,7 +37,7 @@ func resourceHerokuAppFeature() *schema.Resource { } } -func resourceAppFeatureRead(d *schema.ResourceData, meta interface{}) error { +func resourceHerokuAppFeatureRead(d *schema.ResourceData, meta interface{}) error { client := meta.(*heroku.Service) app, id := parseCompositeID(d.Id()) @@ -54,7 +54,7 @@ func resourceAppFeatureRead(d *schema.ResourceData, meta interface{}) error { return nil } -func resourceAppFeatureCreate(d *schema.ResourceData, meta interface{}) error { +func resourceHerokuAppFeatureCreate(d *schema.ResourceData, meta interface{}) error { client := meta.(*heroku.Service) app := d.Get("app").(string) @@ -72,18 +72,18 @@ func resourceAppFeatureCreate(d *schema.ResourceData, meta interface{}) error { d.SetId(buildCompositeID(app, feature.ID)) - return resourceAppFeatureRead(d, meta) + return resourceHerokuAppFeatureRead(d, meta) } -func resourceAppFeatureUpdate(d *schema.ResourceData, meta interface{}) error { +func resourceHerokuAppFeatureUpdate(d *schema.ResourceData, meta interface{}) error { if d.HasChange("enabled") { - return resourceAppFeatureCreate(d, meta) + return resourceHerokuAppFeatureCreate(d, meta) } - return resourceAppFeatureRead(d, meta) + return resourceHerokuAppFeatureRead(d, meta) } -func resourceAppFeatureDelete(d *schema.ResourceData, meta interface{}) error { +func resourceHerokuAppFeatureDelete(d *schema.ResourceData, meta interface{}) error { client := meta.(*heroku.Service) app, id := parseCompositeID(d.Id()) From 9d4a23d9a8e34c990295a415fb926163b5b8798d Mon Sep 17 00:00:00 2001 From: David Tesar Date: Thu, 27 Apr 2017 12:53:39 -0700 Subject: [PATCH 36/49] fix example templates With the FQDN specified, it throws error: ``` 1 error(s) occurred: * azurerm_container_service.test: "agent_pool_profile.0.fqdn": this field cannot be set ``` --- .../docs/providers/azurerm/r/container_service.html.markdown | 3 --- 1 file changed, 3 deletions(-) diff --git a/website/source/docs/providers/azurerm/r/container_service.html.markdown b/website/source/docs/providers/azurerm/r/container_service.html.markdown index b06052f7d..a83121a09 100644 --- a/website/source/docs/providers/azurerm/r/container_service.html.markdown +++ b/website/source/docs/providers/azurerm/r/container_service.html.markdown @@ -44,7 +44,6 @@ resource "azurerm_container_service" "test" { name = "default" count = 1 dns_prefix = "acctestagent1" - fqdn = "you.demo.com" vm_size = "Standard_A0" } @@ -89,7 +88,6 @@ resource "azurerm_container_service" "test" { name = "default" count = 1 dns_prefix = "acctestagent1" - fqdn = "you.demo.com" vm_size = "Standard_A0" } @@ -139,7 +137,6 @@ resource "azurerm_container_service" "test" { name = "default" count = 1 dns_prefix = "acctestagent1" - fqdn = "you.demo.com" vm_size = "Standard_A0" } From 2b911dcc581cd7bf31690de76f5234a5a178b829 Mon Sep 17 00:00:00 2001 From: Dana Hoffman Date: Thu, 27 Apr 2017 13:00:54 -0700 Subject: [PATCH 37/49] provider/google: ignore certain project services that can't be enabled directly via the api (#13730) --- .../resource_google_project_services.go | 12 +++- .../resource_google_project_services_test.go | 56 +++++++++++++++++++ 2 files changed, 67 insertions(+), 1 deletion(-) diff --git a/builtin/providers/google/resource_google_project_services.go b/builtin/providers/google/resource_google_project_services.go index 84bcd95ad..e28456593 100644 --- a/builtin/providers/google/resource_google_project_services.go +++ b/builtin/providers/google/resource_google_project_services.go @@ -31,6 +31,14 @@ func resourceGoogleProjectServices() *schema.Resource { } } +// These services can only be enabled as a side-effect of enabling other services, +// so don't bother storing them in the config or using them for diffing. +var ignore = map[string]struct{}{ + "containeranalysis.googleapis.com": struct{}{}, + "dataproc-control.googleapis.com": struct{}{}, + "source.googleapis.com": struct{}{}, +} + func resourceGoogleProjectServicesCreate(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) pid := d.Get("project").(string) @@ -160,7 +168,9 @@ func getApiServices(pid string, config *Config) ([]string, error) { return apiServices, err } for _, v := range svcResp.Services { - apiServices = append(apiServices, v.ServiceName) + if _, ok := ignore[v.ServiceName]; !ok { + apiServices = append(apiServices, v.ServiceName) + } } return apiServices, nil } diff --git a/builtin/providers/google/resource_google_project_services_test.go b/builtin/providers/google/resource_google_project_services_test.go index dff073b28..155a297c7 100644 --- a/builtin/providers/google/resource_google_project_services_test.go +++ b/builtin/providers/google/resource_google_project_services_test.go @@ -4,6 +4,7 @@ import ( "bytes" "fmt" "log" + "os" "reflect" "sort" "testing" @@ -123,6 +124,46 @@ func TestAccGoogleProjectServices_authoritative2(t *testing.T) { }) } +// Test that services that can't be enabled on their own (such as dataproc-control.googleapis.com) +// don't end up causing diffs when they are enabled as a side-effect of a different service's +// enablement. +func TestAccGoogleProjectServices_ignoreUnenablableServices(t *testing.T) { + skipIfEnvNotSet(t, + []string{ + "GOOGLE_ORG", + "GOOGLE_BILLING_ACCOUNT", + }..., + ) + + billingId := os.Getenv("GOOGLE_BILLING_ACCOUNT") + pid := "terraform-" + acctest.RandString(10) + services := []string{ + "dataproc.googleapis.com", + // The following services are enabled as a side-effect of dataproc's enablement + "storage-component.googleapis.com", + "deploymentmanager.googleapis.com", + "replicapool.googleapis.com", + "replicapoolupdater.googleapis.com", + "resourceviews.googleapis.com", + "compute-component.googleapis.com", + "container.googleapis.com", + "storage-api.googleapis.com", + } + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + resource.TestStep{ + Config: testAccGoogleProjectAssociateServicesBasic_withBilling(services, pid, pname, org, billingId), + Check: resource.ComposeTestCheckFunc( + testProjectServicesMatch(services, pid), + ), + }, + }, + }) +} + func testAccGoogleProjectAssociateServicesBasic(services []string, pid, name, org string) string { return fmt.Sprintf(` resource "google_project" "acceptance" { @@ -137,6 +178,21 @@ resource "google_project_services" "acceptance" { `, pid, name, org, testStringsToString(services)) } +func testAccGoogleProjectAssociateServicesBasic_withBilling(services []string, pid, name, org, billing string) string { + return fmt.Sprintf(` +resource "google_project" "acceptance" { + project_id = "%s" + name = "%s" + org_id = "%s" + billing_account = "%s" +} +resource "google_project_services" "acceptance" { + project = "${google_project.acceptance.project_id}" + services = [%s] +} +`, pid, name, org, billing, testStringsToString(services)) +} + func testProjectServicesMatch(services []string, pid string) resource.TestCheckFunc { return func(s *terraform.State) error { config := testAccProvider.Meta().(*Config) From eeecf5183c64b833ae7904b239b795e4daad5ea7 Mon Sep 17 00:00:00 2001 From: Dana Hoffman Date: Thu, 27 Apr 2017 13:04:46 -0700 Subject: [PATCH 38/49] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 489bf2ea4..58244c130 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ BUG FIXES: * provider/aws: Fix issue getting partition for federated users [GH-13992] * provider/aws: aws_spot_instance_request not forcenew on volume_tags [GH-14046] * provider/digitalocean: Prevent diffs when using IDs of images instead of slugs [GH-13879] +* provider/google: ignore certain project services that can't be enabled directly via the api [GH-13730] * providers/heroku: Configure buildpacks correctly for both Org Apps and non-org Apps [GH-13990] ## 0.9.4 (26th April 2017) From 93e5d573ce5c48bf07f7917018ae300ced3e3a54 Mon Sep 17 00:00:00 2001 From: Paul Stack Date: Fri, 28 Apr 2017 12:09:18 +1200 Subject: [PATCH 39/49] provider/aws: Exclude aws_instance volume tagging for China and Gov Clouds (#14055) Fixes: #14049 The China and Gov regions do not support the new way of tagging instances and volumes on creation. Therefore, we need to hack this to make sure we don't try and set these on instance creation --- builtin/providers/aws/config.go | 14 ++++ .../providers/aws/resource_aws_instance.go | 66 +++++++++++-------- 2 files changed, 51 insertions(+), 29 deletions(-) diff --git a/builtin/providers/aws/config.go b/builtin/providers/aws/config.go index 78fa93deb..327090130 100644 --- a/builtin/providers/aws/config.go +++ b/builtin/providers/aws/config.go @@ -171,6 +171,20 @@ func (c *AWSClient) DynamoDB() *dynamodb.DynamoDB { return c.dynamodbconn } +func (c *AWSClient) IsGovCloud() bool { + if c.region == "us-gov-west-1" { + return true + } + return false +} + +func (c *AWSClient) IsChinaCloud() bool { + if c.region == "cn-north-1" { + return true + } + return false +} + // Client configures and returns a fully initialized AWSClient func (c *Config) Client() (interface{}, error) { // Get the auth and region. This can fail if keys/regions were not diff --git a/builtin/providers/aws/resource_aws_instance.go b/builtin/providers/aws/resource_aws_instance.go index b648b3b35..e6253b3bc 100644 --- a/builtin/providers/aws/resource_aws_instance.go +++ b/builtin/providers/aws/resource_aws_instance.go @@ -432,32 +432,35 @@ func resourceAwsInstanceCreate(d *schema.ResourceData, meta interface{}) error { runOpts.Ipv6Addresses = ipv6Addresses } - tagsSpec := make([]*ec2.TagSpecification, 0) + restricted := meta.(*AWSClient).IsGovCloud() || meta.(*AWSClient).IsChinaCloud() + if !restricted { + tagsSpec := make([]*ec2.TagSpecification, 0) - if v, ok := d.GetOk("tags"); ok { - tags := tagsFromMap(v.(map[string]interface{})) + if v, ok := d.GetOk("tags"); ok { + tags := tagsFromMap(v.(map[string]interface{})) - spec := &ec2.TagSpecification{ - ResourceType: aws.String("instance"), - Tags: tags, + spec := &ec2.TagSpecification{ + ResourceType: aws.String("instance"), + Tags: tags, + } + + tagsSpec = append(tagsSpec, spec) } - tagsSpec = append(tagsSpec, spec) - } + if v, ok := d.GetOk("volume_tags"); ok { + tags := tagsFromMap(v.(map[string]interface{})) - if v, ok := d.GetOk("volume_tags"); ok { - tags := tagsFromMap(v.(map[string]interface{})) + spec := &ec2.TagSpecification{ + ResourceType: aws.String("volume"), + Tags: tags, + } - spec := &ec2.TagSpecification{ - ResourceType: aws.String("volume"), - Tags: tags, + tagsSpec = append(tagsSpec, spec) } - tagsSpec = append(tagsSpec, spec) - } - - if len(tagsSpec) > 0 { - runOpts.TagSpecifications = tagsSpec + if len(tagsSpec) > 0 { + runOpts.TagSpecifications = tagsSpec + } } // Create the instance @@ -713,19 +716,24 @@ func resourceAwsInstanceUpdate(d *schema.ResourceData, meta interface{}) error { d.Partial(true) - if d.HasChange("tags") && !d.IsNewResource() { - if err := setTags(conn, d); err != nil { - return err - } else { - d.SetPartial("tags") + restricted := meta.(*AWSClient).IsGovCloud() || meta.(*AWSClient).IsChinaCloud() + + if d.HasChange("tags") { + if !d.IsNewResource() || !restricted { + if err := setTags(conn, d); err != nil { + return err + } else { + d.SetPartial("tags") + } } } - - if d.HasChange("volume_tags") && !d.IsNewResource() { - if err := setVolumeTags(conn, d); err != nil { - return err - } else { - d.SetPartial("volume_tags") + if d.HasChange("volume_tags") { + if !d.IsNewResource() || !restricted { + if err := setVolumeTags(conn, d); err != nil { + return err + } else { + d.SetPartial("volume_tags") + } } } From 990b6759f155ac3de925fdfe8718d1ae0306a6bd Mon Sep 17 00:00:00 2001 From: Paul Stack Date: Fri, 28 Apr 2017 12:10:38 +1200 Subject: [PATCH 40/49] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 58244c130..203cca6f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ BACKWARDS INCOMPATIBILITIES / NOTES: * provider/aws: Users of aws_cloudfront_distributions with custom_origins have been broken due to changes in the AWS API requiring `OriginReadTimeout` being set for updates. This has been fixed and will show as a change in terraform plan / apply. [GH-13367] +* provider/aws: Users of China and Gov clouds, cannot use the new tagging of volumes created as part of aws_instances [GH-14055] FEATURES: @@ -23,6 +24,7 @@ BUG FIXES: * provider/aws: Set aws_instance volume_tags to be Computed [GH-14007] * provider/aws: Fix issue getting partition for federated users [GH-13992] * provider/aws: aws_spot_instance_request not forcenew on volume_tags [GH-14046] +* provider/aws: Exclude aws_instance volume tagging for China and Gov Clouds [GH-14055] * provider/digitalocean: Prevent diffs when using IDs of images instead of slugs [GH-13879] * provider/google: ignore certain project services that can't be enabled directly via the api [GH-13730] * providers/heroku: Configure buildpacks correctly for both Org Apps and non-org Apps [GH-13990] From 8ec67413be00cfce30f732eb1aa9de0200cb3088 Mon Sep 17 00:00:00 2001 From: Dan Peterson Date: Fri, 28 Apr 2017 10:40:18 -0300 Subject: [PATCH 41/49] providers/heroku: wait for spaces to be allocated (#14052) --- .../providers/heroku/resource_heroku_space.go | 43 +++++++++++++++---- 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/builtin/providers/heroku/resource_heroku_space.go b/builtin/providers/heroku/resource_heroku_space.go index 3e90fffbb..fcabee429 100644 --- a/builtin/providers/heroku/resource_heroku_space.go +++ b/builtin/providers/heroku/resource_heroku_space.go @@ -2,9 +2,12 @@ package heroku import ( "context" + "fmt" "log" + "time" heroku "github.com/cyberdelia/heroku-go/v3" + "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" ) @@ -56,23 +59,32 @@ func resourceHerokuSpaceCreate(d *schema.ResourceData, meta interface{}) error { d.SetId(space.ID) log.Printf("[INFO] Space ID: %s", d.Id()) - // The type conversion here can be dropped when the vendored version of - // heroku-go is updated. - setSpaceAttributes(d, (*heroku.Space)(space)) - return nil + // Wait for the Space to be allocated + log.Printf("[DEBUG] Waiting for Space (%s) to be allocated", d.Id()) + stateConf := &resource.StateChangeConf{ + Pending: []string{"allocating"}, + Target: []string{"allocated"}, + Refresh: SpaceStateRefreshFunc(client, d.Id()), + Timeout: 20 * time.Minute, + } + + if _, err := stateConf.WaitForState(); err != nil { + return fmt.Errorf("Error waiting for Space (%s) to become available: %s", d.Id(), err) + } + + return resourceHerokuSpaceRead(d, meta) } func resourceHerokuSpaceRead(d *schema.ResourceData, meta interface{}) error { client := meta.(*heroku.Service) - space, err := client.SpaceInfo(context.TODO(), d.Id()) + spaceRaw, _, err := SpaceStateRefreshFunc(client, d.Id())() if err != nil { return err } + space := spaceRaw.(*heroku.Space) - // The type conversion here can be dropped when the vendored version of - // heroku-go is updated. - setSpaceAttributes(d, (*heroku.Space)(space)) + setSpaceAttributes(d, space) return nil } @@ -115,3 +127,18 @@ func resourceHerokuSpaceDelete(d *schema.ResourceData, meta interface{}) error { d.SetId("") return nil } + +// SpaceStateRefreshFunc returns a resource.StateRefreshFunc that is used to watch +// a Space. +func SpaceStateRefreshFunc(client *heroku.Service, id string) resource.StateRefreshFunc { + return func() (interface{}, string, error) { + space, err := client.SpaceInfo(context.TODO(), id) + if err != nil { + return nil, "", err + } + + // The type conversion here can be dropped when the vendored version of + // heroku-go is updated. + return (*heroku.Space)(space), space.State, nil + } +} From 93a0bad9239afc527c4296f3a970f1d053b909ce Mon Sep 17 00:00:00 2001 From: Brian Cervenka Date: Fri, 17 Mar 2017 18:03:39 -0700 Subject: [PATCH 42/49] provider/triton: Add metadata key for cloud-init Under joyent/triton, the cloud-init cloud-config data actually comes out of a key called cloud-init:user-data, as opposed to to the standard user-data. This will make it possible to send the cloud-config data to triton machines. Documentation reference: https://docs.joyent.com/public-cloud/instances/virtual-machines/images/linux/ubuntu-certified#cloud-init-examples --- builtin/providers/triton/resource_machine.go | 7 +++++++ .../docs/providers/triton/r/triton_machine.html.markdown | 3 +++ 2 files changed, 10 insertions(+) diff --git a/builtin/providers/triton/resource_machine.go b/builtin/providers/triton/resource_machine.go index 7eb66591c..85b26a8a5 100644 --- a/builtin/providers/triton/resource_machine.go +++ b/builtin/providers/triton/resource_machine.go @@ -23,6 +23,7 @@ var ( "user_script": "user-script", "user_data": "user-data", "administrator_pw": "administrator-pw", + "cloud_config": "cloud-init:user-data", } ) @@ -182,6 +183,12 @@ func resourceMachine() *schema.Resource { Optional: true, Computed: true, }, + "cloud_config": { + Description: "copied to machine on boot", + Type: schema.TypeString, + Optional: true, + Computed: true, + }, "user_data": { Description: "Data copied to machine on boot", Type: schema.TypeString, diff --git a/website/source/docs/providers/triton/r/triton_machine.html.markdown b/website/source/docs/providers/triton/r/triton_machine.html.markdown index f01fd8005..84d8df996 100644 --- a/website/source/docs/providers/triton/r/triton_machine.html.markdown +++ b/website/source/docs/providers/triton/r/triton_machine.html.markdown @@ -77,6 +77,9 @@ The following arguments are supported: * `administrator_pw` - (string) The initial password for the Administrator user. Only used for Windows virtual machines. +* `cloud_config` - (string) + Populate the cloud-init:user-data field. Cloud config data to pass to the instance. Traditionally user-data is used, however joyent uses that key for their own purposes. At least on ubuntu cloud-init, it expects the cloud_config to be in cloud-init:user-data instead of just user-data. + The nested `nic` block supports the following: * `network` - (string, Optional) The network id to attach to the network interface. It will be hex, in the format: `xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx`. From 8cee4eb12b6cf72c959d431fb5723c237c5a6b80 Mon Sep 17 00:00:00 2001 From: Maciej Skierkowski Date: Fri, 28 Apr 2017 10:52:59 -0700 Subject: [PATCH 43/49] Adding a deprecation warning on 'terraform remote config' command --- .../docs/enterprise/state/pushing.html.md | 25 +++++++++++++++++++ website/source/layouts/enterprise.erb | 3 +++ 2 files changed, 28 insertions(+) create mode 100644 website/source/docs/enterprise/state/pushing.html.md diff --git a/website/source/docs/enterprise/state/pushing.html.md b/website/source/docs/enterprise/state/pushing.html.md new file mode 100644 index 000000000..ad058d144 --- /dev/null +++ b/website/source/docs/enterprise/state/pushing.html.md @@ -0,0 +1,25 @@ +--- +layout: "enterprise" +page_title: "Pushing - State - Terraform Enterprise" +sidebar_current: "docs-enterprise-state-pushing" +description: |- + Pushing remote states. +--- + +# Pushing Terraform Remote State to Terraform Enterprise + +Terraform Enterprise is one of a few options to store [remote state](/docs/enterprise/state). + +Remote state gives you the ability to version and collaborate on Terraform +changes. It stores information about the changes Terraform makes based on +configuration. + +To use Terraform Enterprise to store remote state, you'll first need to have the +`ATLAS_TOKEN` environment variable set and run the following command. + +**NOTE:** `terraform remote config` command has been deprecated in 0.9.X. Remote configuration is now managed as a [backend configuration](/docs/backends/config.html). + +```shell +$ terraform remote config \ + -backend-config="name=$USERNAME/product" +``` \ No newline at end of file diff --git a/website/source/layouts/enterprise.erb b/website/source/layouts/enterprise.erb index 3aaf4cc1d..188a66a38 100644 --- a/website/source/layouts/enterprise.erb +++ b/website/source/layouts/enterprise.erb @@ -79,6 +79,9 @@ > State
        + > + Pushing State + > Resolving Conflicts From b142c04db221434a1d993146e7df5cdc5edd936e Mon Sep 17 00:00:00 2001 From: Maciej Skierkowski Date: Fri, 28 Apr 2017 10:54:37 -0700 Subject: [PATCH 44/49] removing whitespace --- website/source/layouts/enterprise.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/source/layouts/enterprise.erb b/website/source/layouts/enterprise.erb index 188a66a38..127074249 100644 --- a/website/source/layouts/enterprise.erb +++ b/website/source/layouts/enterprise.erb @@ -81,7 +81,7 @@
          > Pushing State - + > Resolving Conflicts From 04436e4cbd480087a5c411251ca28232f994d23e Mon Sep 17 00:00:00 2001 From: James Nugent Date: Fri, 28 Apr 2017 11:01:50 -0700 Subject: [PATCH 45/49] provider/triton: Clarify cloud_config docs --- .../source/docs/providers/triton/r/triton_machine.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/source/docs/providers/triton/r/triton_machine.html.markdown b/website/source/docs/providers/triton/r/triton_machine.html.markdown index 84d8df996..af34fade2 100644 --- a/website/source/docs/providers/triton/r/triton_machine.html.markdown +++ b/website/source/docs/providers/triton/r/triton_machine.html.markdown @@ -78,7 +78,7 @@ The following arguments are supported: The initial password for the Administrator user. Only used for Windows virtual machines. * `cloud_config` - (string) - Populate the cloud-init:user-data field. Cloud config data to pass to the instance. Traditionally user-data is used, however joyent uses that key for their own purposes. At least on ubuntu cloud-init, it expects the cloud_config to be in cloud-init:user-data instead of just user-data. + Cloud-init configuration for Linux brand machines, used instead of `user_data`. The nested `nic` block supports the following: * `network` - (string, Optional) From 362ad5d7fa28d8d6606ebf2d8a7de29997b909d8 Mon Sep 17 00:00:00 2001 From: James Nugent Date: Fri, 28 Apr 2017 11:03:17 -0700 Subject: [PATCH 46/49] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 203cca6f1..21881ef41 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ IMPROVEMENTS: * provider/dnsimple: Add support for import for dnsimple_records [GH-9130] * provider/nomad: Add TLS options [GH-13956] * provider/triton: Add support for reading provider configuration from `TRITON_*` environment variables in addition to `SDC_*`[GH-14000] +* provider/triton: Add `cloud_config` argument to `triton_machine` resources for Linux containers [GH-12840] BUG FIXES: From 01714eceb57c8bc561a4de0cd3d5b81fe57e86d9 Mon Sep 17 00:00:00 2001 From: James Nugent Date: Fri, 28 Apr 2017 11:54:11 -0700 Subject: [PATCH 47/49] deps: Update github.com/joyent/triton-go --- .../github.com/joyent/triton-go/accounts.go | 28 ++++++----- vendor/github.com/joyent/triton-go/client.go | 40 +++++++++++---- .../joyent/triton-go/datacenters.go | 6 ++- vendor/github.com/joyent/triton-go/fabrics.go | 3 +- .../github.com/joyent/triton-go/firewall.go | 6 ++- vendor/github.com/joyent/triton-go/images.go | 7 +-- vendor/github.com/joyent/triton-go/keys.go | 3 +- .../github.com/joyent/triton-go/machines.go | 50 +++++++++++++++++-- .../github.com/joyent/triton-go/networks.go | 3 +- vendor/vendor.json | 10 ++-- 10 files changed, 115 insertions(+), 41 deletions(-) diff --git a/vendor/github.com/joyent/triton-go/accounts.go b/vendor/github.com/joyent/triton-go/accounts.go index 8049d4e7e..474cce000 100644 --- a/vendor/github.com/joyent/triton-go/accounts.go +++ b/vendor/github.com/joyent/triton-go/accounts.go @@ -5,8 +5,9 @@ import ( "net/http" "time" - "github.com/hashicorp/errwrap" "fmt" + + "github.com/hashicorp/errwrap" ) type AccountsClient struct { @@ -40,7 +41,8 @@ type Account struct { type GetAccountInput struct{} func (client *AccountsClient) GetAccount(input *GetAccountInput) (*Account, error) { - respReader, err := client.executeRequest(http.MethodGet, "/my", nil) + path := fmt.Sprintf("/%s", client.accountName) + respReader, err := client.executeRequest(http.MethodGet, path, nil) if respReader != nil { defer respReader.Close() } @@ -58,17 +60,17 @@ func (client *AccountsClient) GetAccount(input *GetAccountInput) (*Account, erro } type UpdateAccountInput struct { - Email string `json:"email,omitempty"` - CompanyName string `json:"companyName,omitempty"` - FirstName string `json:"firstName,omitempty"` - LastName string `json:"lastName,omitempty"` - Address string `json:"address,omitempty"` - PostalCode string `json:"postalCode,omitempty"` - City string `json:"city,omitempty"` - State string `json:"state,omitempty"` - Country string `json:"country,omitempty"` - Phone string `json:"phone,omitempty"` - TritonCNSEnabled bool `json:"triton_cns_enabled,omitempty"` + Email string `json:"email,omitempty"` + CompanyName string `json:"companyName,omitempty"` + FirstName string `json:"firstName,omitempty"` + LastName string `json:"lastName,omitempty"` + Address string `json:"address,omitempty"` + PostalCode string `json:"postalCode,omitempty"` + City string `json:"city,omitempty"` + State string `json:"state,omitempty"` + Country string `json:"country,omitempty"` + Phone string `json:"phone,omitempty"` + TritonCNSEnabled bool `json:"triton_cns_enabled,omitempty"` } // UpdateAccount updates your account details with the given parameters. diff --git a/vendor/github.com/joyent/triton-go/client.go b/vendor/github.com/joyent/triton-go/client.go index e34c6b1fe..5ee1f0be7 100644 --- a/vendor/github.com/joyent/triton-go/client.go +++ b/vendor/github.com/joyent/triton-go/client.go @@ -2,6 +2,7 @@ package triton import ( "bytes" + "crypto/tls" "encoding/json" "fmt" "io" @@ -45,16 +46,7 @@ func NewClient(endpoint string, accountName string, signers ...authentication.Si } httpClient := &http.Client{ - Transport: &http.Transport{ - Proxy: http.ProxyFromEnvironment, - Dial: (&net.Dialer{ - Timeout: 30 * time.Second, - KeepAlive: 30 * time.Second, - }).Dial, - TLSHandshakeTimeout: 10 * time.Second, - DisableKeepAlives: true, - MaxIdleConnsPerHost: -1, - }, + Transport: httpTransport(false), CheckRedirect: doNotFollowRedirects, } @@ -75,6 +67,34 @@ func NewClient(endpoint string, accountName string, signers ...authentication.Si }, nil } +// InsecureSkipTLSVerify turns off TLS verification for the client connection. This +// allows connection to an endpoint with a certificate which was signed by a non- +// trusted CA, such as self-signed certificates. This can be useful when connecting +// to temporary Triton installations such as Triton Cloud-On-A-Laptop. +func (c *Client) InsecureSkipTLSVerify() { + if c.client == nil { + return + } + + c.client.HTTPClient.Transport = httpTransport(true) +} + +func httpTransport(insecureSkipTLSVerify bool) *http.Transport { + return &http.Transport{ + Proxy: http.ProxyFromEnvironment, + Dial: (&net.Dialer{ + Timeout: 30 * time.Second, + KeepAlive: 30 * time.Second, + }).Dial, + TLSHandshakeTimeout: 10 * time.Second, + DisableKeepAlives: true, + MaxIdleConnsPerHost: -1, + TLSClientConfig: &tls.Config{ + InsecureSkipVerify: insecureSkipTLSVerify, + }, + } +} + func doNotFollowRedirects(*http.Request, []*http.Request) error { return http.ErrUseLastResponse } diff --git a/vendor/github.com/joyent/triton-go/datacenters.go b/vendor/github.com/joyent/triton-go/datacenters.go index c90cc954a..72ccbd6d9 100644 --- a/vendor/github.com/joyent/triton-go/datacenters.go +++ b/vendor/github.com/joyent/triton-go/datacenters.go @@ -28,7 +28,8 @@ type DataCenter struct { type ListDataCentersInput struct{} func (client *DataCentersClient) ListDataCenters(*ListDataCentersInput) ([]*DataCenter, error) { - respReader, err := client.executeRequest(http.MethodGet, "/my/datacenters", nil) + path := fmt.Sprintf("/%s/datacenters", client.accountName) + respReader, err := client.executeRequest(http.MethodGet, path, nil) if respReader != nil { defer respReader.Close() } @@ -68,7 +69,8 @@ type GetDataCenterInput struct { } func (client *DataCentersClient) GetDataCenter(input *GetDataCenterInput) (*DataCenter, error) { - resp, err := client.executeRequestRaw(http.MethodGet, fmt.Sprintf("/my/datacenters/%s", input.Name), nil) + path := fmt.Sprintf("/%s/datacenters/%s", client.accountName, input.Name) + resp, err := client.executeRequestRaw(http.MethodGet, path, nil) if err != nil { return nil, errwrap.Wrapf("Error executing GetDatacenter request: {{err}}", err) } diff --git a/vendor/github.com/joyent/triton-go/fabrics.go b/vendor/github.com/joyent/triton-go/fabrics.go index 5404d10bb..5b1caa521 100644 --- a/vendor/github.com/joyent/triton-go/fabrics.go +++ b/vendor/github.com/joyent/triton-go/fabrics.go @@ -27,7 +27,8 @@ type FabricVLAN struct { type ListFabricVLANsInput struct{} func (client *FabricsClient) ListFabricVLANs(*ListFabricVLANsInput) ([]*FabricVLAN, error) { - respReader, err := client.executeRequest(http.MethodGet, "/my/fabrics/default/vlans", nil) + path := fmt.Sprintf("/%s/fabrics/default/vlans", client.accountName) + respReader, err := client.executeRequest(http.MethodGet, path, nil) if respReader != nil { defer respReader.Close() } diff --git a/vendor/github.com/joyent/triton-go/firewall.go b/vendor/github.com/joyent/triton-go/firewall.go index c91d012d9..e9d57a80e 100644 --- a/vendor/github.com/joyent/triton-go/firewall.go +++ b/vendor/github.com/joyent/triton-go/firewall.go @@ -39,7 +39,8 @@ type FirewallRule struct { type ListFirewallRulesInput struct{} func (client *FirewallClient) ListFirewallRules(*ListFirewallRulesInput) ([]*FirewallRule, error) { - respReader, err := client.executeRequest(http.MethodGet, "/my/fwrules", nil) + path := fmt.Sprintf("/%s/fwrules", client.accountName) + respReader, err := client.executeRequest(http.MethodGet, path, nil) if respReader != nil { defer respReader.Close() } @@ -194,7 +195,8 @@ type ListMachineFirewallRulesInput struct { } func (client *FirewallClient) ListMachineFirewallRules(input *ListMachineFirewallRulesInput) ([]*FirewallRule, error) { - respReader, err := client.executeRequest(http.MethodGet, fmt.Sprintf("/my/machines/%s/firewallrules", input.MachineID), nil) + path := fmt.Sprintf("/%s/machines/%s/firewallrules", client.accountName, input.MachineID) + respReader, err := client.executeRequest(http.MethodGet, path, nil) if respReader != nil { defer respReader.Close() } diff --git a/vendor/github.com/joyent/triton-go/images.go b/vendor/github.com/joyent/triton-go/images.go index 3e0aa8a75..01d6ea96d 100644 --- a/vendor/github.com/joyent/triton-go/images.go +++ b/vendor/github.com/joyent/triton-go/images.go @@ -49,7 +49,8 @@ type Image struct { type ListImagesInput struct{} func (client *ImagesClient) ListImages(*ListImagesInput) ([]*Image, error) { - respReader, err := client.executeRequest(http.MethodGet, "/my/images", nil) + path := fmt.Sprintf("/%s/images", client.accountName) + respReader, err := client.executeRequest(http.MethodGet, path, nil) if respReader != nil { defer respReader.Close() } @@ -148,7 +149,7 @@ type CreateImageFromMachineInput struct { HomePage string `json:"homepage,omitempty"` EULA string `json:"eula,omitempty"` ACL []string `json:"acl,omitempty"` - tags map[string]string `json:"tags,omitempty"` + Tags map[string]string `json:"tags,omitempty"` } func (client *ImagesClient) CreateImageFromMachine(input *CreateImageFromMachineInput) (*Image, error) { @@ -178,7 +179,7 @@ type UpdateImageInput struct { HomePage string `json:"homepage,omitempty"` EULA string `json:"eula,omitempty"` ACL []string `json:"acl,omitempty"` - tags map[string]string `json:"tags,omitempty"` + Tags map[string]string `json:"tags,omitempty"` } func (client *ImagesClient) UpdateImage(input *UpdateImageInput) (*Image, error) { diff --git a/vendor/github.com/joyent/triton-go/keys.go b/vendor/github.com/joyent/triton-go/keys.go index a4f394a21..e63302349 100644 --- a/vendor/github.com/joyent/triton-go/keys.go +++ b/vendor/github.com/joyent/triton-go/keys.go @@ -35,7 +35,8 @@ type ListKeysInput struct{} // ListKeys lists all public keys we have on record for the specified // account. func (client *KeysClient) ListKeys(*ListKeysInput) ([]*Key, error) { - respReader, err := client.executeRequest(http.MethodGet, "/my/keys", nil) + path := fmt.Sprintf("/%s/keys") + respReader, err := client.executeRequest(http.MethodGet, path, nil) if respReader != nil { defer respReader.Close() } diff --git a/vendor/github.com/joyent/triton-go/machines.go b/vendor/github.com/joyent/triton-go/machines.go index 0fae69b4a..287c706c7 100644 --- a/vendor/github.com/joyent/triton-go/machines.go +++ b/vendor/github.com/joyent/triton-go/machines.go @@ -100,7 +100,7 @@ func (client *MachinesClient) GetMachine(input *GetMachineInput) (*Machine, erro if response != nil { defer response.Body.Close() } - if response.StatusCode == http.StatusNotFound { + if response.StatusCode == http.StatusNotFound || response.StatusCode == http.StatusGone { return nil, &TritonError{ Code: "ResourceNotFound", } @@ -219,7 +219,8 @@ func (input *CreateMachineInput) toAPI() map[string]interface{} { } func (client *MachinesClient) CreateMachine(input *CreateMachineInput) (*Machine, error) { - respReader, err := client.executeRequest(http.MethodPost, "/my/machines", input.toAPI()) + path := fmt.Sprintf("/%s/machines", client.accountName) + respReader, err := client.executeRequest(http.MethodPost, path, input.toAPI()) if respReader != nil { defer respReader.Close() } @@ -501,7 +502,8 @@ type ListNICsInput struct { } func (client *MachinesClient) ListNICs(input *ListNICsInput) ([]*NIC, error) { - respReader, err := client.executeRequest(http.MethodGet, fmt.Sprintf("/my/machines/%s/nics", input.MachineID), nil) + path := fmt.Sprintf("/%s/machines/%s/nics", client.accountName, input.MachineID) + respReader, err := client.executeRequest(http.MethodGet, path, nil) if respReader != nil { defer respReader.Close() } @@ -560,6 +562,48 @@ func (client *MachinesClient) RemoveNIC(input *RemoveNICInput) error { return nil } +type StopMachineInput struct { + MachineID string +} + +func (client *MachinesClient) StopMachine(input *StopMachineInput) error { + path := fmt.Sprintf("/%s/machines/%s", client.accountName, input.MachineID) + + params := &url.Values{} + params.Set("action", "stop") + + respReader, err := client.executeRequestURIParams(http.MethodPost, path, nil, params) + if respReader != nil { + defer respReader.Close() + } + if err != nil { + return errwrap.Wrapf("Error executing StopMachine request: {{err}}", err) + } + + return nil +} + +type StartMachineInput struct { + MachineID string +} + +func (client *MachinesClient) StartMachine(input *StartMachineInput) error { + path := fmt.Sprintf("/%s/machines/%s", client.accountName, input.MachineID) + + params := &url.Values{} + params.Set("action", "start") + + respReader, err := client.executeRequestURIParams(http.MethodPost, path, nil, params) + if respReader != nil { + defer respReader.Close() + } + if err != nil { + return errwrap.Wrapf("Error executing StartMachine request: {{err}}", err) + } + + return nil +} + var reservedMachineCNSTags = map[string]struct{}{ machineCNSTagDisable: {}, machineCNSTagReversePTR: {}, diff --git a/vendor/github.com/joyent/triton-go/networks.go b/vendor/github.com/joyent/triton-go/networks.go index cb1ec1700..440e3bc87 100644 --- a/vendor/github.com/joyent/triton-go/networks.go +++ b/vendor/github.com/joyent/triton-go/networks.go @@ -36,7 +36,8 @@ type Network struct { type ListNetworksInput struct{} func (client *NetworksClient) ListNetworks(*ListNetworksInput) ([]*Network, error) { - respReader, err := client.executeRequest(http.MethodGet, "/my/networks", nil) + path := fmt.Sprintf("/%s/networks", client.accountName) + respReader, err := client.executeRequest(http.MethodGet, path, nil) if respReader != nil { defer respReader.Close() } diff --git a/vendor/vendor.json b/vendor/vendor.json index 1c0c7ca53..9e78284fc 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -2341,16 +2341,16 @@ "revisionTime": "2016-06-16T18:50:15Z" }, { - "checksumSHA1": "2HimxaJVVp2QDVQ0570L71Zd5s4=", + "checksumSHA1": "XsjyaC6eTHUy/n0iuR46TZcgAK8=", "path": "github.com/joyent/triton-go", - "revision": "5db9e2b6a4c1f7ffd2a7e7aa625f42dba956608c", - "revisionTime": "2017-04-12T23:23:58Z" + "revision": "c73729fd38522591909a371c8180ca7090a59ab9", + "revisionTime": "2017-04-28T18:47:44Z" }, { "checksumSHA1": "QzUqkCSn/ZHyIK346xb9V6EBw9U=", "path": "github.com/joyent/triton-go/authentication", - "revision": "66b31a94af28a65e902423879a2820ea34b773fb", - "revisionTime": "2017-03-31T18:12:29Z" + "revision": "c73729fd38522591909a371c8180ca7090a59ab9", + "revisionTime": "2017-04-28T18:47:44Z" }, { "checksumSHA1": "YhQcOsGx8r2S/jkJ0Qt4cZ5BLCU=", From eaed36b47e9cda18716fca3e0d6c9571216d17cf Mon Sep 17 00:00:00 2001 From: James Nugent Date: Fri, 28 Apr 2017 11:56:26 -0700 Subject: [PATCH 48/49] provider/triton: Add `insecure_skip_tls_verify` This commit adds an option to skip TLS verification of the Triton endpoint, which can be useful for private or temporary installations not using a certificate signed by a trusted root CA. Fixes #13722. --- builtin/providers/triton/provider.go | 21 +++++++++++++++---- .../docs/providers/triton/index.html.markdown | 1 + 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/builtin/providers/triton/provider.go b/builtin/providers/triton/provider.go index 4c21722c2..8a56b5dc4 100644 --- a/builtin/providers/triton/provider.go +++ b/builtin/providers/triton/provider.go @@ -42,6 +42,12 @@ func Provider() terraform.ResourceProvider { Required: true, DefaultFunc: schema.MultiEnvDefaultFunc([]string{"TRITON_KEY_ID", "SDC_KEY_ID"}, ""), }, + + "insecure_skip_tls_verify": { + Type: schema.TypeBool, + Optional: true, + DefaultFunc: schema.EnvDefaultFunc("TRITON_SKIP_TLS_VERIFY", ""), + }, }, ResourcesMap: map[string]*schema.Resource{ @@ -56,10 +62,11 @@ func Provider() terraform.ResourceProvider { } type Config struct { - Account string - KeyMaterial string - KeyID string - URL string + Account string + KeyMaterial string + KeyID string + URL string + InsecureSkipTLSVerify bool } func (c Config) validate() error { @@ -98,6 +105,10 @@ func (c Config) getTritonClient() (*triton.Client, error) { return nil, errwrap.Wrapf("Error Creating Triton Client: {{err}}", err) } + if c.InsecureSkipTLSVerify { + client.InsecureSkipTLSVerify() + } + return client, nil } @@ -106,6 +117,8 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) { Account: d.Get("account").(string), URL: d.Get("url").(string), KeyID: d.Get("key_id").(string), + + InsecureSkipTLSVerify: d.Get("insecure_skip_tls_verify").(bool), } if keyMaterial, ok := d.GetOk("key_material"); ok { diff --git a/website/source/docs/providers/triton/index.html.markdown b/website/source/docs/providers/triton/index.html.markdown index 7dc866d27..22b9a40e6 100644 --- a/website/source/docs/providers/triton/index.html.markdown +++ b/website/source/docs/providers/triton/index.html.markdown @@ -33,3 +33,4 @@ The following arguments are supported in the `provider` block: * `key_material` - (Optional) This is the private key of an SSH key associated with the Triton account to be used. If this is not set, the private key corresponding to the fingerprint in `key_id` must be available via an SSH Agent. * `key_id` - (Required) This is the fingerprint of the public key matching the key specified in `key_path`. It can be obtained via the command `ssh-keygen -l -E md5 -f /path/to/key` * `url` - (Optional) This is the URL to the Triton API endpoint. It is required if using a private installation of Triton. The default is to use the Joyent public cloud us-west-1 endpoint. Valid public cloud endpoints include: `us-east-1`, `us-east-2`, `us-east-3`, `us-sw-1`, `us-west-1`, `eu-ams-1` +* `insecure_skip_tls_verify` (Optional - defaults to false) This allows skipping TLS verification of the Triton endpoint. It is useful when connecting to a temporary Triton installation such as Cloud-On-A-Laptop which does not generally use a certificate signed by a trusted root CA. From 0eb191d3a39d34fbea00e572e646e0e078fe2efa Mon Sep 17 00:00:00 2001 From: Jake Champlin Date: Fri, 28 Apr 2017 16:27:26 -0400 Subject: [PATCH 49/49] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 21881ef41..e3d815db2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ IMPROVEMENTS: * provider/nomad: Add TLS options [GH-13956] * provider/triton: Add support for reading provider configuration from `TRITON_*` environment variables in addition to `SDC_*`[GH-14000] * provider/triton: Add `cloud_config` argument to `triton_machine` resources for Linux containers [GH-12840] +* provider/triton: Add `insecure_skip_tls_verify` [GH-14077] BUG FIXES: