Merge pull request #189 from pivotal-cf/REDVM-281-gingko-v2-sb

Redvm 281 gingko v2 sb
pivotal-cf · Oct 3, 2023 · ae7d9ad · ae7d9ad
2 parents 1c58845 + af9f013
commit ae7d9ad
Show file tree

Hide file tree

Showing 452 changed files with 44,264 additions and 12,370 deletions.
diff --git a/azure/azure.go b/azure/azure.go
@@ -7,7 +7,7 @@
 package azure
 
 import (
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"fmt"
 	"github.com/Azure/azure-sdk-for-go/storage"
 	"github.com/pivotal-cf/service-backup/process"

diff --git a/azure/azure_suite_test.go b/azure/azure_suite_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/onsi/gomega/gexec"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

diff --git a/azureintegration/azure_integration_suite_test.go b/azureintegration/azure_integration_suite_test.go
@@ -10,7 +10,7 @@ import (
 	"encoding/json"
 	"os"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gexec"
 

diff --git a/azureintegration/azure_integration_test.go b/azureintegration/azure_integration_test.go
@@ -17,7 +17,7 @@ import (
 	"strconv"
 	"time"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
 	"github.com/onsi/gomega/gexec"

diff --git a/cmd/manual-backup/main.go b/cmd/manual-backup/main.go
@@ -11,7 +11,7 @@ import (
 	"os/signal"
 	"syscall"
 
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"github.com/pivotal-cf/service-backup/config"
 	"github.com/pivotal-cf/service-backup/executor"
 	"github.com/pivotal-cf/service-backup/process"

diff --git a/config/config_suite_test.go b/config/config_suite_test.go
@@ -7,7 +7,7 @@
 package config_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"testing"

diff --git a/config/parse.go b/config/parse.go
@@ -9,7 +9,7 @@ package config
 import (
 	"io/ioutil"
 
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	alerts "github.com/pivotal-cf/service-alerts-client/client"
 	"gopkg.in/yaml.v2"
 )

diff --git a/config/parse_test.go b/config/parse_test.go
@@ -7,8 +7,8 @@
 package config_test
 
 import (
-	"code.cloudfoundry.org/lager"
-	. "github.com/onsi/ginkgo"
+	"code.cloudfoundry.org/lager/v3"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	alerts "github.com/pivotal-cf/service-alerts-client/client"
 	"github.com/pivotal-cf/service-backup/config"

diff --git a/executor/dir_size_test.go b/executor/dir_size_test.go
@@ -12,7 +12,7 @@ import (
 	"os"
 	"path/filepath"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"github.com/satori/go.uuid"

diff --git a/executor/dummy_executor.go b/executor/dummy_executor.go
@@ -6,7 +6,7 @@
 
 package executor
 
-import "code.cloudfoundry.org/lager"
+import "code.cloudfoundry.org/lager/v3"
 
 type dummyExecutor struct {
 	logger lager.Logger

diff --git a/executor/dummy_executor_test.go b/executor/dummy_executor_test.go
@@ -9,12 +9,12 @@ package executor_test
 import (
 	"github.com/pivotal-cf/service-backup/executor"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"github.com/onsi/gomega/gbytes"
 
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 )
 
 var _ = Describe("DummyExecutor", func() {

diff --git a/executor/executor.go b/executor/executor.go
@@ -15,7 +15,7 @@ import (
 	"sync"
 	"time"
 
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"github.com/pivotal-cf/service-backup/process"
 	"github.com/pivotal-cf/service-backup/upload"
 	"github.com/satori/go.uuid"

diff --git a/executor/executor_suite_test.go b/executor/executor_suite_test.go
@@ -7,7 +7,7 @@
 package executor_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"testing"

diff --git a/executor/executor_test.go b/executor/executor_test.go
@@ -12,11 +12,11 @@ import (
 	"strings"
 	"sync"
 
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 
 	"path/filepath"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
 	"github.com/pivotal-cf/service-backup/executor"

diff --git a/gcs/gcs.go b/gcs/gcs.go
@@ -15,7 +15,7 @@ import (
 	"time"
 
 	"cloud.google.com/go/storage"
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"github.com/pivotal-cf/service-backup/process"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"

diff --git a/gcs/gcs_integration_test.go b/gcs/gcs_integration_test.go
@@ -17,8 +17,8 @@ import (
 	"time"
 
 	"cloud.google.com/go/storage"
-	"code.cloudfoundry.org/lager"
-	. "github.com/onsi/ginkgo"
+	"code.cloudfoundry.org/lager/v3"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/pborman/uuid"
 	"github.com/pivotal-cf/service-backup/gcs"

diff --git a/gcs/gcs_suite_test.go b/gcs/gcs_suite_test.go
@@ -7,7 +7,7 @@
 package gcs_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"testing"

diff --git a/gcsintegration/gcs_integration_test.go b/gcsintegration/gcs_integration_test.go
@@ -18,7 +18,7 @@ import (
 	"time"
 
 	"cloud.google.com/go/storage"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
 	"github.com/onsi/gomega/gexec"

diff --git a/gcsintegration/gcsintegration_suite_test.go b/gcsintegration/gcsintegration_suite_test.go
@@ -7,7 +7,7 @@
 package gcsintegration_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"testing"

diff --git a/go.mod b/go.mod
@@ -1,19 +1,18 @@
 module github.com/pivotal-cf/service-backup
 
-go 1.17
+go 1.21
 
 require (
 	cloud.google.com/go/storage v1.31.0
-	code.cloudfoundry.org/lager v2.0.0+incompatible
+	code.cloudfoundry.org/lager/v3 v3.0.2
 	github.com/Azure/azure-sdk-for-go v63.4.0+incompatible
 	github.com/aws/aws-sdk-go-v2 v1.21.0
 	github.com/aws/aws-sdk-go-v2/config v1.18.37
 	github.com/aws/aws-sdk-go-v2/credentials v1.13.35
 	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.81
 	github.com/aws/aws-sdk-go-v2/service/s3 v1.38.5
 	github.com/aws/smithy-go v1.14.2
-	github.com/onsi/ginkgo v1.16.5
-	github.com/onsi/gomega v1.19.0
+	github.com/onsi/gomega v1.27.10
 	github.com/pborman/uuid v1.2.1
 	github.com/pivotal-cf/service-alerts-client v0.0.0-20190725132148-4a3ed3e6ac41
 	github.com/robfig/cron/v3 v3.0.1
@@ -23,16 +22,25 @@ require (
 	gopkg.in/yaml.v2 v2.4.0
 )
 
+require (
+	github.com/Azure/go-autorest/autorest v0.11.18 // indirect
+	github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect
+	github.com/cenk/backoff v2.2.1+incompatible // indirect
+	github.com/craigfurman/herottp v0.0.0-20190418132442-c546d62f2a8d // indirect
+	github.com/dnaeon/go-vcr v1.1.0 // indirect
+	github.com/gofrs/uuid v4.0.0+incompatible // indirect
+	github.com/gorilla/mux v1.8.0 // indirect
+	github.com/onsi/ginkgo/v2 v2.12.1
+)
+
 require (
 	cloud.google.com/go v0.110.2 // indirect
 	cloud.google.com/go/compute v1.20.1 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
 	cloud.google.com/go/iam v1.1.0 // indirect
 	github.com/Azure/go-autorest v14.2.0+incompatible // indirect
-	github.com/Azure/go-autorest/autorest v0.11.18 // indirect
-	github.com/Azure/go-autorest/autorest/adal v0.9.13 // indirect
+	github.com/Azure/go-autorest/autorest/adal v0.9.23 // indirect
 	github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
-	github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect
 	github.com/Azure/go-autorest/logger v0.2.1 // indirect
 	github.com/Azure/go-autorest/tracing v0.6.0 // indirect
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.13 // indirect
@@ -48,34 +56,35 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/sso v1.13.5 // indirect
 	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.5 // indirect
 	github.com/aws/aws-sdk-go-v2/service/sts v1.21.5 // indirect
-	github.com/cenk/backoff v2.2.1+incompatible // indirect
-	github.com/craigfurman/herottp v0.0.0-20190418132442-c546d62f2a8d // indirect
-	github.com/dnaeon/go-vcr v1.1.0 // indirect
 	github.com/form3tech-oss/jwt-go v3.2.2+incompatible // indirect
-	github.com/fsnotify/fsnotify v1.4.9 // indirect
-	github.com/gofrs/uuid v4.0.0+incompatible // indirect
+	github.com/go-logr/logr v1.2.4 // indirect
+	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
+	github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
+	github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
 	github.com/google/s2a-go v0.1.4 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect
 	github.com/googleapis/gax-go/v2 v2.12.0 // indirect
-	github.com/gorilla/mux v1.8.0 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
-	github.com/nxadm/tail v1.4.8 // indirect
+	github.com/kr/pretty v0.3.0 // indirect
+	github.com/openzipkin/zipkin-go v0.4.1 // indirect
 	go.opencensus.io v0.24.0 // indirect
-	golang.org/x/crypto v0.11.0 // indirect
-	golang.org/x/net v0.12.0 // indirect
+	golang.org/x/crypto v0.12.0 // indirect
+	golang.org/x/net v0.14.0 // indirect
 	golang.org/x/oauth2 v0.10.0 // indirect
-	golang.org/x/sys v0.10.0 // indirect
-	golang.org/x/text v0.11.0 // indirect
+	golang.org/x/sys v0.12.0 // indirect
+	golang.org/x/text v0.12.0 // indirect
+	golang.org/x/tools v0.12.0 // indirect
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20230629202037-9506855d4529 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20230629202037-9506855d4529 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20230706204954-ccb25ca9f130 // indirect
 	google.golang.org/grpc v1.56.2 // indirect
 	google.golang.org/protobuf v1.31.0 // indirect
-	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
+	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )