updating fetching resources for civo and tencent

Signed-off-by: bishal7679 <[email protected]>
tailwarden · Nov 17, 2023 · 548721e · 548721e
1 parent 9a8b3f1
commit 548721e
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 25 deletions.
diff --git a/providers/civo/civo.go b/providers/civo/civo.go
@@ -30,20 +30,20 @@ func listOfSupportedServices() []providers.FetchDataFunction {
 
 func FetchResources(ctx context.Context, client providers.ProviderClient, db *bun.DB, telemetry bool, analytics utils.Analytics, wp *providers.WorkerPool) {
 	for _, fetchResources := range listOfSupportedServices() {
-		wp.SubmitTask(func() {
-			regions, err := client.CivoClient.ListRegions()
+		regions, err := client.CivoClient.ListRegions()
+		if err != nil {
+			log.Printf("[%s][Civo] %s", client.Name, err)
+		}
+
+		for _, region := range regions {
+			clientWithRegion, err := civogo.NewClient(client.CivoClient.APIKey, region.Code)
 			if err != nil {
 				log.Printf("[%s][Civo] %s", client.Name, err)
 			}
 
-			for _, region := range regions {
-				clientWithRegion, err := civogo.NewClient(client.CivoClient.APIKey, region.Code)
-				if err != nil {
-					log.Printf("[%s][Civo] %s", client.Name, err)
-				}
-
-				client.CivoClient = clientWithRegion
+			client.CivoClient = clientWithRegion
 
+			wp.SubmitTask(func() {
 				resources, err := fetchResources(ctx, client)
 				if err != nil {
 					log.Printf("[%s][Civo] %s", client.Name, err)
@@ -61,7 +61,7 @@ func FetchResources(ctx context.Context, client providers.ProviderClient, db *bu
 						})
 					}
 				}
-			}
-		})
+			})
+		}
 	}
 }
diff --git a/providers/tencent/tencent.go b/providers/tencent/tencent.go
@@ -22,22 +22,22 @@ func listOfSupportedServices() []providers.FetchDataFunction {
 
 func FetchResources(ctx context.Context, client providers.ProviderClient, db *bun.DB, telemetry bool, analytics utils.Analytics, wp *providers.WorkerPool) {
 	for _, fetchResources := range listOfSupportedServices() {
-		wp.SubmitTask(func() {
-			regions, err := client.TencentClient.DescribeRegionsWithContext(ctx, tccvm.NewDescribeRegionsRequest())
+		regions, err := client.TencentClient.DescribeRegionsWithContext(ctx, tccvm.NewDescribeRegionsRequest())
+		if err != nil {
+			log.Errorf("[%s][Tencent] Couldn't fetch the list of regions: %s", client.Name, err)
+		}
+
+		for _, region := range regions.Response.RegionSet {
+			cpf := profile.NewClientProfile()
+			cpf.Language = "en-US"
+			clientWithRegion, err := tccvm.NewClient(client.TencentClient.GetCredential(), *region.Region, cpf)
 			if err != nil {
-				log.Errorf("[%s][Tencent] Couldn't fetch the list of regions: %s", client.Name, err)
+				log.Errorf("[%s][Tencent] Couldn't create the Tencent client with region %s: %s", client.Name, *region.Region, err)
 			}
 
-			for _, region := range regions.Response.RegionSet {
-				cpf := profile.NewClientProfile()
-				cpf.Language = "en-US"
-				clientWithRegion, err := tccvm.NewClient(client.TencentClient.GetCredential(), *region.Region, cpf)
-				if err != nil {
-					log.Errorf("[%s][Tencent] Couldn't create the Tencent client with region %s: %s", client.Name, *region.Region, err)
-				}
-
-				client.TencentClient = clientWithRegion
+			client.TencentClient = clientWithRegion
 
+			wp.SubmitTask(func() {
 				resources, err := fetchResources(ctx, client)
 				if err != nil {
 					log.Printf("[%s][Tencent] %s", client.Name, err)
@@ -55,7 +55,7 @@ func FetchResources(ctx context.Context, client providers.ProviderClient, db *bu
 						})
 					}
 				}
-			}
-		})
+			})
+		}
 	}
 }