Add RemoveArtifactoryRepository function with unified helper utilities

- Add RemoveArtifactoryRepository() to remove all Artifactory configuration from settings.xml
- Extract shared helper functions: buildRepositoryURL, findElementByID, removeElementByID, removeEmptyContainer
- Refactor findOrCreateElementByID to use new findElementByID helper
- Add 6 comprehensive tests for removal functionality (URL verification, idempotency, config preservation, etc.)
- Test coverage: 94.4%

Author: sverdlov93

artifactory/utils/maven/settingsxml.go

@@ -97,6 +97,11 @@ func (sxm *SettingsXmlManager) loadSettings() {
 	sxm.doc.Indent(2)
 }
 
+// buildRepositoryURL constructs the full repository URL from base URL and repository name.
+func buildRepositoryURL(artifactoryUrl, repoName string) string {
+	return strings.TrimRight(artifactoryUrl, "/") + "/" + repoName
+}
+
 // ConfigureArtifactoryRepository configures Maven to use Artifactory for both downloading and deployment.
 // It updates or creates the following in settings.xml:
 //   - Mirror configuration for downloading artifacts from Artifactory
@@ -120,7 +125,7 @@ func (sxm *SettingsXmlManager) ConfigureArtifactoryRepository(artifactoryUrl, re
 	}
 
 	// Build repository URL
-	repoUrl := strings.TrimRight(artifactoryUrl, "/") + "/" + repoName
+	repoUrl := buildRepositoryURL(artifactoryUrl, repoName)
 
 	// Ensure we have a root <settings> element
 	root := sxm.doc.SelectElement(xmlElementSettings)
@@ -189,14 +194,43 @@ func getOrCreateElement(parent *etree.Element, name string) *etree.Element {
 	return element
 }
 
