Skip to content

Fixed regex for matching size, localhost. Error logging in defer call #3679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Fixed regex for matching size, localhost. Error logging in defer call #3679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cbae980
Fix regex
saisrivathsa Mar 31, 2021
9cfa558
error logging in defer
saisrivathsa Mar 31, 2021
a753e62
Error handling in defer function call
saisrivathsa Mar 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 35 additions & 7 deletions components/content-service/pkg/storage/gcloud.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,7 +761,11 @@ func (p *PresignedGCPStorage) EnsureExists(ctx context.Context, bucket string) (
if err != nil {
return err
}
defer client.Close()
defer func() {
if err := client.Close(); err != nil {
log.Error("Error in closing client: %v", err)
}
}()

return gcpEnsureExists(ctx, client, bucket, p.config)
}
Expand All @@ -772,7 +776,11 @@ func (p *PresignedGCPStorage) DiskUsage(ctx context.Context, bucket string, pref
if err != nil {
return
}
defer client.Close()
defer func() {
if err := client.Close(); err != nil {
log.Error("Error in closing client: %v", err)
}
}()

ctx, cancel := context.WithTimeout(ctx, 10*time.Second)
defer cancel()
Expand Down Expand Up @@ -805,7 +813,11 @@ func (p *PresignedGCPStorage) SignDownload(ctx context.Context, bucket, object s
if err != nil {
return nil, err
}
defer client.Close()
defer func() {
if err := client.Close(); err != nil {
log.Error("Error in closing client: %v", err)
}
}()

bkt := client.Bucket(bucket)
_, err = bkt.Attrs(ctx)
Expand Down Expand Up @@ -863,7 +875,11 @@ func (p *PresignedGCPStorage) SignUpload(ctx context.Context, bucket, object str
if err != nil {
return nil, err
}
defer client.Close()
defer func() {
if err := client.Close(); err != nil {
log.Error("Error in closing client: %v", err)
}
}()

bkt := client.Bucket(bucket)
_, err = bkt.Attrs(ctx)
Expand Down Expand Up @@ -893,7 +909,11 @@ func (p *PresignedGCPStorage) SignUpload(ctx context.Context, bucket, object str
// DeleteObject deletes objects in the given bucket specified by the given query
func (p *PresignedGCPStorage) DeleteObject(ctx context.Context, bucket string, query *DeleteObjectQuery) (err error) {
client, err := newGCPClient(ctx, p.config)
defer client.Close()
defer func() {
if err := client.Close(); err != nil {
log.Error("Error in closing client: %v", err)
}
}()

if query.Name != "" {
err = client.Bucket(bucket).Object(query.Name).Delete(ctx)
Expand Down Expand Up @@ -937,7 +957,11 @@ func (p *PresignedGCPStorage) DeleteObject(ctx context.Context, bucket string, q
// DeleteBucket deletes a bucket
func (p *PresignedGCPStorage) DeleteBucket(ctx context.Context, bucket string) (err error) {
client, err := newGCPClient(ctx, p.config)
defer client.Close()
defer func() {
if err := client.Close(); err != nil {
log.Error("Error in closing client: %v", err)
}
}()

err = p.DeleteObject(ctx, bucket, &DeleteObjectQuery{})
if err != nil {
Expand All @@ -960,7 +984,11 @@ func (p *PresignedGCPStorage) DeleteBucket(ctx context.Context, bucket string) (
// ObjectHash gets a hash value of an object
func (p *PresignedGCPStorage) ObjectHash(ctx context.Context, bucket string, obj string) (hash string, err error) {
client, err := newGCPClient(ctx, p.config)
defer client.Close()
defer func() {
if err := client.Close(); err != nil {
log.Error("Error in closing client: %v", err)
}
}()

attr, err := client.Bucket(bucket).Object(obj).Attrs(ctx)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion components/gitpod-cli/cmd/preview.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"github.com/gitpod-io/gitpod/gitpod-cli/pkg/theialib"
)

var regexLocalhost = regexp.MustCompile("((^(localhost|127\\.0\\.0\\.1))|(https?://(localhost|127\\.0\\.0\\.1)))(:[0-9]+)?")
var regexLocalhost = regexp.MustCompile(`((^(localhost|127\.0\.0\.1))|(https?:\/\/(localhost|127\.0\.0\.1)))(:[0-9]+)?`)

var previewCmdOpts struct {
External bool
Expand Down
7 changes: 6 additions & 1 deletion components/ws-daemon/pkg/hosts/hosts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,12 @@ func (g *DirectController) updateHostsFile(inc <-chan hostUpdate) {
if !ok {
return xerrors.Errorf("cannot acquire lock")
}
defer g.unlockHostsFile()

defer func() {
if err := g.unlockHostsFile(); err != nil {
log.Error("Error in unlocking hosts file: %v", err)
}
}()

_, err = g.hostsFD.Seek(0, 0)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion components/ws-daemon/pkg/quota/size.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const (
)

var (
sizeRegexp = regexp.MustCompile("(\\d+)(k|m|g|t)?")
sizeRegexp = regexp.MustCompile(`(\d+)(k|m|g|t)?`)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While we are at it, I would also suggest the following change:

Suggested change
sizeRegexp = regexp.MustCompile(`(\d+)(k|m|g|t)?`)
sizeRegexp = regexp.MustCompile(`^(\d+)(k|m|g|t)?$`)

That would also fix this one:

gitpod/components/ws-daemon/pkg/quota/size_test.go

Lines 26 to 27 in b7dda84

// This test should fail but doesn't because match somehow matches the regexp
// {"-42m", 0, quota.ErrInvalidSize},

Would be great if you could then make those changes to the tests as well:

diff --git a/components/ws-daemon/pkg/quota/size_test.go b/components/ws-daemon/pkg/quota/size_test.go
index cc21ae25..68b3b822 100644
--- a/components/ws-daemon/pkg/quota/size_test.go
+++ b/components/ws-daemon/pkg/quota/size_test.go
@@ -23,8 +23,8 @@ func TestParseSize(t *testing.T) {
                {"42m", 42 * quota.Megabyte, nil},
                {"42g", 42 * quota.Gigabyte, nil},
                {"42t", 42 * quota.Terabyte, nil},
-               // This test should fail but doesn't because match somehow matches the regexp
-               // {"-42m", 0, quota.ErrInvalidSize},
+               {"-42m", 0, quota.ErrInvalidSize},
+               {"x42mx", 0, quota.ErrInvalidSize},
                {"abc", 0, quota.ErrInvalidSize},
                {"99999999999999999999999999999999999999999999999999999999999999999999999999999999", 0, quota.ErrInvalidSize},
        }

What do you think?


// ErrInvalidSize is returned by ParseSize if input was not a valid size
ErrInvalidSize = errors.New("invalid size")
Expand Down