Merge pull request #492 from Scalingo/fix/491/integration_link_no_int…

…egration_link

Do not get the SCM integration when showing the integration link

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ### To be Released
 
+* Do not get the SCM integration when showing the integration link
+  [#492](https://github.com/Scalingo/cli/pull/492)
+
 ### 1.16.1
 
 * Global commands do not need to query the list of regions

cmd/integration_link.go

@@ -89,7 +89,7 @@ var (
 				errorQuit(err)
 			}
 
-			var params scalingo.SCMRepoLinkParams
+			var params scalingo.SCMRepoLinkCreateParams
 			if c.NumFlags() == 0 {
 				params, err = interactiveCreate()
 				if err != nil {
@@ -123,7 +123,7 @@ var (
 				}
 				hoursBeforeDestroyOnStale := c.Uint("hours-before-destroy-on-stale")
 
-				params = scalingo.SCMRepoLinkParams{
+				params = scalingo.SCMRepoLinkCreateParams{
 					Branch:                   &branch,
 					AutoDeployEnabled:        &autoDeploy,
 					DeployReviewAppsEnabled:  &deployReviewApps,
@@ -302,8 +302,8 @@ var (
 	}
 )
 
-func interactiveCreate() (scalingo.SCMRepoLinkParams, error) {
-	var params scalingo.SCMRepoLinkParams
+func interactiveCreate() (scalingo.SCMRepoLinkCreateParams, error) {
+	var params scalingo.SCMRepoLinkCreateParams
 	if config.C.DisableInteractive {
 		return params, errors.New("need at least one integration link parameter")
 	}

config/config.go

@@ -153,6 +153,7 @@ func (config Config) scalingoClientBaseConfig(opts ClientConfigOpts) scalingo.Cl
 		Region:       opts.Region,
 		AuthEndpoint: config.ScalingoAuthUrl,
 		APIToken:     opts.APIToken,
+		UserAgent:    "Scalingo CLI v" + Version,
 	}
 }
 

integrationlink/create.go

@@ -12,7 +12,7 @@ import (
 	"github.com/Scalingo/go-scalingo"
 )
 
-func Create(app string, integrationType scalingo.SCMType, integrationURL string, params scalingo.SCMRepoLinkParams) error {
+func Create(app string, integrationType scalingo.SCMType, integrationURL string, params scalingo.SCMRepoLinkCreateParams) error {
 	u, err := url.Parse(integrationURL)
 	if err != nil || u.Scheme == "" || u.Host == "" || u.Path == "" {
 		return errors.New("source repository URL is not valid")

integrationlink/params.go

@@ -6,9 +6,9 @@ import (
 	"github.com/Scalingo/go-scalingo"
 )
 
-func CheckAndFillParams(c *cli.Context, app string) (*scalingo.SCMRepoLinkParams, error) {
+func CheckAndFillParams(c *cli.Context, app string) (*scalingo.SCMRepoLinkUpdateParams, error) {
 	paramsChecker := newParamsChecker(c)
-	params := &scalingo.SCMRepoLinkParams{
+	params := &scalingo.SCMRepoLinkUpdateParams{
 		Branch:                   paramsChecker.lookupBranch(),
 		AutoDeployEnabled:        paramsChecker.lookupAutoDeploy(),
 		DeployReviewAppsEnabled:  paramsChecker.lookupDeployReviewApps(),

integrationlink/show.go

@@ -27,18 +27,17 @@ func Show(app string) error {
 		return nil
 	}
 
-	i, err := c.SCMIntegrationsShow(repoLink.AuthIntegrationUUID)
-	if err != nil {
-		return errgo.Notef(err, "fail to get integration information of this integration link")
-	}
-
 	fmt.Printf("%s: %s (%s)\n",
 		color.New(color.FgYellow).Sprint("Application"),
 		app, repoLink.AppID,
 	)
 	fmt.Printf("%s: %s (%s)\n",
 		color.New(color.FgYellow).Sprint("Integration"),
-		scalingo.SCMTypeDisplay[i.SCMType], repoLink.AuthIntegrationUUID,
+		scalingo.SCMTypeDisplay[repoLink.SCMType], repoLink.AuthIntegrationUUID,
+	)
+	fmt.Printf("%s: %s\n",
+		color.New(color.FgYellow).Sprint("Linker"),
+		repoLink.Linker.Username,
 	)
 	fmt.Println()
 

integrationlink/update.go

@@ -8,7 +8,7 @@ import (
 	"github.com/Scalingo/go-scalingo"
 )
 
-func Update(app string, params scalingo.SCMRepoLinkParams) error {
+func Update(app string, params scalingo.SCMRepoLinkUpdateParams) error {
 	if app == "" {
 		return errgo.New("no app defined")
 	}