Skip to content

Commit 268f085

Browse files
arvi3411301shahidhk
arvi3411301
authored and
shahidhk
committed
go vet cli code (#110)
1 parent 58db3b7 commit 268f085

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

‎cli/migrate/source/file/file.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ func (f *File) Close() error {
9494

9595
func (f *File) First() (version uint64, err error) {
9696
if v, ok := f.migrations.First(); !ok {
97-
return 0, &os.PathError{"first", f.path, os.ErrNotExist}
97+
return 0, &os.PathError{Op: "first", Path: f.path, Err: os.ErrNotExist}
9898
} else {
9999
return v, nil
100100
}
@@ -110,15 +110,15 @@ func (f *File) GetUnappliedMigrations(version uint64) (versions []uint64) {
110110

111111
func (f *File) Prev(version uint64) (prevVersion uint64, err error) {
112112
if v, ok := f.migrations.Prev(version); !ok {
113-
return 0, &os.PathError{fmt.Sprintf("prev for version %v", version), f.path, os.ErrNotExist}
113+
return 0, &os.PathError{Op: fmt.Sprintf("prev for version %v", version), Path: f.path, Err: os.ErrNotExist}
114114
} else {
115115
return v, nil
116116
}
117117
}
118118

119119
func (f *File) Next(version uint64) (nextVersion uint64, err error) {
120120
if v, ok := f.migrations.Next(version); !ok {
121-
return 0, &os.PathError{fmt.Sprintf("next for version %v", version), f.path, os.ErrNotExist}
121+
return 0, &os.PathError{Op: fmt.Sprintf("next for version %v", version), Path: f.path, Err: os.ErrNotExist}
122122
} else {
123123
return v, nil
124124
}
@@ -136,7 +136,7 @@ func (f *File) ReadUp(version uint64) (r io.ReadCloser, identifier string, fileN
136136
}
137137
return r, m.Identifier, m.Raw, nil
138138
}
139-
return nil, "", "", &os.PathError{fmt.Sprintf("read version %v", version), f.path, os.ErrNotExist}
139+
return nil, "", "", &os.PathError{Op: fmt.Sprintf("read version %v", version), Path: f.path, Err: os.ErrNotExist}
140140
}
141141

142142
func (f *File) ReadMetaUp(version uint64) (r io.ReadCloser, identifier string, fileName string, err error) {
@@ -147,7 +147,7 @@ func (f *File) ReadMetaUp(version uint64) (r io.ReadCloser, identifier string, f
147147
}
148148
return r, m.Identifier, m.Raw, nil
149149
}
150-
return nil, "", "", &os.PathError{fmt.Sprintf("read version %v", version), f.path, os.ErrNotExist}
150+
return nil, "", "", &os.PathError{Op: fmt.Sprintf("read version %v", version), Path: f.path, Err: os.ErrNotExist}
151151
}
152152

153153
func (f *File) ReadDown(version uint64) (r io.ReadCloser, identifier string, fileName string, err error) {
@@ -158,7 +158,7 @@ func (f *File) ReadDown(version uint64) (r io.ReadCloser, identifier string, fil
158158
}
159159
return r, m.Identifier, m.Raw, nil
160160
}
161-
return nil, "", "", &os.PathError{fmt.Sprintf("read version %v", version), f.path, os.ErrNotExist}
161+
return nil, "", "", &os.PathError{Op: fmt.Sprintf("read version %v", version), Path: f.path, Err: os.ErrNotExist}
162162
}
163163

164164
func (f *File) ReadMetaDown(version uint64) (r io.ReadCloser, identifier string, fileName string, err error) {
@@ -169,5 +169,5 @@ func (f *File) ReadMetaDown(version uint64) (r io.ReadCloser, identifier string,
169169
}
170170
return r, m.Identifier, m.Raw, nil
171171
}
172-
return nil, "", "", &os.PathError{fmt.Sprintf("read version %v", version), f.path, os.ErrNotExist}
172+
return nil, "", "", &os.PathError{Op: fmt.Sprintf("read version %v", version), Path: f.path, Err: os.ErrNotExist}
173173
}

