Merge branch 'develop' into dependabot/npm_and_yarn/dashboard/sentry/…

…react-7.77.0
tailwarden · Nov 16, 2023 · 76c00ce · 76c00ce
2 parents 521c58d + e53b263
commit 76c00ce
Show file tree

Hide file tree

Showing 5 changed files with 257 additions and 251 deletions.
diff --git a/...ard/components/inventory/hooks/useInventory/helpers/getCustomViewInventoryListAndStats.ts b/...ard/components/inventory/hooks/useInventory/helpers/getCustomViewInventoryListAndStats.ts
@@ -110,14 +110,16 @@ function getCustomViewInventoryListAndStats({
             }
           }
         });
-    } else {
-      setTimeout(() => router.push(router.pathname), 5000);
-      return showToast({
-        hasError: true,
-        title: `Invalid view`,
-        message: `We couldn't find this view. Redirecting back to home...`
-      });
-    }
+    } 
+    // TODO: https://github.com/tailwarden/komiser/issues/1208
+    // else {
+    //   setTimeout(() => router.push(router.pathname), 5000);
+    //   return showToast({
+    //     hasError: true,
+    //     title: `Invalid view`,
+    //     message: `We couldn't find this view. Redirecting back to home...`
+    //   });
+    // }
   }
   return null;
 }

diff --git a/internal/api/v1/template.go b/internal/api/v1/template.go
diff --git a/internal/internal.go b/internal/internal.go
@@ -252,11 +252,11 @@ func triggerFetchingWorfklow(ctx context.Context, client providers.ProviderClien
 	case "Scaleway":
 		scaleway.FetchResources(ctx, client, db, telemetry, analytics)
 	case "MongoDBAtlas":
-		mongodbatlas.FetchResources(ctx, client, db, telemetry, analytics)
+		mongodbatlas.FetchResources(ctx, client, db, telemetry, analytics, wp)
 	case "GCP":
 		gcp.FetchResources(ctx, client, db, telemetry, analytics, wp)
 	case "OVH":
-		ovh.FetchResources(ctx, client, db, telemetry, analytics)
+		ovh.FetchResources(ctx, client, db, telemetry, analytics, wp)
 	}
 }
 

diff --git a/providers/mongodbatlas/mongodbatlas.go b/providers/mongodbatlas/mongodbatlas.go
@@ -17,25 +17,27 @@ func listOfSupportedServices() []providers.FetchDataFunction {
 	}
 }
 
-func FetchResources(ctx context.Context, client providers.ProviderClient, db *bun.DB, telemetry bool, analytics utils.Analytics) {
+func FetchResources(ctx context.Context, client providers.ProviderClient, db *bun.DB, telemetry bool, analytics utils.Analytics, wp *providers.WorkerPool) {
 	for _, fetchResources := range listOfSupportedServices() {
-		resources, err := fetchResources(ctx, client)
-		if err != nil {
-			log.Printf("[%s][MongoDBAtlas] %s", client.Name, err)
-		} else {
-			for _, resource := range resources {
-				_, err := db.NewInsert().Model(&resource).On("CONFLICT (resource_id) DO UPDATE").Set("cost = EXCLUDED.cost").Exec(context.Background())
-				if err != nil {
-					logrus.WithError(err).Errorf("db trigger failed")
+		wp.SubmitTask(func() {
+			resources, err := fetchResources(ctx, client)
+			if err != nil {
+				log.Printf("[%s][MongoDBAtlas] %s", client.Name, err)
+			} else {
+				for _, resource := range resources {
+					_, err := db.NewInsert().Model(&resource).On("CONFLICT (resource_id) DO UPDATE").Set("cost = EXCLUDED.cost").Exec(context.Background())
+					if err != nil {
+						logrus.WithError(err).Errorf("db trigger failed")
+					}
+				}
+				if telemetry {
+					analytics.TrackEvent("discovered_resources", map[string]interface{}{
+						"provider":  "MongoDBAtlas",
+						"resources": len(resources),
+					})
 				}
-
-			}
-			if telemetry {
-				analytics.TrackEvent("discovered_resources", map[string]interface{}{
-					"provider":  "MongoDBAtlas",
-					"resources": len(resources),
-				})
 			}
-		}
+		})
+
 	}
 }
diff --git a/providers/ovh/ovh.go b/providers/ovh/ovh.go
@@ -42,24 +42,26 @@ func listOfSupportedServices() []providers.FetchDataFunction {
 	}
 }
 
-func FetchResources(ctx context.Context, client providers.ProviderClient, db *bun.DB, telemetry bool, analytics utils.Analytics) {
-	for _, fetchResources := range listOfSupportedServices() {
-		resources, err := fetchResources(ctx, client)
-		if err != nil {
-			log.Printf("[%s][OVH] %s", client.Name, err)
-		} else {
-			for _, resource := range resources {
-				_, err := db.NewInsert().Model(&resource).On("CONFLICT (resource_id) DO UPDATE").Set("cost = EXCLUDED.cost").Exec(context.Background())
-				if err != nil {
-					logrus.WithError(err).Errorf("db trigger failed")
+func FetchResources(ctx context.Context, client providers.ProviderClient, db *bun.DB, telemetry bool, analytics utils.Analytics, wp *providers.WorkerPool) {
+	wp.SubmitTask(func() {
+		for _, fetchResources := range listOfSupportedServices() {
+			resources, err := fetchResources(ctx, client)
+			if err != nil {
+				log.Printf("[%s][OVH] %s", client.Name, err)
+			} else {
+				for _, resource := range resources {
+					_, err := db.NewInsert().Model(&resource).On("CONFLICT (resource_id) DO UPDATE").Set("cost = EXCLUDED.cost").Exec(context.Background())
+					if err != nil {
+						logrus.WithError(err).Errorf("db trigger failed")
+					}
+				}
+				if telemetry {
+					analytics.TrackEvent("discovered_resources", map[string]interface{}{
+						"provider":  "OVH",
+						"resources": len(resources),
+					})
 				}
-			}
-			if telemetry {
-				analytics.TrackEvent("discovered_resources", map[string]interface{}{
-					"provider":  "OVH",
-					"resources": len(resources),
-				})
 			}
 		}
-	}
+	})
 }