From 9745692b6ef814448e97f8112d37a2fe7594881a Mon Sep 17 00:00:00 2001 From: helongfei Date: Sun, 9 Oct 2022 14:55:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B0=83=E8=AF=95?= =?UTF-8?q?=E6=97=A5=E5=BF=97(pkgId/ak/sk..)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lcmcontroller/controllers/lcmv2.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lcmcontroller/controllers/lcmv2.go b/lcmcontroller/controllers/lcmv2.go index 71813e5..079a526 100644 --- a/lcmcontroller/controllers/lcmv2.go +++ b/lcmcontroller/controllers/lcmv2.go @@ -768,7 +768,9 @@ func DoInstantiate(c *LcmControllerV2, params *models.AppInfoParams, bKey []byte } var aca config.AppConfigAdapter - log.Info(checkYamlContainService(params.TenantId, params.AppPackageId, params.AppName)) + log.Info("params-packageId:" + params.AppPackageId) + log.Info("params-appInstanceId:" + params.AppInstanceId) + log.Info("req-packageId:" + req.PackageId) if checkYamlContainService(params.TenantId, params.AppPackageId, params.AppName) { log.Info("enter process Ak SK config...") err, acm := ProcessAkSkConfig(params.AppInstanceId, params.AppName, &req, params.ClientIP, params.TenantId) @@ -779,7 +781,10 @@ func DoInstantiate(c *LcmControllerV2, params *models.AppInfoParams, bKey []byte return } } - + log.Info("aca-AppInsId:" + aca.AppAuthCfg.AppInsId) + log.Info("aca-Ak:" + aca.AppAuthCfg.Ak) + log.Info("aca-Sk:" + aca.AppAuthCfg.Sk) + log.Info("aca-AppName:" + aca.AppAuthCfg.AppName) err = c.InsertOrUpdateTenantRecord(params.ClientIP, params.TenantId) if err != nil { util.ClearByteArray(bKey) @@ -866,7 +871,6 @@ func checkYamlContainService(tenantId, appPackageId, appName string) bool{ if checkLineContainSth(filename, appName) { appYaml, err := os.Open(filename) if err != nil { - log.Error("open yaml failed! " + err.Error()) return false } defer appYaml.Close() -- Gitee From dbe6b872719804bfddb204b785be9abd077fe157 Mon Sep 17 00:00:00 2001 From: helongfei Date: Sun, 9 Oct 2022 15:00:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B0=83=E8=AF=95?= =?UTF-8?q?=E6=97=A5=E5=BF=97(pkgId/ak/sk..)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lcmcontroller/controllers/lcmv2.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lcmcontroller/controllers/lcmv2.go b/lcmcontroller/controllers/lcmv2.go index 079a526..70c8d82 100644 --- a/lcmcontroller/controllers/lcmv2.go +++ b/lcmcontroller/controllers/lcmv2.go @@ -871,10 +871,10 @@ func checkYamlContainService(tenantId, appPackageId, appName string) bool{ if checkLineContainSth(filename, appName) { appYaml, err := os.Open(filename) if err != nil { + log.Error("open yaml failed! " + err.Error()) return false } defer appYaml.Close() - log.Info(ReadAppYamlVal(appYaml)) if ReadAppYamlVal(appYaml) { return true } -- Gitee