@@ -27,8 +27,10 @@ import (
2727 "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/generic"
2828 "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/mvn"
2929 "github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
30+ buildUtils "github.com/jfrog/jfrog-cli-core/v2/common/build"
3031 "github.com/jfrog/jfrog-cli-core/v2/common/commands"
3132 "github.com/jfrog/jfrog-cli-core/v2/common/spec"
33+ "github.com/jfrog/jfrog-cli-core/v2/utils/config"
3234 "github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
3335 coreTests "github.com/jfrog/jfrog-cli-core/v2/utils/tests"
3436 "github.com/jfrog/jfrog-cli/inttestutils"
@@ -45,18 +47,6 @@ const localRepoSystemProperty = "-Dmaven.repo.local="
4547
4648var localRepoDir string
4749
48- // Simple build configuration struct to avoid importing problematic buildUtils package
49- type buildConfiguration struct {
50- buildName string
51- buildNumber string
52- }
53-
54- func (bc * buildConfiguration ) ValidateBuildAndModuleParams () error {
55- if bc .buildName == "" || bc .buildNumber == "" {
56- return errors .New ("build name and build number are required" )
57- }
58- return nil
59- }
6050
6151func cleanMavenTest (t * testing.T ) {
6252 clientTestUtils .UnSetEnvAndAssert (t , coreutils .HomeDir )
@@ -259,7 +249,7 @@ func runMvnConditionalUploadTest(buildName, buildNumber string) error {
259249 if ! exists {
260250 return errors .New ("no config file was found!" )
261251 }
262- buildConfig := & buildConfiguration { buildName : buildName , buildNumber : buildNumber }
252+ buildConfig := buildUtils . NewBuildConfiguration ( buildName , buildNumber , "" , "" )
263253 if err = buildConfig .ValidateBuildAndModuleParams (); err != nil {
264254 return err
265255 }
@@ -288,7 +278,7 @@ func TestMavenBuildWithServerIDAndDetailedSummary(t *testing.T) {
288278 defer clientTestUtils .ChangeDirAndAssert (t , oldHomeDir )
289279 repoLocalSystemProp := localRepoSystemProperty + localRepoDir
290280 filteredMavenArgs := []string {"clean" , "install" , "-B" , repoLocalSystemProp }
291- mvnCmd := mvn .NewMvnCommand ().SetConfiguration (& buildConfiguration {} ).SetConfigPath (filepath .Join (destPath , tests .MavenConfig )).SetGoals (filteredMavenArgs ).SetDetailedSummary (true )
281+ mvnCmd := mvn .NewMvnCommand ().SetConfiguration (buildUtils . NewBuildConfiguration ( "" , "" , "" , "" ) ).SetConfigPath (filepath .Join (destPath , tests .MavenConfig )).SetGoals (filteredMavenArgs ).SetDetailedSummary (true )
292282 assert .NoError (t , commands .Exec (mvnCmd ))
293283 // Validate
294284 assert .NotNil (t , mvnCmd .Result ())
@@ -375,6 +365,14 @@ func initMavenTest(t *testing.T, disableConfig bool) {
375365 err := createHomeConfigAndLocalRepo (t , true )
376366 assert .NoError (t , err )
377367 }
368+ // Initialize serverDetails for maven tests
369+ serverDetails = & config.ServerDetails {Url : * tests .JfrogUrl , ArtifactoryUrl : * tests .JfrogUrl + tests .ArtifactoryEndpoint , SshKeyPath : * tests .JfrogSshKeyPath , SshPassphrase : * tests .JfrogSshPassphrase }
370+ if * tests .JfrogAccessToken != "" {
371+ serverDetails .AccessToken = * tests .JfrogAccessToken
372+ } else {
373+ serverDetails .User = * tests .JfrogUser
374+ serverDetails .Password = * tests .JfrogPassword
375+ }
378376}
379377
380378func createHomeConfigAndLocalRepo (t * testing.T , encryptPassword bool ) (err error ) {
0 commit comments