Skip to content

Commit ad5b214

Browse files
rafrombrcrafrombrc
committed
Switch all code.google.com dependencies to their github
equivalents.
1 parent b1f5f0e commit ad5b214

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+150
-132
lines changed

‎client/encoders.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,14 @@
1616
package client
1717

1818
import (
19-
"code.google.com/p/gogoprotobuf/proto"
2019
"crypto/hmac"
2120
"crypto/md5"
2221
"crypto/sha1"
2322
"fmt"
24-
"github.com/mozilla-services/heka/message"
2523
"hash"
24+
25+
"github.com/gogo/protobuf/proto"
26+
"github.com/mozilla-services/heka/message"
2627
)
2728

2829
type Encoder interface {

‎cmake/externals.cmake

+8-8
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,9 @@ git_clone(https://github.com/crankycoder/xmlpath 670b185b686fd11aa115291fb2f6dc3
155155
git_clone(https://github.com/thoj/go-ircevent 90dc7f966b95d133f1c65531c6959b52effd5e40)
156156
git_clone(https://github.com/cactus/gostrftime 4544856e3a415ff5668bb75fed36726240ea1f8d)
157157

158-
hg_clone(https://code.google.com/p/snappy-go default)
159-
git_clone(https://github.com/Shopify/sarama ab8518c05fd3775bdbf06c97d97389fe8af2dfef)
160-
add_dependencies(sarama snappy-go)
158+
git_clone(https://github.com/golang/snappy eaa750b9bf4dcb7cb20454be850613b66cda3273)
159+
git_clone(https://github.com/rafrombrc/sarama fda3e239249dd96f4a2c446aea39dfc823f4030a)
160+
add_dependencies(sarama snappy)
161161

162162
if (INCLUDE_GEOIP)
163163
add_external_plugin(git https://github.com/abh/geoip da130741c8ed2052f5f455d56e552f2e997e1ce9)
@@ -168,15 +168,15 @@ if (INCLUDE_DOCKER_PLUGINS)
168168
endif()
169169

170170
if (INCLUDE_MOZSVC)
171-
add_external_plugin(git https://github.com/mozilla-services/heka-mozsvc-plugins 848fc1f3aa858472150c7af5463661393d3c4f3b)
171+
add_external_plugin(git https://github.com/mozilla-services/heka-mozsvc-plugins 77f9b7ae9089e2bfa8f11d2250802860a9f9a1ab)
172172
git_clone(https://github.com/getsentry/raven-go 0cc1491d9d27b258a9b4f0238908cb0d51bd6c9b)
173173
add_dependencies(heka-mozsvc-plugins raven-go)
174174
endif()
175175

176-
hg_clone(https://code.google.com/p/go-uuid default)
177-
git_clone(https://code.google.com/p/gogoprotobuf 7008a93e68bf)
178-
add_custom_command(TARGET gogoprotobuf POST_BUILD
179-
COMMAND ${GO_EXECUTABLE} install code.google.com/p/gogoprotobuf/protoc-gen-gogo)
176+
git_clone(https://github.com/pborman/uuid ca53cad383cad2479bbba7f7a1a05797ec1386e4)
177+
git_clone(https://github.com/gogo/protobuf 7d21ffbc76b992157ec7057b69a1529735fbab21)
178+
add_custom_command(TARGET protobuf POST_BUILD
179+
COMMAND ${GO_EXECUTABLE} install github.com/gogo/protobuf/protoc-gen-gogo)
180180

181181
include(plugin_loader OPTIONAL)
182182

‎cmake/message_proto.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ if(NOT PROTOBUF_EXECUTABLE)
33
endif()
44

55
execute_process(
6-
COMMAND ${PROTOBUF_EXECUTABLE} --gogo_out=. -I=.:../build/heka/src/code.google.com/p/gogoprotobuf/gogoproto:../build/heka/src/code.google.com/p/gogoprotobuf/protobuf message.proto
6+
COMMAND ${PROTOBUF_EXECUTABLE} --gogo_out=. -I=.:../build/heka/src/github.com/gogo/protobuf/gogoproto:../build/heka/src/github.com/gogo/protobuf/protobuf message.proto
77
WORKING_DIRECTORY "${SRC_DIR}/message"
88
)

‎cmd/heka-cat/main.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,17 @@ protobuf logs.
2222
package main
2323

2424
import (
25-
"code.google.com/p/gogoprotobuf/proto"
2625
"encoding/json"
2726
"flag"
2827
"fmt"
29-
"github.com/mozilla-services/heka/message"
30-
"github.com/mozilla-services/heka/pipeline"
3128
"io"
3229
"math"
3330
"os"
3431
"time"
32+
33+
"github.com/gogo/protobuf/proto"
34+
"github.com/mozilla-services/heka/message"
35+
"github.com/mozilla-services/heka/pipeline"
3536
)
3637

3738
func makeSplitterRunner() (pipeline.SplitterRunner, error) {

‎cmd/heka-flood/main.go

+9-10
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,9 @@ package main
2727

2828
import (
2929
"bytes"
30-
"code.google.com/p/go-uuid/uuid"
31-
"code.google.com/p/gogoprotobuf/proto"
3230
"crypto/tls"
3331
"flag"
3432
"fmt"
35-
"github.com/bbangert/toml"
36-
"github.com/mozilla-services/heka/client"
37-
"github.com/mozilla-services/heka/message"
38-
"github.com/mozilla-services/heka/plugins/tcp"
3933
"io"
4034
"math"
4135
"math/rand"
@@ -45,6 +39,13 @@ import (
4539
"runtime/pprof"
4640
"syscall"
4741
"time"
42+
43+
"github.com/bbangert/toml"
44+
"github.com/gogo/protobuf/proto"
45+
"github.com/mozilla-services/heka/client"
46+
"github.com/mozilla-services/heka/message"
47+
"github.com/mozilla-services/heka/plugins/tcp"
48+
"github.com/pborman/uuid"
4849
)
4950

5051
type FloodTest struct {
@@ -272,7 +273,7 @@ func makeFixedMessage(encoder client.StreamEncoder, size uint64,
272273
return ma
273274
}
274275

275-
func createSender(test FloodTest)(sender *client.NetworkSender, err error) {
276+
func createSender(test FloodTest) (sender *client.NetworkSender, err error) {
276277
if test.UseTls {
277278
var goTlsConfig *tls.Config
278279
goTlsConfig, err = tcp.CreateGoTlsConfig(&test.Tls)
@@ -347,7 +348,7 @@ func main() {
347348
message.SetMaxMessageSize(test.MaxMessageSize)
348349
}
349350
if test.ReconnectInterval < 1 {
350-
test.ReconnectInterval = 5
351+
test.ReconnectInterval = 5
351352
}
352353

353354
retryIntervalDuration := time.Duration(test.ReconnectInterval) * time.Second
@@ -370,7 +371,6 @@ func main() {
370371
}
371372
}
372373

373-
374374
unsignedEncoder := client.NewProtobufEncoder(nil)
375375
signedEncoder := client.NewProtobufEncoder(&test.Signer)
376376
oversizedEncoder := &OversizedEncoder{}
@@ -414,7 +414,6 @@ func main() {
414414
test.SignedPercentage /= 100.0
415415
test.OversizedPercentage /= 100.0
416416

417-
418417
var buf []byte
419418
for gotsigint := false; !gotsigint; {
420419
runtime.Gosched()

‎cmd/heka-inject/main.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,13 @@ pipeline.
2424
package main
2525

2626
import (
27-
"code.google.com/p/go-uuid/uuid"
2827
"flag"
29-
"github.com/mozilla-services/heka/client"
30-
"github.com/mozilla-services/heka/message"
3128
"os"
3229
"time"
30+
31+
"github.com/mozilla-services/heka/client"
32+
"github.com/mozilla-services/heka/message"
33+
"github.com/pborman/uuid"
3334
)
3435

3536
type HekaClient struct {

‎cmd/heka-sbmgr/main.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,18 @@ Heka Sandbox Manager
2020
package main
2121

2222
import (
23-
"code.google.com/p/go-uuid/uuid"
2423
"crypto/tls"
2524
"flag"
25+
"io/ioutil"
26+
"os"
27+
"time"
28+
2629
"github.com/bbangert/toml"
2730
"github.com/mozilla-services/heka/client"
2831
"github.com/mozilla-services/heka/message"
2932
"github.com/mozilla-services/heka/pipeline"
3033
"github.com/mozilla-services/heka/plugins/tcp"
31-
"io/ioutil"
32-
"os"
33-
"time"
34+
"github.com/pborman/uuid"
3435
)
3536

3637
type SbmgrConfig struct {

‎cmd/heka-sbmgrload/main.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,18 @@ Heka Sandbox Manager Load Test
2020
package main
2121

2222
import (
23-
"code.google.com/p/go-uuid/uuid"
2423
"crypto/tls"
2524
"flag"
2625
"fmt"
26+
"os"
27+
"time"
28+
2729
"github.com/bbangert/toml"
2830
"github.com/mozilla-services/heka/client"
2931
"github.com/mozilla-services/heka/message"
3032
"github.com/mozilla-services/heka/pipeline"
3133
"github.com/mozilla-services/heka/plugins/tcp"
32-
"os"
33-
"time"
34+
"github.com/pborman/uuid"
3435
)
3536

3637
type SbmgrConfig struct {

‎message/all_specs_test.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@ package message
1616

1717
import (
1818
"bytes"
19-
"code.google.com/p/go-uuid/uuid"
20-
"github.com/rafrombrc/gospec/src/gospec"
21-
gs "github.com/rafrombrc/gospec/src/gospec"
2219
"os"
2320
"testing"
2421
"time"
22+
23+
"github.com/pborman/uuid"
24+
"github.com/rafrombrc/gospec/src/gospec"
25+
gs "github.com/rafrombrc/gospec/src/gospec"
2526
)
2627

2728
func TestAllSpecs(t *testing.T) {

‎message/message.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,10 @@ package message
2424

2525
import (
2626
"bytes"
27-
"code.google.com/p/gogoprotobuf/proto"
2827
"fmt"
2928
"reflect"
29+
30+
"github.com/gogo/protobuf/proto"
3031
)
3132

3233
const (

0 commit comments

Comments
 (0)