Skip to content

Commit

Permalink
Replace Segmentio referenace to FiveAI
Browse files Browse the repository at this point in the history
Update `go.mod` and `go.sum`, we are using go modules more.
Remove the vendor folder.
  • Loading branch information
neuralsandwich committed May 27, 2020
1 parent ee876d3 commit a06425a
Show file tree
Hide file tree
Showing 868 changed files with 35 additions and 362,396 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ VERSION := $(shell git describe --tags --always --dirty="-dev")
LDFLAGS := -ldflags='-X "main.Version=$(VERSION)"'

test:
GO111MODULE=on go test -mod=vendor -v ./...
GO111MODULE=on go test -v ./...

all: dist/aws-okta-$(VERSION)-darwin-amd64 dist/aws-okta-$(VERSION)-linux-amd64

Expand All @@ -19,9 +19,9 @@ dist/:
mkdir -p dist

dist/aws-okta-$(VERSION)-darwin-amd64: | dist/
GOOS=darwin GOARCH=amd64 GO111MODULE=on go build -mod=vendor $(LDFLAGS) -o $@
GOOS=darwin GOARCH=amd64 GO111MODULE=on go build $(LDFLAGS) -o $@

dist/aws-okta-$(VERSION)-linux-amd64: | dist/
GOOS=linux GOARCH=amd64 GO111MODULE=on go build -mod=vendor $(LDFLAGS) -o $@
GOOS=linux GOARCH=amd64 GO111MODULE=on go build $(LDFLAGS) -o $@

.PHONY: clean all
22 changes: 11 additions & 11 deletions Makefile.release
Original file line number Diff line number Diff line change
Expand Up @@ -48,22 +48,22 @@ github-release:
set -o pipefail; \
scripts/changelog | github-release release \
--security-token $$GH_LOGIN \
--user segmentio \
--user fiveai \
--repo aws-okta \
$(GITHUB_RELEASE_FLAGS) \
--tag $(VERSION) \
--description - \
--name $(VERSION) || \
github-release info \
--security-token $$GH_LOGIN \
--user segmentio \
--user fiveai \
--repo aws-okta \
--tag $(VERSION)

publish-github-darwin-bin: dist/aws-okta-$(VERSION)-darwin-amd64 | github-release
github-release upload \
--security-token $$GH_LOGIN \
--user segmentio \
--user fiveai \
--repo aws-okta \
--tag $(VERSION) \
--name aws-okta-$(VERSION)-darwin-amd64 \
Expand All @@ -73,7 +73,7 @@ publish-github-darwin-bin: dist/aws-okta-$(VERSION)-darwin-amd64 | github-releas
publish-github-linux-bin: dist/aws-okta-$(VERSION)-linux-amd64 | github-release
github-release upload \
--security-token $$GH_LOGIN \
--user segmentio \
--user fiveai \
--repo aws-okta \
--tag $(VERSION) \
--name aws-okta-$(VERSION)-linux-amd64 \
Expand All @@ -83,7 +83,7 @@ publish-github-linux-bin: dist/aws-okta-$(VERSION)-linux-amd64 | github-release
publish-github-deb: dist/aws-okta_$(VERSION)_amd64.deb | github-release
github-release upload \
--security-token $$GH_LOGIN \
--user segmentio \
--user fiveai \
--repo aws-okta \
--tag $(VERSION) \
--name aws-okta_$(VERSION)_amd64.deb \
Expand All @@ -93,7 +93,7 @@ publish-github-deb: dist/aws-okta_$(VERSION)_amd64.deb | github-release
publish-github-rpm: dist/aws-okta_$(VERSION)_amd64.rpm | github-release
github-release upload \
--security-token $$GH_LOGIN \
--user segmentio \
--user fiveai \
--repo aws-okta \
--tag $(VERSION) \
--name aws-okta_$(VERSION)_amd64.rpm \
Expand All @@ -103,7 +103,7 @@ publish-github-rpm: dist/aws-okta_$(VERSION)_amd64.rpm | github-release
publish-github-sha256sums: dist/aws-okta-$(VERSION).sha256sums | github-release
github-release upload \
--security-token $$GH_LOGIN \
--user segmentio \
--user fiveai \
--repo aws-okta \
--tag $(VERSION) \
--name aws-okta-$(VERSION).sha256sums \
Expand All @@ -119,18 +119,18 @@ packagecloud.conf.json:
publish-packagecloud-deb: dist/aws-okta_$(VERSION)_amd64.deb packagecloud.conf.json
@set -o pipefail; \
for v in $(PACKAGECLOUD_DEB_DISTROS); do \
(package_cloud yank --config packagecloud.conf.json segment/aws-okta$(PACKAGECLOUD_NAME_SUFFIX)/$$v aws-okta_$(VERSION_NO_V)_amd64.deb || true) | \
(package_cloud yank --config packagecloud.conf.json fiveai/aws-okta$(PACKAGECLOUD_NAME_SUFFIX)/$$v aws-okta_$(VERSION_NO_V)_amd64.deb || true) | \
grep -v 'with token:' || true ; \
package_cloud push --config packagecloud.conf.json segment/aws-okta$(PACKAGECLOUD_NAME_SUFFIX)/$$v $< | \
package_cloud push --config packagecloud.conf.json fiveai/aws-okta$(PACKAGECLOUD_NAME_SUFFIX)/$$v $< | \
grep -v 'with token:' ; \
done

