[PLATFORM-2869] Fix publish step (#27)

CarlosMecha · web-flow · commit b85facf8d95e · 2018-07-03T16:54:38.000-07:00
* Update circleci workflow

* Fix publish step
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -23,34 +23,25 @@ jobs:
           root: .
           paths: [.]
 
-  conventions:
+  test_phantomjs:
     docker:
       - image: ${AWS_ACCOUNT_ID}.dkr.ecr.us-west-2.amazonaws.com/analytics.js-integrations-ci
     steps:
       - attach_workspace: { at: . }
       - restore_cache:
           key: deps-{{ checksum "yarn.lock" }}
-      - run:
-          name: Authenticate npm
-          command: npm config set "//registry.npmjs.org/:_authToken" $NPM_AUTH
       - run:
           name: Linter
           command: yarn lint
+      - run:
+          name: Test updated integrations in PhantomJS
+          command: yarn test-integrations --browsers PhantomJS
       - store_artifacts:
           path: coverage
       - run:
           name: Coverage
           command: yarn coverage
-  test_phantomjs:
-    docker:
-      - image: ${AWS_ACCOUNT_ID}.dkr.ecr.us-west-2.amazonaws.com/analytics.js-integrations-ci
-    steps:
-      - attach_workspace: { at: . }
-      - restore_cache:
-          key: deps-{{ checksum "yarn.lock" }}
-      - run:
-          name: Test updated integrations in PhantomJS
-          command: yarn test-integrations --browsers PhantomJS
+
   # TODO: Currently we just have 2 concurrent sessions in SauceLabs, but each step should 
   # test one browser type.
   test_chrome_firefox_safari:
@@ -94,18 +85,15 @@ workflows:
   test_and_publish:
     jobs:
       - setup
-      - conventions:
-          requires:
-            - setup
       - test_phantomjs:
           requires:
-            - conventions
+            - setup
       - test_chrome_firefox_safari:
           requires:
-            - conventions
+            - setup
       - test_ie_edge:
           requires:
-            - conventions
+            - setup
       - publish:
           requires:
             - test_phantomjs
diff --git a/operations/cmd/archive-integration-repository/main.go b/operations/cmd/archive-integration-repository/main.go
@@ -21,7 +21,7 @@ func init() {
 
 func main() {
 
-	operations.GetAuthToken()
+	operations.GetGitHubAuthToken()
 
 	flag.Parse()
 	if integrationName == "" {
diff --git a/operations/cmd/boneyard-integration-repository/main.go b/operations/cmd/boneyard-integration-repository/main.go
@@ -22,7 +22,7 @@ func init() {
 
 func main() {
 
-	operations.GetAuthToken()
+	operations.GetGitHubAuthToken()
 
 	flag.Parse()
 	if integrationName == "" {
diff --git a/operations/cmd/list-new-releases/main.go b/operations/cmd/list-new-releases/main.go
@@ -29,10 +29,10 @@ func main() {
 		os.Exit(1)
 	}
 
-	npm := &operations.NPM{}
+	yarn := operations.NewYarnClient()
 
 	for _, integration := range integrations {
-		latestPublished, err := npm.GetLatestVersion(integration.Package.Name)
+		latestPublished, err := yarn.GetLatestVersion(integration.Package.Name)
 		if err != nil {
 			if err != operations.ErrPackageNotFound {
 				os.Exit(1)
diff --git a/operations/cmd/list-repositories/main.go b/operations/cmd/list-repositories/main.go
@@ -21,7 +21,7 @@ func init() {
 
 func main() {
 
-	operations.GetAuthToken()
+	operations.GetGitHubAuthToken()
 
 	flag.Parse()
 	github := operations.NewGitHubClient()
diff --git a/operations/cmd/migrate-integration/main.go b/operations/cmd/migrate-integration/main.go
@@ -23,7 +23,7 @@ func init() {
 
 func main() {
 
-	operations.GetAuthToken()
+	operations.GetGitHubAuthToken()
 
 	flag.Parse()
 	if integrationName == "" {
diff --git a/operations/git.go b/operations/git.go
@@ -16,7 +16,7 @@ func printMessage(msg string) git.ErrorCode {
 // credentialsCallback returns the default credentials
 func credentialsCallback(url, username string, t git.CredType) (git.ErrorCode, *git.Cred) {
 	Debug("Credentials called, type %d (%s, %s)", t, url, username)
-	ret, cred := git.NewCredUserpassPlaintext(GetAuthToken(), "x-oauth-basic")
+	ret, cred := git.NewCredUserpassPlaintext(GetGitHubAuthToken(), "x-oauth-basic")
 	Debug("Credentials returned, errorCode %d, type %d, hasUsername %t", ret, cred.Type(), cred.HasUsername())
 	return git.ErrOk, &cred
 }
diff --git a/operations/github.go b/operations/github.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"os"
 	"strings"
 	"time"
 
@@ -12,6 +13,8 @@ import (
 	"golang.org/x/oauth2"
 )
 
+const gitHubAuthvar = "GITHUB_TOKEN"
+
 // Look away, I'm hideous! - KramerQL
 
 // GitHub is a convenient wrapper for the GraphQL client
@@ -72,7 +75,7 @@ type PullRequest struct {
 // GitHub's V4 API.
 func NewGitHubClient() *GitHub {
 	src := oauth2.StaticTokenSource(
-		&oauth2.Token{AccessToken: GetAuthToken()},
+		&oauth2.Token{AccessToken: GetGitHubAuthToken()},
 	)
 	httpClient := oauth2.NewClient(context.Background(), src)
 
@@ -622,3 +625,14 @@ func (g *GitHub) Transfer(project Project, organization string) error {
 
 	return nil
 }
+
+// GetGitHubAuthToken returns the authentication token if found, if not, it exist the
+// app.
+func GetGitHubAuthToken() string {
+	token := os.Getenv(gitHubAuthvar)
+	if token == "" {
+		Log("Please export $%s with a personal token and try again. Exiting", gitHubAuthvar)
+		os.Exit(1)
+	}
+	return token
+}
diff --git a/operations/npm.go b/operations/npm.go
diff --git a/operations/utils.go b/operations/utils.go
@@ -12,8 +12,6 @@ import (
 	"github.com/blang/semver"
 )
 
-const authvar = "GITHUB_TOKEN"
-
 // Verbose prints some extra info
 var Verbose = false
 
@@ -99,17 +97,6 @@ func executeTemplate(tmpl *template.Template, data interface{}) string {
 	return buffer.String()
 }
 
-// GetAuthToken returns the authentication token if found, if not, it exist the
-// app.
-func GetAuthToken() string {
-	token := os.Getenv(authvar)
-	if token == "" {
-		Log("Please export $%s with a personal token and try again. Exiting", authvar)
-		os.Exit(1)
-	}
-	return token
-}
-
 func fileExists(file string) (bool, error) {
 	if _, err := os.Stat(file); err != nil {
 		if os.IsNotExist(err) {
diff --git a/operations/yarn.go b/operations/yarn.go
@@ -0,0 +1,65 @@
+package operations
+
+import (
+	"bytes"
+	"encoding/json"
+	"errors"
+	"os/exec"
+	"strings"
+)
+
+// ErrPackageNotFound returned by NPM when the package is not found
+// in the registry
+var ErrPackageNotFound = errors.New("not found")
+
+// Look away, I'm hideous! - KramerYarn
+type Yarn struct {
+}
+
+// NewNPMClient returns a new npm client
+func NewYarnClient() *Yarn {
+	return &Yarn{}
+}
+
+// GetLatestVersion returns the latest version uploaded to NPM
+func (y *Yarn) GetLatestVersion(pack string) (string, error) {
+
+	cmd := exec.Command("yarn", "info", pack, "dist-tags.latest", "--json")
+
+	buff := &bytes.Buffer{}
+	errBuff := &bytes.Buffer{}
+	cmd.Stdout = buff
+	cmd.Stderr = errBuff
+
+	if err := cmd.Run(); err != nil {
+		if _, ok := err.(*exec.ExitError); ok {
+			if strings.Contains(buff.String(), "404") {
+				return "", ErrPackageNotFound
+			}
+		}
+
+		errOutput := errBuff.String()
+		Debug("Output:\n%s", errOutput)
+
+		if strings.Contains(errOutput, "404") {
+			return "", ErrPackageNotFound
+		}
+
+		LogError(err, "Error running npm for package %s", pack)
+		return "", err
+	}
+
+	output := buff.String()
+
+	var res struct {
+		Type string
+		Data string
+	}
+
+	if err := json.Unmarshal([]byte(output), &res); err != nil {
+		LogError(err, "Error parsing output, expected json object \n%s", output)
+		return "", err
+	}
+
+	return res.Data, nil
+}
diff --git a/scripts/publish-integrations b/scripts/publish-integrations
@@ -4,13 +4,15 @@
 
 set -e
 
+export PATH="ci/bin/:$PATH";
 BRANCH=$(git rev-parse --abbrev-ref HEAD);
 if [ "$BRANCH" != "master" ]; then {
     >&2 echo "Publish is just allowed from master";
     exit 1;
 } fi;
 
-INTEGRATIONS=($(list-new-releases));
+I="$(list-new-releases)";
+INTEGRATIONS=( $I );
 
 if [ ${#INTEGRATIONS[@]} -eq 0 ]; then {
     echo Nothing to publish;

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ func printMessage(msg string) git.ErrorCode {`
`16`	`16`	`// credentialsCallback returns the default credentials`
`17`	`17`	`func credentialsCallback(url, username string, t git.CredType) (git.ErrorCode, *git.Cred) {`
`18`	`18`	`Debug("Credentials called, type %d (%s, %s)", t, url, username)`
`19`		`- ret, cred := git.NewCredUserpassPlaintext(GetAuthToken(), "x-oauth-basic")`
	`19`	`+ ret, cred := git.NewCredUserpassPlaintext(GetGitHubAuthToken(), "x-oauth-basic")`
`20`	`20`	`Debug("Credentials returned, errorCode %d, type %d, hasUsername %t", ret, cred.Type(), cred.HasUsername())`
`21`	`21`	`return git.ErrOk, &cred`
`22`	`22`	`}`