Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

module cleanup #255

Merged
merged 4 commits into from
Apr 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions cmd/longtail/go.mod
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
module github.com/DanEngelbrecht/golongtail/cmd/longtail

go 1.21

toolchain go1.22.0
go 1.22.0

require (
github.com/DanEngelbrecht/golongtail/commands v0.0.0-00010101000000-000000000000
github.com/DanEngelbrecht/golongtail/longtaillib v0.0.0-00010101000000-000000000000
github.com/DanEngelbrecht/golongtail/longtailutils v0.0.0-00010101000000-000000000000
github.com/DanEngelbrecht/golongtail/commands v0.0.0
github.com/DanEngelbrecht/golongtail/longtaillib v0.0.0
github.com/DanEngelbrecht/golongtail/longtailutils v0.0.0
github.com/alecthomas/kong v0.9.0
github.com/sirupsen/logrus v1.9.3
)
Expand All @@ -18,8 +16,8 @@ require (
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/iam v1.1.7 // indirect
cloud.google.com/go/storage v1.40.0 // indirect
github.com/DanEngelbrecht/golongtail/longtailstorelib v0.0.0-20240310103413-f8a9c5526cf0 // indirect
github.com/DanEngelbrecht/golongtail/remotestore v0.0.0-20240310103413-f8a9c5526cf0 // indirect
github.com/DanEngelbrecht/golongtail/longtailstorelib v0.0.0 // indirect
github.com/DanEngelbrecht/golongtail/remotestore v0.0.0 // indirect
github.com/aws/aws-sdk-go-v2 v1.26.1 // indirect
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2 // indirect
github.com/aws/aws-sdk-go-v2/config v1.27.11 // indirect
Expand Down
1 change: 0 additions & 1 deletion commands/cmd_clonestore.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import (
"github.com/DanEngelbrecht/golongtail/longtailutils"
"github.com/DanEngelbrecht/golongtail/remotestore"
"github.com/pkg/errors"

"github.com/sirupsen/logrus"
)

Expand Down
1 change: 0 additions & 1 deletion commands/cmd_clonestore_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (

"github.com/DanEngelbrecht/golongtail/longtailstorelib"
"github.com/DanEngelbrecht/golongtail/longtailutils"

"github.com/pkg/errors"
)

Expand Down
1 change: 0 additions & 1 deletion commands/cmd_pack.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
"github.com/DanEngelbrecht/golongtail/longtailstorelib"
"github.com/DanEngelbrecht/golongtail/longtailutils"
"github.com/pkg/errors"

"github.com/sirupsen/logrus"
)

Expand Down
1 change: 0 additions & 1 deletion commands/cmd_upsync.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (
"github.com/DanEngelbrecht/golongtail/longtailutils"
"github.com/DanEngelbrecht/golongtail/remotestore"
"github.com/pkg/errors"

"github.com/sirupsen/logrus"
)

Expand Down
12 changes: 5 additions & 7 deletions commands/go.mod
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
module github.com/DanEngelbrecht/golongtail/commands

go 1.21

toolchain go1.22.0
go 1.22.0

