Allow specifying initial attachment name when creating addon.

heroku/resource_heroku_addon.go

@@ -55,6 +55,12 @@ func resourceHerokuAddon() *schema.Resource {
 				ValidateFunc: validateCustomAddonName,
 			},
 
+			"attachment_name": {
+				Type:     schema.TypeString,
+				ForceNew: true,
+				Optional: true,
+			},
+
 			"config": {
 				Type:     schema.TypeMap,
 				Optional: true,
@@ -119,6 +125,10 @@ func resourceHerokuAddonCreate(d *schema.ResourceData, meta interface{}) error {
 		opts.Name = &v
 	}
 
+	if v := d.Get("attachment_name").(string); v != "" {
+		opts.Attachment.Name = &v
+	}
+
 	log.Printf("[DEBUG] Addon create configuration: %#v, %#v", app, opts)
 	a, err := client.AddOnCreate(context.TODO(), app, opts)
 	if err != nil {
@@ -148,11 +158,20 @@ func resourceHerokuAddonCreate(d *schema.ResourceData, meta interface{}) error {
 func resourceHerokuAddonRead(d *schema.ResourceData, meta interface{}) error {
 	client := meta.(*Config).Api
 
+	// Retrieve the addon
 	addon, err := resourceHerokuAddonRetrieve(d.Id(), client)
 	if err != nil {
 		return err
 	}
 
+	// Retrieve the addon's attachments to set the addon.attachment_name.
+	// By default, the addon will always have at least one initial attachment to the app that the addon is tied to.
+	lr := &heroku.ListRange{}
+	addonAttachments, attachmentReadErr := client.AddOnAttachmentListByAddOn(context.TODO(), addon.ID, lr)
+	if attachmentReadErr != nil {
+		return attachmentReadErr
+	}
+
 	// Determine the plan. If we were configured without a specific plan,
 	// then just avoid the plan altogether (accepting anything that
 	// Heroku sends down).
@@ -166,12 +185,15 @@ func resourceHerokuAddonRead(d *schema.ResourceData, meta interface{}) error {
 		}
 	}
 
-	d.Set("name", addon.Name)
-	d.Set("app", addon.App.Name)
-	d.Set("plan", plan)
-	d.Set("provider_id", addon.ProviderID)
-	if err := d.Set("config_vars", addon.ConfigVars); err != nil {
-		return err
+	var setErr error
+	setErr = d.Set("name", addon.Name)
+	setErr = d.Set("app", addon.App.Name)
+	setErr = d.Set("plan", plan)
+	setErr = d.Set("provider_id", addon.ProviderID)
+	setErr = d.Set("config_vars", addon.ConfigVars)
+	setErr = d.Set("attachment_name", addonAttachments[0].ID) // I *think* it's safe to just read the zero index attachment.
+	if setErr != nil {
+		return setErr
 	}
 
 	return nil

heroku/resource_heroku_addon_test.go

@@ -77,14 +77,15 @@ func TestAccHerokuAddon_CustomName(t *testing.T) {
 	var addon heroku.AddOn
 	appName := fmt.Sprintf("tftest-%s", acctest.RandString(10))
 	customName := fmt.Sprintf("custom-addonname-%s", acctest.RandString(15))
+	customAttachmentName := fmt.Sprintf("custom-attachment-name-%s", acctest.RandString(15))
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckHerokuAddonDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccCheckHerokuAddonConfig_CustomName(appName, customName),
+				Config: testAccCheckHerokuAddonConfig_CustomName(appName, customName, customAttachmentName),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckHerokuAddonExists("heroku_addon.foobar", &addon),
 					testAccCheckHerokuAddonAttributes(&addon, "memcachier:dev"),
@@ -94,6 +95,8 @@ func TestAccHerokuAddon_CustomName(t *testing.T) {
 						"heroku_addon.foobar", "plan", "memcachier"),
 					resource.TestCheckResourceAttr(
 						"heroku_addon.foobar", "name", customName),
+					resource.TestCheckResourceAttr(
+						"heroku_addon.foobar", "attachment_name", customAttachmentName),
 				),
 			},
 		},
@@ -110,7 +113,7 @@ func TestAccHerokuAddon_CustomName_Invalid(t *testing.T) {
 		CheckDestroy: testAccCheckHerokuAddonDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config:      testAccCheckHerokuAddonConfig_CustomName(appName, customName),
+				Config:      testAccCheckHerokuAddonConfig_CustomName(appName, customName, ""),
 				ExpectError: regexp.MustCompile(`config is invalid: invalid value for name`),
 			},
 		},
@@ -127,7 +130,7 @@ func TestAccHerokuAddon_CustomName_EmptyString(t *testing.T) {
 		CheckDestroy: testAccCheckHerokuAddonDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config:      testAccCheckHerokuAddonConfig_CustomName(appName, customName),
+				Config:      testAccCheckHerokuAddonConfig_CustomName(appName, customName, ""),
 				ExpectError: regexp.MustCompile(`config is invalid: 2 problems:.*`),
 			},
 		},
@@ -144,7 +147,7 @@ func TestAccHerokuAddon_CustomName_FirstCharNum(t *testing.T) {
 		CheckDestroy: testAccCheckHerokuAddonDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config:      testAccCheckHerokuAddonConfig_CustomName(appName, customName),
+				Config:      testAccCheckHerokuAddonConfig_CustomName(appName, customName, ""),
 				ExpectError: regexp.MustCompile(`config is invalid: invalid value for name`),
 			},
 		},
@@ -269,7 +272,7 @@ resource "heroku_addon" "foobar" {
 }`, appName)
 }
 
-func testAccCheckHerokuAddonConfig_CustomName(appName, customAddonName string) string {
+func testAccCheckHerokuAddonConfig_CustomName(appName, customAddonName, customAttachmentName string) string {
 	return fmt.Sprintf(`
 resource "heroku_app" "foobar" {
     name = "%s"
@@ -280,5 +283,6 @@ resource "heroku_addon" "foobar" {
     app = "${heroku_app.foobar.name}"
     plan = "memcachier"
     name = "%s"
-}`, appName, customAddonName)
+	attachment_name = "%s"
+}`, appName, customAddonName, customAttachmentName)
 }

website/docs/r/addon.html.markdown

@@ -44,6 +44,7 @@ The following arguments are supported:
 * `plan` - (Required) The addon to add.
 * `config` - (Optional) Optional plan configuration.
 * `name` - (Optional) Globally unique name of the add-on.
+* `attachment_name` - (Optional) Unique name for this add-on attachment to this app.
 
 ## Attributes Reference