‎cli/migrate/source/stub/stub.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,23 +43,23 @@ func (s *Stub) Close() error {
4343

4444
func (s *Stub) First() (version uint64, err error) {
4545
if v, ok := s.Migrations.First(); !ok {
46-
return 0, &os.PathError{"first", s.Url, os.ErrNotExist} // TODO: s.Url can be empty when called with WithInstance
46+
return 0, &os.PathError{Op: "first", Path: s.Url, Err: os.ErrNotExist} // TODO: s.Url can be empty when called with WithInstance
4747
} else {
4848
return v, nil
4949
}
5050
}
5151

5252
func (s *Stub) Prev(version uint64) (prevVersion uint64, err error) {
5353
if v, ok := s.Migrations.Prev(version); !ok {
54-
return 0, &os.PathError{fmt.Sprintf("prev for version %v", version), s.Url, os.ErrNotExist}
54+
return 0, &os.PathError{Op: fmt.Sprintf("prev for version %v", version), Path: s.Url, Err: os.ErrNotExist}
5555
} else {
5656
return v, nil
5757
}
5858
}
5959

6060
func (s *Stub) Next(version uint64) (nextVersion uint64, err error) {
6161
if v, ok := s.Migrations.Next(version); !ok {
62-
return 0, &os.PathError{fmt.Sprintf("next for version %v", version), s.Url, os.ErrNotExist}
62+
return 0, &os.PathError{Op: fmt.Sprintf("next for version %v", version), Path: s.Url, Err: os.ErrNotExist}
6363
} else {
6464
return v, nil
6565
}
@@ -69,14 +69,14 @@ func (s *Stub) ReadUp(version uint64) (r io.ReadCloser, identifier string, fileN
6969
if m, ok := s.Migrations.Up(version); ok {
7070
return ioutil.NopCloser(bytes.NewBufferString(m.Identifier)), fmt.Sprintf("%v.up.sql.stub", version), fmt.Sprintf("%v.up.sql.stub", version), nil
7171
}
72-
return nil, "", "", &os.PathError{fmt.Sprintf("read up sql version %v", version), s.Url, os.ErrNotExist}
72+
return nil, "", "", &os.PathError{Op: fmt.Sprintf("read up sql version %v", version), Path: s.Url, Err: os.ErrNotExist}
7373
}
7474

7575
func (s *Stub) ReadDown(version uint64) (r io.ReadCloser, identifier string, fileName string, err error) {
7676
if m, ok := s.Migrations.Down(version); ok {
7777
return ioutil.NopCloser(bytes.NewBufferString(m.Identifier)), fmt.Sprintf("%v.down.sql.stub", version), fmt.Sprintf("%v.down.sql.stub", version), nil
7878
}
79-
return nil, "", "", &os.PathError{fmt.Sprintf("read down sql version %v", version), s.Url, os.ErrNotExist}
79+
return nil, "", "", &os.PathError{Op: fmt.Sprintf("read down sql version %v", version), Path: s.Url, Err: os.ErrNotExist}
8080
}
8181

8282
func (s *Stub) GetDirections(version uint64) map[source.Direction]bool {
@@ -95,12 +95,12 @@ func (s *Stub) ReadMetaUp(version uint64) (r io.ReadCloser, identifier string, f
9595
if m, ok := s.Migrations.MetaUp(version); ok {
9696
return ioutil.NopCloser(bytes.NewBufferString(m.Identifier)), fmt.Sprintf("%v.up.yaml.stub", version), fmt.Sprintf("%v.up.yaml.stub", version), nil
9797
}
98-
return nil, "", "", &os.PathError{fmt.Sprintf("read up yaml version %v", version), s.Url, os.ErrNotExist}
98+
return nil, "", "", &os.PathError{Op: fmt.Sprintf("read up yaml version %v", version), Path: s.Url, Err: os.ErrNotExist}
9999
}
100100

101101
func (s *Stub) ReadMetaDown(version uint64) (r io.ReadCloser, identifier string, fileName string, err error) {
102102
if m, ok := s.Migrations.MetaDown(version); ok {
103103
return ioutil.NopCloser(bytes.NewBufferString(m.Identifier)), fmt.Sprintf("%v.down.yaml.stub", version), fmt.Sprintf("%v.down.yaml.stub", version), nil
104104
}
105-
return nil, "", "", &os.PathError{fmt.Sprintf("read down yaml version %v", version), s.Url, os.ErrNotExist}
105+
return nil, "", "", &os.PathError{Op: fmt.Sprintf("read down yaml version %v", version), Path: s.Url, Err: os.ErrNotExist}
106106
}

‎cli/version/server.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func FetchServerVersion(endpoint string) (version string, err error) {
3030
case http.StatusNotFound:
3131
return "", nil
3232
default:
33-
return "", errors.Errorf("GET %s failed - [%s]", versionEndpoint, response.StatusCode)
33+
return "", errors.Errorf("GET %s failed - [%d]", versionEndpoint, response.StatusCode)
3434
}
3535
} else {
3636
defer response.Body.Close()

0 commit comments

Comments
 (0)