chore: extract code to new library (#1109)

* chore: remove code extracted to lib
* chore: replace internal refs with lib refs
* chore: remove disused make targets and scripts
* chore: downgrade color and strip color

Downgrade fatih/color to keep the 1.15 space insertion behavior.

Strip color from command output in tests for simpler string comparison.

* chore: get github.com/kong/go-database-reconciler@v1.0.0

.github/workflows/test.yaml

@@ -24,8 +24,6 @@ jobs:
           go-version: '^1.20'
       - name: Setup golangci-lint
         uses: golangci/golangci-lint-action@v3.7.0
-      - name: Verify Codegen
-        run: make verify-codegen
       - name: Run tests with Coverage
         run: make coverage
       - name: Upload Code Coverage

Makefile

@@ -16,16 +16,6 @@ lint:
 build:
 	CGO_ENABLED=0 go build -o deck main.go
 
-.PHONY: verify-codegen
-verify-codegen:
-	./scripts/verify-codegen.sh
-	./scripts/verify-deepcopy-gen.sh
-
-.PHONY: update-codegen
-update-codegen:
-	./scripts/update-deepcopy-gen.sh
-	go generate ./...
-
 .PHONY: coverage
 coverage:
 	go test -race -v -count=1 -coverprofile=coverage.out.tmp ./...
@@ -49,4 +39,4 @@ setup-kong-ee:
 test-integration:
 	go test -v -count=1 -tags=integration \
 		-race \
-		./tests/integration/...
+		./tests/integration/...

cmd/common.go

@@ -11,12 +11,12 @@ import (
 	"sort"
 
 	"github.com/blang/semver/v4"
-	"github.com/kong/deck/cprint"
-	"github.com/kong/deck/diff"
-	"github.com/kong/deck/dump"
-	"github.com/kong/deck/file"
-	"github.com/kong/deck/state"
-	"github.com/kong/deck/utils"
+	"github.com/kong/go-database-reconciler/pkg/cprint"
+	"github.com/kong/go-database-reconciler/pkg/diff"
+	"github.com/kong/go-database-reconciler/pkg/dump"
+	"github.com/kong/go-database-reconciler/pkg/file"
+	"github.com/kong/go-database-reconciler/pkg/state"
+	"github.com/kong/go-database-reconciler/pkg/utils"
 	"github.com/kong/go-kong/kong"
 	"github.com/spf13/cobra"
 )

cmd/common_konnect.go

@@ -6,12 +6,12 @@ import (
 	"os"
 	"strings"
 
-	"github.com/kong/deck/diff"
-	"github.com/kong/deck/dump"
-	"github.com/kong/deck/file"
-	"github.com/kong/deck/konnect"
-	"github.com/kong/deck/state"
-	"github.com/kong/deck/utils"
+	"github.com/kong/go-database-reconciler/pkg/diff"
+	"github.com/kong/go-database-reconciler/pkg/dump"
+	"github.com/kong/go-database-reconciler/pkg/file"
+	"github.com/kong/go-database-reconciler/pkg/konnect"
+	"github.com/kong/go-database-reconciler/pkg/state"
+	"github.com/kong/go-database-reconciler/pkg/utils"
 	"github.com/kong/go-kong/kong"
 	"golang.org/x/sync/errgroup"
 )

cmd/common_konnect_test.go

@@ -3,7 +3,7 @@ package cmd
 import (
 	"testing"
 
-	"github.com/kong/deck/konnect"
+	"github.com/kong/go-database-reconciler/pkg/konnect"
 	"github.com/kong/go-kong/kong"
 )
 

cmd/common_test.go

@@ -4,8 +4,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/kong/deck/dump"
-	"github.com/kong/deck/file"
+	"github.com/kong/go-database-reconciler/pkg/dump"
+	"github.com/kong/go-database-reconciler/pkg/file"
 )
 
 func TestDetermineSelectorTag(t *testing.T) {

cmd/file_convert.go

@@ -6,9 +6,9 @@ import (
 	"strings"
 
 	"github.com/kong/deck/convert"
-	"github.com/kong/deck/cprint"
-	"github.com/kong/deck/file"
-	"github.com/kong/deck/utils"
+	"github.com/kong/go-database-reconciler/pkg/cprint"
+	"github.com/kong/go-database-reconciler/pkg/file"
+	"github.com/kong/go-database-reconciler/pkg/utils"
 	"github.com/spf13/cobra"
 )
 

cmd/file_render.go

@@ -4,7 +4,7 @@ import (
 	"strings"
 
 	"github.com/kong/deck/convert"
-	"github.com/kong/deck/file"
+	"github.com/kong/go-database-reconciler/pkg/file"
 	"github.com/spf13/cobra"
 )
 

cmd/gateway_dump.go

@@ -6,10 +6,10 @@ import (
 	"os"
 	"strings"
 
-	"github.com/kong/deck/dump"
-	"github.com/kong/deck/file"
-	"github.com/kong/deck/state"
-	"github.com/kong/deck/utils"
+	"github.com/kong/go-database-reconciler/pkg/dump"
+	"github.com/kong/go-database-reconciler/pkg/file"
+	"github.com/kong/go-database-reconciler/pkg/state"
+	"github.com/kong/go-database-reconciler/pkg/utils"
 	"github.com/kong/go-kong/kong"
 	"github.com/spf13/cobra"
 )

cmd/gateway_ping.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/kong/deck/utils"
+	"github.com/kong/go-database-reconciler/pkg/utils"
 	"github.com/spf13/cobra"
 )
 

