Merge pull request #279 from kthcloud/dev

patch net resource version, and fix nicer syntax for resource fetching

go.mod

@@ -17,6 +17,8 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/mittwald/goharbor-client/v5 v5.3.1
 	github.com/patrickmn/go-cache v2.1.0+incompatible
+	github.com/prometheus/client_golang v1.17.0
+	github.com/redis/go-redis/v9 v9.2.1
 	github.com/stretchr/testify v1.8.3
 	github.com/swaggo/files v1.0.1
 	github.com/swaggo/gin-swagger v1.6.0
@@ -25,7 +27,7 @@ require (
 	go.mongodb.org/mongo-driver v1.11.2
 	golang.org/x/crypto v0.14.0
 	golang.org/x/exp v0.0.0-20231006140011-7918f672742d
-	golang.org/x/net v0.16.0
+	golang.org/x/net v0.17.0
 	golang.org/x/oauth2 v0.8.0
 	gopkg.in/square/go-jose.v2 v2.6.0
 	gopkg.in/yaml.v2 v2.4.0
@@ -96,11 +98,9 @@ require (
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pkg/sftp v1.13.5 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/client_golang v1.17.0 // indirect
 	github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
 	github.com/prometheus/common v0.44.0 // indirect
 	github.com/prometheus/procfs v0.11.1 // indirect
-	github.com/redis/go-redis/v9 v9.2.1 // indirect
 	github.com/segmentio/ksuid v1.0.4 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect

go.sum

@@ -13,6 +13,8 @@ github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3d
 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
+github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
+github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
 github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
 github.com/bytedance/sonic v1.9.1 h1:6iJ6NqdoxCDr6mbY8h18oSO+cShGSMRGCEo7F2h0x8s=
 github.com/bytedance/sonic v1.9.1/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U=
@@ -31,7 +33,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
-github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
 github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
 github.com/emicklei/go-restful/v3 v3.8.0 h1:eCZ8ulSerjdAiaNpF7GxXIE7ZCMo1moN1qX+S609eVw=
 github.com/emicklei/go-restful/v3 v3.8.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
@@ -51,7 +52,6 @@ github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=
 github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU=
 github.com/gliderlabs/ssh v0.3.5 h1:OcaySEmAQJgyYcArR+gGGTHCyE7nvhEMTlYY+Dp8CpY=
 github.com/gliderlabs/ssh v0.3.5/go.mod h1:8XB4KraRrX39qHhT6yxPsHedjA08I/uBVwj4xC+/+z4=
-github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
 github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
@@ -203,10 +203,8 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt
 github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
-github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
 github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4=
 github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
@@ -223,7 +221,6 @@ github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
 github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
@@ -260,7 +257,6 @@ github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe h1:iruDEfMl2E6f
 github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
@@ -298,8 +294,8 @@ github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
 github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
-github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8=
 github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
+github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
 github.com/segmentio/ksuid v1.0.4 h1:sBo2BdShXjmcugAMwjugoGUdUV0pcxY5mW4xKRn3v4c=
 github.com/segmentio/ksuid v1.0.4/go.mod h1:/XUiZBD3kVx5SmUOl55voK5yeAbBNNIed+2O73XgrPE=
 github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
@@ -410,11 +406,9 @@ golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qx
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.16.0 h1:7eBu7KsSvFDtSXUIDbh3aqlK4DPsZ1rByC8PFfBThos=
-golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.6.0 h1:Lh8GPgSKBfWSwFvtuWOfeI3aAAnbXTSutYxJiOJFgIw=
-golang.org/x/oauth2 v0.6.0/go.mod h1:ycmewcwgD4Rpr3eZJLSB4Kyyljb3qDh40vJ8STE5HKw=
 golang.org/x/oauth2 v0.8.0 h1:6dkIjl3j3LtZ/O3sTgZTMsLKSftL/B8Zgq4huOIIUu8=
 golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -515,8 +509,6 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
-google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
 google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

models/sys/base/activityResource/helpers.go

@@ -9,26 +9,6 @@ import (
 	"time"
 )
 
-func (client *ActivityResourceClient[T]) ListByActivity(activity string) ([]T, error) {
-	filter := bson.D{{
-		"activities." + activity, bson.M{
-			"$exists": true,
-		},
-	}}
-
-	return models.ListResources[T](client.Collection, models.GroupFilters(filter, client.ExtraFilter, client.Search, false), client.Pagination)
-}
-
-func (client *ActivityResourceClient[T]) ListWithNoActivities() ([]T, error) {
-	filter := bson.D{{
-		"activities", bson.M{
-			"$gte": bson.M{},
-		},
-	}}
-
-	return models.ListResources[T](client.Collection, models.GroupFilters(filter, client.ExtraFilter, client.Search, false), client.Pagination)
-}
-
 func (client *ActivityResourceClient[T]) AddActivity(id, activity string) error {
 	_, err := client.Collection.UpdateOne(context.TODO(),
 		bson.D{{"id", id}},

models/sys/base/resource/helpers.go

@@ -16,7 +16,7 @@ func (client *ResourceClient[T]) GetByName(name string) (*T, error) {
 	return models.GetResource[T](client.Collection, models.GroupFilters(bson.D{{"name", name}}, client.ExtraFilter, client.Search, client.IncludeDeleted))
 }
 
-func (client *ResourceClient[T]) ListAll() ([]T, error) {
+func (client *ResourceClient[T]) List() ([]T, error) {
 	return models.ListResources[T](client.Collection, models.GroupFilters(bson.D{}, client.ExtraFilter, client.Search, client.IncludeDeleted), client.Pagination)
 }
 

models/sys/deployment/client.go

@@ -58,3 +58,31 @@ func (client *Client) RestrictToOwner(ownerID string) *Client {
 
 	return client
 }
+
+func (client *Client) WithActivities(activities ...string) *Client {
+	orFilter := bson.A{}
+
+	for _, activity := range activities {
+		orFilter = append(orFilter, bson.M{
+			"activities." + activity: bson.M{
+				"$exists": true,
+			},
+		})
+	}
+
+	client.ActivityResourceClient.AddExtraFilter(bson.D{{
+		"$or", orFilter,
+	}})
+
+	return client
+}
+
+func (client *Client) WithNoActivities() *Client {
+	client.ActivityResourceClient.AddExtraFilter(bson.D{{
+		"activities", bson.M{
+			"$gte": bson.M{},
+		},
+	}})
+
+	return client
+}

models/sys/storage_manager/client.go

@@ -58,3 +58,31 @@ func (client *Client) RestrictToOwner(ownerID string) *Client {
 
 	return client
 }
+
+func (client *Client) WithActivities(activities ...string) *Client {
+	orFilter := bson.A{}
+
+	for _, activity := range activities {
+		orFilter = append(orFilter, bson.M{
+			"activities." + activity: bson.M{
+				"$exists": true,
+			},
+		})
+	}
+
+	client.ActivityResourceClient.AddExtraFilter(bson.D{{
+		"$or", orFilter,
+	}})
+
+	return client
+}
+
+func (client *Client) WithNoActivities() *Client {
+	client.ActivityResourceClient.AddExtraFilter(bson.D{{
+		"activities", bson.M{
+			"$gte": bson.M{},
+		},
+	}})
+
+	return client
+}

models/sys/vm/client.go

@@ -58,3 +58,31 @@ func (client *Client) RestrictToOwner(ownerID string) *Client {
 
 	return client
 }
+
+func (client *Client) WithActivities(activities ...string) *Client {
+	orFilter := bson.A{}
+
+	for _, activity := range activities {
+		orFilter = append(orFilter, bson.M{
+			"activities." + activity: bson.M{
+				"$exists": true,
+			},
+		})
+	}
+
+	client.ActivityResourceClient.AddExtraFilter(bson.D{{
+		"$or", orFilter,
+	}})
+
+	return client
+}
+
+func (client *Client) WithNoActivities() *Client {
+	client.ActivityResourceClient.AddExtraFilter(bson.D{{
+		"activities", bson.M{
+			"$gte": bson.M{},
+		},
+	}})
+
+	return client
+}

pkg/workers/confirm/workers.go

@@ -18,7 +18,7 @@ func deploymentConfirmer(ctx context.Context) {
 	for {
 		select {
 		case <-time.After(5 * time.Second):
-			beingCreated, _ := deploymentModel.New().ListByActivity(deploymentModel.ActivityBeingCreated)
+			beingCreated, _ := deploymentModel.New().WithActivities(deploymentModel.ActivityBeingCreated).List()
 			for _, deployment := range beingCreated {
 				created := DeploymentCreated(&deployment)
 				if created {
@@ -27,7 +27,7 @@ func deploymentConfirmer(ctx context.Context) {
 				}
 			}
 
-			beingDeleted, _ := deploymentModel.New().ListByActivity(deploymentModel.ActivityBeingDeleted)
+			beingDeleted, _ := deploymentModel.New().WithActivities(deploymentModel.ActivityBeingDeleted).List()
 			for _, deployment := range beingDeleted {
 				deleted := DeploymentDeleted(&deployment)
 				if !deleted {
@@ -66,7 +66,7 @@ func vmConfirmer(ctx context.Context) {
 	for {
 		select {
 		case <-time.After(5 * time.Second):
-			beingCreated, err := vmModel.New().ListByActivity(vmModel.ActivityBeingCreated)
+			beingCreated, err := vmModel.New().WithActivities(vmModel.ActivityBeingCreated).List()
 			if err != nil {
 				utils.PrettyPrintError(fmt.Errorf("failed to get vms being created. details: %w", err))
 			}
@@ -79,7 +79,7 @@ func vmConfirmer(ctx context.Context) {
 				}
 			}
 
-			beingDeleted, err := vmModel.New().ListByActivity(vmModel.ActivityBeingDeleted)
+			beingDeleted, err := vmModel.New().WithActivities(vmModel.ActivityBeingDeleted).List()
 			if err != nil {
 				utils.PrettyPrintError(fmt.Errorf("failed to get vms being deleted. details: %w", err))
 			}

pkg/workers/migrate/migrate.go

@@ -43,7 +43,7 @@ func getMigrations() map[string]func() error {
 }
 
 func removeOldSystemSnapshots() error {
-	vms, err := vmModel.New().ListAll()
+	vms, err := vmModel.New().List()
 	if err != nil {
 		return err
 	}

pkg/workers/repair/workers.go

@@ -22,7 +22,7 @@ func deploymentRepairer(ctx context.Context) {
 
 		select {
 		case <-time.After(time.Duration(config.Config.Deployment.RepairInterval) * time.Second):
-			restarting, err := deploymentModel.New().ListByActivity(deploymentModel.ActivityRestarting)
+			restarting, err := deploymentModel.New().WithActivities(deploymentModel.ActivityRestarting).List()
 			if err != nil {
 				utils.PrettyPrintError(fmt.Errorf("error fetching restarting deployments. details: %w", err))
 				continue
@@ -35,12 +35,12 @@ func deploymentRepairer(ctx context.Context) {
 					log.Printf("removing restarting activity from deployment %s\n", deployment.Name)
 					err = deploymentModel.New().RemoveActivity(deployment.ID, deploymentModel.ActivityRestarting)
 					if err != nil {
-						log.Printf("failed to remove restarting activity from deployment %s. details: %w\n", deployment.Name, err)
+						utils.PrettyPrintError(fmt.Errorf("failed to remove restarting activity from deployment %s. details: %w", deployment.Name, err))
 					}
 				}
 			}
 
-			withNoActivities, err := deploymentModel.New().ListWithNoActivities()
+			withNoActivities, err := deploymentModel.New().WithNoActivities().List()
 			if err != nil {
 				utils.PrettyPrintError(fmt.Errorf("error fetching deployments with no activities. details: %w", err))
 				continue
@@ -77,7 +77,7 @@ func storageManagerRepairer(ctx context.Context) {
 	for {
 		select {
 		case <-time.After(time.Duration(config.Config.Deployment.RepairInterval) * time.Second):
-			withNoActivities, err := storageManagerModel.New().ListWithNoActivities()
+			withNoActivities, err := storageManagerModel.New().WithNoActivities().List()
 			if err != nil {
 				utils.PrettyPrintError(fmt.Errorf("error fetching storage managers with no activities. details: %w", err))
 				continue
@@ -116,7 +116,7 @@ func vmRepairer(ctx context.Context) {
 	for {
 		select {
 		case <-time.After(time.Duration(config.Config.VM.RepairInterval) * time.Second):
-			withNoActivities, err := vmModel.New().ListWithNoActivities()
+			withNoActivities, err := vmModel.New().WithNoActivities().List()
 			if err != nil {
 				utils.PrettyPrintError(fmt.Errorf("error fetching vms with no activities. details: %w", err))
 				continue

pkg/workers/snapshot/workers.go

@@ -18,7 +18,7 @@ func snapshotter(ctx context.Context) {
 	for {
 		select {
 		case <-time.After(10 * time.Second):
-			vms, err := vmModel.New().ListAll()
+			vms, err := vmModel.New().List()
 			if err != nil {
 				utils.PrettyPrintError(fmt.Errorf("failed to get all vms. details: %w", err))
 				continue