publish-packagecloud-rpm: dist/aws-okta_$(VERSION)_amd64.rpm packagecloud.conf.json
@set -o pipefail; \
for v in $(PACKAGECLOUD_RPM_DISTROS); do \
(package_cloud yank --config packagecloud.conf.json segment/aws-okta$(PACKAGECLOUD_NAME_SUFFIX)/$$v aws-okta-$(subst -,_,$(VERSION_NO_V))-1.x86_64.rpm || true) | \
(package_cloud yank --config packagecloud.conf.json fiveai/aws-okta$(PACKAGECLOUD_NAME_SUFFIX)/$$v aws-okta-$(subst -,_,$(VERSION_NO_V))-1.x86_64.rpm || true) | \
grep -v 'with token:' || true ; \
package_cloud push --config packagecloud.conf.json segment/aws-okta$(PACKAGECLOUD_NAME_SUFFIX)/$$v $< | \
package_cloud push --config packagecloud.conf.json fiveai/aws-okta$(PACKAGECLOUD_NAME_SUFFIX)/$$v $< | \
grep -v 'with token:' ; \
done

Expand Down
2 changes: 1 addition & 1 deletion cmd/add.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
log "github.com/sirupsen/logrus"

"github.com/99designs/keyring"
"github.com/segmentio/aws-okta/lib"
"github.com/fiveai/aws-okta/lib"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/cred-process.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"time"

"github.com/99designs/keyring"
"github.com/segmentio/aws-okta/lib"
"github.com/fiveai/aws-okta/lib"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/env.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/99designs/keyring"
"github.com/alessio/shellescape"
"github.com/segmentio/aws-okta/lib"
"github.com/fiveai/aws-okta/lib"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/exec.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"time"

"github.com/99designs/keyring"
"github.com/segmentio/aws-okta/lib"
"github.com/fiveai/aws-okta/lib"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"sort"
"text/tabwriter"

"github.com/segmentio/aws-okta/lib"
"github.com/fiveai/aws-okta/lib"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/login.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"time"

"github.com/99designs/keyring"
"github.com/segmentio/aws-okta/lib"
"github.com/fiveai/aws-okta/lib"
"github.com/skratchdot/open-golang/open"
"github.com/spf13/cobra"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"errors"

"github.com/99designs/keyring"
"github.com/segmentio/aws-okta/lib"
"github.com/fiveai/aws-okta/lib"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"golang.org/x/xerrors"
Expand Down
2 changes: 1 addition & 1 deletion cmd/write-to-credentials.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"time"

