fix: get pkg name from .spec

Author: Antonio Salinas

internal/app/azldev/cmds/downloadsources/downloadsources.go

@@ -7,12 +7,15 @@ import (
 	"fmt"
 	"log/slog"
 	"path/filepath"
+	"strings"
 
+	"github.com/bmatcuk/doublestar/v4"
 	"github.com/microsoft/azure-linux-dev-tools/internal/app/azldev"
 	"github.com/microsoft/azure-linux-dev-tools/internal/app/azldev/core/components"
 	"github.com/microsoft/azure-linux-dev-tools/internal/providers/sourceproviders"
 	"github.com/microsoft/azure-linux-dev-tools/internal/providers/sourceproviders/fedorasource"
 	"github.com/microsoft/azure-linux-dev-tools/internal/utils/downloader"
+	"github.com/microsoft/azure-linux-dev-tools/internal/utils/fileutils"
 	"github.com/microsoft/azure-linux-dev-tools/internal/utils/retry"
 	"github.com/spf13/cobra"
 )
@@ -190,7 +193,7 @@ func resolveDownloadParams(
 ) (packageName string, lookasideBaseURIs []string, err error) {
 	// Standalone mode: --lookaside-uri provided.
 	if len(options.LookasideBaseURIs) > 0 {
-		packageName, err = resolvePackageNameFromDir(options)
+		packageName, err = resolvePackageNameFromDir(env, options)
 		if err != nil {
 			return "", nil, err
 		}
@@ -202,16 +205,40 @@ func resolveDownloadParams(
 	return resolveFromComponent(env, options)
 }
 
-// resolvePackageNameFromDir derives the package name from the directory basename.
-func resolvePackageNameFromDir(options *DownloadSourcesOptions) (string, error) {
-	absDir, err := filepath.Abs(options.Directory)
+// resolvePackageNameFromDir derives the package name from a .spec file
+// in the directory. Exactly one .spec file must be present.
+func resolvePackageNameFromDir(
+	env *azldev.Env, options *DownloadSourcesOptions,
+) (string, error) {
+	specPattern := filepath.Join(options.Directory, "*.spec")
+
+	specFiles, err := fileutils.Glob(
+		env.FS(), specPattern, doublestar.WithFilesOnly(),
+	)
 	if err != nil {
-		return "", fmt.Errorf("failed to resolve absolute path for %#q:\n%w", options.Directory, err)
+		return "", fmt.Errorf(
+			"failed to search for spec files in %#q:\n%w",
+			options.Directory, err)
+	}
+
+	if len(specFiles) == 0 {
+		return "", fmt.Errorf(
+			"no .spec file found in %#q to derive package name",
+			options.Directory)
+	}
+
+	if len(specFiles) > 1 {
+		return "", fmt.Errorf(
+			"multiple .spec files found in %#q; cannot determine package name",
+			options.Directory)
 	}
 
-	packageName := filepath.Base(absDir)
+	packageName := strings.TrimSuffix(
+		filepath.Base(specFiles[0]), ".spec",
+	)
 
-	slog.Debug("Derived package name from directory name", "name", packageName, "dir", options.Directory)
+	slog.Debug("Derived package name from spec file",
+		"name", packageName, "specFile", specFiles[0])
 
 	return packageName, nil
 }

internal/app/azldev/cmds/downloadsources/downloadsources_test.go

@@ -4,7 +4,6 @@
 package downloadsources_test
 
 import (
-	"errors"
 	"testing"
 
 	"github.com/microsoft/azure-linux-dev-tools/internal/app/azldev"
@@ -22,6 +21,8 @@ import (
 
 const testLookasideURI = "https://example.com/lookaside/$pkg/$filename/$hashtype/$hash/$filename"
 
+const testPkgDir = "/project/curl"
+
 func TestOnAppInit(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	app := azldev.NewApp(opctx_test.NewMockFileSystemFactory(ctrl), opctx_test.NewMockOSEnvFactory(ctrl))
@@ -63,64 +64,56 @@ func TestDownloadSources_StandaloneMode(t *testing.T) {
 	testEnv := testutils.NewTestEnv(t)
 	ctrl := gomock.NewController(t)
 
-	pkgDir := "/project/curl"
-	require.NoError(t, fileutils.MkdirAll(testEnv.TestFS, pkgDir))
-	require.NoError(t, fileutils.WriteFile(testEnv.TestFS, pkgDir+"/sources", []byte(""), fileperms.PrivateFile))
+	require.NoError(t, fileutils.MkdirAll(testEnv.TestFS, testPkgDir))
+	require.NoError(t, fileutils.WriteFile(testEnv.TestFS, testPkgDir+"/curl.spec", []byte(""), fileperms.PrivateFile))
+	require.NoError(t, fileutils.WriteFile(testEnv.TestFS, testPkgDir+"/sources", []byte(""), fileperms.PrivateFile))
 
 	mockDownloader := fedorasource_test.NewMockFedoraSourceDownloader(ctrl)
 	mockDownloader.EXPECT().
-		ExtractSourcesFromRepo(gomock.Any(), pkgDir, "curl", testLookasideURI, gomock.Any(), gomock.Any()).
+		ExtractSourcesFromRepo(gomock.Any(), testPkgDir, "curl", testLookasideURI, gomock.Any(), gomock.Any()).
 		Return(nil)
 
 	options := &downloadsources.DownloadSourcesOptions{
-		Directory:           pkgDir,
+		Directory:           testPkgDir,
 		LookasideBaseURIs:   []string{testLookasideURI},
 		LookasideDownloader: mockDownloader,
 	}
 
-	// Package name "curl" derived from directory basename.
+	// Package name "curl" derived from curl.spec filename.
 	err := downloadsources.DownloadSources(testEnv.Env, options)
 	require.NoError(t, err)
 }
 
-func TestDownloadSources_StandaloneMode_NonexistentDir(t *testing.T) {
+func TestDownloadSources_StandaloneMode_NoSpecFile(t *testing.T) {
 	testEnv := testutils.NewTestEnv(t)
-	ctrl := gomock.NewController(t)
 
-	mockDownloader := fedorasource_test.NewMockFedoraSourceDownloader(ctrl)
-	mockDownloader.EXPECT().
-		ExtractSourcesFromRepo(
-			gomock.Any(), "/project/nonexistent", "nonexistent",
-			testLookasideURI, gomock.Any(), gomock.Any(),
-		).
-		Return(errors.New("repository directory does not exist"))
+	require.NoError(t, fileutils.MkdirAll(testEnv.TestFS, testPkgDir))
 
 	options := &downloadsources.DownloadSourcesOptions{
-		Directory:           "/project/nonexistent",
-		LookasideBaseURIs:   []string{testLookasideURI},
-		LookasideDownloader: mockDownloader,
+		Directory:         testPkgDir,
+		LookasideBaseURIs: []string{testLookasideURI},
 	}
 
 	err := downloadsources.DownloadSources(testEnv.Env, options)
 	require.Error(t, err)
-	assert.Contains(t, err.Error(), "does not exist")
+	assert.Contains(t, err.Error(), "no .spec file found")
 }
 
 func TestDownloadSources_StandaloneMode_NoSourcesFile(t *testing.T) {
 	testEnv := testutils.NewTestEnv(t)
 	ctrl := gomock.NewController(t)
 
-	pkgDir := "/project/curl"
-	require.NoError(t, fileutils.MkdirAll(testEnv.TestFS, pkgDir))
+	require.NoError(t, fileutils.MkdirAll(testEnv.TestFS, testPkgDir))
+	require.NoError(t, fileutils.WriteFile(testEnv.TestFS, testPkgDir+"/curl.spec", []byte(""), fileperms.PrivateFile))
 
 	// ExtractSourcesFromRepo returns nil when no sources file exists.
 	mockDownloader := fedorasource_test.NewMockFedoraSourceDownloader(ctrl)
 	mockDownloader.EXPECT().
-		ExtractSourcesFromRepo(gomock.Any(), pkgDir, "curl", testLookasideURI, gomock.Any(), gomock.Any()).
+		ExtractSourcesFromRepo(gomock.Any(), testPkgDir, "curl", testLookasideURI, gomock.Any(), gomock.Any()).
 		Return(nil)
 
 	options := &downloadsources.DownloadSourcesOptions{
-		Directory:           pkgDir,
+		Directory:           testPkgDir,
 		LookasideBaseURIs:   []string{testLookasideURI},
 		LookasideDownloader: mockDownloader,
 	}