Handle botched container host provisions a bit better

Author: loafoe

docs/index.md

@@ -76,6 +76,8 @@ The following arguments are supported:
 
 * `uaa_password` - (Optional) The HSDP CF UAA password.
 
+* `uaa_url` - (Optional) The URL of the UAA authentication service
+
 * `org_id` - (Optional) Your IAM root ORG id as provided by HSDP
 
 * `shared_key` - (Optional) The shared key as provided by HSDP. Actions which require API signing will not work if this value is missing.

docs/resources/metrics_autoscaler.md

@@ -1,7 +1,7 @@
 # hsdp_metrics_autoscaler
 Manages HSDP Metrics Autoscaler settings for Cloudfoundry applications hosted in an HSDP CF space.
 
-> This resource is only available when the `region` and `uaa_*` keys are set in the provider config
+~> **NOTE:** This resource is only available when the `region` and `uaa_*` keys are set in the provider config
 
 [Metrics Service Broker](https://www.hsdp.io/documentation/metrics-service-broker)
 

hsdp/config.go

@@ -24,6 +24,7 @@ type Config struct {
 	RetryMax          int
 	UAAUsername       string
 	UAAPassword       string
+	UAAURL            string
 
 	iamClient        *iam.Client
 	cartelClient     *cartel.Client

hsdp/provider.go

@@ -95,6 +95,11 @@ func Provider(build string) terraform.ResourceProvider {
 				Description:  descriptions["uaa_password"],
 				RequiredWith: []string{"uaa_username"},
 			},
+			"uaa_url": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: descriptions["uaa_url"],
+			},
 			"shared_key": {
 				Type:        schema.TypeString,
 				Optional:    true,
@@ -209,6 +214,7 @@ func init() {
 		"retry_max":           "Maximum number of retries for API requests",
 		"uaa_username":        "The username of the Cloudfoundry account to use",
 		"uaa_password":        "The password of the Cloudfoundry account to use",
+		"uaa_url":             "The URL of the UAA server",
 	}
 }
 
@@ -239,6 +245,7 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) {
 	config.RetryMax = d.Get("retry_max").(int)
 	config.UAAUsername = d.Get("uaa_username").(string)
 	config.UAAPassword = d.Get("uaa_password").(string)
+	config.UAAURL = d.Get("uaa_url").(string)
 
 	config.setupIAMClient()
 	config.setupS3CredsClient()

hsdp/resource_container_host.go

@@ -6,6 +6,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/philips-software/go-hsdp-api/cartel"
 	"log"
+	"net/http"
 	"time"
 )
 
@@ -280,8 +281,13 @@ func resourceContainerHostRead(d *schema.ResourceData, m interface{}) error {
 	}
 
 	tagName := d.Get("name").(string)
-	state, _, err := client.GetDeploymentState(tagName)
+	state, resp, err := client.GetDeploymentState(tagName)
 	if err != nil {
+		if resp != nil && resp.StatusCode == http.StatusBadRequest {
+			// State not found, probably a botched provision :(
+			d.SetId("")
+			return nil
+		}
 		return err
 	}
 	if state != "succeeded" {