Исправление функционала создания дирректорий для работы ALR
This commit is contained in:
@@ -45,17 +45,17 @@ func TestE2EIssue130Install(t *testing.T) {
|
|||||||
)
|
)
|
||||||
runMatrixSuite(
|
runMatrixSuite(
|
||||||
t,
|
t,
|
||||||
"alr install {package}+alr-{repo}",
|
"alr install {package}+{repo}",
|
||||||
COMMON_SYSTEMS,
|
COMMON_SYSTEMS,
|
||||||
func(t *testing.T, r capytest.Runner) {
|
func(t *testing.T, r capytest.Runner) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
defaultPrepare(t, r)
|
defaultPrepare(t, r)
|
||||||
|
|
||||||
r.Command("sudo", "alr", "in", fmt.Sprintf("foo-pkg+alr-%s", REPO_NAME_FOR_E2E_TESTS)).
|
r.Command("sudo", "alr", "in", fmt.Sprintf("foo-pkg+%s", REPO_NAME_FOR_E2E_TESTS)).
|
||||||
ExpectSuccess().
|
ExpectSuccess().
|
||||||
Run(t)
|
Run(t)
|
||||||
|
|
||||||
r.Command("sudo", "alr", "in", fmt.Sprintf("bar-pkg+alr-%s", "NOT_REPO_NAME_FOR_E2E_TESTS")).
|
r.Command("sudo", "alr", "in", fmt.Sprintf("bar-pkg+%s", "NOT_REPO_NAME_FOR_E2E_TESTS")).
|
||||||
ExpectFailure().
|
ExpectFailure().
|
||||||
Run(t)
|
Run(t)
|
||||||
},
|
},
|
||||||
|
@@ -56,13 +56,19 @@ func prepareDirs(dirs types.Directories) error {
|
|||||||
// Новые директории будут созданы или перезаписаны
|
// Новые директории будут созданы или перезаписаны
|
||||||
slog.Debug("Failed to remove base directory", "path", dirs.BaseDir, "error", err)
|
slog.Debug("Failed to remove base directory", "path", dirs.BaseDir, "error", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Создаем базовую директорию для пакета с setgid битом
|
||||||
|
err = utils.EnsureTempDirWithRootOwner(dirs.BaseDir, 0o2775)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
// Создаем директории с правильным владельцем для /tmp/alr с setgid битом
|
// Создаем директории с правильным владельцем для /tmp/alr с setgid битом
|
||||||
err = utils.EnsureTempDirWithRootOwner(dirs.SrcDir, 0o2775)
|
err = utils.EnsureTempDirWithRootOwner(dirs.SrcDir, 0o2775)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
// Создаем директорию для пакетов с setgid битом
|
// Создаем директорию для пакетов с setgid битом
|
||||||
return utils.EnsureTempDirWithRootOwner(dirs.PkgDir, 0o2775)
|
return utils.EnsureTempDirWithRootOwner(dirs.PkgDir, 0o2775)
|
||||||
}
|
}
|
||||||
@@ -169,7 +175,7 @@ func normalizeContents(contents []*files.Content) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var RegexpALRPackageName = regexp.MustCompile(`^(?P<package>[^+]+)\+alr-(?P<repo>.+)$`)
|
var RegexpALRPackageName = regexp.MustCompile(`^(?P<package>[^+]+)\+(?P<repo>.+)$`)
|
||||||
|
|
||||||
func getBasePkgInfo(vars *alrsh.Package, input interface {
|
func getBasePkgInfo(vars *alrsh.Package, input interface {
|
||||||
RepositoryProvider
|
RepositoryProvider
|
||||||
@@ -177,12 +183,8 @@ func getBasePkgInfo(vars *alrsh.Package, input interface {
|
|||||||
},
|
},
|
||||||
) *nfpm.Info {
|
) *nfpm.Info {
|
||||||
repo := input.Repository()
|
repo := input.Repository()
|
||||||
// Избегаем дублирования "alr-" префикса
|
|
||||||
if strings.HasPrefix(repo, "alr-") {
|
|
||||||
repo = repo[4:] // убираем "alr-" префикс
|
|
||||||
}
|
|
||||||
return &nfpm.Info{
|
return &nfpm.Info{
|
||||||
Name: fmt.Sprintf("%s+alr-%s", vars.Name, repo),
|
Name: fmt.Sprintf("%s+%s", vars.Name, repo),
|
||||||
Arch: cpu.Arch(),
|
Arch: cpu.Arch(),
|
||||||
Version: vars.Version,
|
Version: vars.Version,
|
||||||
Release: overrides.ReleasePlatformSpecific(vars.Release, input.OSRelease()),
|
Release: overrides.ReleasePlatformSpecific(vars.Release, input.OSRelease()),
|
||||||
|
158
internal/build/utils_test.go
Normal file
158
internal/build/utils_test.go
Normal file
@@ -0,0 +1,158 @@
|
|||||||
|
// ALR - Any Linux Repository
|
||||||
|
// Copyright (C) 2025 The ALR Authors
|
||||||
|
//
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
package build
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"gitea.plemya-x.ru/Plemya-x/ALR/pkg/alrsh"
|
||||||
|
"gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro"
|
||||||
|
)
|
||||||
|
|
||||||
|
type mockInput struct {
|
||||||
|
repo string
|
||||||
|
osInfo *distro.OSRelease
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *mockInput) Repository() string {
|
||||||
|
return m.repo
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *mockInput) OSRelease() *distro.OSRelease {
|
||||||
|
return m.osInfo
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGetBasePkgInfo(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
packageName string
|
||||||
|
repoName string
|
||||||
|
expectedName string
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "обычный репозиторий",
|
||||||
|
packageName: "test-package",
|
||||||
|
repoName: "default",
|
||||||
|
expectedName: "test-package+default",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "репозиторий с alr- префиксом",
|
||||||
|
packageName: "test-package",
|
||||||
|
repoName: "alr-default",
|
||||||
|
expectedName: "test-package+alr-default",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "репозиторий с двойным alr- префиксом",
|
||||||
|
packageName: "test-package",
|
||||||
|
repoName: "alr-alr-repo",
|
||||||
|
expectedName: "test-package+alr-alr-repo",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
pkg := &alrsh.Package{
|
||||||
|
Name: tt.packageName,
|
||||||
|
Version: "1.0.0",
|
||||||
|
Release: 1,
|
||||||
|
}
|
||||||
|
|
||||||
|
input := &mockInput{
|
||||||
|
repo: tt.repoName,
|
||||||
|
osInfo: &distro.OSRelease{
|
||||||
|
ID: "test",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
info := getBasePkgInfo(pkg, input)
|
||||||
|
|
||||||
|
if info.Name != tt.expectedName {
|
||||||
|
t.Errorf("getBasePkgInfo() имя пакета = %v, ожидается %v", info.Name, tt.expectedName)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestRegexpALRPackageName(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
packageName string
|
||||||
|
expectedPkg string
|
||||||
|
expectedRepo string
|
||||||
|
shouldMatch bool
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "новый формат - обычный репозиторий",
|
||||||
|
packageName: "test-package+default",
|
||||||
|
expectedPkg: "test-package",
|
||||||
|
expectedRepo: "default",
|
||||||
|
shouldMatch: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "новый формат - alr-default репозиторий",
|
||||||
|
packageName: "test-package+alr-default",
|
||||||
|
expectedPkg: "test-package",
|
||||||
|
expectedRepo: "alr-default",
|
||||||
|
shouldMatch: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "новый формат - двойной alr- префикс",
|
||||||
|
packageName: "test-package+alr-alr-repo",
|
||||||
|
expectedPkg: "test-package",
|
||||||
|
expectedRepo: "alr-alr-repo",
|
||||||
|
shouldMatch: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "некорректный формат - без плюса",
|
||||||
|
packageName: "test-package",
|
||||||
|
shouldMatch: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "некорректный формат - пустое имя пакета",
|
||||||
|
packageName: "+repo",
|
||||||
|
shouldMatch: false,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
matches := RegexpALRPackageName.FindStringSubmatch(tt.packageName)
|
||||||
|
|
||||||
|
if tt.shouldMatch {
|
||||||
|
if matches == nil {
|
||||||
|
t.Errorf("RegexpALRPackageName должен найти совпадение для %q", tt.packageName)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
packageName := matches[RegexpALRPackageName.SubexpIndex("package")]
|
||||||
|
repoName := matches[RegexpALRPackageName.SubexpIndex("repo")]
|
||||||
|
|
||||||
|
if packageName != tt.expectedPkg {
|
||||||
|
t.Errorf("RegexpALRPackageName извлеченное имя пакета = %v, ожидается %v", packageName, tt.expectedPkg)
|
||||||
|
}
|
||||||
|
|
||||||
|
if repoName != tt.expectedRepo {
|
||||||
|
t.Errorf("RegexpALRPackageName извлеченное имя репозитория = %v, ожидается %v", repoName, tt.expectedRepo)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if matches != nil {
|
||||||
|
t.Errorf("RegexpALRPackageName не должен найти совпадение для %q", tt.packageName)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
@@ -47,9 +47,9 @@ func (rs *Repos) FindPkgs(ctx context.Context, pkgs []string) (map[string][]alrs
|
|||||||
name := parts[1]
|
name := parts[1]
|
||||||
result, err = rs.db.GetPkgs(ctx, "name = ? AND repository = ?", name, repo)
|
result, err = rs.db.GetPkgs(ctx, "name = ? AND repository = ?", name, repo)
|
||||||
|
|
||||||
case strings.Contains(pkgName, "+alr-"):
|
case strings.Contains(pkgName, "+"):
|
||||||
// pkg+alr-repo
|
// pkg+repo
|
||||||
parts := strings.SplitN(pkgName, "+alr-", 2)
|
parts := strings.SplitN(pkgName, "+", 2)
|
||||||
name := parts[0]
|
name := parts[0]
|
||||||
repo := parts[1]
|
repo := parts[1]
|
||||||
result, err = rs.db.GetPkgs(ctx, "name = ? AND repository = ?", name, repo)
|
result, err = rs.db.GetPkgs(ctx, "name = ? AND repository = ?", name, repo)
|
||||||
|
Reference in New Issue
Block a user