diff --git a/.gitignore b/.gitignore index f11ad28..672711c 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,8 @@ debian/australis.substvars build/ dist/ .idea/ + +# Use checksum database +go.sum + +.DS_Store diff --git a/CHANGELOG b/CHANGELOG index 197c1da..396d4d5 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ -0.1.1 +0.1.1 (unreleased) -* Unreleased +* Removed support for building with dep +* Upgraded depdencies to their latest versions. +* gorealis v2 now lives in the aurora-scheduler organization and dependencies have been updated to reflect that. 0.1.0 diff --git a/Gopkg.lock b/Gopkg.lock deleted file mode 100644 index b2149da..0000000 --- a/Gopkg.lock +++ /dev/null @@ -1,218 +0,0 @@ -# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. - - -[[projects]] - branch = "0.12.0" - digest = "1:89696c38cec777120b8b1bb5e2d363d655cf2e1e7d8c851919aaa0fd576d9b86" - name = "git.apache.org/thrift.git" - packages = ["lib/go/thrift"] - pruneopts = "" - revision = "384647d290e2e4a55a14b1b7ef1b7e66293a2c33" - -[[projects]] - digest = "1:eb53021a8aa3f599d29c7102e65026242bdedce998a54837dc67f14b6a97c5fd" - name = "github.com/fsnotify/fsnotify" - packages = ["."] - pruneopts = "" - revision = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9" - version = "v1.4.7" - -[[projects]] - digest = "1:d14365c51dd1d34d5c79833ec91413bfbb166be978724f15701e17080dc06dec" - name = "github.com/hashicorp/hcl" - packages = [ - ".", - "hcl/ast", - "hcl/parser", - "hcl/printer", - "hcl/scanner", - "hcl/strconv", - "hcl/token", - "json/parser", - "json/scanner", - "json/token", - ] - pruneopts = "" - revision = "8cb6e5b959231cc1119e43259c4a608f9c51a241" - version = "v1.0.0" - -[[projects]] - digest = "1:870d441fe217b8e689d7949fef6e43efbc787e50f200cb1e70dbca9204a1d6be" - name = "github.com/inconshreveable/mousetrap" - packages = ["."] - pruneopts = "" - revision = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75" - version = "v1.0" - -[[projects]] - digest = "1:6a874e3ddfb9db2b42bd8c85b6875407c702fa868eed20634ff489bc896ccfd3" - name = "github.com/konsorten/go-windows-terminal-sequences" - packages = ["."] - pruneopts = "" - revision = "5c8c8bd35d3832f5d134ae1e1e375b69a4d25242" - version = "v1.0.1" - -[[projects]] - digest = "1:961dc3b1d11f969370533390fdf203813162980c858e1dabe827b60940c909a5" - name = "github.com/magiconair/properties" - packages = ["."] - pruneopts = "" - revision = "c2353362d570a7bfa228149c62842019201cfb71" - version = "v1.8.0" - -[[projects]] - digest = "1:bcc46a0fbd9e933087bef394871256b5c60269575bb661935874729c65bbbf60" - name = "github.com/mitchellh/mapstructure" - packages = ["."] - pruneopts = "" - revision = "3536a929edddb9a5b34bd6861dc4a9647cb459fe" - version = "v1.1.2" - -[[projects]] - digest = "1:0a57933aaf17a56940a600fbbe6ede0e0fcc92531d7b85a29f2a6352c12573ca" - name = "github.com/paypal/gorealis" - packages = [ - ".", - "gen-go/apache/aurora", - "response", - ] - pruneopts = "" - revision = "b776bd301d9018b86253711e789eb2376ce60d1c" - version = "v2.0.0" - -[[projects]] - digest = "1:894aef961c056b6d85d12bac890bf60c44e99b46292888bfa66caf529f804457" - name = "github.com/pelletier/go-toml" - packages = ["."] - pruneopts = "" - revision = "c01d1270ff3e442a8a57cddc1c92dc1138598194" - version = "v1.2.0" - -[[projects]] - digest = "1:df48fb76fb2a40edea0c9b3d960bc95e326660d82ff1114e1f88001f7a236b40" - name = "github.com/pkg/errors" - packages = ["."] - pruneopts = "" - revision = "e881fd58d78e04cf6d0de1217f8707c8cc2249bc" - -[[projects]] - digest = "1:78bea5e26e82826dacc5fd64a1013a6711b7075ec8072819b89e6ad76cb8196d" - name = "github.com/samuel/go-zookeeper" - packages = ["zk"] - pruneopts = "" - revision = "471cd4e61d7a78ece1791fa5faa0345dc8c7d5a5" - -[[projects]] - digest = "1:9d57e200ef5ccc4217fe0a34287308bac652435e7c6513f6263e0493d2245c56" - name = "github.com/sirupsen/logrus" - packages = ["."] - pruneopts = "" - revision = "bcd833dfe83d3cebad139e4a29ed79cb2318bf95" - version = "v1.2.0" - -[[projects]] - digest = "1:d0431c2fd72e39ee43ea7742322abbc200c3e704c9102c5c3c2e2e667095b0ca" - name = "github.com/spf13/afero" - packages = [ - ".", - "mem", - ] - pruneopts = "" - revision = "d40851caa0d747393da1ffb28f7f9d8b4eeffebd" - version = "v1.1.2" - -[[projects]] - digest = "1:d0b38ba6da419a6d4380700218eeec8623841d44a856bb57369c172fbf692ab4" - name = "github.com/spf13/cast" - packages = ["."] - pruneopts = "" - revision = "8965335b8c7107321228e3e3702cab9832751bac" - version = "v1.2.0" - -[[projects]] - digest = "1:9ba49264cef4386aded205f9cb5b1f2d30f983d7dc37a21c780d9db3edfac9a7" - name = "github.com/spf13/cobra" - packages = ["."] - pruneopts = "" - revision = "fe5e611709b0c57fa4a89136deaa8e1d4004d053" - -[[projects]] - digest = "1:9ceffa4ab5f7195ecf18b3a7fff90c837a9ed5e22e66d18069e4bccfe1f52aa0" - name = "github.com/spf13/jwalterweatherman" - packages = ["."] - pruneopts = "" - revision = "4a4406e478ca629068e7768fc33f3f044173c0a6" - version = "v1.0.0" - -[[projects]] - digest = "1:cbaf13cdbfef0e4734ed8a7504f57fe893d471d62a35b982bf6fb3f036449a66" - name = "github.com/spf13/pflag" - packages = ["."] - pruneopts = "" - revision = "298182f68c66c05229eb03ac171abe6e309ee79a" - version = "v1.0.3" - -[[projects]] - digest = "1:c08585b9af4c0f3c516af8e06254a66b462aee46937d41b7d8434795051e33b6" - name = "github.com/spf13/viper" - packages = ["."] - pruneopts = "" - revision = "62edee319679b6ceaec16de03b966102d2dea709" - -[[projects]] - branch = "master" - digest = "1:efb97ebbd73c3a7068579327f5d98a17c09f6d8caf1fa3212c506e8bb78126b5" - name = "golang.org/x/crypto" - packages = ["ssh/terminal"] - pruneopts = "" - revision = "4d3f4d9ffa16a13f451c3b2999e9c49e9750bf06" - -[[projects]] - branch = "master" - digest = "1:3d1785223d1b588249f131ddb1a88b1f80ee3eaa20934aba6562a44e633bbe7d" - name = "golang.org/x/sys" - packages = [ - "unix", - "windows", - ] - pruneopts = "" - revision = "44b849a8bc13eb42e95e6c6c5e360481b73ec710" - -[[projects]] - digest = "1:5acd3512b047305d49e8763eef7ba423901e85d5dd2fd1e71778a0ea8de10bd4" - name = "golang.org/x/text" - packages = [ - "internal/gen", - "internal/triegen", - "internal/ucd", - "transform", - "unicode/cldr", - "unicode/norm", - ] - pruneopts = "" - revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0" - version = "v0.3.0" - -[[projects]] - digest = "1:f0620375dd1f6251d9973b5f2596228cc8042e887cd7f827e4220bc1ce8c30e2" - name = "gopkg.in/yaml.v2" - packages = ["."] - pruneopts = "" - revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183" - version = "v2.2.1" - -[solve-meta] - analyzer-name = "dep" - analyzer-version = 1 - input-imports = [ - "git.apache.org/thrift.git/lib/go/thrift", - "github.com/paypal/gorealis", - "github.com/paypal/gorealis/gen-go/apache/aurora", - "github.com/pkg/errors", - "github.com/sirupsen/logrus", - "github.com/spf13/cobra", - "github.com/spf13/pflag", - "github.com/spf13/viper", - ] - solver-name = "gps-cdcl" - solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml deleted file mode 100644 index f4d972d..0000000 --- a/Gopkg.toml +++ /dev/null @@ -1,17 +0,0 @@ -required = ["git.apache.org/thrift.git/lib/go/thrift"] - -[[constraint]] - name = "github.com/paypal/gorealis" - version = ">=2.0.0" - -[[constraint]] - name = "github.com/spf13/cobra" - revision = "fe5e611709b0c57fa4a89136deaa8e1d4004d053" - -[[constraint]] - name = "github.com/spf13/viper" - revision = "62edee319679b6ceaec16de03b966102d2dea709" - -[[constraint]] - name = "git.apache.org/thrift.git" - branch = "0.12.0" diff --git a/README.md b/README.md index 9a4e92a..d2db695 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ # Australis -A light-weight client for [Apache Aurora](https://aurora.apache.org/) built using [gorealis](https://github.com/paypal/gorealis). +A light-weight client for [Aurora Scheduler](https://aurora-scheduler.github.io/) built using [gorealis](https://github.com/aurora-scheduler/gorealis). ## Usage See the [documentation](docs/australis.md) for more information. ## Status -Australis is a work in progress and does not support all the features of Apache Aurora. +Australis is a work in progress and does not support all the features of Aurora Scheduler. ### Build locally This project uses go mods. To build locally run: @@ -14,4 +14,4 @@ This project uses go mods. To build locally run: `$ go build -o australis main.go` ### Building debian package -From the inside of the deb-packaging folder, run [build_deb.sh](deb-packaging/build_deb.sh) \ No newline at end of file +From the inside of the deb-packaging folder, run [build_deb.sh](deb-packaging/build_deb.sh) diff --git a/cmd/create.go b/cmd/create.go index d78d724..daadc5a 100644 --- a/cmd/create.go +++ b/cmd/create.go @@ -20,7 +20,7 @@ import ( yaml "gopkg.in/yaml.v2" - realis "github.com/paypal/gorealis/v2" + realis "github.com/aurora-scheduler/gorealis/v2" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/fetch.go b/cmd/fetch.go index 0939d7a..de824d0 100644 --- a/cmd/fetch.go +++ b/cmd/fetch.go @@ -17,8 +17,8 @@ package cmd import ( "fmt" - realis "github.com/paypal/gorealis/v2" - "github.com/paypal/gorealis/v2/gen-go/apache/aurora" + realis "github.com/aurora-scheduler/gorealis/v2" + "github.com/aurora-scheduler/gorealis/v2/gen-go/apache/aurora" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cmd/kill.go b/cmd/kill.go index fc79c0d..3c3542b 100644 --- a/cmd/kill.go +++ b/cmd/kill.go @@ -15,7 +15,7 @@ package cmd import ( - realis "github.com/paypal/gorealis/v2" + realis "github.com/aurora-scheduler/gorealis/v2" "github.com/spf13/cobra" ) diff --git a/cmd/monitor.go b/cmd/monitor.go index d1c0016..aea4dc1 100644 --- a/cmd/monitor.go +++ b/cmd/monitor.go @@ -18,7 +18,7 @@ import ( "strings" "time" - "github.com/paypal/gorealis/v2/gen-go/apache/aurora" + "github.com/aurora-scheduler/gorealis/v2/gen-go/apache/aurora" "github.com/spf13/cobra" ) diff --git a/cmd/pulse.go b/cmd/pulse.go index 38db2b7..64af116 100644 --- a/cmd/pulse.go +++ b/cmd/pulse.go @@ -15,7 +15,7 @@ package cmd import ( - "github.com/paypal/gorealis/v2/gen-go/apache/aurora" + "github.com/aurora-scheduler/gorealis/v2/gen-go/apache/aurora" "github.com/spf13/cobra" ) diff --git a/cmd/restart.go b/cmd/restart.go index bb84e41..e5f8701 100644 --- a/cmd/restart.go +++ b/cmd/restart.go @@ -15,7 +15,7 @@ package cmd import ( - "github.com/paypal/gorealis/v2/gen-go/apache/aurora" + "github.com/aurora-scheduler/gorealis/v2/gen-go/apache/aurora" "github.com/spf13/cobra" ) diff --git a/cmd/resume.go b/cmd/resume.go index 2b43497..0d3a7e2 100644 --- a/cmd/resume.go +++ b/cmd/resume.go @@ -15,7 +15,7 @@ package cmd import ( - "github.com/paypal/gorealis/v2/gen-go/apache/aurora" + "github.com/aurora-scheduler/gorealis/v2/gen-go/apache/aurora" "github.com/spf13/cobra" ) diff --git a/cmd/rollback.go b/cmd/rollback.go index e1d67ab..3db2f5b 100644 --- a/cmd/rollback.go +++ b/cmd/rollback.go @@ -17,7 +17,7 @@ package cmd import ( "fmt" - "github.com/paypal/gorealis/v2/gen-go/apache/aurora" + "github.com/aurora-scheduler/gorealis/v2/gen-go/apache/aurora" "github.com/spf13/cobra" ) diff --git a/cmd/root.go b/cmd/root.go index 9347c0e..a2d233a 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -20,7 +20,7 @@ import ( "github.com/spf13/viper" - realis "github.com/paypal/gorealis/v2" + realis "github.com/aurora-scheduler/gorealis/v2" "github.com/spf13/cobra" "github.com/sirupsen/logrus" diff --git a/cmd/start.go b/cmd/start.go index a9dddf1..6e74db9 100644 --- a/cmd/start.go +++ b/cmd/start.go @@ -21,7 +21,7 @@ import ( "os" "time" - "github.com/paypal/gorealis/v2/gen-go/apache/aurora" + "github.com/aurora-scheduler/gorealis/v2/gen-go/apache/aurora" "github.com/spf13/cobra" ) diff --git a/cmd/stop.go b/cmd/stop.go index c170e1e..d2ec96c 100644 --- a/cmd/stop.go +++ b/cmd/stop.go @@ -17,7 +17,7 @@ package cmd import ( "time" - "github.com/paypal/gorealis/v2/gen-go/apache/aurora" + "github.com/aurora-scheduler/gorealis/v2/gen-go/apache/aurora" "github.com/spf13/cobra" ) diff --git a/cmd/util.go b/cmd/util.go index d728f03..fd041e0 100644 --- a/cmd/util.go +++ b/cmd/util.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - "github.com/paypal/gorealis/v2/gen-go/apache/aurora" + "github.com/aurora-scheduler/gorealis/v2/gen-go/apache/aurora" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/debian/changelog b/debian/changelog index e31a14c..95172ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ australis (0.1.1) unstable; urgency=medium - * Unreleased + * Removed support for building with dep + * Upgraded depdencies to their latest versions. + * gorealis v2 now lives in the aurora-scheduler organization and dependencies have been updated to reflect that. - -- Renan DelValle Mon, 10 Feb 2020 12:00:00 -0700 + -- Renan DelValle Mon, 19 Feb 2020 12:00:00 -0700 australis (0.1.0) unstable; urgency=medium diff --git a/debian/control b/debian/control index 7a00498..a5e5ab6 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Priority: optional Maintainer: Renan DelValle Section: utils Standards-Version: 4.2.1.3 -Homepage: https://github.com/rdelval/australis +Homepage: https://github.com/aurora-scheduler/australis Package: australis Architecture: any diff --git a/go.mod b/go.mod index 8e10a03..5f4f654 100644 --- a/go.mod +++ b/go.mod @@ -1,16 +1,15 @@ -module github.com/rdelval/australis +module github.com/aurora-scheduler/australis require ( - github.com/BurntSushi/toml v0.3.1 // indirect - github.com/cpuguy83/go-md2man v1.0.10 // indirect - github.com/inconshreveable/mousetrap v1.0.0 // indirect - github.com/paypal/gorealis/v2 v2.21.0 - github.com/pkg/errors v0.0.0-20171216070316-e881fd58d78e - github.com/sirupsen/logrus v1.2.0 - github.com/spf13/cobra v0.0.0-20180115160933-0c34d16c3123 - github.com/spf13/pflag v1.0.3 - github.com/spf13/viper v1.3.1 - gopkg.in/yaml.v2 v2.2.2 + github.com/aurora-scheduler/gorealis/v2 v2.21.4 + github.com/pkg/errors v0.9.1 + github.com/sirupsen/logrus v1.4.2 + github.com/spf13/cobra v0.0.5 + github.com/spf13/pflag v1.0.5 + github.com/spf13/viper v1.6.2 + gopkg.in/yaml.v2 v2.2.8 ) go 1.13 + +replace github.com/apache/thrift v0.12.0 => github.com/ridv/thrift v0.12.2 diff --git a/main.go b/main.go index 4913b0d..d32f2c4 100644 --- a/main.go +++ b/main.go @@ -15,7 +15,7 @@ package main import ( - "github.com/rdelval/australis/cmd" + "github.com/aurora-scheduler/australis/cmd" ) func main() {