-// findOrCreateElementByID finds an element with a specific ID or creates a new one.
-func findOrCreateElementByID(parent *etree.Element, elementName, id string) *etree.Element {
+// findElementByID finds an element with a specific ID within a parent container.
+// Returns nil if not found.
+func findElementByID(parent *etree.Element, elementName, id string) *etree.Element {
 	for _, elem := range parent.SelectElements(elementName) {
 		if idElem := elem.SelectElement(xmlElementID); idElem != nil && idElem.Text() == id {
 			return elem
 		}
 	}
-	return parent.CreateElement(elementName)
+	return nil
+}
+
+// findOrCreateElementByID finds an element with a specific ID or creates a new one.
+func findOrCreateElementByID(parent *etree.Element, elementName, id string) *etree.Element {
+	elem := findElementByID(parent, elementName, id)
+	if elem == nil {
+		elem = parent.CreateElement(elementName)
+	}
+	return elem
+}
+
+// removeElementByID removes an element with a specific ID from its parent container.
+// Returns true if the element was found and removed, false otherwise.
+func removeElementByID(parent *etree.Element, elementName, id string) bool {
+	elem := findElementByID(parent, elementName, id)
+	if elem != nil {
+		parent.RemoveChild(elem)
+		return true
+	}
+	return false
+}
+
+// removeEmptyContainer removes a container element from its parent if it has no children.
+func removeEmptyContainer(root *etree.Element, containerName string) {
+	container := root.SelectElement(containerName)
+	if container != nil && len(container.ChildElements()) == 0 {
+		root.RemoveChild(container)
+	}
 }
 
 // setOrCreateChildElement sets or creates a child element with the given name and text.
@@ -205,6 +239,90 @@ func setOrCreateChildElement(parent *etree.Element, name, text string) {
 	child.SetText(text)
 }
 
+// RemoveArtifactoryRepository removes all Artifactory configuration from settings.xml.
+// This includes:
+//   - Mirror configuration with ArtifactoryMirrorID
+//   - Server credentials with ArtifactoryMirrorID
+//   - Deployment profile with ArtifactoryDeployProfileID
+//
+// Parameters:
+//   - artifactoryUrl: Base URL of the Artifactory instance (used for verification, optional)
+//   - repoName: Name of the Artifactory repository (used for verification, optional)
+//
+// Returns an error if the settings.xml cannot be updated.
+func (sxm *SettingsXmlManager) RemoveArtifactoryRepository(artifactoryUrl, repoName string) error {
+	root := sxm.doc.SelectElement(xmlElementSettings)
+	if root == nil {
+		return fmt.Errorf("invalid settings.xml: missing <%s> root element", xmlElementSettings)
+	}
+
+	// Build repository URL for verification if provided
+	var repoUrl string
+	if artifactoryUrl != "" && repoName != "" {
+		repoUrl = buildRepositoryURL(artifactoryUrl, repoName)
+	}
+
+	// Remove mirror
+	if err := sxm.removeMirror(root, repoUrl); err != nil {
+		return err
+	}
+
+	// Remove server
+	sxm.removeServer(root)
+
+	// Remove deployment profile
+	sxm.removeDeploymentProfile(root)
+
+	// Write settings to file
+	return sxm.writeSettingsToFile()
+}
+
+// removeMirror removes the Artifactory mirror entry.
+func (sxm *SettingsXmlManager) removeMirror(root *etree.Element, expectedUrl string) error {
+	mirrors := root.SelectElement(xmlElementMirrors)
+	if mirrors == nil {
+		return nil
+	}
+
+	// Verify URL if provided before removing
+	if expectedUrl != "" {
+		mirror := findElementByID(mirrors, xmlElementMirror, ArtifactoryMirrorID)
+		if mirror != nil {
+			urlElem := mirror.SelectElement(xmlElementURL)
+			if urlElem != nil && urlElem.Text() != expectedUrl {
+				return fmt.Errorf("mirror URL mismatch: expected %s, found %s", expectedUrl, urlElem.Text())
+			}
+		}
+	}
+
+	removeElementByID(mirrors, xmlElementMirror, ArtifactoryMirrorID)
+	removeEmptyContainer(root, xmlElementMirrors)
+
+	return nil
+}
+
+// removeServer removes the Artifactory server entry.
+func (sxm *SettingsXmlManager) removeServer(root *etree.Element) {
+	servers := root.SelectElement(xmlElementServers)
+	if servers == nil {
+		return
+	}
+
+	removeElementByID(servers, xmlElementServer, ArtifactoryMirrorID)
+	removeEmptyContainer(root, xmlElementServers)
+}
+
+// removeDeploymentProfile removes the Artifactory deployment profile.
+func (sxm *SettingsXmlManager) removeDeploymentProfile(root *etree.Element) {
+	profiles := root.SelectElement(xmlElementProfiles)
+	if profiles == nil {
+		return
+	}
+
+	removeElementByID(profiles, xmlElementProfile, ArtifactoryDeployProfileID)
+	removeEmptyContainer(root, xmlElementProfiles)
+}
+
 // writeSettingsToFile writes the document to the settings.xml file.
 func (sxm *SettingsXmlManager) writeSettingsToFile() error {
 	// Ensure directory exists

artifactory/utils/maven/settingsxml_test.go

@@ -834,6 +834,218 @@ func TestComprehensiveXMLPreservation(t *testing.T) {
 	t.Logf("   - Element counts correct: %d servers, %d mirrors, %d profiles", serverCount, mirrorCount, profileCount)
 }
 
+func TestRemoveArtifactoryRepository(t *testing.T) {
+	tempDir := t.TempDir()
+	settingsPath := filepath.Join(tempDir, "settings.xml")
+
+	// First configure Artifactory
+	manager, err := NewSettingsXmlManagerWithPath(settingsPath)
+	require.NoError(t, err)
+
+	err = manager.ConfigureArtifactoryRepository("https://artifactory.example.com", "maven-virtual", "admin", "secret123")
+	require.NoError(t, err)
+
+	// Verify configuration was added
+	content, err := os.ReadFile(settingsPath)
+	require.NoError(t, err)
+	xmlContent := string(content)
+	assert.Contains(t, xmlContent, "artifactory-mirror")
+	assert.Contains(t, xmlContent, "artifactory-deploy")
+	assert.Contains(t, xmlContent, "admin")
+
+	// Now remove the configuration
+	manager, err = NewSettingsXmlManagerWithPath(settingsPath)
+	require.NoError(t, err)
+
+	err = manager.RemoveArtifactoryRepository("https://artifactory.example.com", "maven-virtual")
+	require.NoError(t, err)
+
+	// Verify configuration was removed
+	content, err = os.ReadFile(settingsPath)
+	require.NoError(t, err)
+	xmlContent = string(content)
+	assert.NotContains(t, xmlContent, "artifactory-mirror")
+	assert.NotContains(t, xmlContent, "artifactory-deploy")
+	assert.NotContains(t, xmlContent, "admin")
+	assert.NotContains(t, xmlContent, "secret123")
+
+	// Should still have valid XML structure
+	manager, err = NewSettingsXmlManagerWithPath(settingsPath)
+	require.NoError(t, err)
+	root := manager.doc.SelectElement(xmlElementSettings)
+	assert.NotNil(t, root)
+}
+
+func TestRemoveArtifactoryRepository_WithoutURL(t *testing.T) {
+	tempDir := t.TempDir()
+	settingsPath := filepath.Join(tempDir, "settings.xml")
+
+	// First configure Artifactory
+	manager, err := NewSettingsXmlManagerWithPath(settingsPath)
+	require.NoError(t, err)
+
+	err = manager.ConfigureArtifactoryRepository("https://artifactory.example.com", "maven-virtual", "admin", "secret123")
+	require.NoError(t, err)
+
+	// Remove without URL verification (should still work)
+	manager, err = NewSettingsXmlManagerWithPath(settingsPath)
+	require.NoError(t, err)
+
+	err = manager.RemoveArtifactoryRepository("", "")
+	require.NoError(t, err)
+
+	// Verify configuration was removed
+	content, err := os.ReadFile(settingsPath)
+	require.NoError(t, err)
+	xmlContent := string(content)
+	assert.NotContains(t, xmlContent, "artifactory-mirror")
+	assert.NotContains(t, xmlContent, "artifactory-deploy")
+}
+
+func TestRemoveArtifactoryRepository_URLMismatch(t *testing.T) {
+	tempDir := t.TempDir()
+	settingsPath := filepath.Join(tempDir, "settings.xml")
+
+	// Configure with one URL
+	manager, err := NewSettingsXmlManagerWithPath(settingsPath)
+	require.NoError(t, err)
+
+	err = manager.ConfigureArtifactoryRepository("https://artifactory.example.com", "maven-virtual", "admin", "secret123")
+	require.NoError(t, err)
+
+	// Try to remove with different URL - should fail
+	manager, err = NewSettingsXmlManagerWithPath(settingsPath)
+	require.NoError(t, err)
+
+	err = manager.RemoveArtifactoryRepository("https://different.example.com", "maven-virtual")
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "mirror URL mismatch")
+
+	// Configuration should still be present
+	content, err := os.ReadFile(settingsPath)
+	require.NoError(t, err)
+	xmlContent := string(content)
+	assert.Contains(t, xmlContent, "artifactory-mirror")
+}
+
+func TestRemoveArtifactoryRepository_PreservesOtherConfig(t *testing.T) {
+	tempDir := t.TempDir()
+	settingsPath := filepath.Join(tempDir, "settings.xml")
+
+	// Create settings with existing configuration
+	existingXML := `<?xml version="1.0" encoding="UTF-8"?>
+<settings xmlns="http://maven.apache.org/SETTINGS/1.2.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.2.0 http://maven.apache.org/xsd/settings-1.2.0.xsd">
+  <servers>
+    <server>
+      <id>my-server</id>
+      <username>myuser</username>
+      <password>mypass</password>
+    </server>
+  </servers>
+  <mirrors>
+    <mirror>
+      <id>my-mirror</id>
+      <url>https://my-mirror.com</url>
+      <mirrorOf>central</mirrorOf>
+    </mirror>
+  </mirrors>
+  <profiles>
+    <profile>
+      <id>my-profile</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+    </profile>
+  </profiles>
+</settings>`
+
+	err := os.WriteFile(settingsPath, []byte(existingXML), 0o644)
+	require.NoError(t, err)
+
+	// Add Artifactory config
+	manager, err := NewSettingsXmlManagerWithPath(settingsPath)
+	require.NoError(t, err)
+
+	err = manager.ConfigureArtifactoryRepository("https://artifactory.example.com", "maven-virtual", "admin", "secret123")
+	require.NoError(t, err)
+
+	// Remove Artifactory config
+	manager, err = NewSettingsXmlManagerWithPath(settingsPath)
+	require.NoError(t, err)
+
+	err = manager.RemoveArtifactoryRepository("", "")
+	require.NoError(t, err)
+
+	// Verify original configuration is preserved
+	content, err := os.ReadFile(settingsPath)
+	require.NoError(t, err)
+	xmlContent := string(content)
+
+	// Original config should be present
+	assert.Contains(t, xmlContent, "my-server")
+	assert.Contains(t, xmlContent, "myuser")
+	assert.Contains(t, xmlContent, "my-mirror")
+	assert.Contains(t, xmlContent, "my-profile")
+
+	// Artifactory config should be removed
+	assert.NotContains(t, xmlContent, "artifactory-mirror")
+	assert.NotContains(t, xmlContent, "artifactory-deploy")
+	assert.NotContains(t, xmlContent, "admin")
+}
+
+func TestRemoveArtifactoryRepository_Idempotent(t *testing.T) {
+	tempDir := t.TempDir()
+	settingsPath := filepath.Join(tempDir, "settings.xml")
+
+	// Create empty settings
+	manager, err := NewSettingsXmlManagerWithPath(settingsPath)
+	require.NoError(t, err)
+
+	// Try to remove from empty file - should not error
+	err = manager.RemoveArtifactoryRepository("", "")
+	assert.NoError(t, err)
+
+	// Remove again - should still not error (idempotent)
+	manager, err = NewSettingsXmlManagerWithPath(settingsPath)
+	require.NoError(t, err)
+
+	err = manager.RemoveArtifactoryRepository("", "")
+	assert.NoError(t, err)
+}
+
+func TestRemoveArtifactoryRepository_RemovesEmptyContainers(t *testing.T) {
+	tempDir := t.TempDir()
+	settingsPath := filepath.Join(tempDir, "settings.xml")
+
+	// Configure Artifactory only (no other servers/mirrors/profiles)
+	manager, err := NewSettingsXmlManagerWithPath(settingsPath)
+	require.NoError(t, err)
+
+	err = manager.ConfigureArtifactoryRepository("https://artifactory.example.com", "maven-virtual", "admin", "secret123")
+	require.NoError(t, err)
+
+	// Remove configuration
+	manager, err = NewSettingsXmlManagerWithPath(settingsPath)
+	require.NoError(t, err)
+
+	err = manager.RemoveArtifactoryRepository("", "")
+	require.NoError(t, err)
+
+	// Verify empty container elements are removed
+	content, err := os.ReadFile(settingsPath)
+	require.NoError(t, err)
+	xmlContent := string(content)
+
+	assert.NotContains(t, xmlContent, "<servers>")
+	assert.NotContains(t, xmlContent, "<mirrors>")
+	assert.NotContains(t, xmlContent, "<profiles>")
+
+	// Should still have valid root structure
+	assert.Contains(t, xmlContent, "<settings")
+}
+
 // Helper function to set home directory for cross-platform testing
 func setTestHomeDir(t *testing.T, tempDir string) {
 	originalHome, err := os.UserHomeDir()