cmd/gateway_reset.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/kong/deck/state"
-	"github.com/kong/deck/utils"
+	"github.com/kong/go-database-reconciler/pkg/state"
+	"github.com/kong/go-database-reconciler/pkg/utils"
 	"github.com/spf13/cobra"
 )
 

cmd/gateway_validate.go

@@ -5,11 +5,11 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/kong/deck/dump"
-	"github.com/kong/deck/file"
-	"github.com/kong/deck/state"
-	"github.com/kong/deck/utils"
 	"github.com/kong/deck/validate"
+	"github.com/kong/go-database-reconciler/pkg/dump"
+	"github.com/kong/go-database-reconciler/pkg/file"
+	"github.com/kong/go-database-reconciler/pkg/state"
+	"github.com/kong/go-database-reconciler/pkg/utils"
 	"github.com/kong/go-kong/kong"
 	"github.com/spf13/cobra"
 )

cmd/konnect.go

@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"github.com/kong/deck/cprint"
+	"github.com/kong/go-database-reconciler/pkg/cprint"
 	"github.com/spf13/cobra"
 )
 

cmd/konnect_dump.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/kong/deck/file"
-	"github.com/kong/deck/utils"
+	"github.com/kong/go-database-reconciler/pkg/file"
+	"github.com/kong/go-database-reconciler/pkg/utils"
 	"github.com/spf13/cobra"
 )
 

cmd/konnect_ping.go

@@ -3,7 +3,7 @@ package cmd
 import (
 	"fmt"
 
-	"github.com/kong/deck/utils"
+	"github.com/kong/go-database-reconciler/pkg/utils"
 	"github.com/spf13/cobra"
 )
 

cmd/root.go

@@ -9,8 +9,8 @@ import (
 	"strings"
 
 	"github.com/fatih/color"
-	"github.com/kong/deck/utils"
 	"github.com/kong/go-apiops/deckformat"
+	"github.com/kong/go-database-reconciler/pkg/utils"
 	homedir "github.com/mitchellh/go-homedir"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"

cmd/utils.go

@@ -2,8 +2,8 @@ package cmd
 
 import (
 	"github.com/fatih/color"
-	"github.com/kong/deck/cprint"
-	"github.com/kong/deck/diff"
+	"github.com/kong/go-database-reconciler/pkg/cprint"
+	"github.com/kong/go-database-reconciler/pkg/diff"
 	"github.com/spf13/pflag"
 )
 

convert/convert.go

@@ -6,11 +6,11 @@ import (
 	"strings"
 
 	"github.com/blang/semver/v4"
-	"github.com/kong/deck/cprint"
-	"github.com/kong/deck/dump"
-	"github.com/kong/deck/file"
-	"github.com/kong/deck/state"
-	"github.com/kong/deck/utils"
+	"github.com/kong/go-database-reconciler/pkg/cprint"
+	"github.com/kong/go-database-reconciler/pkg/dump"
+	"github.com/kong/go-database-reconciler/pkg/file"
+	"github.com/kong/go-database-reconciler/pkg/state"
+	"github.com/kong/go-database-reconciler/pkg/utils"
 	"github.com/kong/go-kong/kong"
 )
 

convert/convert_test.go

@@ -4,8 +4,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/kong/deck/file"
-	"github.com/kong/deck/utils"
+	"github.com/kong/go-database-reconciler/pkg/file"
+	"github.com/kong/go-database-reconciler/pkg/utils"
 	"github.com/kong/go-kong/kong"
 	"github.com/stretchr/testify/assert"
 )