From 5e1508eab3e1b1fff93f6897daf02c94acc24c57 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Thu, 25 Jul 2024 22:53:07 +0300 Subject: [PATCH 1/8] Update dependencies (#2621) --- artifactory/cli.go | 2 +- general/ai/cli.go | 14 +++++++++----- go.mod | 6 +++--- go.sum | 14 ++++++-------- plugins/commands/install.go | 3 ++- utils/cliutils/utils.go | 2 +- 6 files changed, 22 insertions(+), 19 deletions(-) diff --git a/artifactory/cli.go b/artifactory/cli.go index 8f10541a1..dd4026cb5 100644 --- a/artifactory/cli.go +++ b/artifactory/cli.go @@ -1148,7 +1148,7 @@ func BuildDockerCreateCmd(c *cli.Context) error { return err } buildDockerCreateCommand := container.NewBuildDockerCreateCommand() - if err := buildDockerCreateCommand.SetImageNameWithDigest(imageNameWithDigestFile); err != nil { + if err = buildDockerCreateCommand.SetImageNameWithDigest(imageNameWithDigestFile); err != nil { return err } buildDockerCreateCommand.SetRepo(sourceRepo).SetServerDetails(artDetails).SetBuildConfiguration(buildConfiguration) diff --git a/general/ai/cli.go b/general/ai/cli.go index 25a0de0db..b1dd74cfc 100644 --- a/general/ai/cli.go +++ b/general/ai/cli.go @@ -132,12 +132,16 @@ func sendRequestToCliAiServer(content interface{}, apiCommand ApiCommand) (respo return } if err = errorutils.CheckResponseStatus(resp, http.StatusOK); err != nil { - if resp.StatusCode == http.StatusInternalServerError { - err = errorutils.CheckErrorf("AI model Endpoint is not available.\n" + err.Error()) - } else if resp.StatusCode == http.StatusNotFound { - err = errorutils.CheckErrorf("CLI-AI app server is no available. Note that the this command is supported while inside JFrog's internal network only.\n" + err.Error()) + switch resp.StatusCode { + case http.StatusInternalServerError: + err = errorutils.CheckErrorf("AI model Endpoint is not available. Please try again later.") + case http.StatusNotFound: + err = errorutils.CheckErrorf("CLI-AI app server is not available. Note that the this command is supported while inside JFrog's internal network only.\n" + err.Error()) + case http.StatusNotAcceptable: + err = errorutils.CheckErrorf("CLI-AI app server is not available. Please try again later.") + default: + return } - return } if apiCommand == questionApi { defer func() { diff --git a/go.mod b/go.mod index 5557735fa..d95fac8d6 100644 --- a/go.mod +++ b/go.mod @@ -139,7 +139,7 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/ulikunitz/xz v0.5.12 // indirect - github.com/vbauerster/mpb/v7 v7.5.3 // indirect + github.com/vbauerster/mpb/v8 v8.7.4 // indirect github.com/xanzy/go-gitlab v0.95.2 // indirect github.com/xanzy/ssh-agent v0.3.3 // indirect github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect @@ -170,9 +170,9 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -// replace github.com/jfrog/jfrog-cli-core/v2 => github.com/eyalbe4/jfrog-cli-core/v2 v2.31.1-0.20240723145911-300a4683d485 +replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20240725185936-980acf0adf54 -// replace github.com/jfrog/jfrog-client-go => github.com/eyalbe4/jfrog-client-go v1.28.1-0.20240723132744-93aab0ffffb1 +replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20240725183511-4d539d3a7a99 // replace github.com/jfrog/jfrog-cli-security => github.com/jfrog/jfrog-cli-security v1.1.1-0.20240522121307-3e9fe2dc5e81 diff --git a/go.sum b/go.sum index c7461e643..447394d11 100644 --- a/go.sum +++ b/go.sum @@ -946,14 +946,14 @@ github.com/jfrog/jfrog-apps-config v1.0.1 h1:mtv6k7g8A8BVhlHGlSveapqf4mJfonwvXYL github.com/jfrog/jfrog-apps-config v1.0.1/go.mod h1:8AIIr1oY9JuH5dylz2S6f8Ym2MaadPLR6noCBO4C22w= github.com/jfrog/jfrog-cli-artifactory v0.1.1 h1:3HfowB29TBEtr6BgAezdqTRVFhBFa5XasxARLh+1HDE= github.com/jfrog/jfrog-cli-artifactory v0.1.1/go.mod h1:Jyv0OecV8k8JOT5C5m/UmS1KCsR1xkog1OjKJeDuMcY= -github.com/jfrog/jfrog-cli-core/v2 v2.53.4 h1:A9lAYJMkqH9lZyu6ahJ2puzlYGXg9upopretVVfDqzc= -github.com/jfrog/jfrog-cli-core/v2 v2.53.4/go.mod h1:thaQcvQDTHV2jOumb+m2OBfqRSW4JYtLez5Qsi1dovk= +github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20240725185936-980acf0adf54 h1:BBbrrW0dm0kDkIM3BS9AVvvLmw/dJbiiSh5/vQJK9v0= +github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20240725185936-980acf0adf54/go.mod h1:qF+g5F4ImRlyCYoFbeWtksaDGhneQSB27t2/6/H89Hc= github.com/jfrog/jfrog-cli-platform-services v1.3.0 h1:IblSDZFBjL7WLRi37Ni2DmHrXJJ6ysSMxx7t41AvyDA= github.com/jfrog/jfrog-cli-platform-services v1.3.0/go.mod h1:Ky4SDXuMeaiNP/5zMT1YSzIuXG+cNYYOl8BaEA7Awbc= github.com/jfrog/jfrog-cli-security v1.6.2 h1:C2tlCEGA+HxOhgYe5llI4XtamKxFVXNAMfAKaYzECSQ= github.com/jfrog/jfrog-cli-security v1.6.2/go.mod h1:lNcLT+lH7xvZaC+eSjvz1kGpVvkL9ZthYyBZy7O4aCA= -github.com/jfrog/jfrog-client-go v1.43.0 h1:0A4zT8ZIpAwtEUICNhKPx1bwM1LocJN9C38IGycS7UY= -github.com/jfrog/jfrog-client-go v1.43.0/go.mod h1:1RklAq1rNS3HmIsJ+BM3tEn9XHZuTAs37JtVUpefUk4= +github.com/jfrog/jfrog-client-go v1.28.1-0.20240725183511-4d539d3a7a99 h1:jCfJV5FXOIclSGhRbrTNNFteF27CSb+etW246mewVAk= +github.com/jfrog/jfrog-client-go v1.28.1-0.20240725183511-4d539d3a7a99/go.mod h1:1RklAq1rNS3HmIsJ+BM3tEn9XHZuTAs37JtVUpefUk4= 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.10.0 h1:upMDUxhQKqZ5ZDCs/wy+8Kib8rZR8I8lOR34yJkdqhI= @@ -1013,7 +1013,6 @@ github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D github.com/mattn/go-runewidth v0.0.6/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= -github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U= github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/mattn/go-sqlite3 v1.14.14/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= @@ -1158,8 +1157,8 @@ github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc= github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/urfave/cli v1.22.15 h1:nuqt+pdC/KqswQKhETJjo7pvn/k4xMUxgW6liI7XpnM= github.com/urfave/cli v1.22.15/go.mod h1:wSan1hmo5zeyLGBjRJbzRTNk8gwoYa2B9n4q9dmRIc0= -github.com/vbauerster/mpb/v7 v7.5.3 h1:BkGfmb6nMrrBQDFECR/Q7RkKCw7ylMetCb4079CGs4w= -github.com/vbauerster/mpb/v7 v7.5.3/go.mod h1:i+h4QY6lmLvBNK2ah1fSreiw3ajskRlBp9AhY/PnuOE= +github.com/vbauerster/mpb/v8 v8.7.4 h1:p4f16iMfUt3PkAC73SCzAtgtSf8TYDqEbJUT3odPrPo= +github.com/vbauerster/mpb/v8 v8.7.4/go.mod h1:r1B5k2Ljj5KJFCekfihbiqyV4VaaRTANYmvWA2btufI= github.com/vmihailenco/msgpack/v4 v4.3.12/go.mod h1:gborTTJjAo/GWTqqRjrLCn9pgNN+NXzzngzBKDPIqw4= github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI= github.com/xanzy/go-gitlab v0.95.2 h1:4p0IirHqEp5f0baK/aQqr4TR57IsD+8e4fuyAA1yi88= @@ -1495,7 +1494,6 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= diff --git a/plugins/commands/install.go b/plugins/commands/install.go index a45f3138d..7b5a55f94 100644 --- a/plugins/commands/install.go +++ b/plugins/commands/install.go @@ -170,6 +170,7 @@ func downloadPlugin(pluginsDir, pluginName, downloadUrl string, httpDetails http return } if progressMgr != nil { + progressMgr.SetHeadlineMsg("Downloading") progressMgr.InitProgressReaders() progressMgr.IncGeneralProgressTotalBy(1) defer func() { @@ -268,6 +269,6 @@ func downloadFromArtifactory(downloadDetails *httpclient.DownloadFileDetails, ht if err != nil { return } - log.Info("Downloading: " + downloadDetails.FileName) + log.Info("Downloading:", downloadDetails.FileName) return client.DownloadFileWithProgress(downloadDetails, "", httpDetails, false, false, progressMgr) } diff --git a/utils/cliutils/utils.go b/utils/cliutils/utils.go index 5894d023a..630a4c525 100644 --- a/utils/cliutils/utils.go +++ b/utils/cliutils/utils.go @@ -257,7 +257,7 @@ func CreateBuildInfoSummaryReportString(success, failed int, sha256 string, err func CreateDownloadConfiguration(c *cli.Context) (downloadConfiguration *artifactoryUtils.DownloadConfiguration, err error) { downloadConfiguration = new(artifactoryUtils.DownloadConfiguration) - downloadConfiguration.MinSplitSize, err = getMinSplit(c, DownloadMinSplitKb) + downloadConfiguration.MinSplitSizeKb, err = getMinSplit(c, DownloadMinSplitKb) if err != nil { return nil, err } From 675ae37a721e610bf6a7345d984219db37b28499 Mon Sep 17 00:00:00 2001 From: Eyal Ben Moshe Date: Fri, 26 Jul 2024 00:27:21 +0300 Subject: [PATCH 2/8] JFrog CLI's RPM stopped being signed (#2622) --- build/deb_rpm/v2-jf/build-scripts/pack.sh | 29 ++-------------- build/deb_rpm/v2/build-scripts/pack.sh | 41 +++++------------------ 2 files changed, 10 insertions(+), 60 deletions(-) diff --git a/build/deb_rpm/v2-jf/build-scripts/pack.sh b/build/deb_rpm/v2-jf/build-scripts/pack.sh index 7a02590aa..c08c3f0fc 100755 --- a/build/deb_rpm/v2-jf/build-scripts/pack.sh +++ b/build/deb_rpm/v2-jf/build-scripts/pack.sh @@ -2,10 +2,6 @@ # This file is responsible for building rpm and deb package for jfrog-cli installer -# This will contain hold the list of supported architectures which can be built by default. -# Although by passing a different --rpm-build-image or --rpm-build-image, artifacts of different architectures can be built -SUPPORTED_DEFAULT_ARCH_LIST="x86_64" - JFROG_CLI_HOME="$(cd "$(dirname "${BASH_SOURCE[0]}")/../" && pwd)" JFROG_CLI_PKG="$JFROG_CLI_HOME/pkg" JFROG_CLI_PREFIX="jfrog-cli" @@ -244,22 +240,6 @@ createPackage(){ esac } -setBuildImage(){ - local arch="$1" - - [ -n "${arch}" ] || errorExit "Architecture is not passed to setBuildImage method" - - case "$1" in - x86_64) - RPM_BUILD_IMAGE="centos:7" - DEB_BUILD_IMAGE="ubuntu:16.04" - ;; - *) - errorExit "Provided architecture is not supported : $arch. Supported list [ ${SUPPORTED_DEFAULT_ARCH_LIST} ]" - ;; - esac -} - main(){ while [[ $# -gt 0 ]]; do case "$1" in @@ -275,10 +255,6 @@ main(){ JFROG_CLI_VERSION="$2" shift 2 ;; - --arch) - setBuildImage "$2" - shift 2 - ;; --rpm-arch) JFROG_CLI_RPM_ARCH="$2" shift 2 @@ -322,11 +298,10 @@ main(){ esac done + : "${flavours:="rpm deb"}" : "${JFROG_CLI_RUN_TEST:="false"}" - : "${RPM_BUILD_IMAGE:="centos:8"}" - : "${RPM_SIGN_IMAGE:="centos:7"}" - : "${DEB_BUILD_IMAGE:="ubuntu:16.04"}" + : "${RPM_SIGN_IMAGE:="${RPM_BUILD_IMAGE}"}" : "${DEB_TEST_IMAGE:="${DEB_BUILD_IMAGE}"}" : "${RPM_TEST_IMAGE:="${RPM_BUILD_IMAGE}"}" : "${JFROG_CLI_RELEASE_VERSION:="1"}" diff --git a/build/deb_rpm/v2/build-scripts/pack.sh b/build/deb_rpm/v2/build-scripts/pack.sh index 90e904962..0d48817dd 100755 --- a/build/deb_rpm/v2/build-scripts/pack.sh +++ b/build/deb_rpm/v2/build-scripts/pack.sh @@ -2,10 +2,6 @@ # This file is responsible for building rpm and deb package for jfrog-cli installer -# This will contain hold the list of supported architectures which can be built by default. -# Although by passing a different --rpm-build-image or --rpm-build-image, artifacts of different architectures can be built -SUPPORTED_DEFAULT_ARCH_LIST="x86_64" - JFROG_CLI_HOME="$(cd "$(dirname "${BASH_SOURCE[0]}")/../" && pwd)" JFROG_CLI_PKG="$JFROG_CLI_HOME/pkg" JFROG_CLI_PREFIX="jfrog-cli" @@ -46,11 +42,11 @@ errorExit() { } checkDockerAccess() { -if docker -v > /dev/null 2>&1 && docker ps > /dev/null 2>&1; then - log "Docker is available" "DEBUG" -else - errorExit "Must run as a user that can execute docker commands" -fi + if docker -v > /dev/null 2>&1 && docker ps > /dev/null 2>&1; then + log "Docker is available" "DEBUG" + else + errorExit "Must run as a user that can execute docker commands" + fi } exitWithUsage(){ @@ -63,7 +59,7 @@ createDEBPackage(){ local flavour="deb" # cleanup old files and containers - rm -f "${JFROG_CLI_PKG}/${JFROG_CLI_PREFIX}*${VERSION_FORMATTED}*.${flavour}" + rm -f "${JFROG_CLI_PKG}/${JFROG_CLI_PREFIX}*${VERSION_FORMATTED}*.${flavour}" docker rm -f "${RPM_BUILDER_NAME}" 2>/dev/null log "Building ${JFROG_CLI_PREFIX} ${flavour} ${JFROG_CLI_VERSION} on ${DEB_BUILD_IMAGE} image" @@ -244,22 +240,6 @@ createPackage(){ esac } -setBuildImage(){ - local arch="$1" - - [ -n "${arch}" ] || errorExit "Architecture is not passed to setBuildImage method" - - case "$1" in - x86_64) - RPM_BUILD_IMAGE="centos:7" - DEB_BUILD_IMAGE="ubuntu:16.04" - ;; - *) - errorExit "Provided architecture is not supported : $arch. Supported list [ ${SUPPORTED_DEFAULT_ARCH_LIST} ]" - ;; - esac -} - main(){ while [[ $# -gt 0 ]]; do case "$1" in @@ -275,10 +255,6 @@ main(){ JFROG_CLI_VERSION="$2" shift 2 ;; - --arch) - setBuildImage "$2" - shift 2 - ;; --rpm-arch) JFROG_CLI_RPM_ARCH="$2" shift 2 @@ -322,11 +298,10 @@ main(){ esac done + : "${flavours:="rpm deb"}" : "${JFROG_CLI_RUN_TEST:="false"}" - : "${RPM_BUILD_IMAGE:="centos:8"}" - : "${RPM_SIGN_IMAGE:="centos:7"}" - : "${DEB_BUILD_IMAGE:="ubuntu:16.04"}" + : "${RPM_SIGN_IMAGE:="${RPM_BUILD_IMAGE}"}" : "${DEB_TEST_IMAGE:="${DEB_BUILD_IMAGE}"}" : "${RPM_TEST_IMAGE:="${RPM_BUILD_IMAGE}"}" : "${JFROG_CLI_RELEASE_VERSION:="1"}" From c1bee7b1c844a22598e92f67691bc4280684dc14 Mon Sep 17 00:00:00 2001 From: Eyal Ben Moshe Date: Fri, 26 Jul 2024 00:42:11 +0300 Subject: [PATCH 3/8] Bump version from 2.61.0 to 2.61.1 (#2623) --- build/npm/v2-jf/package-lock.json | 2 +- build/npm/v2-jf/package.json | 2 +- build/npm/v2/package-lock.json | 2 +- build/npm/v2/package.json | 2 +- utils/cliutils/cli_consts.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/npm/v2-jf/package-lock.json b/build/npm/v2-jf/package-lock.json index b6fc43b39..f9f4e8bb5 100644 --- a/build/npm/v2-jf/package-lock.json +++ b/build/npm/v2-jf/package-lock.json @@ -1,5 +1,5 @@ { "name": "jfrog-cli-v2-jf", - "version": "2.61.0", + "version": "2.61.1", "lockfileVersion": 1 } diff --git a/build/npm/v2-jf/package.json b/build/npm/v2-jf/package.json index e9a5acc45..1da050034 100644 --- a/build/npm/v2-jf/package.json +++ b/build/npm/v2-jf/package.json @@ -1,6 +1,6 @@ { "name": "jfrog-cli-v2-jf", - "version": "2.61.0", + "version": "2.61.1", "description": "🐸 Command-line interface for JFrog Artifactory, Xray, Distribution, Pipelines and Mission Control 🐸", "homepage": "https://github.com/jfrog/jfrog-cli", "preferGlobal": true, diff --git a/build/npm/v2/package-lock.json b/build/npm/v2/package-lock.json index 04bd073ca..69b78a2bb 100644 --- a/build/npm/v2/package-lock.json +++ b/build/npm/v2/package-lock.json @@ -1,5 +1,5 @@ { "name": "jfrog-cli-v2", - "version": "2.61.0", + "version": "2.61.1", "lockfileVersion": 2 } diff --git a/build/npm/v2/package.json b/build/npm/v2/package.json index 794b117c8..722af2ce9 100644 --- a/build/npm/v2/package.json +++ b/build/npm/v2/package.json @@ -1,6 +1,6 @@ { "name": "jfrog-cli-v2", - "version": "2.61.0", + "version": "2.61.1", "description": "🐸 Command-line interface for JFrog Artifactory, Xray, Distribution, Pipelines and Mission Control 🐸", "homepage": "https://github.com/jfrog/jfrog-cli", "preferGlobal": true, diff --git a/utils/cliutils/cli_consts.go b/utils/cliutils/cli_consts.go index ae376e18f..82d4afec6 100644 --- a/utils/cliutils/cli_consts.go +++ b/utils/cliutils/cli_consts.go @@ -4,7 +4,7 @@ import "time" const ( // General CLI constants - CliVersion = "2.61.0" + CliVersion = "2.61.1" ClientAgent = "jfrog-cli-go" // CLI base commands constants: From 798af081eb942bf977df326a8fc4395bba002246 Mon Sep 17 00:00:00 2001 From: Eyal Ben Moshe Date: Fri, 26 Jul 2024 20:25:26 +0300 Subject: [PATCH 4/8] Fix JFrog CLI's RPM isn't signed (#2624) --- build/deb_rpm/v2-jf/build-scripts/rpm-sign.sh | 80 +++++++++++-------- build/deb_rpm/v2/build-scripts/rpm-sign.sh | 80 +++++++++++-------- 2 files changed, 92 insertions(+), 68 deletions(-) diff --git a/build/deb_rpm/v2-jf/build-scripts/rpm-sign.sh b/build/deb_rpm/v2-jf/build-scripts/rpm-sign.sh index f76d1d0c7..05bb219a2 100755 --- a/build/deb_rpm/v2-jf/build-scripts/rpm-sign.sh +++ b/build/deb_rpm/v2-jf/build-scripts/rpm-sign.sh @@ -1,30 +1,48 @@ #!/bin/bash log(){ - echo "$1" + echo "$1" +} + +debug_info(){ + echo "=== DEBUG INFO ===" + echo "Current User: $(whoami)" + echo "GPG Version: $(gpg --version)" + echo "GPG_TTY: $GPG_TTY" + echo "TTY: $(tty)" + echo "Files in /root/.gnupg:" + ls -la /root/.gnupg + echo "Environment Variables:" + env + echo "===================" } -# Use the given key to configure the rpm macro. This is needed to sign an rpm. -# Arguments: -# - gpgKeyFile : key file location (in PEM format) to be used for signing the rpm -# The structure of the key content should be as follows, -# -----BEGIN PGP PUBLIC KEY BLOCK----- -# Version: GnuPG v1.4.7 (MingW32) -# ..... -# -----END PGP PUBLIC KEY BLOCK----- -# -----BEGIN PGP PRIVATE KEY BLOCK----- -# Version: GnuPG v1.4.7 (MingW32) -# ..... -# -----END PGP PRIVATE KEY BLOCK----- -# - keyID : id of the provided key rpmInitSigning(){ local gpgKeyFile="${KEY_FILE}" local keyID="${KEY_ID}" log "Initializing rpm sign..." - gpg --allow-secret-key-import --import "${gpgKeyFile}" && \ - gpg --export -a "${keyID}" > /tmp/tmpFile && \ + # Start the GPG agent + local gpg_agent_output + gpg_agent_output=$(gpg-agent --daemon --allow-preset-passphrase) + eval "$gpg_agent_output" + + # Set GPG_TTY if possible + local tty_value + if tty -s; then + tty_value=$(tty) + export GPG_TTY="$tty_value" + else + export GPG_TTY="/dev/null" + fi + + # Debug info + debug_info + + # Import the GPG key + gpg --batch --import "${gpgKeyFile}" || { echo "ERROR: Failed to import GPG key"; exit 1; } + gpg --batch --export -a "${keyID}" > /tmp/tmpFile || { echo "ERROR: Failed to export GPG key"; exit 1; } if rpm --import /tmp/tmpFile && rpm -q gpg-pubkey --qf '%{name}-%{version}-%{release} --> %{summary}\n' | grep "${keyID}"; then echo "RPM signature initialization succeeded." else @@ -32,8 +50,7 @@ rpmInitSigning(){ exit 1 fi - rpmEditRpmMacro "${keyID}" || \ - { echo "ERROR: Configuring rpm macro failed!" >&2; exit 1; } + rpmEditRpmMacro "${keyID}" || { echo "ERROR: Configuring rpm macro failed!" >&2; exit 1; } } rpmEditRpmMacro(){ @@ -44,27 +61,21 @@ rpmEditRpmMacro(){ %_gpg_path /root/.gnupg %_gpg_name ${keyID} %_gpgbin /usr/bin/gpg +%_gpg_sign_cmd %{__gpg} gpg --batch --pinentry-mode loopback --passphrase-file /tmp/passphrase --detach-sign --armor --yes --no-secmem-warning -u %{_gpg_name} -o %{__signature_filename} %{__plaintext_filename} RPM_MACRO_CONTENT } -expect_script() { - cat << End-of-text #No white space between << and End-of-text -spawn rpm --resign $RPM_FILE_SIGNED -expect -exact "Enter pass phrase: " -send -- "$PASSPHRASE\r" -expect eof -exit -End-of-text - -} - sign_rpm() { echo "Signing RPM..." - cp -f "${RPM_FILE}" "${RPM_FILE_SIGNED}" || \ - { echo "ERROR: Copying ${RPM_FILE} to ${RPM_FILE_SIGNED} failed! " >&2; exit 1; } - expect_script | /usr/bin/expect -f - - cp -f "${RPM_FILE_SIGNED}" "${RPM_FILE}" || \ - { echo "ERROR: Copying ${RPM_FILE_SIGNED} to ${RPM_FILE} failed! " >&2; exit 1; } + echo "${PASSPHRASE}" > /tmp/passphrase + cp -f "${RPM_FILE}" "${RPM_FILE_SIGNED}" || { echo "ERROR: Copying ${RPM_FILE} to ${RPM_FILE_SIGNED} failed! " >&2; exit 1; } + + gpg --batch --pinentry-mode loopback --passphrase-file /tmp/passphrase --detach-sign --armor --yes --no-secmem-warning -u "${KEY_ID}" -o "${RPM_FILE_SIGNED}.asc" "${RPM_FILE_SIGNED}" || { echo "ERROR: GPG signing failed!"; exit 1; } + + rpm --addsign "${RPM_FILE_SIGNED}" || { echo "ERROR: RPM signing failed!"; exit 1; } + + cp -f "${RPM_FILE_SIGNED}" "${RPM_FILE}" || { echo "ERROR: Copying ${RPM_FILE_SIGNED} to ${RPM_FILE} failed! " >&2; exit 1; } + rm /tmp/passphrase } KEY_FILE="${1}" @@ -72,5 +83,6 @@ KEY_ID="${2}" export PASSPHRASE="${3}" RPM_FILE="${4}" RPM_FILE_SIGNED="/tmp/jfrog-cli-rpm-signed.rpm" + rpmInitSigning sign_rpm diff --git a/build/deb_rpm/v2/build-scripts/rpm-sign.sh b/build/deb_rpm/v2/build-scripts/rpm-sign.sh index f76d1d0c7..05bb219a2 100755 --- a/build/deb_rpm/v2/build-scripts/rpm-sign.sh +++ b/build/deb_rpm/v2/build-scripts/rpm-sign.sh @@ -1,30 +1,48 @@ #!/bin/bash log(){ - echo "$1" + echo "$1" +} + +debug_info(){ + echo "=== DEBUG INFO ===" + echo "Current User: $(whoami)" + echo "GPG Version: $(gpg --version)" + echo "GPG_TTY: $GPG_TTY" + echo "TTY: $(tty)" + echo "Files in /root/.gnupg:" + ls -la /root/.gnupg + echo "Environment Variables:" + env + echo "===================" } -# Use the given key to configure the rpm macro. This is needed to sign an rpm. -# Arguments: -# - gpgKeyFile : key file location (in PEM format) to be used for signing the rpm -# The structure of the key content should be as follows, -# -----BEGIN PGP PUBLIC KEY BLOCK----- -# Version: GnuPG v1.4.7 (MingW32) -# ..... -# -----END PGP PUBLIC KEY BLOCK----- -# -----BEGIN PGP PRIVATE KEY BLOCK----- -# Version: GnuPG v1.4.7 (MingW32) -# ..... -# -----END PGP PRIVATE KEY BLOCK----- -# - keyID : id of the provided key rpmInitSigning(){ local gpgKeyFile="${KEY_FILE}" local keyID="${KEY_ID}" log "Initializing rpm sign..." - gpg --allow-secret-key-import --import "${gpgKeyFile}" && \ - gpg --export -a "${keyID}" > /tmp/tmpFile && \ + # Start the GPG agent + local gpg_agent_output + gpg_agent_output=$(gpg-agent --daemon --allow-preset-passphrase) + eval "$gpg_agent_output" + + # Set GPG_TTY if possible + local tty_value + if tty -s; then + tty_value=$(tty) + export GPG_TTY="$tty_value" + else + export GPG_TTY="/dev/null" + fi + + # Debug info + debug_info + + # Import the GPG key + gpg --batch --import "${gpgKeyFile}" || { echo "ERROR: Failed to import GPG key"; exit 1; } + gpg --batch --export -a "${keyID}" > /tmp/tmpFile || { echo "ERROR: Failed to export GPG key"; exit 1; } if rpm --import /tmp/tmpFile && rpm -q gpg-pubkey --qf '%{name}-%{version}-%{release} --> %{summary}\n' | grep "${keyID}"; then echo "RPM signature initialization succeeded." else @@ -32,8 +50,7 @@ rpmInitSigning(){ exit 1 fi - rpmEditRpmMacro "${keyID}" || \ - { echo "ERROR: Configuring rpm macro failed!" >&2; exit 1; } + rpmEditRpmMacro "${keyID}" || { echo "ERROR: Configuring rpm macro failed!" >&2; exit 1; } } rpmEditRpmMacro(){ @@ -44,27 +61,21 @@ rpmEditRpmMacro(){ %_gpg_path /root/.gnupg %_gpg_name ${keyID} %_gpgbin /usr/bin/gpg +%_gpg_sign_cmd %{__gpg} gpg --batch --pinentry-mode loopback --passphrase-file /tmp/passphrase --detach-sign --armor --yes --no-secmem-warning -u %{_gpg_name} -o %{__signature_filename} %{__plaintext_filename} RPM_MACRO_CONTENT } -expect_script() { - cat << End-of-text #No white space between << and End-of-text -spawn rpm --resign $RPM_FILE_SIGNED -expect -exact "Enter pass phrase: " -send -- "$PASSPHRASE\r" -expect eof -exit -End-of-text - -} - sign_rpm() { echo "Signing RPM..." - cp -f "${RPM_FILE}" "${RPM_FILE_SIGNED}" || \ - { echo "ERROR: Copying ${RPM_FILE} to ${RPM_FILE_SIGNED} failed! " >&2; exit 1; } - expect_script | /usr/bin/expect -f - - cp -f "${RPM_FILE_SIGNED}" "${RPM_FILE}" || \ - { echo "ERROR: Copying ${RPM_FILE_SIGNED} to ${RPM_FILE} failed! " >&2; exit 1; } + echo "${PASSPHRASE}" > /tmp/passphrase + cp -f "${RPM_FILE}" "${RPM_FILE_SIGNED}" || { echo "ERROR: Copying ${RPM_FILE} to ${RPM_FILE_SIGNED} failed! " >&2; exit 1; } + + gpg --batch --pinentry-mode loopback --passphrase-file /tmp/passphrase --detach-sign --armor --yes --no-secmem-warning -u "${KEY_ID}" -o "${RPM_FILE_SIGNED}.asc" "${RPM_FILE_SIGNED}" || { echo "ERROR: GPG signing failed!"; exit 1; } + + rpm --addsign "${RPM_FILE_SIGNED}" || { echo "ERROR: RPM signing failed!"; exit 1; } + + cp -f "${RPM_FILE_SIGNED}" "${RPM_FILE}" || { echo "ERROR: Copying ${RPM_FILE_SIGNED} to ${RPM_FILE} failed! " >&2; exit 1; } + rm /tmp/passphrase } KEY_FILE="${1}" @@ -72,5 +83,6 @@ KEY_ID="${2}" export PASSPHRASE="${3}" RPM_FILE="${4}" RPM_FILE_SIGNED="/tmp/jfrog-cli-rpm-signed.rpm" + rpmInitSigning sign_rpm From 98877fa4cf76b0f6f871ce3196ee716de26ccbe5 Mon Sep 17 00:00:00 2001 From: Eyal Ben Moshe Date: Fri, 26 Jul 2024 20:31:57 +0300 Subject: [PATCH 5/8] Bump version from 2.61.1 to 2.61.2 (#2625) --- build/npm/v2-jf/package-lock.json | 2 +- build/npm/v2-jf/package.json | 2 +- build/npm/v2/package-lock.json | 2 +- build/npm/v2/package.json | 2 +- utils/cliutils/cli_consts.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/npm/v2-jf/package-lock.json b/build/npm/v2-jf/package-lock.json index f9f4e8bb5..5de4ed2f7 100644 --- a/build/npm/v2-jf/package-lock.json +++ b/build/npm/v2-jf/package-lock.json @@ -1,5 +1,5 @@ { "name": "jfrog-cli-v2-jf", - "version": "2.61.1", + "version": "2.61.2", "lockfileVersion": 1 } diff --git a/build/npm/v2-jf/package.json b/build/npm/v2-jf/package.json index 1da050034..b66d58eac 100644 --- a/build/npm/v2-jf/package.json +++ b/build/npm/v2-jf/package.json @@ -1,6 +1,6 @@ { "name": "jfrog-cli-v2-jf", - "version": "2.61.1", + "version": "2.61.2", "description": "🐸 Command-line interface for JFrog Artifactory, Xray, Distribution, Pipelines and Mission Control 🐸", "homepage": "https://github.com/jfrog/jfrog-cli", "preferGlobal": true, diff --git a/build/npm/v2/package-lock.json b/build/npm/v2/package-lock.json index 69b78a2bb..18c54af7f 100644 --- a/build/npm/v2/package-lock.json +++ b/build/npm/v2/package-lock.json @@ -1,5 +1,5 @@ { "name": "jfrog-cli-v2", - "version": "2.61.1", + "version": "2.61.2", "lockfileVersion": 2 } diff --git a/build/npm/v2/package.json b/build/npm/v2/package.json index 722af2ce9..c0478382b 100644 --- a/build/npm/v2/package.json +++ b/build/npm/v2/package.json @@ -1,6 +1,6 @@ { "name": "jfrog-cli-v2", - "version": "2.61.1", + "version": "2.61.2", "description": "🐸 Command-line interface for JFrog Artifactory, Xray, Distribution, Pipelines and Mission Control 🐸", "homepage": "https://github.com/jfrog/jfrog-cli", "preferGlobal": true, diff --git a/utils/cliutils/cli_consts.go b/utils/cliutils/cli_consts.go index 82d4afec6..185d44058 100644 --- a/utils/cliutils/cli_consts.go +++ b/utils/cliutils/cli_consts.go @@ -4,7 +4,7 @@ import "time" const ( // General CLI constants - CliVersion = "2.61.1" + CliVersion = "2.61.2" ClientAgent = "jfrog-cli-go" // CLI base commands constants: From ef31305091b4e7961c8741b6e1e793a8d95cdc70 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Mon, 29 Jul 2024 16:33:53 +0300 Subject: [PATCH 6/8] Update dependencies (#2626) --- go.mod | 10 ++++++---- go.sum | 20 ++++++++++---------- testdata/docker/artifactory/Dockerfile | 3 ++- utils/cliutils/utils.go | 2 +- 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index d95fac8d6..6c178665a 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/gocarina/gocsv v0.0.0-20240520201108-78e41c74b4b1 github.com/jfrog/archiver/v3 v3.6.1 github.com/jfrog/build-info-go v1.9.30 - github.com/jfrog/gofrog v1.7.4 + github.com/jfrog/gofrog v1.7.5 github.com/jfrog/jfrog-cli-artifactory v0.1.1 github.com/jfrog/jfrog-cli-core/v2 v2.53.4 github.com/jfrog/jfrog-cli-platform-services v1.3.0 @@ -170,11 +170,13 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20240725185936-980acf0adf54 +replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20240729104836-9c1dae33c595 -replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20240725183511-4d539d3a7a99 +replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20240729103741-f6c521eb9a40 -// replace github.com/jfrog/jfrog-cli-security => github.com/jfrog/jfrog-cli-security v1.1.1-0.20240522121307-3e9fe2dc5e81 +replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20240729055355-5b51bf71e756 + +replace github.com/jfrog/jfrog-cli-security => github.com/jfrog/jfrog-cli-security v1.6.3-0.20240729081816-371509c205d6 // replace github.com/jfrog/build-info-go => github.com/eyalbe4/build-info-go v1.8.9-0.20240723132035-980d2c84b738 diff --git a/go.sum b/go.sum index 447394d11..2e1dcf030 100644 --- a/go.sum +++ b/go.sum @@ -936,24 +936,24 @@ github.com/jedib0t/go-pretty/v6 v6.5.9 h1:ACteMBRrrmm1gMsXe9PSTOClQ63IXDUt03H5U+ github.com/jedib0t/go-pretty/v6 v6.5.9/go.mod h1:zbn98qrYlh95FIhwwsbIip0LYpwSG8SUOScs+v9/t0E= github.com/jfrog/archiver/v3 v3.6.1 h1:LOxnkw9pOn45DzCbZNFV6K0+6dCsQ0L8mR3ZcujO5eI= github.com/jfrog/archiver/v3 v3.6.1/go.mod h1:VgR+3WZS4N+i9FaDwLZbq+jeU4B4zctXL+gL4EMzfLw= -github.com/jfrog/build-info-go v1.9.30 h1:RmK3NuDGUoyCjCNJJBlHaCm4vWzO8BLjkuAkMzj6PGE= -github.com/jfrog/build-info-go v1.9.30/go.mod h1:fxSfpp+kQ8qln/0y7pgV3tg2exWe5OM1np5FF2LlSDg= +github.com/jfrog/build-info-go v1.8.9-0.20240729055355-5b51bf71e756 h1:xyZEZDZvg/sLS5PH5b8zFnj6b2XBW4aYHXey0sv+F9I= +github.com/jfrog/build-info-go v1.8.9-0.20240729055355-5b51bf71e756/go.mod h1:fxSfpp+kQ8qln/0y7pgV3tg2exWe5OM1np5FF2LlSDg= github.com/jfrog/froggit-go v1.16.1 h1:FBIM1qevX/ag9unfmpGzfmZ36D8ulOJ+DPTSFUk3l5U= github.com/jfrog/froggit-go v1.16.1/go.mod h1:TEJSzgiV+3D/GVGE8Y6j46ut1jrBLD1FL6WdMdKwwCE= -github.com/jfrog/gofrog v1.7.4 h1:on4AeWef5LJUhGCigSjTS4Ez3n9l8+NiZlXH6UYp05c= -github.com/jfrog/gofrog v1.7.4/go.mod h1:jyGiCgiqSSR7k86hcUSu67XVvmvkkgWTmPsH25wI298= +github.com/jfrog/gofrog v1.7.5 h1:dFgtEDefJdlq9cqTRoe09RLxS5Bxbe1Ev5+E6SmZHcg= +github.com/jfrog/gofrog v1.7.5/go.mod h1:jyGiCgiqSSR7k86hcUSu67XVvmvkkgWTmPsH25wI298= github.com/jfrog/jfrog-apps-config v1.0.1 h1:mtv6k7g8A8BVhlHGlSveapqf4mJfonwvXYLipdsOFMY= github.com/jfrog/jfrog-apps-config v1.0.1/go.mod h1:8AIIr1oY9JuH5dylz2S6f8Ym2MaadPLR6noCBO4C22w= github.com/jfrog/jfrog-cli-artifactory v0.1.1 h1:3HfowB29TBEtr6BgAezdqTRVFhBFa5XasxARLh+1HDE= github.com/jfrog/jfrog-cli-artifactory v0.1.1/go.mod h1:Jyv0OecV8k8JOT5C5m/UmS1KCsR1xkog1OjKJeDuMcY= -github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20240725185936-980acf0adf54 h1:BBbrrW0dm0kDkIM3BS9AVvvLmw/dJbiiSh5/vQJK9v0= -github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20240725185936-980acf0adf54/go.mod h1:qF+g5F4ImRlyCYoFbeWtksaDGhneQSB27t2/6/H89Hc= +github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20240729104836-9c1dae33c595 h1:jOCvoCoWaUZTJK4SkgamSCUgA6U5E4YWV6scS9U0Z2c= +github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20240729104836-9c1dae33c595/go.mod h1:h1IMa3Fp1pqn37HJTimnMDoxcVlTpWiO7hC3dd9tNdE= github.com/jfrog/jfrog-cli-platform-services v1.3.0 h1:IblSDZFBjL7WLRi37Ni2DmHrXJJ6ysSMxx7t41AvyDA= github.com/jfrog/jfrog-cli-platform-services v1.3.0/go.mod h1:Ky4SDXuMeaiNP/5zMT1YSzIuXG+cNYYOl8BaEA7Awbc= -github.com/jfrog/jfrog-cli-security v1.6.2 h1:C2tlCEGA+HxOhgYe5llI4XtamKxFVXNAMfAKaYzECSQ= -github.com/jfrog/jfrog-cli-security v1.6.2/go.mod h1:lNcLT+lH7xvZaC+eSjvz1kGpVvkL9ZthYyBZy7O4aCA= -github.com/jfrog/jfrog-client-go v1.28.1-0.20240725183511-4d539d3a7a99 h1:jCfJV5FXOIclSGhRbrTNNFteF27CSb+etW246mewVAk= -github.com/jfrog/jfrog-client-go v1.28.1-0.20240725183511-4d539d3a7a99/go.mod h1:1RklAq1rNS3HmIsJ+BM3tEn9XHZuTAs37JtVUpefUk4= +github.com/jfrog/jfrog-cli-security v1.6.3-0.20240729081816-371509c205d6 h1:U61knfgV/WZ4ZOhEEKKlnXQ8Y1BlKVPyVjTaERymIk0= +github.com/jfrog/jfrog-cli-security v1.6.3-0.20240729081816-371509c205d6/go.mod h1:0m+jdJgsLF2QHl4f/t9JHuJ9E0Oqf9kK24UWsjAtvsE= +github.com/jfrog/jfrog-client-go v1.28.1-0.20240729103741-f6c521eb9a40 h1:zmh1NwYtbS3GE7jCPWtQpGsTakMo5DHl73BRkZTn6Ag= +github.com/jfrog/jfrog-client-go v1.28.1-0.20240729103741-f6c521eb9a40/go.mod h1:BJqDxNVbs34kuCx9ct6ge3/M39Pf/m5L5IYgZ9p8ap4= 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.10.0 h1:upMDUxhQKqZ5ZDCs/wy+8Kib8rZR8I8lOR34yJkdqhI= diff --git a/testdata/docker/artifactory/Dockerfile b/testdata/docker/artifactory/Dockerfile index c47054915..eb1508233 100644 --- a/testdata/docker/artifactory/Dockerfile +++ b/testdata/docker/artifactory/Dockerfile @@ -7,4 +7,5 @@ ENV JFROG_HOME=/jfrog_home WORKDIR /jfrog_home EXPOSE 8082 EXPOSE 8081 -CMD ["sh","-c","local-rt-setup; sleep infinity"] \ No newline at end of file +# Temporarily use version 7.84.17 due to an issue with the automatic token generation mechanism in 7.90 +CMD ["sh","-c","local-rt-setup --rt-version 7.84.17; sleep infinity"] diff --git a/utils/cliutils/utils.go b/utils/cliutils/utils.go index 630a4c525..5894d023a 100644 --- a/utils/cliutils/utils.go +++ b/utils/cliutils/utils.go @@ -257,7 +257,7 @@ func CreateBuildInfoSummaryReportString(success, failed int, sha256 string, err func CreateDownloadConfiguration(c *cli.Context) (downloadConfiguration *artifactoryUtils.DownloadConfiguration, err error) { downloadConfiguration = new(artifactoryUtils.DownloadConfiguration) - downloadConfiguration.MinSplitSizeKb, err = getMinSplit(c, DownloadMinSplitKb) + downloadConfiguration.MinSplitSize, err = getMinSplit(c, DownloadMinSplitKb) if err != nil { return nil, err } From 1cbfa73cfe868a82370a042982aa437913672789 Mon Sep 17 00:00:00 2001 From: Robi Nino Date: Wed, 31 Jul 2024 13:51:39 +0300 Subject: [PATCH 7/8] Bump ver from 2.61.2 to 2.62.0 (#2631) --- build/npm/v2-jf/package-lock.json | 2 +- build/npm/v2-jf/package.json | 2 +- build/npm/v2/package-lock.json | 2 +- build/npm/v2/package.json | 2 +- go.mod | 16 ++++++++-------- go.sum | 16 ++++++++-------- utils/cliutils/cli_consts.go | 2 +- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/build/npm/v2-jf/package-lock.json b/build/npm/v2-jf/package-lock.json index 5de4ed2f7..bf68fb413 100644 --- a/build/npm/v2-jf/package-lock.json +++ b/build/npm/v2-jf/package-lock.json @@ -1,5 +1,5 @@ { "name": "jfrog-cli-v2-jf", - "version": "2.61.2", + "version": "2.62.0", "lockfileVersion": 1 } diff --git a/build/npm/v2-jf/package.json b/build/npm/v2-jf/package.json index b66d58eac..0ebcb0726 100644 --- a/build/npm/v2-jf/package.json +++ b/build/npm/v2-jf/package.json @@ -1,6 +1,6 @@ { "name": "jfrog-cli-v2-jf", - "version": "2.61.2", + "version": "2.62.0", "description": "🐸 Command-line interface for JFrog Artifactory, Xray, Distribution, Pipelines and Mission Control 🐸", "homepage": "https://github.com/jfrog/jfrog-cli", "preferGlobal": true, diff --git a/build/npm/v2/package-lock.json b/build/npm/v2/package-lock.json index 18c54af7f..24eb86e4b 100644 --- a/build/npm/v2/package-lock.json +++ b/build/npm/v2/package-lock.json @@ -1,5 +1,5 @@ { "name": "jfrog-cli-v2", - "version": "2.61.2", + "version": "2.62.0", "lockfileVersion": 2 } diff --git a/build/npm/v2/package.json b/build/npm/v2/package.json index c0478382b..0eadc8e30 100644 --- a/build/npm/v2/package.json +++ b/build/npm/v2/package.json @@ -1,6 +1,6 @@ { "name": "jfrog-cli-v2", - "version": "2.61.2", + "version": "2.62.0", "description": "🐸 Command-line interface for JFrog Artifactory, Xray, Distribution, Pipelines and Mission Control 🐸", "homepage": "https://github.com/jfrog/jfrog-cli", "preferGlobal": true, diff --git a/go.mod b/go.mod index 6c178665a..ac2345320 100644 --- a/go.mod +++ b/go.mod @@ -16,13 +16,13 @@ require ( github.com/docker/docker v27.1.1+incompatible github.com/gocarina/gocsv v0.0.0-20240520201108-78e41c74b4b1 github.com/jfrog/archiver/v3 v3.6.1 - github.com/jfrog/build-info-go v1.9.30 + github.com/jfrog/build-info-go v1.9.31 github.com/jfrog/gofrog v1.7.5 - github.com/jfrog/jfrog-cli-artifactory v0.1.1 - github.com/jfrog/jfrog-cli-core/v2 v2.53.4 + github.com/jfrog/jfrog-cli-artifactory v0.1.2 + github.com/jfrog/jfrog-cli-core/v2 v2.54.0 github.com/jfrog/jfrog-cli-platform-services v1.3.0 - github.com/jfrog/jfrog-cli-security v1.6.2 - github.com/jfrog/jfrog-client-go v1.43.0 + github.com/jfrog/jfrog-cli-security v1.6.3 + github.com/jfrog/jfrog-client-go v1.43.1 github.com/jszwec/csvutil v1.10.0 github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.32.0 @@ -170,11 +170,11 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20240729104836-9c1dae33c595 +// replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20240729104836-9c1dae33c595 -replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20240729103741-f6c521eb9a40 +// replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20240729103741-f6c521eb9a40 -replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20240729055355-5b51bf71e756 +// replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20240729055355-5b51bf71e756 replace github.com/jfrog/jfrog-cli-security => github.com/jfrog/jfrog-cli-security v1.6.3-0.20240729081816-371509c205d6 diff --git a/go.sum b/go.sum index 2e1dcf030..7723736f3 100644 --- a/go.sum +++ b/go.sum @@ -936,24 +936,24 @@ github.com/jedib0t/go-pretty/v6 v6.5.9 h1:ACteMBRrrmm1gMsXe9PSTOClQ63IXDUt03H5U+ github.com/jedib0t/go-pretty/v6 v6.5.9/go.mod h1:zbn98qrYlh95FIhwwsbIip0LYpwSG8SUOScs+v9/t0E= github.com/jfrog/archiver/v3 v3.6.1 h1:LOxnkw9pOn45DzCbZNFV6K0+6dCsQ0L8mR3ZcujO5eI= github.com/jfrog/archiver/v3 v3.6.1/go.mod h1:VgR+3WZS4N+i9FaDwLZbq+jeU4B4zctXL+gL4EMzfLw= -github.com/jfrog/build-info-go v1.8.9-0.20240729055355-5b51bf71e756 h1:xyZEZDZvg/sLS5PH5b8zFnj6b2XBW4aYHXey0sv+F9I= -github.com/jfrog/build-info-go v1.8.9-0.20240729055355-5b51bf71e756/go.mod h1:fxSfpp+kQ8qln/0y7pgV3tg2exWe5OM1np5FF2LlSDg= +github.com/jfrog/build-info-go v1.9.31 h1:1pLC19hc9AEdWA87D+EcvMTLsDeMa390Z8TrNpCO4K8= +github.com/jfrog/build-info-go v1.9.31/go.mod h1:DZCElS/UhaSJHn0K1YzRUOJqiqVS4bjAEnGQSFncwNw= github.com/jfrog/froggit-go v1.16.1 h1:FBIM1qevX/ag9unfmpGzfmZ36D8ulOJ+DPTSFUk3l5U= github.com/jfrog/froggit-go v1.16.1/go.mod h1:TEJSzgiV+3D/GVGE8Y6j46ut1jrBLD1FL6WdMdKwwCE= github.com/jfrog/gofrog v1.7.5 h1:dFgtEDefJdlq9cqTRoe09RLxS5Bxbe1Ev5+E6SmZHcg= github.com/jfrog/gofrog v1.7.5/go.mod h1:jyGiCgiqSSR7k86hcUSu67XVvmvkkgWTmPsH25wI298= github.com/jfrog/jfrog-apps-config v1.0.1 h1:mtv6k7g8A8BVhlHGlSveapqf4mJfonwvXYLipdsOFMY= github.com/jfrog/jfrog-apps-config v1.0.1/go.mod h1:8AIIr1oY9JuH5dylz2S6f8Ym2MaadPLR6noCBO4C22w= -github.com/jfrog/jfrog-cli-artifactory v0.1.1 h1:3HfowB29TBEtr6BgAezdqTRVFhBFa5XasxARLh+1HDE= -github.com/jfrog/jfrog-cli-artifactory v0.1.1/go.mod h1:Jyv0OecV8k8JOT5C5m/UmS1KCsR1xkog1OjKJeDuMcY= -github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20240729104836-9c1dae33c595 h1:jOCvoCoWaUZTJK4SkgamSCUgA6U5E4YWV6scS9U0Z2c= -github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20240729104836-9c1dae33c595/go.mod h1:h1IMa3Fp1pqn37HJTimnMDoxcVlTpWiO7hC3dd9tNdE= +github.com/jfrog/jfrog-cli-artifactory v0.1.2 h1:CbDYDYItZL4QwEX4Br9SDBztSxiXzfaxAT0gNcrcd6Y= +github.com/jfrog/jfrog-cli-artifactory v0.1.2/go.mod h1:Jyv0OecV8k8JOT5C5m/UmS1KCsR1xkog1OjKJeDuMcY= +github.com/jfrog/jfrog-cli-core/v2 v2.54.0 h1:vSVSADvuZ2vou4B5spfsUZ32oA/sl4mPVEVgqfNbjUM= +github.com/jfrog/jfrog-cli-core/v2 v2.54.0/go.mod h1:ynAcz9jWDrcQi1/IkNLrIgfQnJO8LPLFwjLplgvY8KI= github.com/jfrog/jfrog-cli-platform-services v1.3.0 h1:IblSDZFBjL7WLRi37Ni2DmHrXJJ6ysSMxx7t41AvyDA= github.com/jfrog/jfrog-cli-platform-services v1.3.0/go.mod h1:Ky4SDXuMeaiNP/5zMT1YSzIuXG+cNYYOl8BaEA7Awbc= github.com/jfrog/jfrog-cli-security v1.6.3-0.20240729081816-371509c205d6 h1:U61knfgV/WZ4ZOhEEKKlnXQ8Y1BlKVPyVjTaERymIk0= github.com/jfrog/jfrog-cli-security v1.6.3-0.20240729081816-371509c205d6/go.mod h1:0m+jdJgsLF2QHl4f/t9JHuJ9E0Oqf9kK24UWsjAtvsE= -github.com/jfrog/jfrog-client-go v1.28.1-0.20240729103741-f6c521eb9a40 h1:zmh1NwYtbS3GE7jCPWtQpGsTakMo5DHl73BRkZTn6Ag= -github.com/jfrog/jfrog-client-go v1.28.1-0.20240729103741-f6c521eb9a40/go.mod h1:BJqDxNVbs34kuCx9ct6ge3/M39Pf/m5L5IYgZ9p8ap4= +github.com/jfrog/jfrog-client-go v1.43.1 h1:KIauYofb7R02mGDc8XADEvu245BJjUryjtq+YQQIbY8= +github.com/jfrog/jfrog-client-go v1.43.1/go.mod h1:J/Ketm4TkBudXG8gAGY74jtNUbKhXn1+XaRfJcJVkvA= 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.10.0 h1:upMDUxhQKqZ5ZDCs/wy+8Kib8rZR8I8lOR34yJkdqhI= diff --git a/utils/cliutils/cli_consts.go b/utils/cliutils/cli_consts.go index 185d44058..11f708978 100644 --- a/utils/cliutils/cli_consts.go +++ b/utils/cliutils/cli_consts.go @@ -4,7 +4,7 @@ import "time" const ( // General CLI constants - CliVersion = "2.61.2" + CliVersion = "2.62.0" ClientAgent = "jfrog-cli-go" // CLI base commands constants: From db2db8d823f2c2bb919e971f8ffd916296e4aaed Mon Sep 17 00:00:00 2001 From: Robi Nino Date: Wed, 31 Jul 2024 14:40:50 +0300 Subject: [PATCH 8/8] Merge from v2 (#2632)