Skip to content

Commit 658cd41

Browse files
kristinapathakkristinapathak
authored
Merge pull request #416 from xmidt-org/imports
Fixed import paths
2 parents cac2a94 + 14949ac commit 658cd41

File tree

189 files changed

+357
-345
lines changed

Some content is hidden

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

189 files changed

+357
-345
lines changed

‎CHANGELOG.md

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
66

77
## [Unreleased]
88

9+
## [v1.2.0]
10+
- Added minVersion and maxVersion to `server` package.
11+
- Added cpuprofile and memprofile flags.
12+
- Updated import paths.
13+
914

1015
## [v1.1.0]
1116
- Added ability to check status code for retrying http request
@@ -22,7 +27,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
2227
- The first official release. We will be better about documenting changes
2328
moving forward.
2429

25-
[Unreleased]: https://github.com/Comcast/webpa-common/compare/v1.1.0...HEAD
26-
[v1.1.0]: https://github.com/Comcast/webpa-common/compare/v1.0.1...v1.1.0
27-
[v1.0.1]: https://github.com/Comcast/webpa-common/compare/v1.0.0...v1.0.1
28-
[v1.0.0]: https://github.com/Comcast/webpa-common/compare/v0.9.0-alpha...v1.0.0
30+
[Unreleased]: https://github.com/xmidt-org/webpa-common/compare/v1.2.0...HEAD
31+
[v1.2.0]: https://github.com/xmidt-org/webpa-common/compare/v1.1.0...v1.2.0
32+
[v1.1.0]: https://github.com/xmidt-org/webpa-common/compare/v1.0.1...v1.1.0
33+
[v1.0.1]: https://github.com/xmidt-org/webpa-common/compare/v1.0.0...v1.0.1
34+
[v1.0.0]: https://github.com/xmidt-org/webpa-common/compare/v0.9.0-alpha...v1.0.0

‎README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# webpa-common
22

