Cleanup

davissp14 · davissp14 · commit 8cd58e1ede04 · 2023-02-06T18:04:27.000-06:00
diff --git a/internal/flypg/config.go b/internal/flypg/config.go
@@ -19,6 +19,7 @@ type Config interface {
 	UserConfig() ConfigMap
 	SetUserConfig(configMap ConfigMap)
 	ConsulKey() string
+	CurrentConfig() (ConfigMap, error)
 }
 
 func WriteUserConfig(c Config, consul *state.Store) error {
diff --git a/internal/flypg/flypg.go b/internal/flypg/flypg.go
@@ -55,7 +55,7 @@ func (c *FlyPGConfig) UserConfigFile() string {
 	return c.userConfigFilePath
 }
 
-func (c *FlyPGConfig) CurrentConfig() (map[string]interface{}, error) {
+func (c *FlyPGConfig) CurrentConfig() (ConfigMap, error) {
 	internal, err := ReadFromFile(c.InternalConfigFile())
 	if err != nil {
 		return nil, err
@@ -65,7 +65,7 @@ func (c *FlyPGConfig) CurrentConfig() (map[string]interface{}, error) {
 		return nil, err
 	}
 
-	all := map[string]interface{}{}
+	all := ConfigMap{}
 
 	for k, v := range internal {
 		all[k] = v
diff --git a/internal/flypg/pg.go b/internal/flypg/pg.go
@@ -55,7 +55,7 @@ func (c *PGConfig) UserConfigFile() string {
 	return c.userConfigFilePath
 }
 
-func (c *PGConfig) CurrentConfig() (map[string]interface{}, error) {
+func (c *PGConfig) CurrentConfig() (ConfigMap, error) {
 	internal, err := ReadFromFile(c.InternalConfigFile())
 	if err != nil {
 		return nil, err
@@ -65,7 +65,7 @@ func (c *PGConfig) CurrentConfig() (map[string]interface{}, error) {
 		return nil, err
 	}
 
-	all := map[string]interface{}{}
+	all := ConfigMap{}
 
 	for k, v := range internal {
 		all[k] = v
diff --git a/internal/flypg/pgbouncer.go b/internal/flypg/pgbouncer.go
@@ -74,7 +74,7 @@ func (p *PGBouncer) ConfigurePrimary(ctx context.Context, primary string, reload
 	return nil
 }
 
-func (p *PGBouncer) CurrentConfig() (map[string]interface{}, error) {
+func (p *PGBouncer) CurrentConfig() (ConfigMap, error) {
 	internal, err := ReadFromFile(p.InternalConfigFile())
 	if err != nil {
 		return nil, err
@@ -84,7 +84,7 @@ func (p *PGBouncer) CurrentConfig() (map[string]interface{}, error) {
 		return nil, err
 	}
 
-	all := map[string]interface{}{}
+	all := ConfigMap{}
 
 	for k, v := range internal {
 		all[k] = v
diff --git a/internal/flypg/repmgr.go b/internal/flypg/repmgr.go
@@ -58,7 +58,7 @@ func (r *RepMgr) SetUserConfig(configMap ConfigMap) {
 	r.userConfig = configMap
 }
 
-func (r *RepMgr) CurrentConfig() (map[string]interface{}, error) {
+func (r *RepMgr) CurrentConfig() (ConfigMap, error) {
 	internal, err := ReadFromFile(r.InternalConfigFile())
 	if err != nil {
 		return nil, err
@@ -68,7 +68,7 @@ func (r *RepMgr) CurrentConfig() (map[string]interface{}, error) {
 		return nil, err
 	}
 
-	all := map[string]interface{}{}
+	all := ConfigMap{}
 
 	for k, v := range internal {
 		all[k] = v

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ type Config interface {`
`19`	`19`	`UserConfig() ConfigMap`
`20`	`20`	`SetUserConfig(configMap ConfigMap)`
`21`	`21`	`ConsulKey() string`
	`22`	`+ CurrentConfig() (ConfigMap, error)`
`22`	`23`	`}`
`23`	`24`
`24`	`25`	`func WriteUserConfig(c Config, consul *state.Store) error {`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ func (c *FlyPGConfig) UserConfigFile() string {`
`55`	`55`	`return c.userConfigFilePath`
`56`	`56`	`}`
`57`	`57`
`58`		`-func (c *FlyPGConfig) CurrentConfig() (map[string]interface{}, error) {`
	`58`	`+func (c *FlyPGConfig) CurrentConfig() (ConfigMap, error) {`
`59`	`59`	`internal, err := ReadFromFile(c.InternalConfigFile())`
`60`	`60`	`if err != nil {`
`61`	`61`	`return nil, err`
`@@ -65,7 +65,7 @@ func (c *FlyPGConfig) CurrentConfig() (map[string]interface{}, error) {`
`65`	`65`	`return nil, err`
`66`	`66`	`}`
`67`	`67`
`68`		`- all := map[string]interface{}{}`
	`68`	`+ all := ConfigMap{}`
`69`	`69`
`70`	`70`	`for k, v := range internal {`
`71`	`71`	`all[k] = v`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ func (c *PGConfig) UserConfigFile() string {`
`55`	`55`	`return c.userConfigFilePath`
`56`	`56`	`}`
`57`	`57`
`58`		`-func (c *PGConfig) CurrentConfig() (map[string]interface{}, error) {`
	`58`	`+func (c *PGConfig) CurrentConfig() (ConfigMap, error) {`
`59`	`59`	`internal, err := ReadFromFile(c.InternalConfigFile())`
`60`	`60`	`if err != nil {`
`61`	`61`	`return nil, err`
`@@ -65,7 +65,7 @@ func (c *PGConfig) CurrentConfig() (map[string]interface{}, error) {`
`65`	`65`	`return nil, err`
`66`	`66`	`}`
`67`	`67`
`68`		`- all := map[string]interface{}{}`
	`68`	`+ all := ConfigMap{}`
`69`	`69`
`70`	`70`	`for k, v := range internal {`
`71`	`71`	`all[k] = v`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ func (p *PGBouncer) ConfigurePrimary(ctx context.Context, primary string, reload`
`74`	`74`	`return nil`
`75`	`75`	`}`
`76`	`76`
`77`		`-func (p *PGBouncer) CurrentConfig() (map[string]interface{}, error) {`
	`77`	`+func (p *PGBouncer) CurrentConfig() (ConfigMap, error) {`
`78`	`78`	`internal, err := ReadFromFile(p.InternalConfigFile())`
`79`	`79`	`if err != nil {`
`80`	`80`	`return nil, err`
`@@ -84,7 +84,7 @@ func (p *PGBouncer) CurrentConfig() (map[string]interface{}, error) {`
`84`	`84`	`return nil, err`
`85`	`85`	`}`
`86`	`86`
`87`		`- all := map[string]interface{}{}`
	`87`	`+ all := ConfigMap{}`
`88`	`88`
`89`	`89`	`for k, v := range internal {`
`90`	`90`	`all[k] = v`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ func (r *RepMgr) SetUserConfig(configMap ConfigMap) {`
`58`	`58`	`r.userConfig = configMap`
`59`	`59`	`}`
`60`	`60`
`61`		`-func (r *RepMgr) CurrentConfig() (map[string]interface{}, error) {`
	`61`	`+func (r *RepMgr) CurrentConfig() (ConfigMap, error) {`
`62`	`62`	`internal, err := ReadFromFile(r.InternalConfigFile())`
`63`	`63`	`if err != nil {`
`64`	`64`	`return nil, err`
`@@ -68,7 +68,7 @@ func (r *RepMgr) CurrentConfig() (map[string]interface{}, error) {`
`68`	`68`	`return nil, err`
`69`	`69`	`}`
`70`	`70`
`71`		`- all := map[string]interface{}{}`
	`71`	`+ all := ConfigMap{}`
`72`	`72`
`73`	`73`	`for k, v := range internal {`
`74`	`74`	`all[k] = v`