kairos/luet
1
0
Fork 0
mirror of https://github.com/mudler/luet.git synced 2025-06-28 16:28:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use filename instead of name on repo specs

Browse Source
This commit is contained in:
Daniele Rondina 2020-03-24 18:30:52 +01:00
parent dd91a61caf
commit 454e9d934e
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/create-repo.go
View File

@ -40,9 +40,9 @@ var createrepoCmd = &cobra.Command{
viper.BindPFlag("urls", cmd.Flags().Lookup("urls")) viper.BindPFlag("urls", cmd.Flags().Lookup("urls"))
viper.BindPFlag("type", cmd.Flags().Lookup("type")) viper.BindPFlag("type", cmd.Flags().Lookup("type"))
viper.BindPFlag("tree-compression", cmd.Flags().Lookup("tree-compression")) viper.BindPFlag("tree-compression", cmd.Flags().Lookup("tree-compression"))
viper.BindPFlag("tree-name", cmd.Flags().Lookup("tree-name")) viper.BindPFlag("tree-filename", cmd.Flags().Lookup("tree-filename"))
viper.BindPFlag("meta-compression", cmd.Flags().Lookup("meta-compression")) viper.BindPFlag("meta-compression", cmd.Flags().Lookup("meta-compression"))
viper.BindPFlag("meta-name", cmd.Flags().Lookup("meta-name")) viper.BindPFlag("meta-filename", cmd.Flags().Lookup("meta-filename"))
viper.BindPFlag("reset-revision", cmd.Flags().Lookup("reset-revision")) viper.BindPFlag("reset-revision", cmd.Flags().Lookup("reset-revision"))
viper.BindPFlag("repo", cmd.Flags().Lookup("repo")) viper.BindPFlag("repo", cmd.Flags().Lookup("repo"))
}, },
@ -59,9 +59,9 @@ var createrepoCmd = &cobra.Command{
t := viper.GetString("type") t := viper.GetString("type")
reset := viper.GetBool("reset-revision") reset := viper.GetBool("reset-revision")
treetype := viper.GetString("tree-compression") treetype := viper.GetString("tree-compression")
treeName := viper.GetString("tree-name") treeName := viper.GetString("tree-filename")
metatype := viper.GetString("meta-compression") metatype := viper.GetString("meta-compression")
metaName := viper.GetString("meta-name") metaName := viper.GetString("meta-filename")
source_repo := viper.GetString("repo") source_repo := viper.GetString("repo")
treeFile := installer.NewDefaultTreeRepositoryFile() treeFile := installer.NewDefaultTreeRepositoryFile()
@ -104,7 +104,7 @@ var createrepoCmd = &cobra.Command{
} }
if treeName != "" { if treeName != "" {
treeFile.SetName(treeName) treeFile.SetFileName(treeName)
} }
if metatype != "" { if metatype != "" {
@ -112,7 +112,7 @@ var createrepoCmd = &cobra.Command{
} }
if metaName != "" { if metaName != "" {
metaFile.SetName(metaName) metaFile.SetFileName(metaName)
} }
repo.SetRepositoryFile(installer.REPOFILE_TREE_KEY, treeFile) repo.SetRepositoryFile(installer.REPOFILE_TREE_KEY, treeFile)
@ -141,9 +141,9 @@ func init() {
createrepoCmd.Flags().String("repo", "", "Use repository defined in configuration.") createrepoCmd.Flags().String("repo", "", "Use repository defined in configuration.")
createrepoCmd.Flags().String("tree-compression", "none", "Compression alg: none, gzip") createrepoCmd.Flags().String("tree-compression", "none", "Compression alg: none, gzip")
createrepoCmd.Flags().String("tree-name", installer.TREE_TARBALL, "Repository tree filename") createrepoCmd.Flags().String("tree-filename", installer.TREE_TARBALL, "Repository tree filename")
createrepoCmd.Flags().String("meta-compression", "none", "Compression alg: none, gzip") createrepoCmd.Flags().String("meta-compression", "none", "Compression alg: none, gzip")
createrepoCmd.Flags().String("meta-name", installer.REPOSITORY_METAFILE+".tar", "Repository metadata filename") createrepoCmd.Flags().String("meta-filename", installer.REPOSITORY_METAFILE+".tar", "Repository metadata filename")
RootCmd.AddCommand(createrepoCmd) RootCmd.AddCommand(createrepoCmd)
} }

30
pkg/installer/repository.go
View File

