From 9e3efbe451ec0a801f7bbf704ea0e7d71cda928a Mon Sep 17 00:00:00 2001 From: Yahav Itzhak Date: Tue, 4 Jul 2023 14:20:24 +0300 Subject: [PATCH 1/2] Avoid creating the release on GitHub (#2059) --- Jenkinsfile | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ec5c772ef..16c3d1d27 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -133,7 +133,7 @@ def runRelease(architectures) { } } if (identifier == "v2") { - createTagAndRelease() + createTag() } } } finally { @@ -141,7 +141,7 @@ def runRelease(architectures) { } } -def createTagAndRelease() { +def createTag() { stage('Create a tag and a GitHub release') { dir("$jfrogCliRepoDir") { releaseTag = "v$RELEASE_VERSION" @@ -149,13 +149,6 @@ def createTagAndRelease() { sh """#!/bin/bash git tag $releaseTag git push "https://$GITHUB_ACCESS_TOKEN@github.com/jfrog/jfrog-cli.git" --tags - curl -L \ - -X POST \ - -H "Accept: application/vnd.github+json" \ - -H "Authorization: Bearer $GITHUB_ACCESS_TOKEN"\ - -H "X-GitHub-Api-Version: 2022-11-28" \ - https://api.github.com/repos/jfrog/jfrog-cli/releases \ - -d '{"tag_name":"$releaseTag","target_commitish":"$BRANCH","name":"$RELEASE_VERSION","generate_release_notes":true}' """ } } From 9bcf74e5319eca4030944ef23748db53c99eba04 Mon Sep 17 00:00:00 2001 From: Robi Nino Date: Wed, 5 Jul 2023 11:49:30 +0300 Subject: [PATCH 2/2] Add support for Web Login (#2036) --- docs/general/login/help.go | 7 +++++++ general/login/cli.go | 14 ++++++++++++++ go.mod | 4 ++-- go.sum | 8 ++++---- main.go | 11 +++++++++++ 5 files changed, 38 insertions(+), 6 deletions(-) create mode 100644 docs/general/login/help.go create mode 100644 general/login/cli.go diff --git a/docs/general/login/help.go b/docs/general/login/help.go new file mode 100644 index 000000000..2b5a82c06 --- /dev/null +++ b/docs/general/login/help.go @@ -0,0 +1,7 @@ +package login + +var Usage = []string{"login"} + +func GetDescription() string { + return "Log in to a JFrog Platform via your web browser. Available for Artifactory 7.63.1 and above" +} diff --git a/general/login/cli.go b/general/login/cli.go new file mode 100644 index 000000000..437142240 --- /dev/null +++ b/general/login/cli.go @@ -0,0 +1,14 @@ +package login + +import ( + coreLogin "github.com/jfrog/jfrog-cli-core/v2/general/login" + "github.com/jfrog/jfrog-cli/utils/cliutils" + "github.com/urfave/cli" +) + +func LoginCmd(c *cli.Context) error { + if c.NArg() > 0 { + return cliutils.WrongNumberOfArgumentsHandler(c) + } + return coreLogin.NewLoginCommand().Run() +} diff --git a/go.mod b/go.mod index c67223b40..92e1934e0 100644 --- a/go.mod +++ b/go.mod @@ -123,8 +123,8 @@ require ( // replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go -// replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20230629184314-ff61ffffba34 +replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20230705084348-c7d33487e393 // replace github.com/jfrog/gofrog => github.com/jfrog/gofrog v1.2.6-0.20230418122323-2bf299dd6d27 -// replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20230629174113-81715f46ec0f +replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20230705083849-6fd087a5e228 diff --git a/go.sum b/go.sum index f53e8dd10..789c83244 100644 --- a/go.sum +++ b/go.sum @@ -238,10 +238,10 @@ github.com/jfrog/build-info-go v1.9.6 h1:lCJ2j5uXAlJsSwDe5J8WD7Co1f/hUlZvMfwfb5A github.com/jfrog/build-info-go v1.9.6/go.mod h1:GbuFS+viHCKZYx9nWHYu7ab1DgQkFdtVN3BJPUNb2D4= github.com/jfrog/gofrog v1.3.0 h1:o4zgsBZE4QyDbz2M7D4K6fXPTBJht+8lE87mS9bw7Gk= github.com/jfrog/gofrog v1.3.0/go.mod h1:IFMc+V/yf7rA5WZ74CSbXe+Lgf0iApEQLxRZVzKRUR0= -github.com/jfrog/jfrog-cli-core/v2 v2.37.1 h1:VE/6cagGor/5lWB7l+aU5FlhztoHM9q9M2FlWcn3ESo= -github.com/jfrog/jfrog-cli-core/v2 v2.37.1/go.mod h1:i62WcX9jQbH0dJjQdkmJAGridZgFVIK1B3yIPfXayHI= -github.com/jfrog/jfrog-client-go v1.31.0 h1:VIptdPkECaM0UDbKE2ZjFZh9i85W99xM65c6rFxDNj4= -github.com/jfrog/jfrog-client-go v1.31.0/go.mod h1:qEJxoe68sUtqHJ1YhXv/7pKYP/9p1D5tJrruzJKYeoI= +github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20230705084348-c7d33487e393 h1:zIaBtAjalQ7HLwiYcR3OSU9Jglpmhtw8rg6piYervNU= +github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20230705084348-c7d33487e393/go.mod h1:DnamqHWhKmrmWlCRG3i3z8Wn0JRtNFMC+Bu8TCFzSPY= +github.com/jfrog/jfrog-client-go v1.28.1-0.20230705083849-6fd087a5e228 h1:bkOkjb6sVqo6Jgw9eYSH58jIFPOJvFvwt+jIXvef7QM= +github.com/jfrog/jfrog-client-go v1.28.1-0.20230705083849-6fd087a5e228/go.mod h1:qEJxoe68sUtqHJ1YhXv/7pKYP/9p1D5tJrruzJKYeoI= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jszwec/csvutil v1.8.0 h1:G7vS2LGdpZZDH1HmHeNbxOaJ/ZnJlpwGFvOkTkJzzNk= diff --git a/main.go b/main.go index 42c3c804c..7f8dcd7b8 100644 --- a/main.go +++ b/main.go @@ -22,8 +22,10 @@ import ( "github.com/jfrog/jfrog-cli/distribution" "github.com/jfrog/jfrog-cli/docs/common" "github.com/jfrog/jfrog-cli/docs/general/cisetup" + loginDocs "github.com/jfrog/jfrog-cli/docs/general/login" cisetupcommand "github.com/jfrog/jfrog-cli/general/cisetup" "github.com/jfrog/jfrog-cli/general/envsetup" + "github.com/jfrog/jfrog-cli/general/login" "github.com/jfrog/jfrog-cli/general/project" "github.com/jfrog/jfrog-cli/missioncontrol" "github.com/jfrog/jfrog-cli/pipelines" @@ -266,6 +268,15 @@ func getCommands() []cli.Command { fmt.Println(common.GetGlobalEnvVars()) }, }, + { + Name: "login", + Usage: loginDocs.GetDescription(), + HelpName: corecommon.CreateUsage("login", loginDocs.GetDescription(), loginDocs.Usage), + BashComplete: corecommon.CreateBashCompletionFunc(), + Category: otherCategory, + Action: login.LoginCmd, + Hidden: true, // TODO remove when Artifactory 7.63.1 is released to self-hosted + }, } allCommands := append(slices.Clone(cliNameSpaces), utils.GetPlugins()...) allCommands = append(allCommands, scan.GetCommands()...)