Skip to content

Commit 76be143

Browse files
xchristensenxchristensen
authored
Merge pull request #1 from cbsinteractive/fix/module
import into mediacore
2 parents 9348934 + 4cb5bf5 commit 76be143

File tree

35 files changed

+265
-2713
lines changed

35 files changed

+265
-2713
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ On an AWS s3 instance, ccp downloaded a 1.5 TiB file in less than 10 minutes on
66
## Install
77

88
```
9-
go install github.com/as/ccp@latest
9+
go install github.com/cbsinteractive/mc-ccp@latest
1010
```
1111

1212
## Usage

‎accel.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"sync/atomic"
1212
"time"
1313

14-
"github.com/as/log"
14+
log "github.com/cbsinteractive/mc-log"
1515

1616
s3 "github.com/aws/aws-sdk-go/service/s3"
1717
)

‎fs.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"syscall"
2727
"time"
2828

29-
"github.com/as/log"
29+
log "github.com/cbsinteractive/mc-log"
3030
)
3131

3232
var (

‎fs_gs.go‎

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

1010
"cloud.google.com/go/storage"
11-
"github.com/as/log"
11+
log "github.com/cbsinteractive/mc-log"
1212
"google.golang.org/api/iterator"
1313
)
1414

‎fs_http.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"sync"
1212
"time"
1313

14-
"github.com/as/log"
14+
log "github.com/cbsinteractive/mc-log"
1515
)
1616

1717
type HTTP struct {

‎fs_s3.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,15 @@ import (
88
"net/http"
99
"os"
1010
"strings"
11-
12-
// "path"
1311
"sync/atomic"
1412
"time"
1513

16-
"github.com/as/log"
1714
"github.com/aws/aws-sdk-go/aws"
1815
"github.com/aws/aws-sdk-go/aws/session"
1916
s3 "github.com/aws/aws-sdk-go/service/s3"
2017
"github.com/aws/aws-sdk-go/service/s3/s3manager"
2118
s3m "github.com/aws/aws-sdk-go/service/s3/s3manager"
19+
log "github.com/cbsinteractive/mc-log"
2220
)
2321

2422
type S3 struct {

‎go.mod‎

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,31 @@
1-
module github.com/as/ccp
1+
module github.com/cbsinteractive/mc-ccp
22

3-
go 1.16
3+
go 1.21
44

55
require (
66
cloud.google.com/go/storage v1.19.0
7-
github.com/as/log v0.0.9
7+
github.com/cbsinteractive/mc-log v0.0.0-20250701145422-987218416d5c
88
github.com/aws/aws-sdk-go v1.40.32
99
google.golang.org/api v0.65.0
1010
)
11+
12+
require (
13+
cloud.google.com/go v0.100.2 // indirect
14+
cloud.google.com/go/compute v0.1.0 // indirect
15+
cloud.google.com/go/iam v0.1.1 // indirect
16+
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
17+
github.com/golang/protobuf v1.5.2 // indirect
18+
github.com/google/go-cmp v0.5.7 // indirect
19+
github.com/googleapis/gax-go/v2 v2.1.1 // indirect
20+
github.com/jmespath/go-jmespath v0.4.0 // indirect
21+
go.opencensus.io v0.23.0 // indirect
22+
golang.org/x/net v0.0.0-20210614182718-04defd469f4e // indirect
23+
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
24+
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
25+
golang.org/x/text v0.3.6 // indirect
26+
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
27+
google.golang.org/appengine v1.6.7 // indirect
28+
google.golang.org/genproto v0.0.0-20220118154757-00ab72f36ad5 // indirect
29+
google.golang.org/grpc v1.40.1 // indirect
30+
google.golang.org/protobuf v1.27.1 // indirect
31+
)

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
5757
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
5858
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
5959
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
60-
github.com/as/log v0.0.9 h1:7+odoHT3i106cfKnrjs6NBt+6xSJAnJBTGo8S2w8eKo=
61-
github.com/as/log v0.0.9/go.mod h1:urp1lQfFuIGmcdEH1A9W40ilVjhUj2MQCQLqNmwH0Dk=
60+
github.com/cbsinteractive/mc-log v0.0.0-20250701145422-987218416d5c h1:YECZIy82b++Muz9+wooG9Y+q0IlYfJTCTO0F9ZHXUwY=
61+
github.com/cbsinteractive/mc-log v0.0.0-20250701145422-987218416d5c/go.mod h1:kc1iU90xWFpAXey6ZdOJ+oC5psopzhp83HF8FonxA3M=
6262
github.com/aws/aws-sdk-go v1.40.32 h1:ok+9vnnqYWJXofYhaOtfP/bOt2reDqTA6ZAS00AO5pA=
6363
github.com/aws/aws-sdk-go v1.40.32/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q=
6464
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=

‎sniff.go‎

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

3-
import "github.com/as/log"
3+
import log "github.com/cbsinteractive/mc-log"
44

55
const (
66
kindUnknown = "application/octet-stream"

‎stat.go‎

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

10-
"github.com/as/log"
10+
log "github.com/cbsinteractive/mc-log"
1111
)
1212

1313
func init() {

0 commit comments

Comments
 (0)