feature: cli-config.yaml also has provider/org/repo info CF-1766

Author: pedrobpereira

cmd/config.go

@@ -112,7 +112,7 @@ func runConfigResetLogic(cmd *cobra.Command, args []string, flags domain.InitFla
 		fmt.Println()
 		fmt.Println("ℹ️  Resetting to local default configurations.")
 		noTools := []domain.Tool{} // Empty slice for tools as we are in local mode without specific toolset from API initially
-		if err := configsetup.CreateConfigurationFiles(noTools, cliLocalMode); err != nil {
+		if err := configsetup.CreateConfigurationFiles(noTools, cliLocalMode, flags); err != nil {
 			log.Fatalf("Failed to create base configuration files: %v", err)
 		}
 		// Create default configuration files for tools

cmd/configsetup/setup.go

@@ -212,15 +212,15 @@ func CreateGitIgnoreFile() error {
 	return writeConfigFile(gitIgnorePath, []byte(content))
 }
 
-func CreateConfigurationFiles(tools []domain.Tool, cliLocalMode bool) error {
+func CreateConfigurationFiles(tools []domain.Tool, cliLocalMode bool, flags domain.InitFlags) error {
 	// Create project config file
 	configContent := ConfigFileTemplate(tools)
 	if err := writeConfigFile(config.Config.ProjectConfigFile(), []byte(configContent)); err != nil {
 		return fmt.Errorf("failed to write project config file: %w", err)
 	}
 
 	// Create CLI config file
-	cliConfigContent := buildCliConfigContent(cliLocalMode)
+	cliConfigContent := buildCliConfigContent(cliLocalMode, flags)
 	if err := writeConfigFile(config.Config.CliConfigFile(), []byte(cliConfigContent)); err != nil {
 		return fmt.Errorf("failed to write CLI config file: %w", err)
 	}
@@ -229,12 +229,12 @@ func CreateConfigurationFiles(tools []domain.Tool, cliLocalMode bool) error {
 }
 
 // buildCliConfigContent creates the CLI configuration content
-func buildCliConfigContent(cliLocalMode bool) string {
-	mode := "remote"
+func buildCliConfigContent(cliLocalMode bool, initFlags domain.InitFlags) string {
 	if cliLocalMode {
-		mode = "local"
+		return fmt.Sprintf("mode: local")
+	} else {
+		return fmt.Sprintf("mode: remote\nprovider: %s\norg: %s\nrepository: %s", initFlags.Provider, initFlags.Organization, initFlags.Repository)
 	}
-	return fmt.Sprintf("mode: %s", mode)
 }
 
 // RuntimePluginConfig holds the structure of the runtime plugin.yaml file
@@ -425,7 +425,7 @@ func BuildRepositoryConfigurationFiles(flags domain.InitFlags) error {
 	logVersionConflicts(familyToVersions, toolsWithLatestVersion)
 
 	// Create main config files with all enabled API tools (including cli-config.yaml)
-	if err := CreateConfigurationFiles(toolsWithLatestVersion, false); err != nil {
+	if err := CreateConfigurationFiles(toolsWithLatestVersion, false, flags); err != nil {
 		return err
 	}
 

cmd/init.go

@@ -42,7 +42,7 @@ var initCmd = &cobra.Command{
 			fmt.Println()
 			fmt.Println("ℹ️  No project token was specified, fetching codacy default configurations")
 			noTools := []domain.Tool{}
-			err := configsetup.CreateConfigurationFiles(noTools, cliLocalMode)
+			err := configsetup.CreateConfigurationFiles(noTools, cliLocalMode, initFlags)
 			if err != nil {
 				log.Fatal(err)
 			}

cmd/init_test.go

@@ -220,7 +220,7 @@ func TestInitCommand_NoToken(t *testing.T) {
 	cliLocalMode := len(currentInitFlags.ApiToken) == 0
 	if cliLocalMode {
 		noTools := []domain.Tool{}
-		err := configsetup.CreateConfigurationFiles(noTools, cliLocalMode)
+		err := configsetup.CreateConfigurationFiles(noTools, cliLocalMode, currentInitFlags)
 		assert.NoError(t, err, "CreateConfigurationFiles should not return an error")
 		if err := configsetup.BuildDefaultConfigurationFiles(toolsConfigDir, currentInitFlags); err != nil {
 			t.Fatalf("Failed to build default configuration files: %v", err)
@@ -255,4 +255,91 @@ func TestInitCommand_NoToken(t *testing.T) {
 		_, err := os.Stat(filePath)
 		assert.NoError(t, err, "Expected config file %s to be created at %s", file, filePath)
 	}
+
+	cliConfigPath := filepath.Join(codacyDir, "cli-config.yaml")
+	cliConfigFileContent, err := os.ReadFile(cliConfigPath)
+	assert.NoError(t, err, "Expected cli-config.yaml file to be created at %s", cliConfigPath)
+
+	assert.Equal(t, cliConfigFileContent, "mode: remote")
+}
+
+func TestInitCommand_WithToken(t *testing.T) {
+	tempDir := t.TempDir()
+	originalWD, err := os.Getwd()
+	assert.NoError(t, err, "Failed to get current working directory")
+	defer os.Chdir(originalWD)
+
+	// Use the real plugins/tools/semgrep/rules.yaml file
+	rulesPath := filepath.Join("..", "plugins", "tools", "semgrep", "rules.yaml")
+	if _, err := os.Stat(rulesPath); os.IsNotExist(err) {
+		t.Skipf("plugins/tools/semgrep/rules.yaml not found at %s; skipping test", rulesPath)
+	}
+
+	// Change to the temp directory to simulate a new project
+	err = os.Chdir(tempDir)
+	assert.NoError(t, err, "Failed to change working directory to tempDir")
+
+	// Simulate running init with no token
+	currentInitFlags := domain.InitFlags{
+		ApiToken:     "token",
+		Provider:     "gh",
+		Organization: "acme",
+		Repository:   "acme-repo",
+	}
+
+	// Call the Run logic from initCmd
+	if err := config.Config.CreateLocalCodacyDir(); err != nil {
+		t.Fatalf("Failed to create local codacy directory: %v", err)
+	}
+
+	toolsConfigDir := config.Config.ToolsConfigDirectory()
+	if err := os.MkdirAll(toolsConfigDir, constants.DefaultDirPerms); err != nil {
+		t.Fatalf("Failed to create tools-configs directory: %v", err)
+	}
+
+	cliLocalMode := len(currentInitFlags.ApiToken) == 0
+	if cliLocalMode {
+		noTools := []domain.Tool{}
+		err := configsetup.CreateConfigurationFiles(noTools, cliLocalMode, currentInitFlags)
+		assert.NoError(t, err, "CreateConfigurationFiles should not return an error")
+		if err := configsetup.BuildDefaultConfigurationFiles(toolsConfigDir, currentInitFlags); err != nil {
+			t.Fatalf("Failed to build default configuration files: %v", err)
+		}
+		if err := configsetup.CreateLanguagesConfigFileLocal(toolsConfigDir); err != nil {
+			t.Fatalf("Failed to create languages config file: %v", err)
+		}
+	}
+
+	// Assert that the expected config files are created
+	codacyDir := config.Config.LocalCodacyDirectory()
+	expectedFiles := []string{
+		filepath.Join("tools-configs", "eslint.config.mjs"),
+		filepath.Join("tools-configs", "trivy.yaml"),
+		filepath.Join("tools-configs", "ruleset.xml"),
+		filepath.Join("tools-configs", "pylint.rc"),
+		filepath.Join("tools-configs", "analysis_options.yaml"),
+		filepath.Join("tools-configs", "semgrep.yaml"),
+		filepath.Join("tools-configs", "lizard.yaml"),
+		"codacy.yaml",
+		"cli-config.yaml",
+		filepath.Join("tools-configs", "languages-config.yaml"),
+		".gitignore",
+	}
+
+	for _, file := range expectedFiles {
+		filePath := filepath.Join(codacyDir, file)
+		if file == ".gitignore" {
+			filePath = filepath.Join(config.Config.LocalCodacyDirectory(), file)
+		}
+
+		_, err := os.Stat(filePath)
+		assert.NoError(t, err, "Expected config file %s to be created at %s", file, filePath)
+	}
+
+	cliConfigPath := filepath.Join(codacyDir, "cli-config.yaml")
+	cliConfigFileContent, err := os.ReadFile(cliConfigPath)
+	assert.NoError(t, err, "Expected cli-config.yaml file to be created at %s", cliConfigPath)
+
+	assert.Equal(t, cliConfigFileContent, "mode: remote\nprovider: gh\norganizg4g4ation: acme\nrepository: acme-repo")
+
 }

integration-tests/init-with-token/expected/cli-config.yaml

@@ -1 +1,4 @@
-mode: remote
+mode: remote
+provider: gh
+organization: troubleshoot-codacy-dev
+repository: codacy-cli-test