Use our own fork to carry local patches not yet merged upstream

overmindtech · Sep 11, 2024 · 40cefb9 · 40cefb9
1 parent 6782289
commit 40cefb9
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 9 deletions.
diff --git a/cmd/explore.go b/cmd/explore.go
@@ -11,8 +11,8 @@ import (
 	"github.com/overmindtech/aws-source/proc"
 	"github.com/overmindtech/cli/tfutils"
 	"github.com/overmindtech/discovery"
+	"github.com/overmindtech/pterm"
 	stdlibsource "github.com/overmindtech/stdlib-source/sources"
-	"github.com/pterm/pterm"
 	log "github.com/sirupsen/logrus"
 	"github.com/sourcegraph/conc/pool"
 	"github.com/spf13/cobra"

diff --git a/cmd/pterm.go b/cmd/pterm.go
@@ -14,9 +14,9 @@ import (
 
 	"connectrpc.com/connect"
 	"github.com/overmindtech/cli/tracing"
+	"github.com/overmindtech/pterm"
 	"github.com/overmindtech/sdp-go"
 	"github.com/overmindtech/sdp-go/auth"
-	"github.com/pterm/pterm"
 	log "github.com/sirupsen/logrus"
 	"github.com/sourcegraph/conc/pool"
 	"github.com/spf13/cobra"

diff --git a/cmd/root.go b/cmd/root.go
@@ -25,9 +25,9 @@ import (
 	josejwt "github.com/go-jose/go-jose/v4/jwt"
 	"github.com/google/uuid"
 	"github.com/overmindtech/cli/tracing"
+	"github.com/overmindtech/pterm"
 	"github.com/overmindtech/sdp-go"
 	"github.com/pkg/browser"
-	"github.com/pterm/pterm"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"

diff --git a/cmd/terraform_apply.go b/cmd/terraform_apply.go
@@ -9,8 +9,8 @@ import (
 	"time"
 
 	"connectrpc.com/connect"
+	"github.com/overmindtech/pterm"
 	"github.com/overmindtech/sdp-go"
-	"github.com/pterm/pterm"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"

diff --git a/cmd/terraform_plan.go b/cmd/terraform_plan.go
@@ -17,8 +17,8 @@ import (
 	"github.com/muesli/reflow/wordwrap"
 	"github.com/overmindtech/cli/custerm"
 	"github.com/overmindtech/cli/tfutils"
+	"github.com/overmindtech/pterm"
 	"github.com/overmindtech/sdp-go"
-	"github.com/pterm/pterm"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"

diff --git a/custerm/spinner_printer.go b/custerm/spinner_printer.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/overmindtech/cli/custerm/internal"
-	"github.com/pterm/pterm"
+	"github.com/overmindtech/pterm"
 )
 
 var activeSpinnerPrinters []*SpinnerPrinter

diff --git a/go.mod b/go.mod
@@ -24,10 +24,10 @@ require (
 	github.com/muesli/termenv v0.15.3-0.20240618155329-98d742f6907a
 	github.com/overmindtech/aws-source v0.0.0-20240910143452-74bcfddd91cf
 	github.com/overmindtech/discovery v0.27.7
+	github.com/overmindtech/pterm v0.0.0-20240911163008-e8e02ddb148c
 	github.com/overmindtech/sdp-go v0.93.1
 	github.com/overmindtech/stdlib-source v0.0.0-20240902171206-a7ba824b1451
 	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c
-	github.com/pterm/pterm v0.12.79
 	github.com/sirupsen/logrus v1.9.3
 	github.com/sourcegraph/conc v0.3.0
 	github.com/spf13/cobra v1.8.1

diff --git a/go.sum b/go.sum
@@ -261,6 +261,8 @@ github.com/overmindtech/aws-source v0.0.0-20240910143452-74bcfddd91cf h1:cyld1op
 github.com/overmindtech/aws-source v0.0.0-20240910143452-74bcfddd91cf/go.mod h1:5VCPq4zJ8j4lBxKxN/4iSy3TeuGiSym0R2xrYNV/YkI=
 github.com/overmindtech/discovery v0.27.7 h1:Mz0npcA0poJc676368KzY65qM1i/7Y+yGe/qq7xK/Ms=
 github.com/overmindtech/discovery v0.27.7/go.mod h1:Zds0U9qKVJKogSsnyUzPrT1Uj9jzssaCWfGyosXLPWc=
+github.com/overmindtech/pterm v0.0.0-20240911163008-e8e02ddb148c h1:JXY4DIxSRvNPhOhhcrhD8svSwNBVbGuGu9Uix1pw5s4=
+github.com/overmindtech/pterm v0.0.0-20240911163008-e8e02ddb148c/go.mod h1:bRQZYnvLrW1S5wYT6tbQnun8NpO5X6zP5cY3VKuDc4U=
 github.com/overmindtech/sdp-go v0.93.1 h1:EtIJ5SAxuzonOnhxjPufoS7BKsovk4V7tIfBJcHbq6I=
 github.com/overmindtech/sdp-go v0.93.1/go.mod h1:yThheAAyOqQwkw8B5dt3YErZBM+/o0499troPpSr/ss=
 github.com/overmindtech/sdpcache v1.6.4 h1:MJoYBDqDE3s8FrRzZ0RPgFiH39HWI/Mv2ImH1NdLT8k=
@@ -285,8 +287,8 @@ github.com/pterm/pterm v0.12.31/go.mod h1:32ZAWZVXD7ZfG0s8qqHXePte42kdz8ECtRyEej
 github.com/pterm/pterm v0.12.33/go.mod h1:x+h2uL+n7CP/rel9+bImHD5lF3nM9vJj80k9ybiiTTE=
 github.com/pterm/pterm v0.12.36/go.mod h1:NjiL09hFhT/vWjQHSj1athJpx6H8cjpHXNAK5bUw8T8=
 github.com/pterm/pterm v0.12.40/go.mod h1:ffwPLwlbXxP+rxT0GsgDTzS3y3rmpAO1NMjUkGTYf8s=
-github.com/pterm/pterm v0.12.79 h1:lH3yrYMhdpeqX9y5Ep1u7DejyHy7NSQg9qrBjF9dFT4=
-github.com/pterm/pterm v0.12.79/go.mod h1:1v/gzOF1N0FsjbgTHZ1wVycRkKiatFvJSJC4IGaQAAo=
+github.com/pterm/pterm v0.12.53 h1:8ERV5eXyvXlAIY8LRrhapPS34j7IKKDAnb7o1Ih3T0w=
+github.com/pterm/pterm v0.12.53/go.mod h1:BY2H3GtX2BX0ULqLY11C2CusIqnxsYerbkil3XvXIBg=
 github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=