kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Remove deprecated MkdirAllAs(), MkdirAs()

Browse source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2017-11-19 00:52:47 +01:00
parent ce66470f54
commit 38b3af567f
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
10 changed files with 37 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
daemon/graphdriver/aufs/aufs.go
View file

@ -125,7 +125,7 @@ func Init(root string, options []string, uidMaps, gidMaps []idtools.IDMap) (grap
// Create the root aufs driver dir and return // Create the root aufs driver dir and return
// if it already exists // if it already exists
// If not populate the dir structure // If not populate the dir structure
if err := idtools.MkdirAllAs(root, 0700, rootUID, rootGID); err != nil { if err := idtools.MkdirAllAndChown(root, 0700, idtools.IDPair{UID: rootUID, GID: rootGID}); err != nil {
if os.IsExist(err) { if os.IsExist(err) {
return a, nil return a, nil
} }
@ -138,7 +138,7 @@ func Init(root string, options []string, uidMaps, gidMaps []idtools.IDMap) (grap
// Populate the dir structure // Populate the dir structure
for _, p := range paths { for _, p := range paths {
if err := idtools.MkdirAllAs(path.Join(root, p), 0700, rootUID, rootGID); err != nil { if err := idtools.MkdirAllAndChown(path.Join(root, p), 0700, idtools.IDPair{UID: rootUID, GID: rootGID}); err != nil {
return nil, err return nil, err
} }
} }
@ -290,7 +290,7 @@ func (a *Driver) createDirsFor(id string) error {
// The path of directories are <aufs_root_path>/mnt/<image_id> // The path of directories are <aufs_root_path>/mnt/<image_id>
// and <aufs_root_path>/diff/<image_id> // and <aufs_root_path>/diff/<image_id>
for _, p := range paths { for _, p := range paths {
if err := idtools.MkdirAllAs(path.Join(a.rootPath(), p, id), 0755, rootUID, rootGID); err != nil { if err := idtools.MkdirAllAndChown(path.Join(a.rootPath(), p, id), 0755, idtools.IDPair{UID: rootUID, GID: rootGID}); err != nil {
return err return err
} }
} }

6
daemon/graphdriver/btrfs/btrfs.go
View file

@ -64,7 +64,7 @@ func Init(home string, options []string, uidMaps, gidMaps []idtools.IDMap) (grap
if err != nil { if err != nil {
return nil, err return nil, err
} }
if err := idtools.MkdirAllAs(home, 0700, rootUID, rootGID); err != nil { if err := idtools.MkdirAllAndChown(home, 0700, idtools.IDPair{UID: rootUID, GID: rootGID}); err != nil {
return nil, err return nil, err
} }
@ -502,7 +502,7 @@ func (d *Driver) Create(id, parent string, opts *graphdriver.CreateOpts) error {
if err != nil { if err != nil {
return err return err
} }
if err := idtools.MkdirAllAs(subvolumes, 0700, rootUID, rootGID); err != nil { if err := idtools.MkdirAllAndChown(subvolumes, 0700, idtools.IDPair{UID: rootUID, GID: rootGID}); err != nil {
return err return err
} }
if parent == "" { if parent == "" {
@ -537,7 +537,7 @@ func (d *Driver) Create(id, parent string, opts *graphdriver.CreateOpts) error {
if err := d.setStorageSize(path.Join(subvolumes, id), driver); err != nil { if err := d.setStorageSize(path.Join(subvolumes, id), driver); err != nil {
return err return err
} }
if err := idtools.MkdirAllAs(quotas, 0700, rootUID, rootGID); err != nil { if err := idtools.MkdirAllAndChown(quotas, 0700, idtools.IDPair{UID: rootUID, GID: rootGID}); err != nil {
return err return err
} }
if err := ioutil.WriteFile(path.Join(quotas, id), []byte(fmt.Sprint(driver.options.size)), 0644); err != nil { if err := ioutil.WriteFile(path.Join(quotas, id), []byte(fmt.Sprint(driver.options.size)), 0644); err != nil {

4
daemon/graphdriver/devmapper/deviceset.go
View file

@ -268,7 +268,7 @@ func (devices *DeviceSet) ensureImage(name string, size int64) (string, error) {
if err != nil { if err != nil {
return "", err return "", err
} }
if err := idtools.MkdirAllAs(dirname, 0700, uid, gid); err != nil && !os.IsExist(err) { if err := idtools.MkdirAllAndChown(dirname, 0700, idtools.IDPair{UID: uid, GID: gid}); err != nil && !os.IsExist(err) {
return "", err return "", err
} }
@ -1697,7 +1697,7 @@ func (devices *DeviceSet) initDevmapper(doInit bool) (retErr error) {
if err != nil { if err != nil {
return err return err
} }
if err := idtools.MkdirAs(devices.root, 0700, uid, gid); err != nil && !os.IsExist(err) { if err := idtools.MkdirAndChown(devices.root, 0700, idtools.IDPair{UID: uid, GID: gid}); err != nil && !os.IsExist(err) {
return err return err
} }
if err := os.MkdirAll(devices.metadataDir(), 0700); err != nil && !os.IsExist(err) { if err := os.MkdirAll(devices.metadataDir(), 0700); err != nil && !os.IsExist(err) {

6
daemon/graphdriver/devmapper/driver.go
View file

@ -189,11 +189,11 @@ func (d *Driver) Get(id, mountLabel string) (containerfs.ContainerFS, error) {
} }
// Create the target directories if they don't exist // Create the target directories if they don't exist
if err := idtools.MkdirAllAs(path.Join(d.home, "mnt"), 0755, uid, gid); err != nil && !os.IsExist(err) { if err := idtools.MkdirAllAndChown(path.Join(d.home, "mnt"), 0755, idtools.IDPair{UID: uid, GID: gid}); err != nil && !os.IsExist(err) {
d.ctr.Decrement(mp) d.ctr.Decrement(mp)
return nil, err return nil, err
} }
if err := idtools.MkdirAs(mp, 0755, uid, gid); err != nil && !os.IsExist(err) { if err := idtools.MkdirAndChown(mp, 0755, idtools.IDPair{UID: uid, GID: gid}); err != nil && !os.IsExist(err) {
d.ctr.Decrement(mp) d.ctr.Decrement(mp)
return nil, err return nil, err
} }
@ -204,7 +204,7 @@ func (d *Driver) Get(id, mountLabel string) (containerfs.ContainerFS, error) {
return nil, err return nil, err
} }
if err := idtools.MkdirAllAs(rootFs, 0755, uid, gid); err != nil && !os.IsExist(err) { if err := idtools.MkdirAllAndChown(rootFs, 0755, idtools.IDPair{UID: uid, GID: gid}); err != nil && !os.IsExist(err) {
d.ctr.Decrement(mp) d.ctr.Decrement(mp)
d.DeviceSet.UnmountDevice(id, mp) d.DeviceSet.UnmountDevice(id, mp)
return nil, err return nil, err

6
daemon/graphdriver/lcow/lcow.go
View file

@ -181,17 +181,17 @@ func InitDriver(dataRoot string, options []string, _, _ []idtools.IDMap) (graphd
} }
// Make sure the dataRoot directory is created // Make sure the dataRoot directory is created
if err := idtools.MkdirAllAs(dataRoot, 0700, 0, 0); err != nil { if err := idtools.MkdirAllAndChown(dataRoot, 0700, idtools.IDPair{UID: 0, GID: 0}); err != nil {
return nil, fmt.Errorf("%s failed to create '%s': %v", title, dataRoot, err) return nil, fmt.Errorf("%s failed to create '%s': %v", title, dataRoot, err)
} }
// Make sure the cache directory is created under dataRoot // Make sure the cache directory is created under dataRoot
if err := idtools.MkdirAllAs(cd, 0700, 0, 0); err != nil { if err := idtools.MkdirAllAndChown(cd, 0700, idtools.IDPair{UID: 0, GID: 0}); err != nil {
return nil, fmt.Errorf("%s failed to create '%s': %v", title, cd, err) return nil, fmt.Errorf("%s failed to create '%s': %v", title, cd, err)
} }
// Make sure the scratch directory is created under dataRoot // Make sure the scratch directory is created under dataRoot
if err := idtools.MkdirAllAs(sd, 0700, 0, 0); err != nil { if err := idtools.MkdirAllAndChown(sd, 0700, idtools.IDPair{UID: 0, GID: 0}); err != nil {
return nil, fmt.Errorf("%s failed to create '%s': %v", title, sd, err) return nil, fmt.Errorf("%s failed to create '%s': %v", title, sd, err)
} }

22
daemon/graphdriver/overlay/overlay.go
View file

@ -136,7 +136,7 @@ func Init(home string, options []string, uidMaps, gidMaps []idtools.IDMap) (grap
return nil, err return nil, err
} }
// Create the driver home dir // Create the driver home dir
if err := idtools.MkdirAllAs(home, 0700, rootUID, rootGID); err != nil && !os.IsExist(err) { if err := idtools.MkdirAllAndChown(home, 0700, idtools.IDPair{rootUID, rootGID}); err != nil && !os.IsExist(err) {
return nil, err return nil, err
} }
@ -255,10 +255,12 @@ func (d *Driver) Create(id, parent string, opts *graphdriver.CreateOpts) (retErr
if err != nil { if err != nil {
return err return err
} }
if err := idtools.MkdirAllAs(path.Dir(dir), 0700, rootUID, rootGID); err != nil { root := idtools.IDPair{UID: rootUID, GID: rootGID}
if err := idtools.MkdirAllAndChown(path.Dir(dir), 0700, root); err != nil {
return err return err
} }
if err := idtools.MkdirAs(dir, 0700, rootUID, rootGID); err != nil { if err := idtools.MkdirAndChown(dir, 0700, root); err != nil {
return err return err
} }
@ -271,7 +273,7 @@ func (d *Driver) Create(id, parent string, opts *graphdriver.CreateOpts) (retErr
// Toplevel images are just a "root" dir // Toplevel images are just a "root" dir
if parent == "" { if parent == "" {
return idtools.MkdirAndChown(path.Join(dir, "root"), 0755, idtools.IDPair{rootUID, rootGID}) return idtools.MkdirAndChown(path.Join(dir, "root"), 0755, root)
} }
parentDir := d.dir(parent) parentDir := d.dir(parent)
@ -285,13 +287,13 @@ func (d *Driver) Create(id, parent string, opts *graphdriver.CreateOpts) (retErr
parentRoot := path.Join(parentDir, "root") parentRoot := path.Join(parentDir, "root")
if s, err := os.Lstat(parentRoot); err == nil { if s, err := os.Lstat(parentRoot); err == nil {
if err := idtools.MkdirAs(path.Join(dir, "upper"), s.Mode(), rootUID, rootGID); err != nil { if err := idtools.MkdirAndChown(path.Join(dir, "upper"), s.Mode(), root); err != nil {
return err return err
} }
if err := idtools.MkdirAs(path.Join(dir, "work"), 0700, rootUID, rootGID); err != nil { if err := idtools.MkdirAndChown(path.Join(dir, "work"), 0700, root); err != nil {
return err return err
} }
if err := idtools.MkdirAs(path.Join(dir, "merged"), 0700, rootUID, rootGID); err != nil { if err := idtools.MkdirAndChown(path.Join(dir, "merged"), 0700, root); err != nil {
return err return err
} }
if err := ioutil.WriteFile(path.Join(dir, "lower-id"), []byte(parent), 0666); err != nil { if err := ioutil.WriteFile(path.Join(dir, "lower-id"), []byte(parent), 0666); err != nil {
@ -318,13 +320,13 @@ func (d *Driver) Create(id, parent string, opts *graphdriver.CreateOpts) (retErr
} }
upperDir := path.Join(dir, "upper") upperDir := path.Join(dir, "upper")
if err := idtools.MkdirAs(upperDir, s.Mode(), rootUID, rootGID); err != nil { if err := idtools.MkdirAndChown(upperDir, s.Mode(), root); err != nil {
return err return err
} }
if err := idtools.MkdirAs(path.Join(dir, "work"), 0700, rootUID, rootGID); err != nil { if err := idtools.MkdirAndChown(path.Join(dir, "work"), 0700, root); err != nil {
return err return err
} }
if err := idtools.MkdirAs(path.Join(dir, "merged"), 0700, rootUID, rootGID); err != nil { if err := idtools.MkdirAndChown(path.Join(dir, "merged"), 0700, root); err != nil {
return err return err
} }

14
daemon/graphdriver/overlay2/overlay.go
View file

@ -171,7 +171,7 @@ func Init(home string, options []string, uidMaps, gidMaps []idtools.IDMap) (grap
return nil, err return nil, err
} }
// Create the driver home dir // Create the driver home dir
if err := idtools.MkdirAllAs(path.Join(home, linkDir), 0700, rootUID, rootGID); err != nil && !os.IsExist(err) { if err := idtools.MkdirAllAndChown(path.Join(home, linkDir), 0700, idtools.IDPair{rootUID, rootGID}); err != nil && !os.IsExist(err) {
return nil, err return nil, err
} }
@ -362,10 +362,12 @@ func (d *Driver) create(id, parent string, opts *graphdriver.CreateOpts) (retErr
if err != nil { if err != nil {
return err return err
} }
if err := idtools.MkdirAllAs(path.Dir(dir), 0700, rootUID, rootGID); err != nil { root := idtools.IDPair{UID: rootUID, GID: rootGID}
if err := idtools.MkdirAllAndChown(path.Dir(dir), 0700, root); err != nil {
return err return err
} }
if err := idtools.MkdirAs(dir, 0700, rootUID, rootGID); err != nil { if err := idtools.MkdirAndChown(dir, 0700, root); err != nil {
return err return err
} }
@ -390,7 +392,7 @@ func (d *Driver) create(id, parent string, opts *graphdriver.CreateOpts) (retErr
} }
} }
if err := idtools.MkdirAs(path.Join(dir, "diff"), 0755, rootUID, rootGID); err != nil { if err := idtools.MkdirAndChown(path.Join(dir, "diff"), 0755, root); err != nil {
return err return err
} }
@ -409,10 +411,10 @@ func (d *Driver) create(id, parent string, opts *graphdriver.CreateOpts) (retErr
return nil return nil
} }
if err := idtools.MkdirAs(path.Join(dir, "work"), 0700, rootUID, rootGID); err != nil { if err := idtools.MkdirAndChown(path.Join(dir, "work"), 0700, root); err != nil {
return err return err
} }
if err := idtools.MkdirAs(path.Join(dir, "merged"), 0700, rootUID, rootGID); err != nil { if err := idtools.MkdirAndChown(path.Join(dir, "merged"), 0700, root); err != nil {
return err return err
} }

2
daemon/graphdriver/windows/windows.go
View file

@ -95,7 +95,7 @@ func InitFilter(home string, options []string, uidMaps, gidMaps []idtools.IDMap)
return nil, fmt.Errorf("%s is on an ReFS volume - ReFS volumes are not supported", home) return nil, fmt.Errorf("%s is on an ReFS volume - ReFS volumes are not supported", home)
} }
if err := idtools.MkdirAllAs(home, 0700, 0, 0); err != nil { if err := idtools.MkdirAllAndChown(home, 0700, idtools.IDPair{UID: 0, GID: 0}); err != nil {
return nil, fmt.Errorf("windowsfilter failed to create '%s': %v", home, err) return nil, fmt.Errorf("windowsfilter failed to create '%s': %v", home, err)
} }

4
daemon/graphdriver/zfs/zfs.go
View file

@ -104,7 +104,7 @@ func Init(base string, opt []string, uidMaps, gidMaps []idtools.IDMap) (graphdri
if err != nil { if err != nil {
return nil, fmt.Errorf("Failed to get root uid/guid: %v", err) return nil, fmt.Errorf("Failed to get root uid/guid: %v", err)
} }
if err := idtools.MkdirAllAs(base, 0700, rootUID, rootGID); err != nil { if err := idtools.MkdirAllAndChown(base, 0700, idtools.IDPair{rootUID, rootGID}); err != nil {
return nil, fmt.Errorf("Failed to create '%s': %v", base, err) return nil, fmt.Errorf("Failed to create '%s': %v", base, err)
} }
@ -373,7 +373,7 @@ func (d *Driver) Get(id, mountLabel string) (containerfs.ContainerFS, error) {
return nil, err return nil, err
} }
// Create the target directories if they don't exist // Create the target directories if they don't exist
if err := idtools.MkdirAllAs(mountpoint, 0755, rootUID, rootGID); err != nil { if err := idtools.MkdirAllAndChown(mountpoint, 0755, idtools.IDPair{rootUID, rootGID}); err != nil {
d.ctr.Decrement(mountpoint) d.ctr.Decrement(mountpoint)
return nil, err return nil, err
} }

15
pkg/idtools/idtools.go
View file

@ -34,21 +34,6 @@ const (
subgidFileName string = "/etc/subgid" subgidFileName string = "/etc/subgid"
) )
// MkdirAllAs creates a directory (include any along the path) and then modifies
// ownership to the requested uid/gid. If the directory already exists, this
// function will still change ownership to the requested uid/gid pair.
// Deprecated: Use MkdirAllAndChown
func MkdirAllAs(path string, mode os.FileMode, ownerUID, ownerGID int) error {
return mkdirAs(path, mode, ownerUID, ownerGID, true, true)
}
// MkdirAs creates a directory and then modifies ownership to the requested uid/gid.
// If the directory already exists, this function still changes ownership
// Deprecated: Use MkdirAndChown with a IDPair
func MkdirAs(path string, mode os.FileMode, ownerUID, ownerGID int) error {
return mkdirAs(path, mode, ownerUID, ownerGID, false, true)
}
// MkdirAllAndChown creates a directory (include any along the path) and then modifies // MkdirAllAndChown creates a directory (include any along the path) and then modifies
// ownership to the requested uid/gid. If the directory already exists, this // ownership to the requested uid/gid. If the directory already exists, this
// function will still change ownership to the requested uid/gid pair. // function will still change ownership to the requested uid/gid pair.