feedback

Author: dmcilvaney

internal/app/azldev/cmds/component/diffidentity.go

@@ -130,7 +130,13 @@ func readIdentityFile(
 // ComputeDiff compares base and head identity maps and produces a diff report.
 // When changedOnly is true, the Removed and Unchanged lists are left empty.
 func ComputeDiff(base map[string]string, head map[string]string, changedOnly bool) *IdentityDiffReport {
-	report := &IdentityDiffReport{}
+	// Initialize all slices so JSON serialization produces [] instead of null.
+	report := &IdentityDiffReport{
+		Changed:   make([]string, 0),
+		Added:     make([]string, 0),
+		Removed:   make([]string, 0),
+		Unchanged: make([]string, 0),
+	}
 
 	// Check base components against head.
 	for name, baseFP := range base {

internal/app/azldev/cmds/component/diffidentity_test.go

@@ -4,8 +4,10 @@
 package component_test
 
 import (
+	"encoding/json"
 	"testing"
 
+	"github.com/microsoft/azure-linux-dev-tools/internal/app/azldev"
 	"github.com/microsoft/azure-linux-dev-tools/internal/app/azldev/cmds/component"
 	"github.com/microsoft/azure-linux-dev-tools/internal/app/azldev/core/testutils"
 	"github.com/microsoft/azure-linux-dev-tools/internal/utils/fileperms"
@@ -200,3 +202,34 @@ func TestDiffIdentities_EmptyArray(t *testing.T) {
 	require.True(t, ok)
 	assert.Empty(t, tableResults)
 }
+
+func TestDiffIdentities_JSONFormat(t *testing.T) {
+	testEnv := testutils.NewTestEnv(t)
+	testEnv.Env.SetDefaultReportFormat(azldev.ReportFormatJSON)
+
+	require.NoError(t, fileutils.WriteFile(testEnv.TestFS, "/base.json",
+		[]byte(`[{"component":"curl","fingerprint":"sha256:aaa"}]`), fileperms.PublicFile))
+	require.NoError(t, fileutils.WriteFile(testEnv.TestFS, "/head.json",
+		[]byte(`[{"component":"curl","fingerprint":"sha256:bbb"},{"component":"wget","fingerprint":"sha256:ccc"}]`),
+		fileperms.PublicFile))
+
+	result, err := component.DiffIdentities(testEnv.Env, "/base.json", "/head.json", false)
+	require.NoError(t, err)
+
+	report, ok := result.(*component.IdentityDiffReport)
+	require.True(t, ok, "expected IdentityDiffReport for JSON format")
+
+	assert.Equal(t, []string{"curl"}, report.Changed)
+	assert.Equal(t, []string{"wget"}, report.Added)
+	assert.Empty(t, report.Removed)
+	assert.Empty(t, report.Unchanged)
+
+	// Verify JSON serialization produces [] not null for empty arrays.
+	jsonBytes, err := json.Marshal(report)
+	require.NoError(t, err)
+
+	jsonStr := string(jsonBytes)
+	assert.Contains(t, jsonStr, `"removed":[]`)
+	assert.Contains(t, jsonStr, `"unchanged":[]`)
+	assert.NotContains(t, jsonStr, "null")
+}

internal/app/azldev/cmds/component/identity.go

@@ -91,7 +91,7 @@ func ComputeComponentIdentities(
 	distroRef := env.Config().Project.DefaultDistro
 
 	// Resolve the distro definition (fills in default version for the fingerprint).
-	distroRef, _, err = resolveDistroForIdentity(env, distroRef)
+	distroRef, err = resolveDistroForIdentity(env, distroRef)
 	if err != nil {
 		slog.Debug("Could not resolve distro", "error", err)
 	}
@@ -214,14 +214,14 @@ func computeSingleIdentity(
 	}, nil
 }
 
-// resolveDistroForIdentity resolves the default distro reference and returns a
-// [sourceproviders.ResolvedDistro] for constructing a source manager.
+// resolveDistroForIdentity resolves the default distro reference, filling in the
+// default version when unspecified.
 func resolveDistroForIdentity(
 	env *azldev.Env, distroRef projectconfig.DistroReference,
-) (projectconfig.DistroReference, sourceproviders.ResolvedDistro, error) {
-	distroDef, distroVersionDef, err := env.ResolveDistroRef(distroRef)
+) (projectconfig.DistroReference, error) {
+	distroDef, _, err := env.ResolveDistroRef(distroRef)
 	if err != nil {
-		return distroRef, sourceproviders.ResolvedDistro{},
+		return distroRef,
 			fmt.Errorf("resolving distro %#q:\n%w", distroRef.Name, err)
 	}
 
@@ -230,11 +230,7 @@ func resolveDistroForIdentity(
 		distroRef.Version = distroDef.DefaultVersion
 	}
 
-	return distroRef, sourceproviders.ResolvedDistro{
-		Ref:        distroRef,
-		Definition: distroDef,
-		Version:    distroVersionDef,
-	}, nil
+	return distroRef, nil
 }
 
 // countAffectsCommits counts the number of "Affects: <componentName>" commits in the
@@ -281,6 +277,8 @@ func resolveSourceIdentityForComponent(
 	}
 
 	// Upstream components: need a source manager with the component's resolved distro.
+	// A new SourceManager is created per component because each component can reference
+	// a different upstream distro, making shared caching impractical.
 	distro, err := sourceproviders.ResolveDistro(env, comp)
 	if err != nil {
 		return "", fmt.Errorf("resolving distro for component %#q:\n%w",

internal/utils/git/git.go

@@ -173,11 +173,6 @@ func (g *GitProviderImpl) LsRemoteHead(
 		return "", errors.New("repository URL cannot be empty")
 	}
 
-	_, err := url.Parse(repoURL)
-	if err != nil {
-		return "", fmt.Errorf("invalid URL %#q:\n%w", repoURL, err)
-	}
-
 	if branch == "" {
 		return "", errors.New("branch cannot be empty")
 	}