From 5ae80f2e32884a2b7fb1ecc6565bbb2b731385cf Mon Sep 17 00:00:00 2001 From: Renan DelValle Date: Wed, 13 Dec 2017 17:39:13 -0800 Subject: [PATCH] * Adding a Pull request template to serve as a reminder of what to do before creating the pull request. * Updating our thrift API to match changes made by Aurora. * Update go bindings to match update thrift API. --- .auroraversion | 2 +- .github/PULL_REQUEST_TEMPLATE.md | 8 ++++++++ realis.go | 6 +++--- 3 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.auroraversion b/.auroraversion index d183d4a..3f46c4d 100644 --- a/.auroraversion +++ b/.auroraversion @@ -1 +1 @@ -0.16.0 \ No newline at end of file +0.19.0 \ No newline at end of file diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..f8a9474 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,8 @@ +Before submitting, please make sure you run a vagrant box running Aurora with the latest version shown in .auroraversion +and run go test from the project root. + +* Have you run goformat on the project before submitting? + +* Have you run go test on the project before submitting? Do all tests pass? + +* Does the Pull Request require a test to be added to the end to end tests? If so, has it been added? \ No newline at end of file diff --git a/realis.go b/realis.go index d9177b6..5bf4436 100644 --- a/realis.go +++ b/realis.go @@ -267,7 +267,7 @@ func NewRealisClient(options ...ClientOption) (Realis, error) { config.protoFactory = thrift.NewTBinaryProtocolFactoryDefault() } - config.logger.Printf("gorealis config url: %+v\n", config.url) + config.logger.Printf("gorealis config url: %+v\n", url) //Basic Authentication. if config.username != "" && config.password != "" { @@ -579,7 +579,7 @@ func (r *realisClient) KillInstances(key *aurora.JobKey, instances ...int32) (*a retryErr := ExponentialBackoff(*r.config.backoff, func() (bool, error) { resp, clientErr = CheckAndRetryConn(r, func() (*aurora.Response, error) { - return r.client.KillTasks(key, instanceIds) + return r.client.KillTasks(key, instanceIds, "") }) if clientErr != nil && clientErr.Error() == RetryConnErr.Error() { return false, nil @@ -614,7 +614,7 @@ func (r *realisClient) KillJob(key *aurora.JobKey) (*aurora.Response, error) { if len(instanceIds) > 0 { retryErr := ExponentialBackoff(*r.config.backoff, func() (bool, error) { resp, clientErr = CheckAndRetryConn(r, func() (*aurora.Response, error) { - return r.client.KillTasks(key, instanceIds) + return r.client.KillTasks(key, instanceIds, "") }) if clientErr != nil && clientErr.Error() == RetryConnErr.Error() { return false, nil