From 49e8f4ee62a23b9237b2d5f226db19517610d7ff Mon Sep 17 00:00:00 2001 From: Luohao Wang Date: Sat, 8 Nov 2025 21:58:12 +0800 Subject: [PATCH 1/2] Fix conda nil issue --- routers/api/packages/conda/conda.go | 7 ++++++- tests/integration/api_packages_conda_test.go | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/routers/api/packages/conda/conda.go b/routers/api/packages/conda/conda.go index f496002bb5a5e..50ebbc427189e 100644 --- a/routers/api/packages/conda/conda.go +++ b/routers/api/packages/conda/conda.go @@ -140,6 +140,11 @@ func EnumeratePackages(ctx *context.Context) { versionMetadata := pd.Metadata.(*conda_module.VersionMetadata) + deps := fileMetadata.Dependencies + if deps == nil { + deps = []string{} + } + pi := &PackageInfo{ Name: pd.PackageProperties.GetByName(conda_module.PropertyName), Version: pd.Version.Version, @@ -148,7 +153,7 @@ func EnumeratePackages(ctx *context.Context) { Timestamp: fileMetadata.Timestamp, Build: fileMetadata.Build, BuildNumber: fileMetadata.BuildNumber, - Dependencies: fileMetadata.Dependencies, + Dependencies: deps, License: versionMetadata.License, LicenseFamily: versionMetadata.LicenseFamily, HashMD5: pfd.Blob.HashMD5, diff --git a/tests/integration/api_packages_conda_test.go b/tests/integration/api_packages_conda_test.go index b69a8c906686b..8dbcba5b54d1f 100644 --- a/tests/integration/api_packages_conda_test.go +++ b/tests/integration/api_packages_conda_test.go @@ -237,6 +237,8 @@ func TestPackageConda(t *testing.T) { assert.Equal(t, pd.Files[0].Blob.HashMD5, packageInfo.HashMD5) assert.Equal(t, pd.Files[0].Blob.HashSHA256, packageInfo.HashSHA256) assert.Equal(t, pd.Files[0].Blob.Size, packageInfo.Size) + assert.NotNil(t, packageInfo.Dependencies) + assert.Empty(t, packageInfo.Dependencies) }) t.Run(".conda", func(t *testing.T) { @@ -268,6 +270,8 @@ func TestPackageConda(t *testing.T) { assert.Equal(t, pd.Files[0].Blob.HashMD5, packageInfo.HashMD5) assert.Equal(t, pd.Files[0].Blob.HashSHA256, packageInfo.HashSHA256) assert.Equal(t, pd.Files[0].Blob.Size, packageInfo.Size) + assert.NotNil(t, packageInfo.Dependencies) + assert.Empty(t, packageInfo.Dependencies) }) }) } From d20b745eadb418e97a8f54e21894223774d8bfcb Mon Sep 17 00:00:00 2001 From: Luohao Wang Date: Sat, 8 Nov 2025 22:06:36 +0800 Subject: [PATCH 2/2] refactor by review --- routers/api/packages/conda/conda.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/routers/api/packages/conda/conda.go b/routers/api/packages/conda/conda.go index 50ebbc427189e..8519ae3e082d9 100644 --- a/routers/api/packages/conda/conda.go +++ b/routers/api/packages/conda/conda.go @@ -140,11 +140,6 @@ func EnumeratePackages(ctx *context.Context) { versionMetadata := pd.Metadata.(*conda_module.VersionMetadata) - deps := fileMetadata.Dependencies - if deps == nil { - deps = []string{} - } - pi := &PackageInfo{ Name: pd.PackageProperties.GetByName(conda_module.PropertyName), Version: pd.Version.Version, @@ -153,7 +148,7 @@ func EnumeratePackages(ctx *context.Context) { Timestamp: fileMetadata.Timestamp, Build: fileMetadata.Build, BuildNumber: fileMetadata.BuildNumber, - Dependencies: deps, + Dependencies: util.SliceNilAsEmpty(fileMetadata.Dependencies), License: versionMetadata.License, LicenseFamily: versionMetadata.LicenseFamily, HashMD5: pfd.Blob.HashMD5,