EDBのJSON構造変更対応 (#197)

sacloud · Apr 14, 2023 · de4402a · de4402a
1 parent be6f6a1
commit de4402a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 15 deletions.
diff --git a/internal/define/enhanced_database.go b/internal/define/enhanced_database.go
@@ -130,7 +130,7 @@ var (
 				Name: "MaxConnections",
 				Type: meta.TypeInt,
 				Tags: &dsl.FieldTags{
-					MapConv: "Settings.EnhancedDB.MaxConnections",
+					MapConv: "Config.MaxConnections",
 				},
 				Value: `50`,
 			},
@@ -155,7 +155,7 @@ var (
 				Name: "MaxConnections",
 				Type: meta.TypeInt,
 				Tags: &dsl.FieldTags{
-					MapConv: "Settings.EnhancedDB.MaxConnections",
+					MapConv: "Config.MaxConnections",
 				},
 				Value: `50`,
 			},

diff --git a/internal/define/fields.go b/internal/define/fields.go
@@ -1880,7 +1880,7 @@ func (f *fieldsDef) EnhancedDBMaxConnections() *dsl.FieldDesc {
 		Name: "MaxConnections",
 		Type: meta.TypeInt,
 		Tags: &dsl.FieldTags{
-			MapConv: "Settings.EnhancedDB.MaxConnections",
+			MapConv: "Config.MaxConnections",
 		},
 	}
 }

diff --git a/naked/enhanced_db.go b/naked/enhanced_db.go
@@ -31,19 +31,14 @@ type EnhancedDB struct {
 	ModifiedAt   *time.Time          `json:",omitempty" yaml:"modified_at,omitempty" structs:",omitempty"`
 	Availability types.EAvailability `json:",omitempty" yaml:"availability,omitempty" structs:",omitempty"`
 	Provider     *Provider           `json:",omitempty" yaml:"provider,omitempty" structs:",omitempty"`
-	Settings     *EnhancedDBSettings `json:",omitempty" yaml:"settings,omitempty" structs:",omitempty"`
+	Config       *EnhancedDBConfig   `json:",omitempty" yaml:"settings,omitempty" structs:",omitempty"`
 	SettingsHash string              `json:",omitempty" yaml:"settings_hash,omitempty" structs:",omitempty"`
 	Status       *EnhancedDBStatus   `json:",omitempty" yaml:"status" structs:",omitempty"`
 	ServiceClass string              `json:",omitempty" yaml:"service_class,omitempty" structs:",omitempty"`
 }
 
-// EnhancedDBSettings セッティング
-type EnhancedDBSettings struct {
-	EnhancedDB *EnhancedDBSetting `json:",omitempty" yaml:"enhanced_db,omitempty" structs:",omitempty"`
-}
-
-// EnhancedDBSetting セッティング
-type EnhancedDBSetting struct {
+// EnhancedDBConfig コンフィグ
+type EnhancedDBConfig struct {
 	MaxConnections int `json:"max_connections,omitempty" yaml:"max_connections,omitempty" structs:",omitempty"`
 }
 

diff --git a/zz_models.go b/zz_models.go
@@ -10538,7 +10538,7 @@ type EnhancedDB struct {
 	CreatedAt      time.Time
 	ModifiedAt     time.Time
 	SettingsHash   string `json:",omitempty" mapconv:",omitempty"`
-	MaxConnections int    `mapconv:"Settings.EnhancedDB.MaxConnections"`
+	MaxConnections int    `mapconv:"Config.MaxConnections"`
 	DatabaseName   string `mapconv:"Status.DatabaseName"`
 	DatabaseType   string `mapconv:"Status.DatabaseType"`
 	Region         string `mapconv:"Status.Region"`
@@ -10558,7 +10558,7 @@ func (o *EnhancedDB) setDefaults() interface{} {
 		CreatedAt      time.Time
 		ModifiedAt     time.Time
 		SettingsHash   string `json:",omitempty" mapconv:",omitempty"`
-		MaxConnections int    `mapconv:"Settings.EnhancedDB.MaxConnections"`
+		MaxConnections int    `mapconv:"Config.MaxConnections"`
 		DatabaseName   string `mapconv:"Status.DatabaseName"`
 		DatabaseType   string `mapconv:"Status.DatabaseType"`
 		Region         string `mapconv:"Status.Region"`
@@ -10797,7 +10797,7 @@ func (o *EnhancedDBCreateRequest) setDefaults() interface{} {
 		Class          string   `mapconv:"Provider.Class"`
 		Region         string   `mapconv:"Status.Region"`
 		DatabaseType   string   `mapconv:"Status.DatabaseType"`
-		MaxConnections int      `mapconv:"Settings.EnhancedDB.MaxConnections"`
+		MaxConnections int      `mapconv:"Config.MaxConnections"`
 	}{
 		Name:           o.GetName(),
 		Description:    o.GetDescription(),
@@ -10902,7 +10902,7 @@ func (o *EnhancedDBUpdateRequest) setDefaults() interface{} {
 		Tags           types.Tags
 		IconID         types.ID `mapconv:"Icon.ID"`
 		SettingsHash   string   `json:",omitempty" mapconv:",omitempty"`
-		MaxConnections int      `mapconv:"Settings.EnhancedDB.MaxConnections"`
+		MaxConnections int      `mapconv:"Config.MaxConnections"`
 	}{
 		Name:           o.GetName(),
 		Description:    o.GetDescription(),