Merge pull request #54 from fly-apps/project-restructure

Project restructure

Author: davissp14

Dockerfile

@@ -9,11 +9,10 @@ COPY . .
 
 RUN CGO_ENABLED=0 GOOS=linux go build -v -o /fly/bin/event_handler ./cmd/event_handler
 RUN CGO_ENABLED=0 GOOS=linux go build -v -o /fly/bin/failover_validation ./cmd/failover_validation
-
 RUN CGO_ENABLED=0 GOOS=linux go build -v -o /fly/bin/standby_cleaner ./cmd/standby_cleaner
-RUN CGO_ENABLED=0 GOOS=linux go build -v -o /fly/bin/pg_unregister ./.flyctl/cmd/pg_unregister
-
+RUN CGO_ENABLED=0 GOOS=linux go build -v -o /fly/bin/pg_unregister ./cmd/pg_unregister
 RUN CGO_ENABLED=0 GOOS=linux go build -v -o /fly/bin/start ./cmd/start
+
 COPY ./bin/* /fly/bin/
 
 FROM wrouesnel/postgres_exporter:latest AS postgres_exporter

cmd/connection_test/connection_test

@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/fly-apps/postgres-flex/pkg/flypg"
+	"github.com/fly-apps/postgres-flex/internal/flypg"
 )
 
 const eventLogFile = "/data/event.log"

cmd/connection_test/main.go

@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/fly-apps/postgres-flex/pkg/flypg"
-	"github.com/fly-apps/postgres-flex/pkg/utils"
+	"github.com/fly-apps/postgres-flex/internal/flypg"
+	"github.com/fly-apps/postgres-flex/internal/utils"
 )
 
 func main() {

cmd/event_handler/main.go

@@ -6,8 +6,8 @@ import (
 	"os"
 	"time"
 
-	"github.com/fly-apps/postgres-flex/pkg/flypg"
-	"github.com/fly-apps/postgres-flex/pkg/flypg/admin"
+	"github.com/fly-apps/postgres-flex/internal/flypg"
+	"github.com/fly-apps/postgres-flex/internal/flypg/admin"
 	"github.com/jackc/pgx/v4"
 
 	"golang.org/x/exp/maps"

.flyctl/cmd/pg_unregister/main.go renamed to cmd/pg_unregister/main.go

@@ -7,8 +7,8 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/fly-apps/postgres-flex/pkg/flypg"
-	"github.com/fly-apps/postgres-flex/pkg/supervisor"
+	"github.com/fly-apps/postgres-flex/internal/flypg"
+	"github.com/fly-apps/postgres-flex/internal/supervisor"
 )
 
 func main() {

cmd/standby_cleaner/main.go

@@ -6,9 +6,9 @@ import (
 	"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"
+	"github.com/fly-apps/postgres-flex/internal/flypg"
+	"github.com/fly-apps/postgres-flex/internal/flypg/admin"
+	"github.com/fly-apps/postgres-flex/internal/flypg/state"
 	"golang.org/x/exp/slices"
 )
 

cmd/start/main.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/fly-apps/postgres-flex/pkg/flypg/admin"
+	"github.com/fly-apps/postgres-flex/internal/flypg/admin"
 	"github.com/go-chi/chi/v5"
 )
 

pkg/api/handle_admin.go renamed to internal/api/handle_admin.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/fly-apps/postgres-flex/pkg/flypg/admin"
+	"github.com/fly-apps/postgres-flex/internal/flypg/admin"
 	"github.com/go-chi/chi/v5"
 )