"github.com/99designs/keyring"
"github.com/segmentio/aws-okta/lib"
"github.com/fiveai/aws-okta/lib"
"github.com/spf13/cobra"
ini "gopkg.in/ini.v1"
)
Expand Down
10 changes: 5 additions & 5 deletions docs/windows.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,22 @@ Native Windows includes Windows shells/environments that execute Windows binarie
1. Install [go for windows](https://golang.org/dl/) >= 1.10
2. If you're using network drives on your system make sure that `%GOPATH%` and `%GOROOT%` point to a LOCAL disk. You may also need to download the zip distribution of golang and manually install on a local drive.
3. Install gcc. MinGW-w64 package is known to have issues while [Win-builds](http://win-builds.org/doku.php) 1.5.0 has been confirmed working.
4. From your favorite shell `go get github.com/segmentio/aws-okta`
4. From your favorite shell `go get github.com/fiveai/aws-okta`
5. Add `%USERPROFILE%\go\bin` to your PATH
6. From a cmd.exe shell run `aws-okta add` - some shells lack the required functionality for this command to work but cmd.exe is consistent
7. Follow the general instructions for configuring and using `aws-okta`
8. To update `go get -u github.com/segmentio/aws-okta`
8. To update `go get -u github.com/fiveai/aws-okta`

## Windows Subsystem for Linux

`aws-okta` generally works fine in WSL as long as you're on Windows build >= 15093. Windows builds earlier than this lack the console features required. To find out what build of Windows you're on run the `winver` command.

The easiest way to install under WSL is to download the [latest release](https://github.com/segmentio/aws-okta/releases) Linux binary and put it somewhere in your path.
The easiest way to install under WSL is to download the [latest release](https://github.com/fiveai/aws-okta/releases) Linux binary and put it somewhere in your path.

### Installation From Source

1. Install golang >= 1.10 - follow the instructions [here](https://github.com/golang/go/wiki/Ubuntu) if your WSL distribution does not natively include an appropriate version
2. `go get github.com/segmentio/aws-okta`
2. `go get github.com/fiveai/aws-okta`
3. Add `~/go/bin` to your $PATH
4. Follow the general instructions for configuring and using `aws-okta`
5. To update `go get -u github.com/segmentio/aws-okta`
5. To update `go get -u github.com/fiveai/aws-okta`
15 changes: 3 additions & 12 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,29 +1,20 @@
module github.com/segmentio/aws-okta
module github.com/fiveai/aws-okta

require (
github.com/99designs/keyring v1.0.0
github.com/alessio/shellescape v0.0.0-20190409004728-b115ca0f9053
github.com/aws/aws-sdk-go v1.25.25
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/karalabe/hid v1.0.0 // indirect
github.com/keybase/go-keychain v0.0.0-20190604185112-cc436cc9fe98 // indirect
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
github.com/marshallbrekka/go-u2fhost v0.0.0-20200114212649-cc764c209ee9
github.com/mitchellh/go-homedir v1.1.0
github.com/segmentio/analytics-go v3.0.1+incompatible
github.com/segmentio/backo-go v0.0.0-20160424052352-204274ad699c // indirect
github.com/segmentio/aws-okta v1.0.2
github.com/sirupsen/logrus v1.4.1
github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c
github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a // indirect
github.com/spf13/cobra v0.0.0-20170621173259-31694f19adee
github.com/spf13/pflag v1.0.0 // indirect
github.com/stretchr/testify v1.3.0
github.com/vaughan0/go-ini v0.0.0-20130923145212-a98ad7ee00ec
github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c // indirect
golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4
golang.org/x/net v0.0.0-20190628185345-da137c7871d7
golang.org/x/sys v0.0.0-20190710143415-6ec70d6a5542 // indirect
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae // indirect
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7
gopkg.in/ini.v1 v1.42.0
)
Expand Down
4 changes: 4 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/segmentio/analytics-go v3.0.1+incompatible h1:W7T3ieNQjPFMb+SE8SAVYo6mPkKK/Y37wYdiNf5lCVg=
github.com/segmentio/analytics-go v3.0.1+incompatible/go.mod h1:C7CYBtQWk4vRk2RyLu0qOcbHJ18E3F1HV2C/8JvKN48=
github.com/segmentio/aws-okta v1.0.2 h1:Y76Q362LqjPuyLsWAwV6vusnk/FxOwXhW8R61raXO+o=
github.com/segmentio/aws-okta v1.0.2/go.mod h1:MUOcmY7w53Jxq3hYUdY5cStZ8oYeSnO3ENGjKyJubhQ=
github.com/segmentio/backo-go v0.0.0-20160424052352-204274ad699c h1:rsRTAcCR5CeNLkvgBVSjQoDGRRt6kggsE6XYBqCv2KQ=
github.com/segmentio/backo-go v0.0.0-20160424052352-204274ad699c/go.mod h1:kJ9mm9YmoWSkk+oQ+5Cj8DEoRCX2JT6As4kEtIIOp1M=
github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k=
Expand Down Expand Up @@ -88,6 +90,8 @@ golang.org/x/sys v0.0.0-20190516110030-61b9204099cb h1:k07iPOt0d6nEnwXF+kHB+iEg+
golang.org/x/sys v0.0.0-20190516110030-61b9204099cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190710143415-6ec70d6a5542 h1:6ZQFf1D2YYDDI7eSwW8adlkkavTB9sw5I24FVtEvNUQ=
golang.org/x/sys v0.0.0-20190710143415-6ec70d6a5542/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae h1:/WDfKMnPU+m5M4xB+6x4kaepxRw6jWvR5iDRdvjHgy8=
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
Expand Down
2 changes: 1 addition & 1 deletion scripts/changelog
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

set -euo pipefail

commit_url_base='https://github.com/segmentio/aws-okta/commit'
commit_url_base='https://github.com/fiveai/aws-okta/commit'

# generates a changelog between the current commit and the previous tag
changelog() {
Expand Down
19 changes: 0 additions & 19 deletions vendor/github.com/99designs/keyring/.travis.yml

This file was deleted.

22 changes: 0 additions & 22 deletions vendor/github.com/99designs/keyring/LICENSE

This file was deleted.

55 changes: 0 additions & 55 deletions vendor/github.com/99designs/keyring/README.md

This file was deleted.

Loading

0 comments on commit a06425a

Please sign in to comment.