fix(main): fix misused return statement

instill-ai · Jan 3, 2024 · 5cbfc3d · 5cbfc3d
1 parent 8ec74e3
commit 5cbfc3d
Showing 1 changed file with 16 additions and 18 deletions.
diff --git a/cmd/main/main.go b/cmd/main/main.go
@@ -254,27 +254,25 @@ func main() {
 		panic(err)
 	}
 
-	var userUID string
-	if !strings.HasPrefix(config.Config.Server.Edition, "cloud") ||
-		strings.HasSuffix(config.Config.Server.Edition, "test") {
-		if resp, err := mgmtPrivateServiceClient.GetUserAdmin(ctx, &mgmtPB.GetUserAdminRequest{Name: constant.CoreDefaultUserID}); err == nil {
-			userUID = resp.GetUser().GetUid()
-		} else {
-			logger.Error(err.Error())
-			return
-		}
-	} else {
-		if resp, err := mgmtPrivateServiceClient.GetUserAdmin(ctx, &mgmtPB.GetUserAdminRequest{Name: constant.CloudDefaultUserID}); err == nil {
-			userUID = resp.GetUser().GetUid()
-		} else {
-			logger.Error(err.Error())
-			return
-		}
-	}
-
 	// Start usage reporter
 	var usg usage.Usage
 	if config.Config.Server.Usage.Enabled {
+		var userUID string
+		if !strings.HasPrefix(config.Config.Server.Edition, "cloud") ||
+			strings.HasSuffix(config.Config.Server.Edition, "test") {
+			if resp, err := mgmtPrivateServiceClient.GetUserAdmin(ctx, &mgmtPB.GetUserAdminRequest{Name: constant.CoreDefaultUserID}); err == nil {
+				userUID = resp.GetUser().GetUid()
+			} else {
+				logger.Error(err.Error())
+			}
+		} else {
+			if resp, err := mgmtPrivateServiceClient.GetUserAdmin(ctx, &mgmtPB.GetUserAdminRequest{Name: constant.CloudDefaultUserID}); err == nil {
+				userUID = resp.GetUser().GetUid()
+			} else {
+				logger.Error(err.Error())
+			}
+		}
+
 		usageServiceClient, usageServiceClientConn := external.InitUsageServiceClient(ctx)
 		defer usageServiceClientConn.Close()
 		logger.Info("try to start usage reporter")