@ -49,7 +49,7 @@ const (
) )
type LuetRepositoryFile struct { type LuetRepositoryFile struct {
Name string `json:"name"` FileName string `json:"filename"`
CompressionType compiler.CompressionImplementation `json:"compressiontype,omitempty"` CompressionType compiler.CompressionImplementation `json:"compressiontype,omitempty"`
Checksums compiler.Checksums `json:"checksums,omitempty"` Checksums compiler.Checksums `json:"checksums,omitempty"`
} }
@ -145,23 +145,23 @@ func (m *LuetSystemRepositoryMetadata) ToArtificatIndex() (ans compiler.Artifact
func NewDefaultTreeRepositoryFile() LuetRepositoryFile { func NewDefaultTreeRepositoryFile() LuetRepositoryFile {
return LuetRepositoryFile{ return LuetRepositoryFile{
Name: TREE_TARBALL, FileName: TREE_TARBALL,
CompressionType: compiler.GZip, CompressionType: compiler.GZip,
} }
} }
func NewDefaultMetaRepositoryFile() LuetRepositoryFile { func NewDefaultMetaRepositoryFile() LuetRepositoryFile {
return LuetRepositoryFile{ return LuetRepositoryFile{
Name: REPOSITORY_METAFILE + ".tar", FileName: REPOSITORY_METAFILE + ".tar",
CompressionType: compiler.None, CompressionType: compiler.None,
} }
} }
func (f *LuetRepositoryFile) SetName(n string) { func (f *LuetRepositoryFile) SetFileName(n string) {
f.Name = n f.FileName = n
} }
func (f *LuetRepositoryFile) GetName() string { func (f *LuetRepositoryFile) GetFileName() string {
return f.Name return f.FileName
} }
func (f *LuetRepositoryFile) SetCompressionType(c compiler.CompressionImplementation) { func (f *LuetRepositoryFile) SetCompressionType(c compiler.CompressionImplementation) {
f.CompressionType = c f.CompressionType = c
@ -421,7 +421,7 @@ func (r *LuetSystemRepository) Write(dst string, resetRevision bool) error {
r.SetRepositoryFile(REPOFILE_TREE_KEY, treeFile) r.SetRepositoryFile(REPOFILE_TREE_KEY, treeFile)
} }
a := compiler.NewPackageArtifact(filepath.Join(dst, treeFile.GetName())) a := compiler.NewPackageArtifact(filepath.Join(dst, treeFile.GetFileName()))
a.SetCompressionType(treeFile.GetCompressionType()) a.SetCompressionType(treeFile.GetCompressionType())
err = a.Compress(archive, 1) err = a.Compress(archive, 1)
if err != nil { if err != nil {
@ -429,7 +429,7 @@ func (r *LuetSystemRepository) Write(dst string, resetRevision bool) error {
} }
// Update the tree name with the name created by compression selected. // Update the tree name with the name created by compression selected.
treeFile.SetName(path.Base(a.GetPath())) treeFile.SetFileName(path.Base(a.GetPath()))
err = a.Hash() err = a.Hash()
if err != nil { if err != nil {
return errors.Wrap(err, "Failed generating checksums for tree") return errors.Wrap(err, "Failed generating checksums for tree")
@ -460,14 +460,14 @@ func (r *LuetSystemRepository) Write(dst string, resetRevision bool) error {
return err return err
} }
a = compiler.NewPackageArtifact(filepath.Join(dst, metaFile.GetName())) a = compiler.NewPackageArtifact(filepath.Join(dst, metaFile.GetFileName()))
a.SetCompressionType(metaFile.GetCompressionType()) a.SetCompressionType(metaFile.GetCompressionType())
err = a.Compress(metaTmpDir, 1) err = a.Compress(metaTmpDir, 1)
if err != nil { if err != nil {
return errors.Wrap(err, "Error met while archiving repository metadata") return errors.Wrap(err, "Error met while archiving repository metadata")
} }
metaFile.SetName(path.Base(a.GetPath())) metaFile.SetFileName(path.Base(a.GetPath()))
r.SetRepositoryFile(REPOFILE_META_KEY, metaFile) r.SetRepositoryFile(REPOFILE_META_KEY, metaFile)
err = a.Hash() err = a.Hash()
if err != nil { if err != nil {
@ -570,10 +570,10 @@ func (r *LuetSystemRepository) Sync(force bool) (Repository, error) {
if !repoUpdated { if !repoUpdated {
// Get Tree // Get Tree
a := compiler.NewPackageArtifact(treeFile.GetName()) a := compiler.NewPackageArtifact(treeFile.GetFileName())
artifactTree, err := c.DownloadArtifact(a) artifactTree, err := c.DownloadArtifact(a)
if err != nil { if err != nil {
return nil, errors.Wrap(err, "While downloading "+treeFile.GetName()) return nil, errors.Wrap(err, "While downloading "+treeFile.GetFileName())
} }
defer os.Remove(artifactTree.GetPath()) defer os.Remove(artifactTree.GetPath())
@ -588,10 +588,10 @@ func (r *LuetSystemRepository) Sync(force bool) (Repository, error) {
Debug("Tree tarball for the repository " + r.GetName() + " downloaded correctly.") Debug("Tree tarball for the repository " + r.GetName() + " downloaded correctly.")
// Get Repository Metadata // Get Repository Metadata
a = compiler.NewPackageArtifact(metaFile.GetName()) a = compiler.NewPackageArtifact(metaFile.GetFileName())
artifactMeta, err := c.DownloadArtifact(a) artifactMeta, err := c.DownloadArtifact(a)
if err != nil { if err != nil {
return nil, errors.Wrap(err, "While downloading "+metaFile.GetName()) return nil, errors.Wrap(err, "While downloading "+metaFile.GetFileName())
} }
defer os.Remove(artifactMeta.GetPath()) defer os.Remove(artifactMeta.GetPath())