Allow running tests with access token (#770)

Author: yahavi

Diff for: README.md

@@ -229,11 +229,12 @@ Flags:
   Once the tests are completed, the repository will be deleted.
 
 ### Distribution tests
-In addition to [general optional flags](#Usage) you *must* use the following flag:
+In addition to [general optional flags](#Usage) you can use the following flags:
 
 | Flag | Description |
 | --- | --- |
-| `-rt.distUrl` | JFrog Distribution URL. |
+| `-rt.distUrl` | [Mandatory] JFrog Distribution URL. |
+| `-rt.distAccessToken` | [Optional] Distribution access token. |
 
 To run distribution tests run the following command:
 ```

Diff for: artifactory_test.go

@@ -65,11 +65,8 @@ func InitArtifactoryTests() {
 }
 
 func authenticate() string {
-	artifactoryDetails = &config.ArtifactoryDetails{Url: clientutils.AddTrailingSlashIfNeeded(*tests.RtUrl), SshKeyPath: *tests.RtSshKeyPath, SshPassphrase: *tests.RtSshPassphrase, AccessToken: *tests.RtAccessToken}
+	artifactoryDetails = &config.ArtifactoryDetails{Url: clientutils.AddTrailingSlashIfNeeded(*tests.RtUrl), SshKeyPath: *tests.RtSshKeyPath, SshPassphrase: *tests.RtSshPassphrase}
 	cred := "--url=" + *tests.RtUrl
-	if *tests.RtDistributionUrl != "" {
-		cred += " --dist-url=" + *tests.RtDistributionUrl
-	}
 	if !fileutils.IsSshUrl(artifactoryDetails.Url) {
 		if *tests.RtApiKey != "" {
 			artifactoryDetails.ApiKey = *tests.RtApiKey
@@ -934,7 +931,7 @@ func TestArtifactoryProxy(t *testing.T) {
 	assert.NoError(t, err)
 	var proxyTestArgs []string
 	var httpProxyEnv string
-	testArgs := []string{"-test.artifactoryProxy=true", "-rt.url=" + *tests.RtUrl, "-rt.user=" + *tests.RtUser, "-rt.password=" + *tests.RtPassword, "-rt.apikey=" + *tests.RtApiKey, "-rt.sshKeyPath=" + *tests.RtSshKeyPath, "-rt.sshPassphrase=" + *tests.RtSshPassphrase}
+	testArgs := []string{"-test.artifactoryProxy=true", "-rt.url=" + *tests.RtUrl, "-rt.user=" + *tests.RtUser, "-rt.password=" + *tests.RtPassword, "-rt.apikey=" + *tests.RtApiKey, "-rt.sshKeyPath=" + *tests.RtSshKeyPath, "-rt.sshPassphrase=" + *tests.RtSshPassphrase, "-rt.accessToken=" + *tests.RtAccessToken}
 	if rtUrl.Scheme == "https" {
 		os.Setenv(tests.HttpsProxyEnvVar, "1026")
 		proxyTestArgs = append([]string{"test", "-run=TestArtifactoryHttpsProxyEnvironmentVariableDelegator"}, testArgs...)
@@ -3730,8 +3727,10 @@ func initVcsTestDir(t *testing.T) string {
 
 func TestArtifactoryReplicationCreate(t *testing.T) {
 	initArtifactoryTest(t)
-	configArtifactoryCli.Exec("c", tests.RtServerId, "--url="+*tests.RtUrl, "--user="+*tests.RtUser, "--password="+*tests.RtPassword, "--apikey="+*tests.RtApiKey, "--access-token="+*tests.RtAccessToken, "--interactive=false")
+	// Configure server with dummy credentials
+	err := tests.NewJfrogCli(execMain, "jfrog rt", "").Exec("c", tests.RtServerId, "--url="+*tests.RtUrl, "--user=admin", "--password=password", "--interactive=false", "--enc-password=false")
 	defer deleteServerConfig()
+	assert.NoError(t, err)
 
 	// Init tmp dir
 	specFile, err := tests.CreateSpec(tests.ReplicationTempCreate)
@@ -3746,7 +3745,6 @@ func TestArtifactoryReplicationCreate(t *testing.T) {
 	assert.NoError(t, err)
 	result, err := servicesManager.GetReplication(tests.RtRepo1)
 	assert.NoError(t, err)
-	result[0].Password = ""
 	assert.ElementsMatch(t, result, tests.GetReplicationConfig())
 
 	// Delete replication
@@ -3780,14 +3778,13 @@ func TestAccessTokenCreate(t *testing.T) {
 	// Write the command output to the origin
 	content := buffer.Bytes()
 	buffer.Reset()
-	previousLog.Output(string(content))
 
 	// Extract the the token from the output
 	token, err := jsonparser.GetString(content, "access_token")
 	assert.NoError(t, err)
 
 	// Try ping with the new token
-	err = artifactoryCli.Exec("ping", "--access-token="+token)
+	err = tests.NewJfrogCli(execMain, "jfrog rt", "--url="+*tests.RtUrl+" --access-token="+token).Exec("ping")
 	assert.NoError(t, err)
 
 	// Cleanup

Diff for: buildinfo_test.go

@@ -369,7 +369,7 @@ func testBuildAddGit(t *testing.T, useEnvBuildNameAndNumber bool) {
 
 	// Populate cli config with 'default' server
 	oldHomeDir := os.Getenv(cliutils.HomeDir)
-	createJfrogHomeConfig(t)
+	createJfrogHomeConfig(t, true)
 
 	// Create .git folder for this test
 	originalFolder := "buildaddgit_.git_suffix"

Diff for: distribution_test.go

@@ -1,40 +1,82 @@
 package main
 
 import (
+	"errors"
 	"io/ioutil"
 	"path/filepath"
 	"testing"
 
 	"github.com/jfrog/jfrog-cli/inttestutils"
+	"github.com/jfrog/jfrog-cli/utils/cliutils"
+	"github.com/jfrog/jfrog-cli/utils/config"
 	"github.com/jfrog/jfrog-cli/utils/tests"
+	"github.com/jfrog/jfrog-client-go/auth"
 	"github.com/jfrog/jfrog-client-go/utils"
 	"github.com/jfrog/jfrog-client-go/utils/io/fileutils"
+	"github.com/jfrog/jfrog-client-go/utils/io/httputils"
 	"github.com/stretchr/testify/assert"
 )
 
 const bundleVersion = "10"
 
+var (
+	distributionDetails *config.ArtifactoryDetails
+	distAuth            auth.ServiceDetails
+	distHttpDetails     httputils.HttpClientDetails
+	// JFrog CLI for Distribution commands
+	distributionCli *tests.JfrogCli
+)
+
 func InitDistributionTests() {
-	*tests.RtDistributionUrl = utils.AddTrailingSlashIfNeeded(*tests.RtDistributionUrl)
-	initArtifactoryCli()
-	inttestutils.CleanUpOldBundles(artHttpDetails, bundleVersion, artifactoryCli)
 	InitArtifactoryTests()
-	inttestutils.SendGpgKeys(artHttpDetails)
+	initDistributionCli()
+	inttestutils.CleanUpOldBundles(distHttpDetails, bundleVersion, distributionCli)
+	inttestutils.SendGpgKeys(artHttpDetails, distHttpDetails)
 }
 
 func CleanDistributionTests() {
 	deleteCreatedRepos()
 }
 
+func authenticateDistribution() string {
+	distributionDetails = &config.ArtifactoryDetails{DistributionUrl: *tests.RtDistributionUrl}
+	cred := "--dist-url=" + *tests.RtDistributionUrl
+	if *tests.RtAccessToken != "" {
+		distributionDetails.AccessToken = *tests.RtDistributionAccessToken
+		cred += " --access-token=" + *tests.RtDistributionAccessToken
+	} else {
+		distributionDetails.User = *tests.RtUser
+		distributionDetails.Password = *tests.RtPassword
+		cred += " --user=" + *tests.RtUser + " --password=" + *tests.RtPassword
+	}
+
+	var err error
+	if distAuth, err = distributionDetails.CreateDistAuthConfig(); err != nil {
+		cliutils.ExitOnErr(errors.New("Failed while attempting to authenticate with Artifactory: " + err.Error()))
+	}
+	distributionDetails.DistributionUrl = distAuth.GetUrl()
+	distHttpDetails = distAuth.CreateHttpClientDetails()
+	return cred
+}
+
+func initDistributionCli() {
+	if distributionCli != nil {
+		return
+	}
+	*tests.RtDistributionUrl = utils.AddTrailingSlashIfNeeded(*tests.RtDistributionUrl)
+	cred := authenticateDistribution()
+	distributionCli = tests.NewJfrogCli(execMain, "jfrog rt", cred)
+}
+
 func initDistributionTest(t *testing.T) {
 	if !*tests.TestDistribution {
 		t.Skip("Skipping distribution test. To run distribution test add the '-test.distribution=true' option.")
 	}
 }
 
 func cleanDistributionTest(t *testing.T) {
-	artifactoryCli.Exec("rbdel", tests.BundleName, bundleVersion, "--site=*", "--delete-from-dist", "--quiet")
-	inttestutils.WaitForDeletion(t, tests.BundleName, bundleVersion, artHttpDetails)
+	distributionCli.Exec("rbdel", tests.BundleName, bundleVersion, "--site=*", "--delete-from-dist", "--quiet")
+	inttestutils.WaitForDeletion(t, tests.BundleName, bundleVersion, distHttpDetails)
 	inttestutils.CleanDistributionRepositories(t, artifactoryDetails)
 	tests.CleanFileSystem()
 }
@@ -48,9 +90,9 @@ func TestBundleAsyncDistDownload(t *testing.T) {
 	artifactoryCli.Exec("u", "--spec="+specFile)
 
 	// Create and distribute release bundle
-	artifactoryCli.Exec("rbc", tests.BundleName, bundleVersion, tests.DistRepo1+"/data/b1.in", "--sign")
-	artifactoryCli.Exec("rbd", tests.BundleName, bundleVersion, "--site=*")
-	inttestutils.WaitForDistribution(t, tests.BundleName, bundleVersion, artHttpDetails)
+	distributionCli.Exec("rbc", tests.BundleName, bundleVersion, tests.DistRepo1+"/data/b1.in", "--sign")
+	distributionCli.Exec("rbd", tests.BundleName, bundleVersion, "--site=*")
+	inttestutils.WaitForDistribution(t, tests.BundleName, bundleVersion, distHttpDetails)
 
 	// Download by bundle version, b2 and b3 should not be downloaded, b1 should
 	artifactoryCli.Exec("dl "+tests.DistRepo1+"/data/* "+tests.Out+fileutils.GetFileSeparator()+"download"+fileutils.GetFileSeparator()+"simple_by_build"+fileutils.GetFileSeparator(), "--bundle="+tests.BundleName+"/"+bundleVersion)
@@ -71,13 +113,12 @@ func TestBundleDownloadUsingSpec(t *testing.T) {
 	specFile, err := tests.CreateSpec(tests.DistributionUploadSpecB)
 	assert.NoError(t, err)
 	artifactoryCli.Exec("u", "--spec="+specFile)
-	inttestutils.WaitForDeletion(t, tests.BundleName, bundleVersion, artHttpDetails)
 
 	// Create release bundle
 	distributionRules, err := tests.CreateSpec(tests.DistributionRules)
 	assert.NoError(t, err)
-	artifactoryCli.Exec("rbc", tests.BundleName, bundleVersion, tests.DistRepo1+"/data/b1.in", "--sign")
-	artifactoryCli.Exec("rbd", tests.BundleName, bundleVersion, "--dist-rules="+distributionRules, "--sync")
+	distributionCli.Exec("rbc", tests.BundleName, bundleVersion, tests.DistRepo1+"/data/b1.in", "--sign")
+	distributionCli.Exec("rbd", tests.BundleName, bundleVersion, "--dist-rules="+distributionRules, "--sync")
 
 	// Download by bundle version, b2 and b3 should not be downloaded, b1 should
 	specFile, err = tests.CreateSpec(tests.BundleDownloadSpec)
@@ -102,8 +143,8 @@ func TestBundleDownloadNoPattern(t *testing.T) {
 	artifactoryCli.Exec("u", "--spec="+specFile)
 
 	// Create release bundle
-	artifactoryCli.Exec("rbc", tests.BundleName, bundleVersion, tests.DistRepo1+"/data/b1.in", "--sign")
-	artifactoryCli.Exec("rbd", tests.BundleName, bundleVersion, "--site=*", "--sync")
+	distributionCli.Exec("rbc", tests.BundleName, bundleVersion, tests.DistRepo1+"/data/b1.in", "--sign")
+	distributionCli.Exec("rbd", tests.BundleName, bundleVersion, "--site=*", "--sync")
 
 	// Download by bundle name and version with pattern "*", b2 and b3 should not be downloaded, b1 should
 	artifactoryCli.Exec("dl", "*", "out/download/simple_by_build/data/", "--bundle="+tests.BundleName+"/"+bundleVersion, "--flat")
@@ -136,8 +177,8 @@ func TestBundleExclusions(t *testing.T) {
 	artifactoryCli.Exec("u", "--spec="+specFile)
 
 	// Create release bundle. Include b1.in and b2.in. Exclude b3.in.
-	artifactoryCli.Exec("rbc", tests.BundleName, bundleVersion, tests.DistRepo1+"/data/b*.in", "--sign", "--exclusions=*b3.in")
-	artifactoryCli.Exec("rbd", tests.BundleName, bundleVersion, "--site=*", "--sync")
+	distributionCli.Exec("rbc", tests.BundleName, bundleVersion, tests.DistRepo1+"/data/b*.in", "--sign", "--exclusions=*b3.in")
+	distributionCli.Exec("rbd", tests.BundleName, bundleVersion, "--site=*", "--sync")
 
 	// Download by bundle version, b2 and b3 should not be downloaded, b1 should
 	artifactoryCli.Exec("dl "+tests.DistRepo1+"/data/* "+tests.Out+fileutils.GetFileSeparator()+"download"+fileutils.GetFileSeparator()+"simple_by_build"+fileutils.GetFileSeparator(), "--bundle="+tests.BundleName+"/"+bundleVersion, "--exclusions=*b2.in")
@@ -163,8 +204,8 @@ func TestBundleCopy(t *testing.T) {
 	artifactoryCli.Exec("u", "--spec="+specFileB)
 
 	// Create release bundle
-	artifactoryCli.Exec("rbc", tests.BundleName, bundleVersion, tests.DistRepo1+"/data/a*", "--sign")
-	artifactoryCli.Exec("rbd", tests.BundleName, bundleVersion, "--site=*", "--sync")
+	distributionCli.Exec("rbc", tests.BundleName, bundleVersion, tests.DistRepo1+"/data/a*", "--sign")
+	distributionCli.Exec("rbd", tests.BundleName, bundleVersion, "--site=*", "--sync")
 
 	// Copy by bundle name and version
 	specFile, err := tests.CreateSpec(tests.CopyByBundleSpec)
@@ -187,8 +228,8 @@ func TestBundleSetProperties(t *testing.T) {
 	artifactoryCli.Exec("u", "testsdata/a/a1.in", tests.DistRepo1+"/a.in")
 
 	// Create release bundle
-	artifactoryCli.Exec("rbc", tests.BundleName, bundleVersion, tests.DistRepo1+"/a.in", "--sign")
-	artifactoryCli.Exec("rbd", tests.BundleName, bundleVersion, "--site=*", "--sync")
+	distributionCli.Exec("rbc", tests.BundleName, bundleVersion, tests.DistRepo1+"/a.in", "--sign")
+	distributionCli.Exec("rbd", tests.BundleName, bundleVersion, "--site=*", "--sync")
 
 	// Set the 'prop=red' property to the file.
 	artifactoryCli.Exec("sp", tests.DistRepo1+"/a.*", "prop=red", "--bundle="+tests.BundleName+"/"+bundleVersion)
@@ -222,16 +263,17 @@ func TestSignReleaseBundle(t *testing.T) {
 	artifactoryCli.Exec("u", "--spec="+specFile)
 
 	// Create a release bundle without --sign and make sure it is not signed
-	artifactoryCli.Exec("rbc", tests.BundleName, bundleVersion, tests.DistRepo1+"/data/b1.in")
-	distributableResponse := inttestutils.GetLocalBundle(t, tests.BundleName, bundleVersion, artHttpDetails)
+	distributionCli.Exec("rbc", tests.BundleName, bundleVersion, tests.DistRepo1+"/data/b1.in")
+	distributableResponse := inttestutils.GetLocalBundle(t, tests.BundleName, bundleVersion, distHttpDetails)
 	assert.NotNil(t, distributableResponse)
 	assert.Equal(t, inttestutils.Open, distributableResponse.State)
 
 	// Sign the release bundle and make sure it is signed
-	artifactoryCli.Exec("rbs", tests.BundleName, bundleVersion)
-	distributableResponse = inttestutils.GetLocalBundle(t, tests.BundleName, bundleVersion, artHttpDetails)
+	distributionCli.Exec("rbs", tests.BundleName, bundleVersion)
+	distributableResponse = inttestutils.GetLocalBundle(t, tests.BundleName, bundleVersion, distHttpDetails)
 	assert.NotNil(t, distributableResponse)
-	assert.Equal(t, inttestutils.Signed, distributableResponse.State)
+
+	assert.True(t, distributableResponse.State == inttestutils.Signed || distributableResponse.State == inttestutils.ReadyForDistribution)
 
 	// Cleanup
 	cleanDistributionTest(t)
@@ -246,12 +288,12 @@ func TestBundleDeleteLocal(t *testing.T) {
 	artifactoryCli.Exec("u", "--spec="+specFile)
 
 	// Create a release bundle
-	artifactoryCli.Exec("rbc", tests.BundleName, bundleVersion, tests.DistRepo1+"/data/b1.in", "--sign")
-	inttestutils.VerifyLocalBundleExistence(t, tests.BundleName, bundleVersion, true, artHttpDetails)
+	distributionCli.Exec("rbc", tests.BundleName, bundleVersion, tests.DistRepo1+"/data/b1.in", "--sign")
+	inttestutils.VerifyLocalBundleExistence(t, tests.BundleName, bundleVersion, true, distHttpDetails)
 
 	// Delete release bundle locally
-	artifactoryCli.Exec("rbdel", tests.BundleName, bundleVersion, "--site=*", "--delete-from-dist", "--quiet")
-	inttestutils.VerifyLocalBundleExistence(t, tests.BundleName, bundleVersion, false, artHttpDetails)
+	distributionCli.Exec("rbdel", tests.BundleName, bundleVersion, "--site=*", "--delete-from-dist", "--quiet")
+	inttestutils.VerifyLocalBundleExistence(t, tests.BundleName, bundleVersion, false, distHttpDetails)
 
 	// Cleanup
 	cleanDistributionTest(t)
@@ -266,14 +308,14 @@ func TestUpdateReleaseBundle(t *testing.T) {
 	artifactoryCli.Exec("u", "--spec="+specFile)
 
 	// Create a release bundle with b2.in
-	artifactoryCli.Exec("rbc", tests.BundleName, bundleVersion, tests.DistRepo1+"/data/b2.in")
-	inttestutils.VerifyLocalBundleExistence(t, tests.BundleName, bundleVersion, true, artHttpDetails)
+	distributionCli.Exec("rbc", tests.BundleName, bundleVersion, tests.DistRepo1+"/data/b2.in")
+	inttestutils.VerifyLocalBundleExistence(t, tests.BundleName, bundleVersion, true, distHttpDetails)
 
 	// Update release bundle to have b1.in
-	artifactoryCli.Exec("rbu", tests.BundleName, bundleVersion, tests.DistRepo1+"/data/b1.in", "--sign")
+	distributionCli.Exec("rbu", tests.BundleName, bundleVersion, tests.DistRepo1+"/data/b1.in", "--sign")
 
 	// Distribute release bundle
-	artifactoryCli.Exec("rbd", tests.BundleName, bundleVersion, "--site=*", "--sync")
+	distributionCli.Exec("rbd", tests.BundleName, bundleVersion, "--site=*", "--sync")
 
 	// Download by bundle version, b2 and b3 should not be downloaded, b1 should
 	artifactoryCli.Exec("dl "+tests.DistRepo1+"/data/* "+tests.Out+fileutils.GetFileSeparator()+"download"+fileutils.GetFileSeparator()+"simple_by_build"+fileutils.GetFileSeparator(), "--bundle="+tests.BundleName+"/"+bundleVersion)
@@ -298,10 +340,10 @@ func TestCreateBundleText(t *testing.T) {
 	// Create a release bundle with release notes and description
 	releaseNotesPath := filepath.Join(tests.GetTestResourcesPath(), "distribution", "releasenotes.md")
 	description := "thisIsADescription"
-	artifactoryCli.Exec("rbc", tests.BundleName, bundleVersion, tests.DistRepo1+"/data/*", "--release-notes-path="+releaseNotesPath, "--desc="+description)
+	distributionCli.Exec("rbc", tests.BundleName, bundleVersion, tests.DistRepo1+"/data/*", "--release-notes-path="+releaseNotesPath, "--desc="+description)
 
 	// Validate release notes and description
-	distributableResponse := inttestutils.GetLocalBundle(t, tests.BundleName, bundleVersion, artHttpDetails)
+	distributableResponse := inttestutils.GetLocalBundle(t, tests.BundleName, bundleVersion, distHttpDetails)
 	if distributableResponse != nil {
 		assert.Equal(t, description, distributableResponse.Description)
 		releaseNotes, err := ioutil.ReadFile(releaseNotesPath)

Diff for: gradle_test.go

@@ -79,13 +79,18 @@ func TestGradleBuildWithServerIDWithUsesPlugin(t *testing.T) {
 	cleanGradleTest()
 }
 
+// This test check legacy behavior whereby the Gradle config yml contains the username, url and password.
 func TestGradleBuildWithCredentials(t *testing.T) {
-	if *tests.RtUser == "" || *tests.RtPassword == "" {
-		t.SkipNow()
-	}
-
 	initGradleTest(t)
 
+	if *tests.RtAccessToken != "" {
+		origUsername, origPassword := tests.SetBasicAuthFromAccessToken(t)
+		defer func() {
+			*tests.RtUser = origUsername
+			*tests.RtPassword = origPassword
+		}()
+	}
+
 	buildNumber := "1"
 	buildGradlePath := createGradleProject(t, "gradleproject")
 	srcConfigTemplate := filepath.Join(filepath.FromSlash(tests.GetTestResourcesPath()), "buildspecs", tests.GradleUsernamePasswordTemplate)
@@ -123,5 +128,5 @@ func initGradleTest(t *testing.T) {
 	if !*tests.TestGradle {
 		t.Skip("Skipping Gradle test. To run Gradle test add the '-test.gradle=true' option.")
 	}
-	createJfrogHomeConfig(t)
+	createJfrogHomeConfig(t, true)
 }