From cc6eca5b90025c5f2641ad51d1434614261cd003 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= <qu_xuan@icloud.com>
Date: Mon, 19 Feb 2024 12:08:23 +0800
Subject: [PATCH] fix(cloudproxy): cloudproxy service auth first (#19499)

---
 cmd/cloudproxy/main.go            |  9 +++++++++
 pkg/cloudproxy/service/service.go | 16 +++-------------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/cmd/cloudproxy/main.go b/cmd/cloudproxy/main.go
index 01bcd41404..76c0e56311 100644
--- a/cmd/cloudproxy/main.go
+++ b/cmd/cloudproxy/main.go
@@ -23,6 +23,9 @@ import (
 
 	"yunion.io/x/log"
 
+	api "yunion.io/x/onecloud/pkg/apis/cloudproxy"
+	common_app "yunion.io/x/onecloud/pkg/cloudcommon/app"
+	common_options "yunion.io/x/onecloud/pkg/cloudcommon/options"
 	"yunion.io/x/onecloud/pkg/cloudproxy/agent/worker"
 	"yunion.io/x/onecloud/pkg/cloudproxy/options"
 	"yunion.io/x/onecloud/pkg/cloudproxy/service"
@@ -41,6 +44,12 @@ func main() {
 		opts = options.Get()
 	)
 
+	common_app.InitAuth(&opts.CommonOptions, func() {
+		log.Infof("Auth complete")
+	})
+
+	common_options.StartOptionManager(opts, opts.ConfigSyncPeriodSeconds, api.SERVICE_TYPE, api.SERVICE_VERSION, options.OnOptionsChange)
+
 	wg.Add(1)
 	go func() {
 		defer wg.Done()
diff --git a/pkg/cloudproxy/service/service.go b/pkg/cloudproxy/service/service.go
index dd0528579d..26e4383910 100644
--- a/pkg/cloudproxy/service/service.go
+++ b/pkg/cloudproxy/service/service.go
@@ -18,16 +18,13 @@ import (
 	"context"
 
 	"yunion.io/x/jsonutils"
-	"yunion.io/x/log"
 	_ "yunion.io/x/sqlchemy/backends"
 
-	api "yunion.io/x/onecloud/pkg/apis/cloudproxy"
 	"yunion.io/x/onecloud/pkg/cloudcommon"
 	common_app "yunion.io/x/onecloud/pkg/cloudcommon/app"
 	"yunion.io/x/onecloud/pkg/cloudcommon/consts"
 	"yunion.io/x/onecloud/pkg/cloudcommon/db"
 	"yunion.io/x/onecloud/pkg/cloudcommon/notifyclient"
-	common_options "yunion.io/x/onecloud/pkg/cloudcommon/options"
 	"yunion.io/x/onecloud/pkg/cloudproxy/models"
 	"yunion.io/x/onecloud/pkg/cloudproxy/options"
 	"yunion.io/x/onecloud/pkg/mcclient/auth"
@@ -35,18 +32,11 @@ import (
 
 func StartService() {
 	var (
-		opts       = options.Get()
-		dbOpts     = &opts.DBOptions
-		baseOpts   = &opts.BaseOptions
-		commonOpts = &opts.CommonOptions
+		opts     = options.Get()
+		dbOpts   = &opts.DBOptions
+		baseOpts = &opts.BaseOptions
 	)
 
-	common_app.InitAuth(commonOpts, func() {
-		log.Infof("Auth complete")
-	})
-
-	common_options.StartOptionManager(opts, opts.ConfigSyncPeriodSeconds, api.SERVICE_TYPE, api.SERVICE_VERSION, options.OnOptionsChange)
-
 	app := common_app.InitApp(baseOpts, true).
 		OnException(func(method, path string, body jsonutils.JSONObject, err error) {
 			ctx := context.Background()