Removed cyclic dependency on cli-artifactory

Author: bhanurp

artifactory/commands/generic/ping.go

@@ -0,0 +1,49 @@
+package generic
+
+import (
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
+)
+
+type PingCommand struct {
+	serverDetails *config.ServerDetails
+	response      []byte
+}
+
+func NewPingCommand() *PingCommand {
+	return &PingCommand{}
+}
+
+func (pc *PingCommand) Response() []byte {
+	return pc.response
+}
+
+func (pc *PingCommand) ServerDetails() (*config.ServerDetails, error) {
+	return pc.serverDetails, nil
+}
+
+func (pc *PingCommand) SetServerDetails(serverDetails *config.ServerDetails) *PingCommand {
+	pc.serverDetails = serverDetails
+	return pc
+}
+
+func (pc *PingCommand) CommandName() string {
+	return "rt_ping"
+}
+
+func (pc *PingCommand) Run() error {
+	var err error
+	pc.response, err = pc.Ping()
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (pc *PingCommand) Ping() ([]byte, error) {
+	servicesManager, err := utils.CreateServiceManager(pc.serverDetails, -1, 0, false)
+	if err != nil {
+		return nil, err
+	}
+	return servicesManager.Ping()
+}

artifactory/commands/generic/ping_test.go

@@ -0,0 +1,46 @@
+package generic
+
+import (
+	"fmt"
+	"github.com/stretchr/testify/assert"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/log"
+)
+
+func TestPingSuccess(t *testing.T) {
+	log.SetDefaultLogger()
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusOK)
+		_, err := fmt.Fprint(w, "OK")
+		assert.NoError(t, err)
+	}))
+	defer ts.Close()
+	responseBytes, err := new(PingCommand).SetServerDetails(&config.ServerDetails{ArtifactoryUrl: ts.URL + "/"}).Ping()
+	if err != nil {
+		t.Logf("Error received from Artifactory following ping request: %s", err)
+		t.Fail()
+	}
+	responseString := string(responseBytes)
+	if responseString != "OK" {
+		t.Logf("Non 'OK' response received from Artifactory following ping request:: %s", responseString)
+		t.Fail()
+	}
+}
+
+func TestPingFailed(t *testing.T) {
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusServiceUnavailable)
+		_, err := fmt.Fprint(w, `{"error":"error"}`)
+		assert.NoError(t, err)
+	}))
+	defer ts.Close()
+	_, err := new(PingCommand).SetServerDetails(&config.ServerDetails{ArtifactoryUrl: ts.URL + "/"}).Ping()
+	if err == nil {
+		t.Log("Expected error from artifactory")
+		t.Fail()
+	}
+}

artifactory/commands/gradle/config/gradle.yaml

@@ -12,7 +12,7 @@ import (
 
 	"github.com/jfrog/gofrog/version"
 
-	"github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/generic"
+	"github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/generic"
 	"github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/transferconfig/configxmlutils"
 	commandsUtils "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/utils"
 	"github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/utils/precheckrunner"

artifactory/commands/gradle/deployableArtifacts/artifacts

@@ -14,7 +14,6 @@ require (
 	github.com/jedib0t/go-pretty/v6 v6.6.5
 	github.com/jfrog/build-info-go v1.10.8
 	github.com/jfrog/gofrog v1.7.6
-	github.com/jfrog/jfrog-cli-artifactory v0.1.11
 	github.com/jfrog/jfrog-client-go v1.49.1
 	github.com/magiconair/properties v1.8.9
 	github.com/manifoldco/promptui v0.9.0
@@ -97,7 +96,7 @@ require (
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 )
 
-// replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20250121093504-a3e981c875d7
+// replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20241225183733-80a5e1ba7a2c
 
 // replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20241121100855-e7a75ceee2bd
 

artifactory/commands/transferconfig/transferconfig.go

@@ -19,8 +19,6 @@ github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFI
 github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
-github.com/bhanurp/jfrog-cli-artifactory v0.1.12-0.20250110100951-d002779f4509 h1:UYm+G5P/YTo+Y/gOG72U3JOYqSmJc53fp8x6UtZInho=
-github.com/bhanurp/jfrog-cli-artifactory v0.1.12-0.20250110100951-d002779f4509/go.mod h1:2bMm7UHMiJY1DEJTLSFJyRCiR8kCwx71m/FoFJezNNo=
 github.com/bradleyjkemp/cupaloy/v2 v2.8.0 h1:any4BmKE+jGIaMpnU8YgH/I2LPiLBufr6oMMlVBbn9M=
 github.com/bradleyjkemp/cupaloy/v2 v2.8.0/go.mod h1:bm7JXdkRd4BHJk9HpwqAI8BoAY1lps46Enkdqw6aRX0=
 github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs=