Rebase

Author: davissp14

pkg/api/handle_admin.go

@@ -3,12 +3,13 @@ package api
 import (
 	"encoding/json"
 	"fmt"
+	"net/http"
+	"strings"
+
 	"github.com/fly-apps/postgres-flex/pkg/flypg"
 	"github.com/fly-apps/postgres-flex/pkg/flypg/admin"
 	"github.com/fly-apps/postgres-flex/pkg/flypg/state"
 	"golang.org/x/exp/slices"
-	"net/http"
-	"strings"
 )
 
 func handleRole(w http.ResponseWriter, r *http.Request) {
@@ -118,7 +119,7 @@ func (s *Server) handleApplyConfig(w http.ResponseWriter, r *http.Request) {
 	}
 	defer close()
 
-	consul, err := state.NewConsulClient()
+	consul, err := state.NewStore()
 	if err != nil {
 		renderErr(w, err)
 		return

pkg/flypg/node.go

@@ -133,7 +133,7 @@ func (n *Node) Init(ctx context.Context) error {
 		fmt.Printf("Failed to initialize repmgr: %s\n", err.Error())
 	}
 
-	err = SyncUserConfig(&repmgr, consul)
+	err = SyncUserConfig(&repmgr, cs.Store)
 	if err != nil {
 		fmt.Printf("Failed to sync user config from consul for repmgr: %s\n", err.Error())
 	}
@@ -148,7 +148,7 @@ func (n *Node) Init(ctx context.Context) error {
 		return err
 	}
 
-	err = SyncUserConfig(&pgbouncer, consul)
+	err = SyncUserConfig(&pgbouncer, cs.Store)
 	if err != nil {
 		fmt.Printf("Failed to sync user config from consul for pgbouncer: %s\n", err.Error())
 	}
@@ -205,7 +205,7 @@ func (n *Node) Init(ctx context.Context) error {
 	fmt.Println("Resolving PG configuration settings.")
 	PGConfig.Setup()
 
-	err = SyncUserConfig(PGConfig, consul)
+	err = SyncUserConfig(PGConfig, cs.Store)
 	if err != nil {
 		fmt.Printf("Failed to sync user config from consul for pgbouncer: %s\n", err.Error())
 	}

pkg/flypg/state/cluster.go

@@ -9,7 +9,7 @@ import (
 )
 
 type ClusterState struct {
-	store *Store
+	Store *Store
 }
 
 type ClusterData struct {
@@ -39,7 +39,7 @@ func NewClusterState() (*ClusterState, error) {
 	}
 
 	return &ClusterState{
-		store: store,
+		Store: store,
 	}, nil
 }
 
@@ -160,10 +160,10 @@ func (c *ClusterState) FindMember(id int32) (*Member, error) {
 func (c *ClusterState) clusterData() (*ClusterData, uint64, error) {
 	var (
 		cluster ClusterData
-		key     = c.store.targetKey(stateKey)
+		key     = c.Store.targetKey(stateKey)
 	)
 
-	result, _, err := c.store.Client.KV().Get(key, nil)
+	result, _, err := c.Store.Client.KV().Get(key, nil)
 	if err != nil {
 		return nil, 0, err
 	}
@@ -186,11 +186,11 @@ func (c *ClusterState) updateClusterState(modifyIndex uint64, cluster *ClusterDa
 	}
 
 	kv := &api.KVPair{
-		Key:         c.store.targetKey(stateKey),
+		Key:         c.Store.targetKey(stateKey),
 		Value:       clusterJSON,
 		ModifyIndex: modifyIndex,
 	}
-	succ, _, err := c.store.Client.KV().CAS(kv, nil)
+	succ, _, err := c.Store.Client.KV().CAS(kv, nil)
 	if err != nil {
 		return err
 	}