require (
github.com/DanEngelbrecht/golongtail/longtaillib v0.0.0-00010101000000-000000000000
github.com/DanEngelbrecht/golongtail/longtailstorelib v0.0.0-00010101000000-000000000000
github.com/DanEngelbrecht/golongtail/longtailutils v0.0.0-00010101000000-000000000000
github.com/DanEngelbrecht/golongtail/remotestore v0.0.0-00010101000000-000000000000
github.com/DanEngelbrecht/golongtail/longtaillib v0.0.0
github.com/DanEngelbrecht/golongtail/longtailstorelib v0.0.0
github.com/DanEngelbrecht/golongtail/longtailutils v0.0.0
github.com/DanEngelbrecht/golongtail/remotestore v0.0.0
github.com/alecthomas/kong v0.9.0
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.9.3
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module github.com/DanEngelbrecht/golongtail

go 1.19
go 1.22.0
Empty file added go.sum
Empty file.
10 changes: 10 additions & 0 deletions go.work
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
go 1.22.0

use (
./cmd/longtail
./commands
./longtaillib
./longtailstorelib
./longtailutils
./remotestore
)
171 changes: 163 additions & 8 deletions go.work.sum

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion longtaillib/go.mod
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
module github.com/DanEngelbrecht/golongtail/longtaillib

go 1.19
go 1.22.0

require github.com/pkg/errors v0.9.1

retract v0.0.22
3 changes: 1 addition & 2 deletions longtailstorelib/fsstore_test.go
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
package longtailstorelib

import (
"context"
"fmt"
"io/ioutil"
"strings"
"sync"
"testing"

"golang.org/x/net/context"

"github.com/DanEngelbrecht/golongtail/longtaillib"
)

Expand Down
1 change: 1 addition & 0 deletions longtailstorelib/fsstore_unix_amd64.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build aix || darwin || dragonfly || freebsd || (js && wasm) || linux || nacl || netbsd || openbsd || solaris
// +build aix darwin dragonfly freebsd js,wasm linux nacl netbsd openbsd solaris

package longtailstorelib
Expand Down
1 change: 1 addition & 0 deletions longtailstorelib/fsstore_unix_arm64.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build aix || darwin || dragonfly || freebsd || (js && wasm) || linux || nacl || netbsd || openbsd || solaris
// +build aix darwin dragonfly freebsd js,wasm linux nacl netbsd openbsd solaris

package longtailstorelib
Expand Down
3 changes: 1 addition & 2 deletions longtailstorelib/gcsBlobStore_test.go
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
package longtailstorelib

import (
"context"
"fmt"
"net/url"
"strings"
"sync"
"testing"

"golang.org/x/net/context"

"github.com/DanEngelbrecht/golongtail/longtaillib"
)

Expand Down
8 changes: 3 additions & 5 deletions longtailstorelib/go.mod
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
module github.com/DanEngelbrecht/golongtail/longtailstorelib

go 1.21

toolchain go1.22.0
go 1.22.0

require (
cloud.google.com/go/storage v1.40.0
github.com/DanEngelbrecht/golongtail/longtaillib v0.0.0-00010101000000-000000000000
github.com/DanEngelbrecht/golongtail/longtaillib v0.0.0
github.com/aws/aws-sdk-go-v2 v1.26.1
github.com/aws/aws-sdk-go-v2/config v1.27.11
github.com/aws/aws-sdk-go-v2/service/s3 v1.53.1
github.com/pkg/errors v0.9.1
golang.org/x/net v0.24.0
google.golang.org/api v0.172.0
)

Expand Down Expand Up @@ -51,6 +48,7 @@ require (
go.opentelemetry.io/otel/metric v1.25.0 // indirect
go.opentelemetry.io/otel/trace v1.25.0 // indirect
golang.org/x/crypto v0.22.0 // indirect
golang.org/x/net v0.24.0 // indirect
golang.org/x/oauth2 v0.19.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.19.0 // indirect
Expand Down
3 changes: 1 addition & 2 deletions longtailstorelib/s3Store_test.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
package longtailstorelib

import (
"context"
"net/url"
"testing"

"golang.org/x/net/context"

"github.com/DanEngelbrecht/golongtail/longtaillib"
)

Expand Down
8 changes: 3 additions & 5 deletions longtailutils/go.mod
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
module github.com/DanEngelbrecht/golongtail/longtailutils

go 1.21

toolchain go1.22.0
go 1.22.0

require (
github.com/DanEngelbrecht/golongtail/longtaillib v0.0.0-00010101000000-000000000000
github.com/DanEngelbrecht/golongtail/longtailstorelib v0.0.0-00010101000000-000000000000
github.com/DanEngelbrecht/golongtail/longtaillib v0.0.0
github.com/DanEngelbrecht/golongtail/longtailstorelib v0.0.0
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.9.3
)
Expand Down
1 change: 0 additions & 1 deletion longtailutils/longtailutils.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
"github.com/DanEngelbrecht/golongtail/longtaillib"
"github.com/DanEngelbrecht/golongtail/longtailstorelib"
"github.com/pkg/errors"

"github.com/sirupsen/logrus"
)

Expand Down
1 change: 0 additions & 1 deletion longtailutils/pathfilter.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (

"github.com/DanEngelbrecht/golongtail/longtaillib"
"github.com/pkg/errors"

log "github.com/sirupsen/logrus"
)

Expand Down
10 changes: 4 additions & 6 deletions remotestore/go.mod
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
module github.com/DanEngelbrecht/golongtail/remotestore

go 1.21

toolchain go1.22.0
go 1.22.0

require (
github.com/DanEngelbrecht/golongtail/longtaillib v0.0.0-00010101000000-000000000000
github.com/DanEngelbrecht/golongtail/longtailstorelib v0.0.0-00010101000000-000000000000
github.com/DanEngelbrecht/golongtail/longtailutils v0.0.0-00010101000000-000000000000
github.com/DanEngelbrecht/golongtail/longtaillib v0.0.0
github.com/DanEngelbrecht/golongtail/longtailstorelib v0.0.0
github.com/DanEngelbrecht/golongtail/longtailutils v0.0.0
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.9.3
)
Expand Down
Loading