Supporting Run native behavior for Gradle

buildtools/cli.go

@@ -14,6 +14,7 @@ import (
 	"github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/container/strategies"
 	"github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/python"
 	"github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/setup"
+	artutils "github.com/jfrog/jfrog-cli-artifactory/artifactory/utils"
 	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
 	"github.com/jfrog/jfrog-cli-core/v2/utils/ioutils"
 	"github.com/jfrog/jfrog-cli-security/utils/techutils"
@@ -558,8 +559,13 @@ func MvnCmd(c *cli.Context) (err error) {
 		return err
 	}
 
-	// FlexPack bypasses all config file requirements
-	if os.Getenv("JFROG_RUN_NATIVE") == "true" {
+	configFilePath, configExists, err := project.GetProjectConfFilePath(project.Maven)
+	if err != nil {
+		return err
+	}
+
+	// FlexPack bypasses all config file requirements (only when no config exists)
+	if artutils.ShouldRunNative(configFilePath) && !configExists {
 		log.Debug("Routing to Maven native implementation")
 		// Extract build configuration for FlexPack
 		args := cliutils.ExtractCommand(c)
@@ -572,9 +578,11 @@ func MvnCmd(c *cli.Context) (err error) {
 		return commands.Exec(mvnCmd)
 	}
 
-	configFilePath, err := getProjectConfigPathOrThrow(project.Maven, "mvn", "mvn-config")
-	if err != nil {
-		return err
+	// If config file is missing and not in native mode, return the standard missing-config error.
+	if !configExists {
+		if configFilePath, err = getProjectConfigPathOrThrow(project.Maven, "mvn", "mvn-config"); err != nil {
+			return err
+		}
 	}
 
 	if c.NArg() < 1 {
@@ -629,10 +637,63 @@ func GradleCmd(c *cli.Context) (err error) {
 		return err
 	}
 
-	configFilePath, err := getProjectConfigPathOrThrow(project.Gradle, "gradle", "gradle-config")
+	resolveServer := func(args []string) ([]string, *coreConfig.ServerDetails, error) {
+		cleanedArgs, serverID, err := coreutils.ExtractServerIdFromCommand(args)
+		if err != nil {
+			return nil, nil, fmt.Errorf("failed to extract server ID: %w", err)
+		}
+
+		if serverID == "" {
+			serverDetails, err := coreConfig.GetDefaultServerConf()
+			if err != nil {
+				return cleanedArgs, nil, err
+			}
+			if serverDetails == nil {
+				return cleanedArgs, nil, fmt.Errorf("no default server configuration found. Please configure a server using 'jfrog config add' or specify a server using --server-id")
+			}
+			return cleanedArgs, serverDetails, nil
+		}
+
+		serverDetails, err := coreConfig.GetSpecificConfig(serverID, true, true)
+		if err != nil {
+			return nil, nil, fmt.Errorf("failed to get server configuration for ID '%s': %w", serverID, err)
+		}
+		return cleanedArgs, serverDetails, nil
+	}
+
+	configFilePath, configExists, err := project.GetProjectConfFilePath(project.Gradle)
 	if err != nil {
 		return err
 	}
+	nativeMode := artutils.ShouldRunNative(configFilePath)
+
+	// FlexPack native mode for Gradle (bypasses config file requirements)
+	if nativeMode && !configExists {
+		log.Debug("Routing to Gradle FlexPack implementation")
+		if c.NArg() < 1 {
+			return cliutils.WrongNumberOfArgumentsHandler(c)
+		}
+		args := cliutils.ExtractCommand(c)
+		args, serverDetails, err := resolveServer(args)
+		if err != nil {
+			return err
+		}
+		filteredGradleArgs, buildConfiguration, err := build.ExtractBuildDetailsFromArgs(args)
+		if err != nil {
+			return err
+		}
+
+		// Create Gradle command with FlexPack (no config file needed)
+		gradleCmd := gradle.NewGradleCommand().SetConfiguration(buildConfiguration).SetTasks(filteredGradleArgs).SetConfigPath("").SetServerDetails(serverDetails)
+		return commands.Exec(gradleCmd)
+	}
+
+	// If config file is missing and not in native mode, return the standard missing-config error.
+	if !configExists {
+		if configFilePath, err = getProjectConfigPathOrThrow(project.Gradle, "gradle", "gradle-config"); err != nil {
+			return err
+		}
+	}
 
 	// Found a config file. Continue as native command.
 	if c.NArg() < 1 {
@@ -1508,7 +1569,7 @@ func pythonCmd(c *cli.Context, projectType project.ProjectType) error {
 	}
 
 	// FlexPack native mode for Poetry (bypasses config file requirements)
-	if os.Getenv("JFROG_RUN_NATIVE") == "true" && projectType == project.Poetry {
+	if artutils.ShouldRunNative("") && projectType == project.Poetry {
 		log.Debug("Routing to Poetry native implementation")
 		args := cliutils.ExtractCommand(c)
 		filteredArgs, buildConfiguration, err := build.ExtractBuildDetailsFromArgs(args)

go.mod

@@ -282,9 +282,9 @@ replace github.com/docker/docker => github.com/docker/docker v27.5.1+incompatibl
 
 replace github.com/gfleury/go-bitbucket-v1 => github.com/gfleury/go-bitbucket-v1 v0.0.0-20230825095122-9bc1711434ab
 
-//replace github.com/jfrog/jfrog-cli-artifactory => github.com/naveenku-jfrog/jfrog-cli-artifactory v0.0.0-20251210184507-0c8d138690cb
+replace github.com/jfrog/jfrog-cli-artifactory => github.com/nitinp19/jfrog-cli-artifactory v0.0.0-20251218130310-3bde47e0f6e2
 
-//replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20251006061821-8b1be6a65215
+replace github.com/jfrog/build-info-go => github.com/nitinp19/build-info-go v1.12.3-0.20251218125859-b4b775c8b360
 
 // replace github.com/jfrog/jfrog-cli-core/v2 => github.com/reshmifrog/jfrog-cli-core/v2 v2.58.5-0.20251110095124-ab9a4102ec5a
 

go.sum

@@ -1204,8 +1204,6 @@ github.com/jellydator/ttlcache/v3 v3.4.0 h1:YS4P125qQS0tNhtL6aeYkheEaB/m8HCqdMMP
 github.com/jellydator/ttlcache/v3 v3.4.0/go.mod h1:Hw9EgjymziQD3yGsQdf1FqFdpp7YjFMd4Srg5EJlgD4=
 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.12.5-0.20251209171349-eb030db986f9 h1:CL7lp7Y7srwQ1vy1btX66t4wbztzEGQbqi/9tdEz7xk=
-github.com/jfrog/build-info-go v1.12.5-0.20251209171349-eb030db986f9/go.mod h1:9W4U440fdTHwW1HiB/R0VQvz/5q8ZHsms9MWcq+JrdY=
 github.com/jfrog/froggit-go v1.20.6 h1:Xp7+LlEh0m1KGrQstb+u0aGfjRUtv1eh9xQBV3571jQ=
 github.com/jfrog/froggit-go v1.20.6/go.mod h1:obSG1SlsWjktkuqmKtpq7MNTTL63e0ot+ucTnlOMV88=
 github.com/jfrog/go-mockhttp v0.3.1 h1:/wac8v4GMZx62viZmv4wazB5GNKs+GxawuS1u3maJH8=
@@ -1216,8 +1214,6 @@ 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-application v1.0.2-0.20251210075951-519050602a7f h1:YHwPNF13Gmt65J618kEGn/4SGewXqyYuAdcyYWYdrBA=
 github.com/jfrog/jfrog-cli-application v1.0.2-0.20251210075951-519050602a7f/go.mod h1:xum2HquWO5uExa/A7MQs3TgJJVEeoqTR+6Z4mfBr1Xw=
-github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20251218044417-5113b260e416 h1:bCCsZ/2oVgcxeWVgUG8K0bE1I7JFZ+O6CISzwwEfrV8=
-github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20251218044417-5113b260e416/go.mod h1:7cCaRhXorlbyXZgiW5bplCExFxlnROaG21K12d8inpQ=
 github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20251210085744-f8481d179ac5 h1:GYE67ubwl+ZRw3CcXFUi49EwwQp6k+qS8sX0QuHDHO8=
 github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20251210085744-f8481d179ac5/go.mod h1:BMoGi2rG0udCCeaghqlNgiW3fTmT+TNnfTnBoWFYgcg=
 github.com/jfrog/jfrog-cli-evidence v0.8.3-0.20251204144808-73fa744851c0 h1:8S1vE1PeVtrzWkKL0N39cX6XLLNV0It+f6xjRKjw7Ug=
@@ -1327,6 +1323,10 @@ github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
 github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
+github.com/nitinp19/build-info-go v1.12.3-0.20251218125859-b4b775c8b360 h1:9XxSgWkh9gr9GALi0NHDlfU7kpVUtLbsYhsUG59/N5E=
+github.com/nitinp19/build-info-go v1.12.3-0.20251218125859-b4b775c8b360/go.mod h1:9W4U440fdTHwW1HiB/R0VQvz/5q8ZHsms9MWcq+JrdY=
+github.com/nitinp19/jfrog-cli-artifactory v0.0.0-20251218130310-3bde47e0f6e2 h1:HjiGdPDAl0Q79ZMUmA7YpBOkAZylVa3MvpFm24VWlcM=
+github.com/nitinp19/jfrog-cli-artifactory v0.0.0-20251218130310-3bde47e0f6e2/go.mod h1:iMc/mGpwoCYc+9+0GwfpnNKH+RpOrUb7FSLeckVjFZQ=
 github.com/nwaples/rardecode v1.1.3 h1:cWCaZwfM5H7nAD6PyEdcVnczzV8i/JtotnyW/dD9lEc=
 github.com/nwaples/rardecode v1.1.3/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0=
 github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw=