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.

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

Api externalization #150

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .goxc.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"AppName": "scalingo",
"ArtifactsDest": "bin",
"Arch": "386,amd64",
"Arch": "386,amd64,arm",
"BuildConstraints": "darwin windows linux freebsd openbsd",
"Resources": {
"Include": "INSTALL*,README.md,LICENSE*",
"Exclude": "*.go"
},
"PackageVersion": "1.1.0",
"PackageVersion": "1.1.1",
"ConfigVersion": "0.9",
"OutPath": "{{.Dest}}{{.PS}}{{.Version}}-{{.Os}}-{{.Arch}}{{.PS}}{{.AppName}}{{.Ext}}",
"Env": [
Expand Down
9 changes: 9 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
Changelog
=========

### v1.1.1 - 22/09/2015

* [Feature] Build in Linux ARM #145
* [Feature - Completion] Add local cache of applications when using completion on them, avoid heavy unrequired API requests #141
* [Feature - Completion] Completion of the `--remote` flag #139
* [Optimisation - Completion] Completion of `collaborators-add` command is now quicker (×2 - ×4) #137
* [Bugfix - Completion] Do not display error in autocompletion when unlogged #142
* [Bugfix] Fix regression, small flags were not working anymore #144 #147

### v1.1.0 - 17/09/2015

* [Feature - CLI] Setup Bash and ZSH completion thanks to codegangsta/cli helpers #127
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Scalingo-CLI v1.1.0
Scalingo-CLI v1.1.1
=======================

This repository contains the command line utility for the public PaaS Scalingo
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.1.0
1.1.1
4 changes: 2 additions & 2 deletions addon_providers/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (

"github.com/Scalingo/cli/Godeps/_workspace/src/github.com/olekukonko/tablewriter"
"github.com/Scalingo/cli/Godeps/_workspace/src/gopkg.in/errgo.v1"
"github.com/Scalingo/cli/api"
"github.com/Scalingo/go-scalingo"
)

func List() error {
addonProviders, err := api.AddonProvidersList()
addonProviders, err := scalingo.AddonProvidersList()
if err != nil {
return errgo.Mask(err, errgo.Any)
}
Expand Down
4 changes: 2 additions & 2 deletions addon_providers/plans.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (

"github.com/Scalingo/cli/Godeps/_workspace/src/github.com/olekukonko/tablewriter"
"github.com/Scalingo/cli/Godeps/_workspace/src/gopkg.in/errgo.v1"
"github.com/Scalingo/cli/api"
"github.com/Scalingo/go-scalingo"
)

func Plans(addon string) error {
plans, err := api.AddonProviderPlansList(addon)
plans, err := scalingo.AddonProviderPlansList(addon)
if err != nil {
return errgo.Mask(err, errgo.Any)
}
Expand Down
8 changes: 4 additions & 4 deletions addons/destroy.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"strings"

"github.com/Scalingo/cli/Godeps/_workspace/src/gopkg.in/errgo.v1"
"github.com/Scalingo/cli/api"
"github.com/Scalingo/cli/io"
"github.com/Scalingo/go-scalingo"
)

func Destroy(app, resourceID string) error {
Expand Down Expand Up @@ -34,7 +34,7 @@ func Destroy(app, resourceID string) error {
return errgo.Newf("'%s' is not '%s', aborting…\n", validationName, resourceID)
}

err = api.AddonDestroy(app, addon.ID)
err = scalingo.AddonDestroy(app, addon.ID)
if err != nil {
return errgo.Mask(err, errgo.Any)
}
Expand All @@ -43,8 +43,8 @@ func Destroy(app, resourceID string) error {
return nil
}

func checkAddonExist(app, resourceID string) (*api.Addon, error) {
resources, err := api.AddonsList(app)
func checkAddonExist(app, resourceID string) (*scalingo.Addon, error) {
resources, err := scalingo.AddonsList(app)
if err != nil {
return nil, errgo.Mask(err, errgo.Any)
}
Expand Down
4 changes: 2 additions & 2 deletions addons/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (

"github.com/Scalingo/cli/Godeps/_workspace/src/github.com/olekukonko/tablewriter"
"github.com/Scalingo/cli/Godeps/_workspace/src/gopkg.in/errgo.v1"
"github.com/Scalingo/cli/api"
"github.com/Scalingo/go-scalingo"
)

func List(app string) error {
resources, err := api.AddonsList(app)
resources, err := scalingo.AddonsList(app)
if err != nil {
return errgo.Mask(err, errgo.Any)
}
Expand Down
6 changes: 3 additions & 3 deletions addons/provision.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"errors"

"github.com/Scalingo/cli/Godeps/_workspace/src/gopkg.in/errgo.v1"
"github.com/Scalingo/cli/api"
"github.com/Scalingo/cli/io"
"github.com/Scalingo/go-scalingo"
)

func Provision(app, addon, plan string) error {
Expand All @@ -22,7 +22,7 @@ func Provision(app, addon, plan string) error {
return errgo.Mask(err, errgo.Any)
}

params, err := api.AddonProvision(app, addon, planID)
params, err := scalingo.AddonProvision(app, addon, planID)
if err != nil {
return errgo.Mask(err, errgo.Any)
}
Expand All @@ -39,7 +39,7 @@ func Provision(app, addon, plan string) error {
}

func checkPlanExist(addon, plan string) (string, error) {
plans, err := api.AddonProviderPlansList(addon)
plans, err := scalingo.AddonProviderPlansList(addon)
if err != nil {
return "", errgo.Mask(err, errgo.Any)
}
Expand Down
4 changes: 2 additions & 2 deletions addons/upgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package addons

import (
"github.com/Scalingo/cli/Godeps/_workspace/src/gopkg.in/errgo.v1"
"github.com/Scalingo/cli/api"
"github.com/Scalingo/cli/io"
"github.com/Scalingo/go-scalingo"
)

func Upgrade(app, resourceID, plan string) error {
Expand All @@ -25,7 +25,7 @@ func Upgrade(app, resourceID, plan string) error {
return errgo.Mask(err, errgo.Any)
}

params, err := api.AddonUpgrade(app, addon.ID, planID)
params, err := scalingo.AddonUpgrade(app, addon.ID, planID)
if err != nil {
return errgo.Mask(err, errgo.Any)
}
Expand Down
53 changes: 0 additions & 53 deletions api/addons.go

This file was deleted.

70 changes: 0 additions & 70 deletions api/addons_providers.go

This file was deleted.

Loading