Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update go and dependency versions and switch all module references #5

Closed
wants to merge 11 commits into from
Closed

update go and dependency versions and switch all module references #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cc4db61
update go and dependency versions and switch all module references to…
dandersonsw Dec 18, 2024
4dd708a
update more dependencies
dandersonsw Dec 18, 2024
e955584
update more dependencies
dandersonsw Dec 18, 2024
a23fea7
adding dependencies
dandersonsw Dec 18, 2024
e4378ff
update modules
dandersonsw Dec 18, 2024
d25df59
updating
dandersonsw Dec 18, 2024
e4baa48
updating again
dandersonsw Dec 18, 2024
d159efb
running go mod tidy
dandersonsw Dec 18, 2024
83a9c9c
updating
dandersonsw Dec 18, 2024
d62532a
updating
dandersonsw Dec 18, 2024
2909ac9
add back in vendored packages
dandersonsw Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions bosh/bosh_io_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

. "github.com/cloudfoundry/bosh-deployment-resource/bosh"
"github.com/cloudfoundry/bosh-deployment-resource/bosh/boshfakes"
. "github.com/cloud-gov/bosh-deployment-resource/bosh"
"github.com/cloud-gov/bosh-deployment-resource/bosh/boshfakes"
)

var _ = Describe("LookupBoshIOStemcell", func() {
Expand Down
2 changes: 1 addition & 1 deletion bosh/boshfakes/fake_bosh_io.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bosh/boshfakes/fake_director.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bosh/boshfakes/fake_proxy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bosh/boshfakes/fake_runner.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions bosh/cli_coordinator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@ import (
"bytes"
"errors"
"fmt"
"github.com/cloudfoundry/bosh-utils/httpclient"
"io"
"io/ioutil"
"log"
"os"

"github.com/cloudfoundry/bosh-deployment-resource/concourse"
"github.com/cloudfoundry/bosh-utils/httpclient"

"github.com/cloud-gov/bosh-deployment-resource/concourse"

boshcmd "github.com/cloudfoundry/bosh-cli/v7/cmd"
cmdconf "github.com/cloudfoundry/bosh-cli/v7/cmd/config"
Expand Down
6 changes: 3 additions & 3 deletions bosh/cli_coordinator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package bosh_test
import (
"errors"

"github.com/cloudfoundry/bosh-deployment-resource/bosh"
"github.com/cloudfoundry/bosh-deployment-resource/bosh/boshfakes"
"github.com/cloudfoundry/bosh-deployment-resource/concourse"
"github.com/cloud-gov/bosh-deployment-resource/bosh"
"github.com/cloud-gov/bosh-deployment-resource/bosh/boshfakes"
"github.com/cloud-gov/bosh-deployment-resource/concourse"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
Expand Down
2 changes: 1 addition & 1 deletion bosh/deployment_manifest_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

"github.com/cloudfoundry/bosh-deployment-resource/bosh"
"github.com/cloud-gov/bosh-deployment-resource/bosh"
)

var _ = Describe("DeploymentManifest", func() {
Expand Down
2 changes: 1 addition & 1 deletion bosh/director.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"strconv"
"time"

"github.com/cloudfoundry/bosh-deployment-resource/concourse"
"github.com/cloud-gov/bosh-deployment-resource/concourse"

boshcmdopts "github.com/cloudfoundry/bosh-cli/v7/cmd/opts"
"github.com/cloudfoundry/bosh-cli/v7/director"
Expand Down
6 changes: 3 additions & 3 deletions bosh/director_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

"github.com/cloudfoundry/bosh-deployment-resource/bosh"
"github.com/cloudfoundry/bosh-deployment-resource/bosh/boshfakes"
"github.com/cloudfoundry/bosh-deployment-resource/concourse"
"github.com/cloud-gov/bosh-deployment-resource/bosh"
"github.com/cloud-gov/bosh-deployment-resource/bosh/boshfakes"
"github.com/cloud-gov/bosh-deployment-resource/concourse"
"github.com/cppforlife/go-patch/patch"
"github.com/cppforlife/go-semi-semantic/version"

Expand Down
2 changes: 1 addition & 1 deletion bosh/release.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package bosh
import (
"fmt"

"github.com/cloudfoundry/bosh-deployment-resource/tools"
"github.com/cloud-gov/bosh-deployment-resource/tools"
"gopkg.in/yaml.v2"
)

Expand Down
2 changes: 1 addition & 1 deletion bosh/release_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package bosh_test

import (
"github.com/cloudfoundry/bosh-deployment-resource/bosh"
"github.com/cloud-gov/bosh-deployment-resource/bosh"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
Expand Down
2 changes: 1 addition & 1 deletion bosh/stemcell.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package bosh
import (
"fmt"

"github.com/cloudfoundry/bosh-deployment-resource/tools"
"github.com/cloud-gov/bosh-deployment-resource/tools"
"gopkg.in/yaml.v2"
)

Expand Down
2 changes: 1 addition & 1 deletion bosh/stemcell_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package bosh_test

import (
"github.com/cloudfoundry/bosh-deployment-resource/bosh"
"github.com/cloud-gov/bosh-deployment-resource/bosh"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
Expand Down
4 changes: 2 additions & 2 deletions check/check_command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package check

import (
"github.com/cloudfoundry/bosh-deployment-resource/bosh"
"github.com/cloudfoundry/bosh-deployment-resource/concourse"
"github.com/cloud-gov/bosh-deployment-resource/bosh"
"github.com/cloud-gov/bosh-deployment-resource/concourse"
)

type CheckCommand struct {
Expand Down
6 changes: 3 additions & 3 deletions check/check_command_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (

"errors"

"github.com/cloudfoundry/bosh-deployment-resource/bosh/boshfakes"
"github.com/cloudfoundry/bosh-deployment-resource/check"
"github.com/cloudfoundry/bosh-deployment-resource/concourse"
"github.com/cloud-gov/bosh-deployment-resource/bosh/boshfakes"
"github.com/cloud-gov/bosh-deployment-resource/check"
"github.com/cloud-gov/bosh-deployment-resource/concourse"
)

var _ = Describe("CheckCommand", func() {
Expand Down
8 changes: 4 additions & 4 deletions cmd/check/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (

"io/ioutil"

"github.com/cloudfoundry/bosh-deployment-resource/bosh"
"github.com/cloudfoundry/bosh-deployment-resource/check"
"github.com/cloudfoundry/bosh-deployment-resource/concourse"
"github.com/cloudfoundry/socks5-proxy"
"github.com/cloud-gov/bosh-deployment-resource/bosh"
"github.com/cloud-gov/bosh-deployment-resource/check"
"github.com/cloud-gov/bosh-deployment-resource/concourse"
proxy "github.com/cloudfoundry/socks5-proxy"
)

func main() {
Expand Down
8 changes: 4 additions & 4 deletions cmd/in/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"os"
"time"

"github.com/cloudfoundry/bosh-deployment-resource/bosh"
"github.com/cloudfoundry/bosh-deployment-resource/concourse"
"github.com/cloudfoundry/bosh-deployment-resource/in"
"github.com/cloudfoundry/socks5-proxy"
"github.com/cloud-gov/bosh-deployment-resource/bosh"
"github.com/cloud-gov/bosh-deployment-resource/concourse"
"github.com/cloud-gov/bosh-deployment-resource/in"
proxy "github.com/cloudfoundry/socks5-proxy"
)

func main() {
Expand Down
8 changes: 4 additions & 4 deletions cmd/out/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (

"io/ioutil"

"github.com/cloudfoundry/bosh-deployment-resource/bosh"
"github.com/cloudfoundry/bosh-deployment-resource/concourse"
"github.com/cloudfoundry/bosh-deployment-resource/out"
"github.com/cloudfoundry/bosh-deployment-resource/storage"
"github.com/cloud-gov/bosh-deployment-resource/bosh"
"github.com/cloud-gov/bosh-deployment-resource/concourse"
"github.com/cloud-gov/bosh-deployment-resource/out"
"github.com/cloud-gov/bosh-deployment-resource/storage"
proxy "github.com/cloudfoundry/socks5-proxy"
)

Expand Down
2 changes: 1 addition & 1 deletion concourse/in_request_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package concourse_test

import (
"github.com/cloudfoundry/bosh-deployment-resource/concourse"
"github.com/cloud-gov/bosh-deployment-resource/concourse"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
Expand Down
2 changes: 1 addition & 1 deletion concourse/out_request_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"io/ioutil"
"path/filepath"

"github.com/cloudfoundry/bosh-deployment-resource/concourse"
"github.com/cloud-gov/bosh-deployment-resource/concourse"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
Expand Down
2 changes: 1 addition & 1 deletion concourse/source_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"io/ioutil"
"path/filepath"

"github.com/cloudfoundry/bosh-deployment-resource/concourse"
"github.com/cloud-gov/bosh-deployment-resource/concourse"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
Expand Down
2 changes: 1 addition & 1 deletion concourse/version_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package concourse_test

import (
"github.com/cloudfoundry/bosh-deployment-resource/concourse"
"github.com/cloud-gov/bosh-deployment-resource/concourse"

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
Expand Down
123 changes: 73 additions & 50 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,75 +1,98 @@
module github.com/cloudfoundry/bosh-deployment-resource
module github.com/cloud-gov/bosh-deployment-resource

go 1.22
go 1.23

require (
github.com/cloudfoundry/bosh-cli/v7 v7.0.1
github.com/cloudfoundry/bosh-utils v0.0.331
github.com/cloudfoundry/socks5-proxy v0.2.71
github.com/cloudfoundry/bosh-cli/v7 v7.8.5
github.com/cloudfoundry/bosh-utils v0.0.515
github.com/cloudfoundry/socks5-proxy v0.2.135
github.com/cppforlife/go-patch v0.2.0
github.com/cppforlife/go-semi-semantic v0.0.0-20160921010311-576b6af77ae4
github.com/jessevdk/go-flags v1.5.0
github.com/jessevdk/go-flags v1.6.1
github.com/onsi/ginkgo v1.16.5
github.com/onsi/gomega v1.20.2
golang.org/x/oauth2 v0.7.0
google.golang.org/api v0.114.0
github.com/onsi/gomega v1.36.1
golang.org/x/oauth2 v0.24.0
google.golang.org/api v0.213.0
gopkg.in/yaml.v2 v2.4.0
)

require (
cloud.google.com/go v0.110.0 // indirect
cloud.google.com/go/compute v1.19.1 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/iam v0.13.0 // indirect
cloud.google.com/go/storage v1.28.1 // indirect
code.cloudfoundry.org/clock v1.0.0 // indirect
code.cloudfoundry.org/tlsconfig v0.0.0-20220621140725-0e6fbd869921 // indirect
code.cloudfoundry.org/workpool v0.0.0-20200131000409-2ac56b354115 // indirect
cel.dev/expr v0.19.1 // indirect
cloud.google.com/go v0.117.0 // indirect
cloud.google.com/go/auth v0.13.0 // indirect
cloud.google.com/go/auth/oauth2adapt v0.2.6 // indirect
cloud.google.com/go/compute/metadata v0.6.0 // indirect
cloud.google.com/go/iam v1.3.0 // indirect
cloud.google.com/go/monitoring v1.22.0 // indirect
cloud.google.com/go/storage v1.48.0 // indirect
code.cloudfoundry.org/clock v1.25.0 // indirect
code.cloudfoundry.org/tlsconfig v0.13.0 // indirect
code.cloudfoundry.org/workpool v0.0.0-20241210013132-62cbb12e809b // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.25.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.49.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.49.0 // indirect
github.com/VividCortex/ewma v1.2.0 // indirect
github.com/aws/aws-sdk-go v1.44.94 // indirect
github.com/aws/aws-sdk-go v1.55.5 // indirect
github.com/bmatcuk/doublestar v1.3.4 // indirect
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/charlievieth/fs v0.0.3 // indirect
github.com/cheggaaa/pb/v3 v3.1.0 // indirect
github.com/cheggaaa/pb/v3 v3.1.5 // indirect
github.com/cloudfoundry/bosh-agent v2.367.0+incompatible // indirect
github.com/cloudfoundry/bosh-davcli v0.0.78 // indirect
github.com/cloudfoundry/bosh-gcscli v0.0.54 // indirect
github.com/cloudfoundry/bosh-s3cli v0.0.152 // indirect
github.com/cloudfoundry/config-server v0.1.71 // indirect
github.com/cloudfoundry/go-socks5 v0.0.0-20180221174514-54f73bdb8a8e // indirect
github.com/creack/pty v1.1.9 // indirect
github.com/dustin/go-humanize v1.0.0 // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/fsnotify/fsnotify v1.5.4 // 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/uuid v1.3.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
github.com/googleapis/gax-go/v2 v2.7.1 // indirect
github.com/cloudfoundry/bosh-davcli v0.0.385 // indirect
github.com/cloudfoundry/bosh-gcscli v0.0.266 // indirect
github.com/cloudfoundry/bosh-s3cli v0.0.337 // indirect
github.com/cloudfoundry/config-server v0.1.224 // indirect
github.com/cloudfoundry/go-socks5 v0.0.0-20240831012420-2590b55236ee // indirect
github.com/cncf/xds/go v0.0.0-20241213214725-57cfbe6fad57 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/envoyproxy/go-control-plane v0.13.1 // indirect
github.com/envoyproxy/protoc-gen-validate v1.1.0 // indirect
github.com/fatih/color v1.18.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.8.0 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/s2a-go v0.1.8 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
github.com/googleapis/gax-go/v2 v2.14.0 // indirect
github.com/gopacket/gopacket v1.3.1 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/jpillora/backoff v1.0.0 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.16 // indirect
github.com/mattn/go-runewidth v0.0.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mattn/go-runewidth v0.0.16 // indirect
github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/nxadm/tail v1.4.11 // indirect
github.com/pivotal-cf/paraphernalia v0.0.0-20180203224945-a64ae2051c20 // indirect
github.com/rivo/uniseg v0.3.4 // indirect
github.com/rogpeppe/go-internal v1.8.1 // indirect
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
github.com/vito/go-interact v1.0.1 // indirect
go.opencensus.io v0.24.0 // indirect
golang.org/x/crypto v0.21.0 // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/term v0.18.0 // indirect
golang.org/x/text v0.14.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-20230410155749-daa745c078e1 // indirect
google.golang.org/grpc v1.56.3 // indirect
google.golang.org/protobuf v1.33.0 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/contrib/detectors/gcp v1.33.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
go.opentelemetry.io/otel v1.33.0 // indirect
go.opentelemetry.io/otel/metric v1.33.0 // indirect
go.opentelemetry.io/otel/sdk v1.33.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.33.0 // indirect
go.opentelemetry.io/otel/trace v1.33.0 // indirect
golang.org/x/crypto v0.31.0 // indirect
golang.org/x/net v0.33.0 // indirect
golang.org/x/sync v0.10.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/term v0.27.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/time v0.8.0 // indirect
google.golang.org/genproto v0.0.0-20241216192217-9240e9c98484 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20241216192217-9240e9c98484 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241216192217-9240e9c98484 // indirect
google.golang.org/grpc v1.69.2 // indirect
google.golang.org/protobuf v1.36.0 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Expand Down
Loading