diff --git a/glide.lock b/glide.lock index 29f27e3..a042398 100644 --- a/glide.lock +++ b/glide.lock @@ -1,5 +1,5 @@ -hash: c22dfc173acb9cd3dbbf6e422e11ac32d9ee7fcf9836c08d5b4a663cde223e0b -updated: 2019-03-20T15:45:19.60946498+01:00 +hash: 63df28255ebfe97dfac59a95354dc148b70bf57dde1fc9f094ea2aa9ac3a6438 +updated: 2019-04-15T11:49:31.402647966+02:00 imports: - name: github.com/alecthomas/template version: a0175ee3bccc567396460bf5acd36800cb10c49c @@ -11,24 +11,86 @@ imports: version: a368813c5e648fee92e5f6c30e3944ff9d5e8895 - name: github.com/codegangsta/cli version: 4b90d79a682b4bf685762c7452db20f2a676ecb2 +- name: github.com/coreos/pkg + version: 447b7ec906e523386d9c53be15b55a8ae86ea944 + subpackages: + - flagutil - name: github.com/dghubble/sling version: eb56e89ac5088bebb12eef3cb4b293300f43608b - name: github.com/ghodss/yaml version: 0ca9ea5df5451ffdf184b4428c902747c2c11cd7 - name: github.com/go-ini/ini version: 3d73f4b845efdf9989fffd4b4e562727744a34ba +- name: github.com/golang/protobuf + version: 8ee79997227bf9b34611aee7946ae64735e6fd93 + subpackages: + - proto - name: github.com/google/go-querystring version: 9235644dd9e52eeae6fa48efd539fdc351a0af53 subpackages: - query -- name: github.com/zachmann/liboidcagent-go - version: 0fe761bf9f7b97d87e227d19f4e70437e5b60574 +- name: github.com/indigo-dc/liboidcagent-go + version: 5a786cab8df1fba86e99f8c32bd12e9555b9b7aa subpackages: - liboidcagent - name: github.com/zpatrick/go-config version: 710646a45582fde23bf77bacbc2f38008dc7ffc2 +- name: golang.org/x/net + version: 45e771701b814666a7eb299e6c7a57d0b1799e91 + subpackages: + - context +- name: golang.org/x/oauth2 + version: 314dd2c0bf3ebd592ec0d20847d27e79d0dbe8dd + subpackages: + - internal +- name: google.golang.org/appengine + version: 08a149cfaee099e6ce4be01c0113a78c85ee1dee + subpackages: + - internal + - internal/base + - internal/datastore + - internal/log + - internal/remote_api + - internal/urlfetch + - urlfetch - name: gopkg.in/alecthomas/kingpin.v2 version: e9044be3ab2a8e11d4e1f418d12f0790d57e8d70 +- name: gopkg.in/urfave/cli.v1 + version: cfb38830724cc34fedffe9a2a29fb54fa9169cd1 - name: gopkg.in/yaml.v2 version: a83829b6f1293c91addabc89d0571c246397bbf4 -testImports: [] +testImports: +- name: github.com/davecgh/go-spew + version: 04cdfd42973bb9c8589fd6a731800cf222fde1a9 + subpackages: + - spew +- name: github.com/gopherjs/gopherjs + version: bd77b112433e999447bf4bc599e36214ba494a99 + subpackages: + - js +- name: github.com/jtolds/gls + version: b4936e06046bbecbb94cae9c18127ebe510a2cb9 +- name: github.com/pmezard/go-difflib + version: d8ed2627bdf02c080bf22230dbb337003b7aba2d + subpackages: + - difflib +- name: github.com/smartystreets/assertions + version: f487f9de1cd36ebab28235b9373028812fb47cbd + subpackages: + - internal/go-diff/diffmatchpatch + - internal/go-render/render + - internal/oglematchers +- name: github.com/smartystreets/goconvey + version: 68dc04aab96ae4326137d6b77330c224063a927e + subpackages: + - convey + - convey/gotest + - convey/reporting +- name: github.com/stretchr/testify + version: 2402e8e7a02fc811447d11f881aa9746cdc57983 + subpackages: + - assert +- name: gopkg.in/check.v1 + version: 4f90aeace3a26ad7021961c297b22c42160c7b25 +- name: gopkg.in/ini.v1 + version: c85607071cf08ca1adaf48319cd1aa322e81d8c1 diff --git a/glide.yaml b/glide.yaml index 32dd093..eeb3ef6 100644 --- a/glide.yaml +++ b/glide.yaml @@ -4,4 +4,4 @@ import: version: 1.1.0 - package: gopkg.in/alecthomas/kingpin.v2 - package: github.com/zpatrick/go-config -- package: github.com/zachmann/liboidcagent-go/liboidcagent +- package: github.com/indigo-dc/liboidcagent-go/liboidcagent diff --git a/orchent.go b/orchent.go index ed090d6..9130c53 100644 --- a/orchent.go +++ b/orchent.go @@ -14,12 +14,12 @@ import ( "strings" "github.com/dghubble/sling" - "github.com/zachmann/liboidcagent-go/liboidcagent" + "github.com/indigo-dc/liboidcagent-go/liboidcagent" "github.com/zpatrick/go-config" "gopkg.in/alecthomas/kingpin.v2" ) -const OrchentVersion string = "1.2.3" +const OrchentVersion string = "1.2.4" var ( app = kingpin.New("orchent", "The orchestrator client. \n \nPlease either store your access token in 'ORCHENT_TOKEN' or set the account to use with oidc-agent in the 'ORCHENT_AGENT_ACCOUNT' and the socket of the oidc-agent in the 'OIDC_SOCK' environment variable: \n export ORCHENT_TOKEN= \n OR \n export OIDC_SOCK= (usually this is already exported) \n export ORCHENT_AGENT_ACCOUNT= \nIf you need to specify the file containing the trusted root CAs use the 'ORCHENT_CAFILE' environment variable: \n export ORCHENT_CAFILE=\n \n").Version(OrchentVersion) diff --git a/utils/build_docker.sh b/utils/build_docker.sh index 9453512..dd78c0a 100755 --- a/utils/build_docker.sh +++ b/utils/build_docker.sh @@ -47,7 +47,7 @@ echo -n " go-config ... " go get github.com/zpatrick/go-config echo "done" echo -n " liboidcagent ... " -go get github.com/zachmann/liboidcagent-go/liboidcagent +go get github.com/indigo-dc/liboidcagent-go/liboidcagent echo "done" echo -n "building orchent ... " CGO_ENABLED=0 GOOS=linux go build -a -v -o $ORCHENT ${GOPATH}/orchent.go diff --git a/utils/compile.sh b/utils/compile.sh index a1b56d6..34c41cd 100755 --- a/utils/compile.sh +++ b/utils/compile.sh @@ -32,7 +32,7 @@ echo -n " go-config ... " go get github.com/zpatrick/go-config echo "done" echo -n " liboidcagent ... " -go get github.com/zachmann/liboidcagent-go/liboidcagent +go get github.com/indigo-dc/liboidcagent-go/liboidcagent echo "done" echo -n "building orchent ... " go build -o orchent ${GOPATH}/orchent.go diff --git a/utils/compile_macos.sh b/utils/compile_macos.sh index 30812f4..0e582b6 100755 --- a/utils/compile_macos.sh +++ b/utils/compile_macos.sh @@ -30,6 +30,9 @@ echo "done" echo -n " go-config ... " go get github.com/zpatrick/go-config echo "done" +echo -n " liboidcagent ... " +go get github.com/indigo-dc/liboidcagent-go/liboidcagent +echo "done" echo -n "building orchent ... " go build -o orchent ${GOPATH}/orchent.go echo "done"