Merge pull request #7916 from swordqiu/hotfix/qj-keystone-skip-nil-extra-fields

fix: keystone initialize data skip nil extra fields

pkg/keystone/models/credentials.go

@@ -22,6 +22,7 @@ import (
 
 	"yunion.io/x/jsonutils"
 	"yunion.io/x/pkg/errors"
+	"yunion.io/x/pkg/gotypes"
 	"yunion.io/x/pkg/tristate"
 	"yunion.io/x/sqlchemy"
 
@@ -93,6 +94,9 @@ func (manager *SCredentialManager) InitializeData() error {
 		return err
 	}
 	for i := range creds {
+		if gotypes.IsNil(creds[i].Extra) {
+			continue
+		}
 		name, _ := creds[i].Extra.GetString("name")
 		desc, _ := creds[i].Extra.GetString("description")
 		if len(name) == 0 {

pkg/keystone/models/endpoints.go

@@ -24,6 +24,7 @@ import (
 	"yunion.io/x/jsonutils"
 	"yunion.io/x/log"
 	"yunion.io/x/pkg/errors"
+	"yunion.io/x/pkg/gotypes"
 	"yunion.io/x/pkg/tristate"
 	"yunion.io/x/sqlchemy"
 
@@ -100,6 +101,9 @@ func (manager *SEndpointManager) InitializeData() error {
 		return err
 	}
 	for i := range eps {
+		if gotypes.IsNil(eps[i].Extra) {
+			continue
+		}
 		name, _ := eps[i].Extra.GetString("name")
 		desc, _ := eps[i].Extra.GetString("description")
 		if len(name) == 0 {

pkg/keystone/models/policies.go

@@ -21,6 +21,7 @@ import (
 	"yunion.io/x/jsonutils"
 	"yunion.io/x/log"
 	"yunion.io/x/pkg/errors"
+	"yunion.io/x/pkg/gotypes"
 	"yunion.io/x/sqlchemy"
 
 	"yunion.io/x/onecloud/pkg/apis"
@@ -81,6 +82,9 @@ func (manager *SPolicyManager) InitializeData() error {
 		return err
 	}
 	for i := range policies {
+		if !gotypes.IsNil(policies[i].Extra) {
+			continue
+		}
 		db.Update(&policies[i], func() error {
 			policies[i].Name = policies[i].Type
 			policies[i].Description, _ = policies[i].Extra.GetString("description")

pkg/keystone/models/regions.go

@@ -19,6 +19,7 @@ import (
 
 	"yunion.io/x/jsonutils"
 	"yunion.io/x/pkg/errors"
+	"yunion.io/x/pkg/gotypes"
 	"yunion.io/x/sqlchemy"
 
 	"yunion.io/x/onecloud/pkg/apis"
@@ -75,6 +76,9 @@ func (manager *SRegionManager) InitializeData() error {
 		return err
 	}
 	for i := range regions {
+		if gotypes.IsNil(regions[i].Extra) {
+			continue
+		}
 		name, _ := regions[i].Extra.GetString("name")
 		if len(name) == 0 {
 			name = regions[i].Id

pkg/keystone/models/roles.go

@@ -22,6 +22,7 @@ import (
 	"yunion.io/x/jsonutils"
 	"yunion.io/x/log"
 	"yunion.io/x/pkg/errors"
+	"yunion.io/x/pkg/gotypes"
 	"yunion.io/x/sqlchemy"
 
 	"yunion.io/x/onecloud/pkg/apis"
@@ -91,6 +92,9 @@ func (manager *SRoleManager) InitializeData() error {
 		return errors.Wrap(err, "query")
 	}
 	for i := range roles {
+		if gotypes.IsNil(roles[i].Extra) {
+			continue
+		}
 		desc, _ := roles[i].Extra.GetString("description")
 		_, err = db.Update(&roles[i], func() error {
 			roles[i].Description = desc

pkg/keystone/models/services.go

@@ -20,6 +20,7 @@ import (
 
 	"yunion.io/x/jsonutils"
 	"yunion.io/x/pkg/errors"
+	"yunion.io/x/pkg/gotypes"
 	"yunion.io/x/pkg/tristate"
 	"yunion.io/x/sqlchemy"
 
@@ -82,6 +83,9 @@ func (manager *SServiceManager) InitializeData() error {
 		return err
 	}
 	for i := range srvs {
+		if gotypes.IsNil(srvs[i].Extra) {
+			continue
+		}
 		name, _ := srvs[i].Extra.GetString("name")
 		desc, _ := srvs[i].Extra.GetString("description")
 		if len(name) == 0 {