625b1578fa
Update the osbuild/images to the version which introduces "dot notation" for distro release versions. - Replace all uses of distroregistry by distrofactory. - Delete local version of reporegistry and use the one from the osbuild/images. - Weldr: unify `createWeldrAPI()` and `createWeldrAPI2()` into a single `createTestWeldrAPI()` function`. - store/fixture: rework fixtures to allow overriding the host distro name and host architecture name. A cleanup function to restore the host distro and arch names is always part of the fixture struct. - Delete `distro_mock` package, since it is no longer used. - Bump the required version of osbuild to 98, because the OSCAP customization is using the 'compress_results' stage option, which is not available in older versions of osbuild. Signed-off-by: Tomáš Hozza <thozza@redhat.com>
74 lines
2.2 KiB
Go
74 lines
2.2 KiB
Go
package storage
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/containers/storage/types"
|
|
)
|
|
|
|
// ParseIDMapping takes idmappings and subuid and subgid maps and returns a storage mapping
|
|
func ParseIDMapping(UIDMapSlice, GIDMapSlice []string, subUIDMap, subGIDMap string) (*types.IDMappingOptions, error) {
|
|
return types.ParseIDMapping(UIDMapSlice, GIDMapSlice, subUIDMap, subGIDMap)
|
|
}
|
|
|
|
// GetRootlessRuntimeDir returns the runtime directory when running as non root
|
|
func GetRootlessRuntimeDir(rootlessUID int) (string, error) {
|
|
return types.GetRootlessRuntimeDir(rootlessUID)
|
|
}
|
|
|
|
// DefaultStoreOptionsAutoDetectUID returns the default storage options for containers
|
|
func DefaultStoreOptionsAutoDetectUID() (types.StoreOptions, error) {
|
|
return types.DefaultStoreOptionsAutoDetectUID()
|
|
}
|
|
|
|
// DefaultStoreOptions returns the default storage options for containers
|
|
func DefaultStoreOptions(rootless bool, rootlessUID int) (types.StoreOptions, error) {
|
|
return types.DefaultStoreOptions(rootless, rootlessUID)
|
|
}
|
|
|
|
func validateMountOptions(mountOptions []string) error {
|
|
var Empty struct{}
|
|
// Add invalid options for ImageMount() here.
|
|
invalidOptions := map[string]struct{}{
|
|
"rw": Empty,
|
|
}
|
|
|
|
for _, opt := range mountOptions {
|
|
if _, ok := invalidOptions[opt]; ok {
|
|
return fmt.Errorf(" %q option not supported", opt)
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func applyNameOperation(oldNames []string, opParameters []string, op updateNameOperation) ([]string, error) {
|
|
var result []string
|
|
switch op {
|
|
case setNames:
|
|
// ignore all old names and just return new names
|
|
result = opParameters
|
|
case removeNames:
|
|
// remove given names from old names
|
|
result = make([]string, 0, len(oldNames))
|
|
for _, name := range oldNames {
|
|
// only keep names in final result which do not intersect with input names
|
|
// basically `result = oldNames - opParameters`
|
|
nameShouldBeRemoved := false
|
|
for _, opName := range opParameters {
|
|
if name == opName {
|
|
nameShouldBeRemoved = true
|
|
}
|
|
}
|
|
if !nameShouldBeRemoved {
|
|
result = append(result, name)
|
|
}
|
|
}
|
|
case addNames:
|
|
result = make([]string, 0, len(opParameters)+len(oldNames))
|
|
result = append(result, opParameters...)
|
|
result = append(result, oldNames...)
|
|
default:
|
|
return result, errInvalidUpdateNameOperation
|
|
}
|
|
return dedupeStrings(result), nil
|
|
}
|