containers
/
storage
mirror of https://github.com/containers/storage.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove Get prefix on method calls. 

Go validate suggests that you should not use functions that begin with Get,
unless you have to.

Signed-off-by: Dan Walsh <dwalsh@redhat.com>
This commit is contained in:
Dan Walsh 2017-05-10 10:25:10 -04:00
parent d10d8680af
commit 473f49f004
18 changed files with 240 additions and 240 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/oci-storage/container.go
View File

@ -22,7 +22,7 @@ func container(flags *mflag.FlagSet, action string, m storage.Store, args []stri
} }
matches := []*storage.Container{} matches := []*storage.Container{}
for _, arg := range args { for _, arg := range args {
if container, err := m.GetContainer(arg); err == nil { if container, err := m.Container(arg); err == nil {
matches = append(matches, container) matches = append(matches, container)
} }
} }
@ -56,7 +56,7 @@ func container(flags *mflag.FlagSet, action string, m storage.Store, args []stri
} }
func listContainerBigData(flags *mflag.FlagSet, action string, m storage.Store, args []string) int { func listContainerBigData(flags *mflag.FlagSet, action string, m storage.Store, args []string) int {
container, err := m.GetContainer(args[0]) container, err := m.Container(args[0])
if err != nil { if err != nil {
fmt.Fprintf(os.Stderr, "%v\n", err) fmt.Fprintf(os.Stderr, "%v\n", err)
return 1 return 1
@ -73,7 +73,7 @@ func listContainerBigData(flags *mflag.FlagSet, action string, m storage.Store,
} }
func getContainerBigData(flags *mflag.FlagSet, action string, m storage.Store, args []string) int { func getContainerBigData(flags *mflag.FlagSet, action string, m storage.Store, args []string) int {
container, err := m.GetContainer(args[0]) container, err := m.Container(args[0])
if err != nil { if err != nil {
fmt.Fprintf(os.Stderr, "%v\n", err) fmt.Fprintf(os.Stderr, "%v\n", err)
return 1 return 1
@ -87,7 +87,7 @@ func getContainerBigData(flags *mflag.FlagSet, action string, m storage.Store, a
} }
output = f output = f
} }
b, err := m.GetContainerBigData(container.ID, args[1]) b, err := m.ContainerBigData(container.ID, args[1])
if err != nil { if err != nil {
fmt.Fprintf(os.Stderr, "%v\n", err) fmt.Fprintf(os.Stderr, "%v\n", err)
return 1 return 1
@ -98,7 +98,7 @@ func getContainerBigData(flags *mflag.FlagSet, action string, m storage.Store, a
} }
func setContainerBigData(flags *mflag.FlagSet, action string, m storage.Store, args []string) int { func setContainerBigData(flags *mflag.FlagSet, action string, m storage.Store, args []string) int {
container, err := m.GetContainer(args[0]) container, err := m.Container(args[0])
if err != nil { if err != nil {
fmt.Fprintf(os.Stderr, "%v\n", err) fmt.Fprintf(os.Stderr, "%v\n", err)
return 1 return 1
@ -126,7 +126,7 @@ func setContainerBigData(flags *mflag.FlagSet, action string, m storage.Store, a
} }
func getContainerDir(flags *mflag.FlagSet, action string, m storage.Store, args []string) int { func getContainerDir(flags *mflag.FlagSet, action string, m storage.Store, args []string) int {
path, err := m.GetContainerDirectory(args[0]) path, err := m.ContainerDirectory(args[0])
if err != nil { if err != nil {
fmt.Fprintf(os.Stderr, "%v\n", err) fmt.Fprintf(os.Stderr, "%v\n", err)
return 1 return 1
@ -136,7 +136,7 @@ func getContainerDir(flags *mflag.FlagSet, action string, m storage.Store, args
} }
func getContainerRunDir(flags *mflag.FlagSet, action string, m storage.Store, args []string) int { func getContainerRunDir(flags *mflag.FlagSet, action string, m storage.Store, args []string) int {
path, err := m.GetContainerRunDirectory(args[0]) path, err := m.ContainerRunDirectory(args[0])
if err != nil { if err != nil {
fmt.Fprintf(os.Stderr, "%v\n", err) fmt.Fprintf(os.Stderr, "%v\n", err)
return 1 return 1

6
cmd/oci-storage/exists.go
View File

@ -26,17 +26,17 @@ func exist(flags *mflag.FlagSet, action string, m storage.Store, args []string)
exists := m.Exists(what) exists := m.Exists(what)
existDict[what] = exists existDict[what] = exists
if existContainer { if existContainer {
if c, err := m.GetContainer(what); c == nil || err != nil { if c, err := m.Container(what); c == nil || err != nil {
exists = false exists = false
} }
} }
if existImage { if existImage {
if i, err := m.GetImage(what); i == nil || err != nil { if i, err := m.Image(what); i == nil || err != nil {
exists = false exists = false
} }
} }
if existLayer { if existLayer {
if l, err := m.GetLayer(what); l == nil || err != nil { if l, err := m.Layer(what); l == nil || err != nil {
exists = false exists = false
} }
} }

10
cmd/oci-storage/image.go
View File

@ -17,7 +17,7 @@ var (
func image(flags *mflag.FlagSet, action string, m storage.Store, args []string) int { func image(flags *mflag.FlagSet, action string, m storage.Store, args []string) int {
matched := []*storage.Image{} matched := []*storage.Image{}
for _, arg := range args { for _, arg := range args {
if image, err := m.GetImage(arg); err == nil { if image, err := m.Image(arg); err == nil {
matched = append(matched, image) matched = append(matched, image)
} }
} }
@ -42,7 +42,7 @@ func image(flags *mflag.FlagSet, action string, m storage.Store, args []string)
} }
func listImageBigData(flags *mflag.FlagSet, action string, m storage.Store, args []string) int { func listImageBigData(flags *mflag.FlagSet, action string, m storage.Store, args []string) int {
image, err := m.GetImage(args[0]) image, err := m.Image(args[0])
if err != nil { if err != nil {
fmt.Fprintf(os.Stderr, "%v\n", err) fmt.Fprintf(os.Stderr, "%v\n", err)
return 1 return 1
@ -59,7 +59,7 @@ func listImageBigData(flags *mflag.FlagSet, action string, m storage.Store, args
} }
func getImageBigData(flags *mflag.FlagSet, action string, m storage.Store, args []string) int { func getImageBigData(flags *mflag.FlagSet, action string, m storage.Store, args []string) int {
image, err := m.GetImage(args[0]) image, err := m.Image(args[0])
if err != nil { if err != nil {
fmt.Fprintf(os.Stderr, "%v\n", err) fmt.Fprintf(os.Stderr, "%v\n", err)
return 1 return 1
@ -73,7 +73,7 @@ func getImageBigData(flags *mflag.FlagSet, action string, m storage.Store, args
} }
output = f output = f
} }
b, err := m.GetImageBigData(image.ID, args[1]) b, err := m.ImageBigData(image.ID, args[1])
if err != nil { if err != nil {
fmt.Fprintf(os.Stderr, "%v\n", err) fmt.Fprintf(os.Stderr, "%v\n", err)
return 1 return 1
@ -84,7 +84,7 @@ func getImageBigData(flags *mflag.FlagSet, action string, m storage.Store, args
} }
func setImageBigData(flags *mflag.FlagSet, action string, m storage.Store, args []string) int { func setImageBigData(flags *mflag.FlagSet, action string, m storage.Store, args []string) int {
image, err := m.GetImage(args[0]) image, err := m.Image(args[0])
if err != nil { if err != nil {
fmt.Fprintf(os.Stderr, "%v\n", err) fmt.Fprintf(os.Stderr, "%v\n", err)
return 1 return 1

2
cmd/oci-storage/metadata.go
View File

@ -20,7 +20,7 @@ func metadata(flags *mflag.FlagSet, action string, m storage.Store, args []strin
metadataDict := make(map[string]string) metadataDict := make(map[string]string)
missingAny := false missingAny := false
for _, what := range args { for _, what := range args {
if metadata, err := m.GetMetadata(what); err == nil { if metadata, err := m.Metadata(what); err == nil {
metadataDict[what] = strings.TrimSuffix(metadata, "\n") metadataDict[what] = strings.TrimSuffix(metadata, "\n")
} else { } else {
missingAny = true missingAny = true

6
cmd/oci-storage/name.go
View File

@ -19,7 +19,7 @@ func addNames(flags *mflag.FlagSet, action string, m storage.Store, args []strin
fmt.Fprintf(os.Stderr, "%v\n", err) fmt.Fprintf(os.Stderr, "%v\n", err)
return 1 return 1
} }
oldnames, err := m.GetNames(id) oldnames, err := m.Names(id)
if err != nil { if err != nil {
fmt.Fprintf(os.Stderr, "%v\n", err) fmt.Fprintf(os.Stderr, "%v\n", err)
return 1 return 1
@ -35,7 +35,7 @@ func addNames(flags *mflag.FlagSet, action string, m storage.Store, args []strin
fmt.Fprintf(os.Stderr, "%v\n", err) fmt.Fprintf(os.Stderr, "%v\n", err)
return 1 return 1
} }
names, err := m.GetNames(id) names, err := m.Names(id)
if err != nil { if err != nil {
fmt.Fprintf(os.Stderr, "%v\n", err) fmt.Fprintf(os.Stderr, "%v\n", err)
return 1 return 1
@ -59,7 +59,7 @@ func setNames(flags *mflag.FlagSet, action string, m storage.Store, args []strin
fmt.Fprintf(os.Stderr, "%v\n", err) fmt.Fprintf(os.Stderr, "%v\n", err)
return 1 return 1
} }
names, err := m.GetNames(id) names, err := m.Names(id)
if err != nil { if err != nil {
fmt.Fprintf(os.Stderr, "%v\n", err) fmt.Fprintf(os.Stderr, "%v\n", err)
return 1 return 1

4
drivers/aufs/aufs.go
View File

@ -185,8 +185,8 @@ func (a *Driver) Status() [][2]string {
} }
} }
// GetMetadata not implemented // Metadata not implemented
func (a *Driver) GetMetadata(id string) (map[string]string, error) { func (a *Driver) Metadata(id string) (map[string]string, error) {
return nil, nil return nil, nil
} }

4
drivers/btrfs/btrfs.go
View File

@ -143,8 +143,8 @@ func (d *Driver) Status() [][2]string {
return status return status
} }
// GetMetadata returns empty metadata for this driver. // Metadata returns empty metadata for this driver.
func (d *Driver) GetMetadata(id string) (map[string]string, error) { func (d *Driver) Metadata(id string) (map[string]string, error) {
return nil, nil return nil, nil
} }

4
drivers/devmapper/driver.go
View File

@ -94,8 +94,8 @@ func (d *Driver) Status() [][2]string {
return status return status
} }
// GetMetadata returns a map of information about the device. // Metadata returns a map of information about the device.
func (d *Driver) GetMetadata(id string) (map[string]string, error) { func (d *Driver) Metadata(id string) (map[string]string, error) {
m, err := d.DeviceSet.exportDeviceMetadata(id) m, err := d.DeviceSet.exportDeviceMetadata(id)
if err != nil { if err != nil {

2
drivers/driver.go
View File

@ -69,7 +69,7 @@ type ProtoDriver interface {
Status() [][2]string Status() [][2]string
// Returns a set of key-value pairs which give low level information // Returns a set of key-value pairs which give low level information
// about the image/container driver is managing. // about the image/container driver is managing.
GetMetadata(id string) (map[string]string, error) Metadata(id string) (map[string]string, error)
// Cleanup performs necessary tasks to release resources // Cleanup performs necessary tasks to release resources
// held by the driver, e.g., unmounting all layered filesystems // held by the driver, e.g., unmounting all layered filesystems
// known to this driver. // known to this driver.

4
drivers/overlay/overlay.go
View File

@ -226,9 +226,9 @@ func (d *Driver) Status() [][2]string {
} }
} }
// GetMetadata returns meta data about the overlay driver such as // Metadata returns meta data about the overlay driver such as
// LowerDir, UpperDir, WorkDir and MergeDir used to store data. // LowerDir, UpperDir, WorkDir and MergeDir used to store data.
func (d *Driver) GetMetadata(id string) (map[string]string, error) { func (d *Driver) Metadata(id string) (map[string]string, error) {
dir := d.dir(id) dir := d.dir(id)
if _, err := os.Stat(dir); err != nil { if _, err := os.Stat(dir); err != nil {
return nil, err return nil, err

4
drivers/proxy.go
View File

@ -144,12 +144,12 @@ func (d *graphDriverProxy) Status() [][2]string {
return ret.Status return ret.Status
} }
func (d *graphDriverProxy) GetMetadata(id string) (map[string]string, error) { func (d *graphDriverProxy) Metadata(id string) (map[string]string, error) {
args := &graphDriverRequest{ args := &graphDriverRequest{
ID: id, ID: id,
} }
var ret graphDriverResponse var ret graphDriverResponse
if err := d.client.Call("GraphDriver.GetMetadata", args, &ret); err != nil { if err := d.client.Call("GraphDriver.Metadata", args, &ret); err != nil {
return nil, err return nil, err
} }
if ret.Err != "" { if ret.Err != "" {

4
drivers/vfs/driver.go
View File

@ -58,8 +58,8 @@ func (d *Driver) Status() [][2]string {
return nil return nil
} }
// GetMetadata is used for implementing the graphdriver.ProtoDriver interface. VFS does not currently have any meta data. // Metadata is used for implementing the graphdriver.ProtoDriver interface. VFS does not currently have any meta data.
func (d *Driver) GetMetadata(id string) (map[string]string, error) { func (d *Driver) Metadata(id string) (map[string]string, error) {
return nil, nil return nil, nil
} }

10
drivers/windows/windows.go
View File

@ -133,7 +133,7 @@ func (d *Driver) create(id, parent, mountLabel string, readOnly bool, storageOpt
var layerChain []string var layerChain []string
if rPId != "" { if rPId != "" {
parentPath, err := hcsshim.GetLayerMountPath(d.info, rPId) parentPath, err := hcsshim.LayerMountPath(d.info, rPId)
if err != nil { if err != nil {
return err return err
} }
@ -248,7 +248,7 @@ func (d *Driver) Get(id, mountLabel string) (string, error) {
return "", err return "", err
} }
mountPath, err := hcsshim.GetLayerMountPath(d.info, rID) mountPath, err := hcsshim.LayerMountPath(d.info, rID)
if err != nil { if err != nil {
d.ctr.Decrement(rID) d.ctr.Decrement(rID)
if err2 := hcsshim.DeactivateLayer(d.info, rID); err2 != nil { if err2 := hcsshim.DeactivateLayer(d.info, rID); err2 != nil {
@ -403,7 +403,7 @@ func (d *Driver) ApplyDiff(id, parent string, diff archive.Reader) (int64, error
if err != nil { if err != nil {
return 0, err return 0, err
} }
parentPath, err := hcsshim.GetLayerMountPath(d.info, rPId) parentPath, err := hcsshim.LayerMountPath(d.info, rPId)
if err != nil { if err != nil {
return 0, err return 0, err
} }
@ -446,8 +446,8 @@ func (d *Driver) DiffSize(id, parent string) (size int64, err error) {
return archive.ChangesSize(layerFs, changes), nil return archive.ChangesSize(layerFs, changes), nil
} }
// GetMetadata returns custom driver information. // Metadata returns custom driver information.
func (d *Driver) GetMetadata(id string) (map[string]string, error) { func (d *Driver) Metadata(id string) (map[string]string, error) {
m := make(map[string]string) m := make(map[string]string)
m["dir"] = d.dir(id) m["dir"] = d.dir(id)
return m, nil return m, nil

4
drivers/zfs/zfs.go
View File

@ -210,8 +210,8 @@ func (d *Driver) Status() [][2]string {
} }
} }
// GetMetadata returns image/container metadata related to graph driver // Metadata returns image/container metadata related to graph driver
func (d *Driver) GetMetadata(id string) (map[string]string, error) { func (d *Driver) Metadata(id string) (map[string]string, error) {
return nil, nil return nil, nil
} }

8
storage/containers.go
View File

@ -264,7 +264,7 @@ func (r *containerStore) Create(id string, names []string, image, layer, metadat
return container, err return container, err
} }
func (r *containerStore) GetMetadata(id string) (string, error) { func (r *containerStore) Metadata(id string) (string, error) {
if container, ok := r.lookup(id); ok { if container, ok := r.lookup(id); ok {
return container.Metadata, nil return container.Metadata, nil
} }
@ -347,7 +347,7 @@ func (r *containerStore) Exists(id string) bool {
return ok return ok
} }
func (r *containerStore) GetBigData(id, key string) ([]byte, error) { func (r *containerStore) BigData(id, key string) ([]byte, error) {
c, ok := r.lookup(id) c, ok := r.lookup(id)
if !ok { if !ok {
return nil, ErrContainerUnknown return nil, ErrContainerUnknown
@ -355,7 +355,7 @@ func (r *containerStore) GetBigData(id, key string) ([]byte, error) {
return ioutil.ReadFile(r.datapath(c.ID, key)) return ioutil.ReadFile(r.datapath(c.ID, key))
} }
func (r *containerStore) GetBigDataSize(id, key string) (int64, error) { func (r *containerStore) BigDataSize(id, key string) (int64, error) {
c, ok := r.lookup(id) c, ok := r.lookup(id)
if !ok { if !ok {
return -1, ErrContainerUnknown return -1, ErrContainerUnknown
@ -366,7 +366,7 @@ func (r *containerStore) GetBigDataSize(id, key string) (int64, error) {
return -1, ErrSizeUnknown return -1, ErrSizeUnknown
} }
func (r *containerStore) GetBigDataNames(id string) ([]string, error) { func (r *containerStore) BigDataNames(id string) ([]string, error) {
c, ok := r.lookup(id) c, ok := r.lookup(id)
if !ok { if !ok {
return nil, ErrContainerUnknown return nil, ErrContainerUnknown

8
storage/images.go
View File

@ -249,7 +249,7 @@ func (r *imageStore) Create(id string, names []string, layer, metadata string) (
return image, err return image, err
} }
func (r *imageStore) GetMetadata(id string) (string, error) { func (r *imageStore) Metadata(id string) (string, error) {
if image, ok := r.lookup(id); ok { if image, ok := r.lookup(id); ok {
return image.Metadata, nil return image.Metadata, nil
} }
@ -331,7 +331,7 @@ func (r *imageStore) Exists(id string) bool {
return ok return ok
} }
func (r *imageStore) GetBigData(id, key string) ([]byte, error) { func (r *imageStore) BigData(id, key string) ([]byte, error) {
image, ok := r.lookup(id) image, ok := r.lookup(id)
if !ok { if !ok {
return nil, ErrImageUnknown return nil, ErrImageUnknown
@ -339,7 +339,7 @@ func (r *imageStore) GetBigData(id, key string) ([]byte, error) {
return ioutil.ReadFile(r.datapath(image.ID, key)) return ioutil.ReadFile(r.datapath(image.ID, key))
} }
func (r *imageStore) GetBigDataSize(id, key string) (int64, error) { func (r *imageStore) BigDataSize(id, key string) (int64, error) {
image, ok := r.lookup(id) image, ok := r.lookup(id)
if !ok { if !ok {
return -1, ErrImageUnknown return -1, ErrImageUnknown
@ -350,7 +350,7 @@ func (r *imageStore) GetBigDataSize(id, key string) (int64, error) {
return -1, ErrSizeUnknown return -1, ErrSizeUnknown
} }
func (r *imageStore) GetBigDataNames(id string) ([]string, error) { func (r *imageStore) BigDataNames(id string) ([]string, error) {
image, ok := r.lookup(id) image, ok := r.lookup(id)
if !ok { if !ok {
return nil, ErrImageUnknown return nil, ErrImageUnknown

2
storage/layers.go
View File

@ -520,7 +520,7 @@ func (r *layerStore) SetNames(id string, names []string) error {
return ErrLayerUnknown return ErrLayerUnknown
} }
func (r *layerStore) GetMetadata(id string) (string, error) { func (r *layerStore) Metadata(id string) (string, error) {
if layer, ok := r.lookup(id); ok { if layer, ok := r.lookup(id); ok {
return layer.Metadata, nil return layer.Metadata, nil
} }

384
storage/store.go
View File

File diff suppressed because it is too large Load Diff