Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Starting point for adding Organization app support for Heroku Provider #389

Merged
merged 4 commits into from
Oct 14, 2014
Merged

Starting point for adding Organization app support for Heroku Provider #389

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
95a815d
Starting point for adding Organization app support for Heroku Provider
catsby Oct 10, 2014
5fe2593
Add to Organization schema ref. Also gofmt the file
catsby Oct 12, 2014
8ab3ebb
clean up the conditional check for Heroku organization
catsby Oct 12, 2014
764b025
Document the organization name field
catsby Oct 12, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 59 additions & 1 deletion builtin/providers/heroku/resource_heroku_app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func (a *application) Update() error {

func resourceHerokuApp() *schema.Resource {
return &schema.Resource{
Create: resourceHerokuAppCreate,
Create: switchHerokuAppCreate,
Read: resourceHerokuAppRead,
Update: resourceHerokuAppUpdate,
Delete: resourceHerokuAppDelete,
Expand Down Expand Up @@ -93,10 +93,24 @@ func resourceHerokuApp() *schema.Resource {
Type: schema.TypeString,
Computed: true,
},

"organization": &schema.Schema{
Type: schema.TypeString,
Optional: true,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm guessing that changing this would require a new app to be created? i.e. you can't "update" an app to be part of an organization? If so, you need to set ForceNew: true here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct, the Platform API seems limited here; you can't use it to move an app to an organization. There's App Transfering, but that requires a human on the other side.

Added ForceNew: true in 5fe2593.

},
},
}
}

func switchHerokuAppCreate(d *schema.ResourceData, meta interface{}) error {
isOrg := d.Get("organization")
if len(isOrg.(string)) != 0 {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As I mentioned in the PR itself, just use GetOk here :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Excellent, I wasn't happy with len() != 0 :P

return resourceHerokuOrgAppCreate(d, meta)
} else {
return resourceHerokuAppCreate(d, meta)
}
}

func resourceHerokuAppCreate(d *schema.ResourceData, meta interface{}) error {
client := meta.(*heroku.Service)

Expand Down Expand Up @@ -138,6 +152,50 @@ func resourceHerokuAppCreate(d *schema.ResourceData, meta interface{}) error {
return resourceHerokuAppRead(d, meta)
}

func resourceHerokuOrgAppCreate(d *schema.ResourceData, meta interface{}) error {
client := meta.(*heroku.Service)
// Build up our creation options
opts := heroku.OrganizationAppCreateOpts{}
if v := d.Get("organization"); v != nil {
vs := v.(string)
log.Printf("[DEBUG] App name: %s", vs)
opts.Organization = &vs
}
if v := d.Get("name"); v != nil {
vs := v.(string)
log.Printf("[DEBUG] App name: %s", vs)
opts.Name = &vs
}
if v := d.Get("region"); v != nil {
vs := v.(string)
log.Printf("[DEBUG] App region: %s", vs)
opts.Region = &vs
}
if v := d.Get("stack"); v != nil {
vs := v.(string)
log.Printf("[DEBUG] App stack: %s", vs)
opts.Stack = &vs
}

log.Printf("[DEBUG] Creating Heroku app...")
a, err := client.OrganizationAppCreate(opts)
if err != nil {
return err
}

d.SetId(a.Name)
log.Printf("[INFO] App ID: %s", d.Id())

if v := d.Get("config_vars"); v != nil {
err = update_config_vars(d.Id(), client, nil, v.([]interface{}))
if err != nil {
return err
}
}

return resourceHerokuAppRead(d, meta)
}

func resourceHerokuAppRead(d *schema.ResourceData, meta interface{}) error {
client := meta.(*heroku.Service)
app, err := resource_heroku_app_retrieve(d.Id(), client)
Expand Down