Skip to content

Commit fa78b39

Browse files
committed
refactor: remove unnecessary code
1 parent 8ec8c46 commit fa78b39

File tree

9 files changed

+15
-17
lines changed

9 files changed

+15
-17
lines changed

cmd/pkg/driver/mongo.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ type MongoDriver struct {
2727
var _ Driver = (*MongoDriver)(nil)
2828

2929
// NewMongoDriver initializes a new MongoDB connection and returns a Driver instance.
30-
func NewMongoDriver(ctx context.Context, uri, name string) (Driver, error) {
30+
func NewMongoDriver(uri, name string) (Driver, error) {
3131
var server *memongo.Server
3232
if strings.HasPrefix(uri, "memongodb://") {
3333
server = mongoserver.New()

cmd/pkg/driver/mongo_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ func TestNewMongoDriver(t *testing.T) {
1111
ctx, cancel := context.WithCancel(context.TODO())
1212
defer cancel()
1313

14-
driver, err := NewMongoDriver(ctx, "memongodb://", "")
14+
driver, err := NewMongoDriver("memongodb://", "")
1515
assert.NoError(t, err)
1616
assert.NotNil(t, driver)
1717
assert.NoError(t, driver.Close(ctx))
@@ -21,7 +21,7 @@ func TestMongoDriver_SpecStore(t *testing.T) {
2121
ctx, cancel := context.WithCancel(context.TODO())
2222
defer cancel()
2323

24-
driver, _ := NewMongoDriver(ctx, "memongodb://", "")
24+
driver, _ := NewMongoDriver("memongodb://", "")
2525
defer driver.Close(ctx)
2626

2727
store, err := driver.SpecStore(ctx, "")
@@ -33,7 +33,7 @@ func TestMongoDriver_SecretStore(t *testing.T) {
3333
ctx, cancel := context.WithCancel(context.TODO())
3434
defer cancel()
3535

36-
driver, _ := NewMongoDriver(ctx, "memongodb://", "")
36+
driver, _ := NewMongoDriver("memongodb://", "")
3737
defer driver.Close(ctx)
3838

3939
store, err := driver.SecretStore(ctx, "")
@@ -45,7 +45,7 @@ func TestMongoDriver_ChartStore(t *testing.T) {
4545
ctx, cancel := context.WithCancel(context.TODO())
4646
defer cancel()
4747

48-
driver, _ := NewMongoDriver(ctx, "memongodb://", "")
48+
driver, _ := NewMongoDriver("memongodb://", "")
4949
defer driver.Close(ctx)
5050

5151
store, err := driver.ChartStore(ctx, "")

cmd/pkg/uniflow/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func main() {
8888

8989
if strings.HasPrefix(databaseURL, "memongodb://") || strings.HasPrefix(databaseURL, "mongodb://") {
9090
var err error
91-
if drv, err = driver.NewMongoDriver(ctx, databaseURL, databaseName); err != nil {
91+
if drv, err = driver.NewMongoDriver(databaseURL, databaseName); err != nil {
9292
log.Fatal(err)
9393
}
9494
}

cmd/pkg/uniflowctl/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func main() {
5454

5555
if strings.HasPrefix(databaseURL, "memongodb://") || strings.HasPrefix(databaseURL, "mongodb://") {
5656
var err error
57-
if drv, err = driver.NewMongoDriver(ctx, databaseURL, databaseName); err != nil {
57+
if drv, err = driver.NewMongoDriver(databaseURL, databaseName); err != nil {
5858
log.Fatal(err)
5959
}
6060
}

driver/mongo/pkg/chart/store.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,8 @@ func (s *Store) Index(ctx context.Context) error {
5656
{Key: chart.KeyNamespace, Value: 1},
5757
{Key: chart.KeyName, Value: 1},
5858
},
59-
Options: options.Index().SetUnique(true).SetPartialFilterExpression(bson.M{
60-
chart.KeyName: bson.M{"$exists": true},
61-
}),
59+
Options: options.Index().SetUnique(true).
60+
SetPartialFilterExpression(bson.M{chart.KeyName: bson.M{"$exists": true}}),
6261
},
6362
}
6463

driver/mongo/pkg/secret/store.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,8 @@ func (s *Store) Index(ctx context.Context) error {
5555
{Key: secret.KeyNamespace, Value: 1},
5656
{Key: secret.KeyName, Value: 1},
5757
},
58-
Options: options.Index().SetUnique(true).SetPartialFilterExpression(bson.M{
59-
secret.KeyName: bson.M{"$exists": true},
60-
}),
58+
Options: options.Index().SetUnique(true).
59+
SetPartialFilterExpression(bson.M{secret.KeyName: bson.M{"$exists": true}}),
6160
},
6261
}
6362

driver/mongo/pkg/spec/store.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,8 @@ func (s *Store) Index(ctx context.Context) error {
5656
{Key: spec.KeyNamespace, Value: 1},
5757
{Key: spec.KeyName, Value: 1},
5858
},
59-
Options: options.Index().SetUnique(true).SetPartialFilterExpression(bson.M{
60-
spec.KeyName: bson.M{"$exists": true},
61-
}),
59+
Options: options.Index().SetUnique(true).
60+
SetPartialFilterExpression(bson.M{spec.KeyName: bson.M{"$exists": true}}),
6261
},
6362
{
6463
Keys: bson.M{spec.KeyKind: 1},

ext/pkg/network/listener.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
type ListenNodeSpec struct {
2828
spec.Meta `map:",inline"`
2929
Protocol string `map:"protocol" validate:"required"`
30-
Host string `map:"host,omitempty"`
30+
Host string `map:"host,omitempty" validate:"omitempty,hostname|ip"`
3131
Port int `map:"port" validate:"required"`
3232
Cert string `map:"cert,omitempty"`
3333
Key string `map:"key,omitempty"`

pkg/resource/store.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ func (s *store[T]) Watch(ctx context.Context, resources ...T) (Stream, error) {
102102

103103
go func() {
104104
<-stream.Done()
105+
105106
s.mu.Lock()
106107
defer s.mu.Unlock()
107108

0 commit comments

Comments
 (0)