Added osx arm64 support

.gitignore

@@ -1 +1,2 @@
 /cf-targets-plugin
+/bin/**

build-all.sh

@@ -25,18 +25,24 @@ mkdir -p bin/linux64
 mv cf-targets-plugin bin/linux64
 
 GOOS=darwin GOARCH=amd64 go build
-OSX_SHA1=`cat cf-targets-plugin | openssl sha1`
-mkdir -p bin/osx
-mv cf-targets-plugin bin/osx
+OSX_AMD64_SHA1=`cat cf-targets-plugin | openssl sha1`
+mkdir -p bin/osx-amd64
+mv cf-targets-plugin bin/osx-amd64
+
+GOOS=darwin GOARCH=arm64 go build
+OSX_ARM64_SHA1=`cat cf-targets-plugin | openssl sha1`
+mkdir -p bin/osx-arm64
+mv cf-targets-plugin bin/osx-arm64/cf-targets-plugin
 
 GOOS=windows GOARCH=amd64 go build
 WIN64_SHA1=`cat cf-targets-plugin.exe | openssl sha1`
 mkdir -p bin/win64
 mv cf-targets-plugin.exe bin/win64
 
 cat repo-index.yml |
-sed "s/osx-sha1/$OSX_SHA1/" |
-sed "s/win64-sha1/$WIN64_SHA1/" |
+sed "s/osx-amd64-sha1/$OSX_AMD64_SHA1/" |
+sed "s/osx-arm64-sha1/$OSX_ARM64_SHA1/" |
+# sed "s/win64-sha1/$WIN64_SHA1/" |
 sed "s/linux64-sha1/$LINUX64_SHA1/" |
 sed "s/_TAG_/$TAG/" |
 cat

cf_targets.go

@@ -10,10 +10,10 @@ import (
 	realio "io/ioutil"
 	realos "os"
 
-	"github.com/cloudfoundry/cli/cf/configuration"
-	"github.com/cloudfoundry/cli/cf/configuration/confighelpers"
-	"github.com/cloudfoundry/cli/cf/configuration/coreconfig"
-	"github.com/cloudfoundry/cli/plugin"
+	"code.cloudfoundry.org/cli/cf/configuration"
+	"code.cloudfoundry.org/cli/cf/configuration/confighelpers"
+	"code.cloudfoundry.org/cli/cf/configuration/coreconfig"
+	"code.cloudfoundry.org/cli/plugin"
 )
 
 type TargetsPlugin struct {

cf_targets_suite_test.go

@@ -1,13 +1,13 @@
 package main
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"testing"
 )
 
 func TestTargets(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, "Targets Suite")
+	RunSpecs(t, "CF Plugin Targets Suite")
 }

cf_targets_test.go

@@ -3,10 +3,10 @@ package main
 import (
 	realos "os"
 
-	fakes "github.com/cloudfoundry/cli/plugin/pluginfakes"
-	. "github.com/cloudfoundry/cli/cf/util/testhelpers/io"
-	. "github.com/cloudfoundry/cli/cf/util/testhelpers/matchers"
-	. "github.com/onsi/ginkgo"
+	fakes "code.cloudfoundry.org/cli/plugin/pluginfakes"
+	. "code.cloudfoundry.org/cli/cf/util/testhelpers/io"
+	. "code.cloudfoundry.org/cli/cf/util/testhelpers/matchers"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

go.mod

@@ -1,46 +1,120 @@
-module github.com/guidowb/cf-targets-plugin
+module github.com/norman-abramovitz/cf-targets-plugin/v7
 
-go 1.12
+go 1.22
 
 require (
+	code.cloudfoundry.org/cli v7.1.0+incompatible
+	github.com/onsi/ginkgo/v2 v2.17.3
+	github.com/onsi/gomega v1.33.1
+)
+
+require (
+	cloud.google.com/go v0.113.0 // indirect
+	cloud.google.com/go/auth v0.4.1 // indirect
+	cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect
+	cloud.google.com/go/compute/metadata v0.3.0 // indirect
+	cloud.google.com/go/iam v1.1.8 // indirect
+	cloud.google.com/go/storage v1.41.0 // indirect
 	code.cloudfoundry.org/bytefmt v0.0.0-20190710193110-1eb035ffe2b6 // indirect
-	code.cloudfoundry.org/cli v6.46.0+incompatible // indirect
-	code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f
-	github.com/SermoDigital/jose v0.0.0-20161205225155-2bd9b81ac51d
-	github.com/blang/semver v3.1.0+incompatible
-	github.com/bmatcuk/doublestar v1.1.5 // indirect
-	github.com/bmizerany/pat v0.0.0-20160217103242-c068ca2f0aac
-	github.com/charlievieth/fs v0.0.0-20170613215519-7dc373669fa1 // indirect
-	github.com/cloudfoundry-incubator/cli-plugin-repo v0.0.0-20170127230318-62545a44009b
-	github.com/cloudfoundry/bosh-cli v6.0.0+incompatible // indirect
-	github.com/cloudfoundry/bosh-utils v0.0.0-20190813211102-4d0b7c5acdfd // indirect
-	github.com/cloudfoundry/cli v6.46.0+incompatible
-	github.com/cloudfoundry/cli-plugin-repo v0.0.0-20190808155747-f1af6115b6ff // indirect
-	github.com/cloudfoundry/go-ccapi v0.0.0-20170111115350-71998966d470
-	github.com/cloudfoundry/noaa v0.0.0-20170131060151-9e087230f2fe
-	github.com/cloudfoundry/sonde-go v0.0.0-20170118225207-78019103037a
+	code.cloudfoundry.org/cli-plugin-repo v0.0.0-20240412012324-ec47981422ea // indirect
+	code.cloudfoundry.org/clock v1.1.0 // indirect
+	code.cloudfoundry.org/diego-ssh v0.0.0-20240408164108-f465a655f448 // indirect
+	code.cloudfoundry.org/go-log-cache v1.0.0 // indirect
+	code.cloudfoundry.org/go-loggregator v7.4.0+incompatible // indirect
+	code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f // indirect
+	code.cloudfoundry.org/jsonry v1.1.4 // indirect
+	code.cloudfoundry.org/lager v2.0.0+incompatible // indirect
+	code.cloudfoundry.org/lager/v3 v3.0.3 // indirect
+	code.cloudfoundry.org/rfc5424 v0.0.0-20201103192249-000122071b78 // indirect
+	code.cloudfoundry.org/tlsconfig v0.0.0-20240510172918-c1e19801fe80 // indirect
+	code.cloudfoundry.org/workpool v0.0.0-20240408164905-b6c2fa5a80e4 // indirect
+	code.cloudfoundry.org/ykk v0.0.0-20170424192843-e4df4ce2fd4d // indirect
+	github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
+	github.com/SermoDigital/jose v0.0.0-20161205225155-2bd9b81ac51d // indirect
+	github.com/aws/aws-sdk-go v1.53.1 // indirect
+	github.com/blang/semver v3.5.1+incompatible // indirect
+	github.com/bmatcuk/doublestar v1.3.4 // indirect
+	github.com/bmizerany/pat v0.0.0-20160217103242-c068ca2f0aac // indirect
+	github.com/charlievieth/fs v0.0.3 // indirect
+	github.com/cheggaaa/pb v1.0.29 // indirect
+	github.com/cloudfoundry/bosh-agent v2.367.0+incompatible // indirect
+	github.com/cloudfoundry/bosh-cli v6.4.1+incompatible // indirect
+	github.com/cloudfoundry/bosh-davcli v0.0.342 // indirect
+	github.com/cloudfoundry/bosh-gcscli v0.0.225 // indirect
+	github.com/cloudfoundry/bosh-s3cli v0.0.294 // indirect
+	github.com/cloudfoundry/bosh-utils v0.0.465 // indirect
+	github.com/cloudfoundry/config-server v0.1.184 // indirect
+	github.com/cloudfoundry/go-socks5 v0.0.0-20180221174514-54f73bdb8a8e // indirect
+	github.com/cloudfoundry/socks5-proxy v0.2.117 // indirect
 	github.com/cppforlife/go-patch v0.2.0 // indirect
+	github.com/cppforlife/go-semi-semantic v0.0.0-20160921010311-576b6af77ae4 // indirect
 	github.com/cyphar/filepath-securejoin v0.2.2 // indirect
-	github.com/fatih/color v0.0.0-20150823214434-76d423163af7
-	github.com/gogo/protobuf v0.0.0-20170125171659-fb8a359905af
-	github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135
-	github.com/gorilla/websocket v0.0.0-20151216051058-3986be78bf85
+	github.com/dustin/go-humanize v1.0.1 // indirect
+	github.com/fatih/color v1.17.0 // indirect
+	github.com/felixge/httpsnoop v1.0.4 // indirect
+	github.com/fsnotify/fsnotify v1.7.0 // indirect
+	github.com/go-logr/logr v1.4.1 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
+	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135 // indirect
+	github.com/google/pprof v0.0.0-20240509144519-723abb6459b7 // indirect
+	github.com/google/s2a-go v0.1.7 // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
+	github.com/googleapis/gax-go/v2 v2.12.4 // indirect
+	github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
+	github.com/hashicorp/errwrap v1.1.0 // indirect
+	github.com/hashicorp/go-multierror v1.1.1 // indirect
+	github.com/jessevdk/go-flags v1.5.0 // indirect
+	github.com/jmespath/go-jmespath v0.4.0 // indirect
+	github.com/jpillora/backoff v1.0.0 // indirect
+	github.com/konsorten/go-windows-terminal-sequences v1.0.1 // indirect
+	github.com/kr/pty v1.1.8 // indirect
 	github.com/lunixbochs/vtclean v1.0.0 // indirect
-	github.com/mattn/go-colorable v0.0.7
-	github.com/mattn/go-isatty v0.0.0-20150814002629-7fcbc72f853b
-	github.com/mattn/go-runewidth v0.0.4 // indirect
-	github.com/nicksnyder/go-i18n v0.0.0-20170120160056-64786dc4f56b
-	github.com/onsi/ginkgo v0.0.0-20170126062008-bb93381d543b
-	github.com/onsi/gomega v0.0.0-20160705151310-82a02eccf12c
-	github.com/pkg/errors v0.8.1 // indirect
-	github.com/shiena/ansicolor v0.0.0-20151119151921-a422bbe96644 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mattn/go-runewidth v0.0.15 // indirect
+	github.com/moby/moby v20.10.27+incompatible // indirect
+	github.com/moby/term v0.5.0 // indirect
+	github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d // indirect
+	github.com/nxadm/tail v1.4.11 // indirect
+	github.com/onsi/ginkgo v1.16.5 // indirect
+	github.com/pivotal-cf/paraphernalia v0.0.0-20180203224945-a64ae2051c20 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/rivo/uniseg v0.4.7 // indirect
+	github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 // indirect
+	github.com/shiena/ansicolor v0.0.0-20230509054315-a9deabde6e02 // indirect
 	github.com/sirupsen/logrus v1.4.2 // indirect
-	github.com/tedsuo/rata v1.0.0
-	github.com/vito/go-interact v1.0.0 // indirect
-	golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4
-	golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3
-	golang.org/x/sys v0.0.0-20190422165155-953cdadca894
-	golang.org/x/text v0.3.2 // indirect
+	github.com/tedsuo/rata v1.0.0 // indirect
+	github.com/vito/go-interact v1.0.1 // indirect
+	go.opencensus.io v0.24.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.51.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.51.0 // indirect
+	go.opentelemetry.io/otel v1.26.0 // indirect
+	go.opentelemetry.io/otel/metric v1.26.0 // indirect
+	go.opentelemetry.io/otel/trace v1.26.0 // indirect
+	golang.org/x/crypto v0.23.0 // indirect
+	golang.org/x/net v0.25.0 // indirect
+	golang.org/x/oauth2 v0.20.0 // indirect
+	golang.org/x/sync v0.7.0 // indirect
+	golang.org/x/sys v0.20.0 // indirect
+	golang.org/x/term v0.20.0 // indirect
+	golang.org/x/text v0.15.0 // indirect
+	golang.org/x/time v0.5.0 // indirect
+	golang.org/x/tools v0.21.0 // indirect
+	google.golang.org/api v0.180.0 // indirect
+	google.golang.org/genproto v0.0.0-20240513163218-0867130af1f8 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20240513163218-0867130af1f8 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240513163218-0867130af1f8 // indirect
+	google.golang.org/grpc v1.63.2 // indirect
+	google.golang.org/protobuf v1.34.1 // indirect
+	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/cheggaaa/pb.v1 v1.0.28 // indirect
-	gopkg.in/yaml.v2 v2.0.0-20151201162745-f7716cbe52ba
+	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
+replace github.com/vito/go-interact => github.com/vito/go-interact v1.0.0