Merge remote-tracking branch 'origin/dev' into v2

artifactory_test.go

@@ -33,7 +33,6 @@ import (
 	"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
 	commonCliUtils "github.com/jfrog/jfrog-cli-core/v2/common/cliutils"
 	"github.com/jfrog/jfrog-cli-core/v2/common/commands"
-	"github.com/jfrog/jfrog-cli-core/v2/common/project"
 	"github.com/jfrog/jfrog-cli-core/v2/common/spec"
 	commontests "github.com/jfrog/jfrog-cli-core/v2/common/tests"
 	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
@@ -5652,82 +5651,6 @@ func readerGetErrorAndAssert(t *testing.T, reader *content.ContentReader) {
 	assert.NoError(t, reader.GetError(), "Couldn't get reader error")
 }
 
-func TestProjectInitMaven(t *testing.T) {
-	testProjectInit(t, "multiproject", coreutils.Maven)
-}
-
-func TestProjectInitGradle(t *testing.T) {
-	testProjectInit(t, "gradleproject", coreutils.Gradle)
-}
-
-func TestProjectInitNpm(t *testing.T) {
-	testProjectInit(t, "npmproject", coreutils.Npm)
-}
-
-func TestProjectInitGo(t *testing.T) {
-	testProjectInit(t, "dependency", coreutils.Go)
-}
-
-func TestProjectInitPip(t *testing.T) {
-	testProjectInit(t, "requirementsproject", coreutils.Pip)
-}
-
-func TestProjectInitNuget(t *testing.T) {
-	testProjectInit(t, "multipackagesconfig", coreutils.Nuget)
-}
-
-func testProjectInit(t *testing.T, projectExampleName string, technology coreutils.Technology) {
-	initArtifactoryTest(t, "")
-	defer cleanArtifactoryTest()
-	// Create temp JFrog home dir
-	tmpHomeDir, deleteHomeDir := coretests.CreateTempDirWithCallbackAndAssert(t)
-	defer deleteHomeDir()
-	clientTestUtils.SetEnvAndAssert(t, coreutils.HomeDir, tmpHomeDir)
-	_, err := createServerConfigAndReturnPassphrase(t)
-	assert.NoError(t, err)
-
-	// Copy a simple project in a temp work dir
-	tmpWorkDir, deleteWorkDir := coretests.CreateTempDirWithCallbackAndAssert(t)
-	defer deleteWorkDir()
-	testdataSrc := filepath.Join(filepath.FromSlash(tests.GetTestResourcesPath()), technology.String(), projectExampleName)
-	err = biutils.CopyDir(testdataSrc, tmpWorkDir, true, nil)
-	assert.NoError(t, err)
-	if technology == coreutils.Go {
-		goModeOriginalPath := filepath.Join(tmpWorkDir, "createGoProject_go.mod_suffix")
-		goModeTargetPath := filepath.Join(tmpWorkDir, "go.mod")
-		assert.NoError(t, os.Rename(goModeOriginalPath, goModeTargetPath))
-	}
-
-	// Run cd command to temp dir.
-	currentWd, err := os.Getwd()
-	assert.NoError(t, err)
-	changeDirBack := clientTestUtils.ChangeDirWithCallback(t, currentWd, tmpWorkDir)
-	defer changeDirBack()
-	// Run JFrog project init
-	err = platformCli.WithoutCredentials().Exec("project", "init", "--path", tmpWorkDir, "--server-id="+tests.ServerId)
-	assert.NoError(t, err)
-	// Validate correctness of .jfrog/projects/$technology.yml
-	validateProjectYamlFile(t, tmpWorkDir, technology.String())
-	// Validate correctness of .jfrog/projects/build.yml
-	validateBuildYamlFile(t, tmpWorkDir)
-}
-
-func validateProjectYamlFile(t *testing.T, projectDir, technology string) {
-	techConfig, err := project.ReadConfigFile(filepath.Join(projectDir, ".jfrog", "projects", technology+".yaml"), project.YAML)
-	if assert.NoError(t, err) {
-		assert.Equal(t, technology, techConfig.GetString("type"))
-		assert.Equal(t, tests.ServerId, techConfig.GetString("resolver.serverId"))
-		assert.Equal(t, tests.ServerId, techConfig.GetString("deployer.serverId"))
-	}
-}
-
-func validateBuildYamlFile(t *testing.T, projectDir string) {
-	techConfig, err := project.ReadConfigFile(filepath.Join(projectDir, ".jfrog", "projects", "build.yaml"), project.YAML)
-	assert.NoError(t, err)
-	assert.Equal(t, "build", techConfig.GetString("type"))
-	assert.Equal(t, filepath.Base(projectDir+"/"), techConfig.GetString("name"))
-}
-
 func TestTerraformPublish(t *testing.T) {
 	testTerraformPublish(t, false)
 }

general/ai/cli.go

@@ -47,12 +47,12 @@ func HowCmd(c *cli.Context) error {
 		return cliutils.WrongNumberOfArgumentsHandler(c)
 	}
 	log.Output(coreutils.PrintTitle("This AI-based interface converts your natural language inputs into fully functional JFrog CLI commands.\n" +
-		"NOTE: This is a beta version and it supports mostly Artifactory and Xray commands.\n"))
+		"NOTE: This is an experimental version and it supports mostly Artifactory and Xray commands.\n"))
 
 	for {
 		var question string
 		scanner := bufio.NewScanner(os.Stdin)
-		fmt.Print("🐸 Your request: ")
+		fmt.Print("🐸 Your request:\n   ")
 		for {
 			// Ask the user for a question
 			scanner.Scan()
@@ -62,13 +62,15 @@ func HowCmd(c *cli.Context) error {
 				break
 			}
 		}
+		fmt.Print("\n🤖 Generated command:\n   ")
 		questionBody := QuestionBody{Question: question}
 		llmAnswer, err := askQuestion(questionBody)
 		if err != nil {
 			return err
 		}
+		log.Output(coreutils.PrintLink(llmAnswer) + "\n")
 
-		log.Output("🤖 Generated command: " + coreutils.PrintLink(llmAnswer) + "\n")
+		// Ask the user for feedback
 		feedback := FeedbackBody{QuestionBody: questionBody, LlmAnswer: llmAnswer}
 		feedback.getUserFeedback()
 		if err = sendFeedback(feedback); err != nil {