3-
[![Build Status](https://travis-ci.org/Comcast/webpa-common.svg?branch=master)](https://travis-ci.org/Comcast/webpa-common)
4-
[![codecov.io](http://codecov.io/github/Comcast/webpa-common/coverage.svg?branch=master)](http://codecov.io/github/Comcast/webpa-common?branch=master)
5-
[![Go Report Card](https://goreportcard.com/badge/github.com/Comcast/webpa-common)](https://goreportcard.com/report/github.com/Comcast/webpa-common)
3+
[![Build Status](https://travis-ci.org/xmidt-org/webpa-common.svg?branch=master)](https://travis-ci.org/xmidt-org/webpa-common)
4+
[![codecov.io](http://codecov.io/github/xmidt-org/webpa-common/coverage.svg?branch=master)](http://codecov.io/github/xmidt-org/webpa-common?branch=master)
5+
[![Go Report Card](https://goreportcard.com/badge/github.com/xmidt-org/webpa-common)](https://goreportcard.com/report/github.com/xmidt-org/webpa-common)
66

77
## Environment Setup Instructions
88

@@ -18,11 +18,11 @@ export GOPATH=$newWorkSpace
1818
```
1919
**2)** Create necessary path
2020
```
21-
mkdir -p $GOPATH/github.com/Comcast
21+
mkdir -p $GOPATH/github.com/xmidt-org
2222
```
2323
**3)** Clone repo
2424
```
25-
cd $GOPATH/github.com/Comcast
25+
cd $GOPATH/github.com/xmidt-org
2626
git clone git@github.com:Comcast/webpa-common.git
2727
```
2828
**4)** Get Dependencies

‎basculechecks/basculechecks.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"regexp"
88
"strings"
99

10-
"github.com/Comcast/comcast-bascule/bascule"
10+
"github.com/xmidt-org/bascule"
1111
)
1212

1313
var (

‎basculechecks/basculechecks_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"errors"
66
"testing"
77

8-
"github.com/Comcast/comcast-bascule/bascule"
98
"github.com/stretchr/testify/assert"
9+
"github.com/xmidt-org/bascule"
1010
)
1111

1212
func TestValidCapabilityCheck(t *testing.T) {

‎basculechecks/metricListener.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package basculechecks
33
import (
44
"time"
55

6-
"github.com/Comcast/comcast-bascule/bascule"
7-
"github.com/Comcast/comcast-bascule/bascule/basculehttp"
86
"github.com/SermoDigital/jose/jwt"
7+
"github.com/xmidt-org/bascule"
8+
"github.com/xmidt-org/bascule/basculehttp"
99
)
1010

1111
type MetricListener struct {

‎basculechecks/metrics.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package basculechecks
22

33
import (
4-
"github.com/Comcast/webpa-common/xmetrics"
4+
"github.com/xmidt-org/webpa-common/xmetrics"
55
"github.com/go-kit/kit/metrics"
66
gokitprometheus "github.com/go-kit/kit/metrics/prometheus"
77
)

‎basculechecks/metrics_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package basculechecks
33
import (
44
"testing"
55

6-
"github.com/Comcast/webpa-common/xmetrics"
6+
"github.com/xmidt-org/webpa-common/xmetrics"
77
"github.com/stretchr/testify/assert"
88
)
99

‎bookkeeping/bookkeeper.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package bookkeeping
22

33
import (
44
"bytes"
5-
"github.com/Comcast/webpa-common/logging"
6-
"github.com/Comcast/webpa-common/xhttp/xcontext"
5+
"github.com/xmidt-org/webpa-common/logging"
6+
"github.com/xmidt-org/webpa-common/xhttp/xcontext"
77
"net/http"
88
"time"
99
)

‎bookkeeping/bookkeeper_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"net/http/httptest"
66
"testing"
77

8-
"github.com/Comcast/webpa-common/logging"
9-
"github.com/Comcast/webpa-common/logging/logginghttp"
10-
"github.com/Comcast/webpa-common/xhttp/xcontext"
8+
"github.com/xmidt-org/webpa-common/logging"
9+
"github.com/xmidt-org/webpa-common/logging/logginghttp"
10+
"github.com/xmidt-org/webpa-common/xhttp/xcontext"
1111
gokithttp "github.com/go-kit/kit/transport/http"
1212
"github.com/stretchr/testify/assert"
1313
"github.com/stretchr/testify/require"

‎bookkeeping/requestResponse.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package bookkeeping
22

33
import (
4-
"github.com/Comcast/webpa-common/xhttp"
4+
"github.com/xmidt-org/webpa-common/xhttp"
55
"io/ioutil"
66
"net/http"
77
"net/textproto"

‎capacitor/capacitor.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"sync/atomic"
66
"time"
77

8-
"github.com/Comcast/webpa-common/clock"
8+
"github.com/xmidt-org/webpa-common/clock"
99
)
1010

1111
// DefaultDelay is the default time a capacitor waits to execute the most recently

‎capacitor/capacitor_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"testing"
88
"time"
99

10-
"github.com/Comcast/webpa-common/clock/clocktest"
10+
"github.com/xmidt-org/webpa-common/clock/clocktest"
1111
"github.com/stretchr/testify/assert"
1212
"github.com/stretchr/testify/mock"
1313
"github.com/stretchr/testify/require"

‎capacitor/capacitortest/mock.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package capacitortest
22

33
import (
4-
"github.com/Comcast/webpa-common/capacitor"
4+
"github.com/xmidt-org/webpa-common/capacitor"
55
"github.com/stretchr/testify/mock"
66
)
77

‎clock/clocktest/mocks.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package clocktest
33
import (
44
"time"
55

6-
"github.com/Comcast/webpa-common/clock"
6+
"github.com/xmidt-org/webpa-common/clock"
77
"github.com/stretchr/testify/mock"
88
)
99

‎convey/convey.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"reflect"
88
"strings"
99

10-
"github.com/Comcast/webpa-common/wrp/wrpmeta"
10+
"github.com/xmidt-org/webpa-common/wrp/wrpmeta"
1111
"github.com/ugorji/go/codec"
1212
)
1313

‎convey/conveyhttp/header.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"errors"
55
"net/http"
66

7-
"github.com/Comcast/webpa-common/convey"
7+
"github.com/xmidt-org/webpa-common/convey"
88
)
99

1010
// DefaultHeaderName is the HTTP header assumed to contain Convey data when no header is supplied

‎convey/conveyhttp/header_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"net/http"
66
"testing"
77

8-
"github.com/Comcast/webpa-common/convey"
8+
"github.com/xmidt-org/webpa-common/convey"
99
"github.com/stretchr/testify/assert"
1010
"github.com/stretchr/testify/require"
1111
)

‎convey/conveymetric/metric.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package conveymetric
22

33
import (
4-
"github.com/Comcast/webpa-common/convey"
4+
"github.com/xmidt-org/webpa-common/convey"
55
"github.com/go-kit/kit/metrics"
66
)
77

‎convey/conveymetric/metric_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package conveymetric
22

33
import (
4-
"github.com/Comcast/webpa-common/convey"
5-
"github.com/Comcast/webpa-common/xmetrics"
6-
"github.com/Comcast/webpa-common/xmetrics/xmetricstest"
4+
"github.com/xmidt-org/webpa-common/convey"
5+
"github.com/xmidt-org/webpa-common/xmetrics"
6+
"github.com/xmidt-org/webpa-common/xmetrics/xmetricstest"
77
"testing"
88

99
"github.com/stretchr/testify/assert"

‎device/connection.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"io"
55
"time"
66

7-
"github.com/Comcast/webpa-common/xmetrics"
7+
"github.com/xmidt-org/webpa-common/xmetrics"
88
"github.com/gorilla/websocket"
99
)
1010

‎device/connection_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"testing"
66
"time"
77

8-
"github.com/Comcast/webpa-common/xmetrics"
8+
"github.com/xmidt-org/webpa-common/xmetrics"
99
"github.com/go-kit/kit/metrics/generic"
1010
"github.com/gorilla/websocket"
1111
"github.com/stretchr/testify/assert"

‎device/device.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import (
77
"sync/atomic"
88
"time"
99

10-
"github.com/Comcast/webpa-common/convey"
11-
"github.com/Comcast/webpa-common/convey/conveymetric"
12-
"github.com/Comcast/webpa-common/secure"
10+
"github.com/xmidt-org/webpa-common/convey"
11+
"github.com/xmidt-org/webpa-common/convey/conveymetric"
12+
"github.com/xmidt-org/webpa-common/secure"
1313

14-
"github.com/Comcast/webpa-common/logging"
14+
"github.com/xmidt-org/webpa-common/logging"
1515
"github.com/go-kit/kit/log"
1616
)
1717

‎device/device_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"testing"
77
"time"
88

9-
"github.com/Comcast/webpa-common/logging"
10-
"github.com/Comcast/webpa-common/wrp"
9+
"github.com/xmidt-org/webpa-common/logging"
10+
"github.com/xmidt-org/webpa-common/wrp"
1111
"github.com/stretchr/testify/assert"
1212
"github.com/stretchr/testify/require"
1313
)

‎device/devicehealth/health.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package devicehealth
22

33
import (
4-
"github.com/Comcast/webpa-common/device"
5-
"github.com/Comcast/webpa-common/health"
4+
"github.com/xmidt-org/webpa-common/device"
5+
"github.com/xmidt-org/webpa-common/health"
66
)
77

88
const (

‎device/devicehealth/health_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package devicehealth
33
import (
44
"testing"
55

6-
"github.com/Comcast/webpa-common/device"
7-
"github.com/Comcast/webpa-common/health"
6+
"github.com/xmidt-org/webpa-common/device"
7+
"github.com/xmidt-org/webpa-common/health"
88
"github.com/stretchr/testify/assert"
99
"github.com/stretchr/testify/mock"
1010
)

‎device/devicehealth/mocks_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package devicehealth
22

33
import (
4-
"github.com/Comcast/webpa-common/health"
4+
"github.com/xmidt-org/webpa-common/health"
55
"github.com/stretchr/testify/mock"
66
)
77

‎device/drain/drainer.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010
"github.com/go-kit/kit/log/level"
1111
"github.com/go-kit/kit/metrics/discard"
1212

13-
"github.com/Comcast/webpa-common/device"
14-
"github.com/Comcast/webpa-common/logging"
15-
"github.com/Comcast/webpa-common/xmetrics"
13+
"github.com/xmidt-org/webpa-common/device"
14+
"github.com/xmidt-org/webpa-common/logging"
15+
"github.com/xmidt-org/webpa-common/xmetrics"
1616
)
1717

1818
var (

‎device/drain/drainer_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"testing"
77
"time"
88

9-
"github.com/Comcast/webpa-common/logging"
10-
"github.com/Comcast/webpa-common/xmetrics/xmetricstest"
9+
"github.com/xmidt-org/webpa-common/logging"
10+
"github.com/xmidt-org/webpa-common/xmetrics/xmetricstest"
1111
"github.com/stretchr/testify/assert"
1212
"github.com/stretchr/testify/require"
1313
)

‎device/drain/mocks_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"net/http"
55
"sync"
66

7-
"github.com/Comcast/webpa-common/device"
7+
"github.com/xmidt-org/webpa-common/device"
88
"github.com/stretchr/testify/assert"
99
"github.com/stretchr/testify/mock"
1010
)

‎device/drain/start.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"net/http"
66
"time"
77

8-
"github.com/Comcast/webpa-common/logging"
9-
"github.com/Comcast/webpa-common/xhttp"
10-
"github.com/Comcast/webpa-common/xhttp/converter"
8+
"github.com/xmidt-org/webpa-common/logging"
9+
"github.com/xmidt-org/webpa-common/xhttp"
10+
"github.com/xmidt-org/webpa-common/xhttp/converter"
1111
"github.com/go-kit/kit/log/level"
1212
"github.com/gorilla/schema"
1313
)

‎device/drain/start_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"testing"
99
"time"
1010

11-
"github.com/Comcast/webpa-common/logging"
11+
"github.com/xmidt-org/webpa-common/logging"
1212
"github.com/stretchr/testify/assert"
1313
)
1414

‎device/drain/status.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"encoding/json"
55
"net/http"
66

7-
"github.com/Comcast/webpa-common/xhttp"
7+
"github.com/xmidt-org/webpa-common/xhttp"
88
)
99

1010
// Status returns a JSON message describing the status of the drain job

‎device/drain/tracker.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"sync/atomic"
55
"time"
66

7-
"github.com/Comcast/webpa-common/xmetrics"
7+
"github.com/xmidt-org/webpa-common/xmetrics"
88
)
99

1010
// Progress represents a snapshot of what a drain job has done so far.

‎device/handlers.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88
"sync"
99
"time"
1010

11-
"github.com/Comcast/webpa-common/logging"
12-
"github.com/Comcast/webpa-common/wrp"
13-
"github.com/Comcast/webpa-common/xhttp"
11+
"github.com/xmidt-org/webpa-common/logging"
12+
"github.com/xmidt-org/webpa-common/wrp"
13+
"github.com/xmidt-org/webpa-common/xhttp"
1414
"github.com/go-kit/kit/log"
1515
"github.com/go-kit/kit/log/level"
1616
"github.com/gorilla/mux"

‎device/handlers_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
"testing"
1212
"time"
1313

14-
"github.com/Comcast/webpa-common/logging"
15-
"github.com/Comcast/webpa-common/wrp"
14+
"github.com/xmidt-org/webpa-common/logging"
15+
"github.com/xmidt-org/webpa-common/wrp"
1616
"github.com/gorilla/mux"
1717
"github.com/justinas/alice"
1818
"github.com/stretchr/testify/assert"

‎device/listener.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package device
22

33
import (
4-
"github.com/Comcast/webpa-common/wrp"
4+
"github.com/xmidt-org/webpa-common/wrp"
55
)
66

77
// EventType is the type of device-related event

0 commit comments

Comments
 (0)