Skip to content

Commit ac05868

Browse files
committed
all: remove license handling code
Signed-off-by: Jacob Howard <[email protected]>
1 parent e3205da commit ac05868

39 files changed

+10
-2617
lines changed

cmd/mutagen/daemon/run.go

-12
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,6 @@ func runMain(_ *cobra.Command, _ []string) error {
5151
}
5252
logger := logging.NewLogger(logLevel, os.Stderr)
5353

54-
// Initialize the licensing manager and defer its shutdown. This must be
55-
// done before creating forwarding and synchronization session managers
56-
// because those sessions may depend on a Mutagen Pro license. Both of these
57-
// operations are no-ops in non-SSPL builds.
58-
if err := initializeLicenseManager(logger.Sublogger("license")); err != nil {
59-
return fmt.Errorf("unable to initialize license manager: %w", err)
60-
}
61-
defer shutdownLicenseManager()
62-
6354
// Create a forwarding session manager and defer its shutdown.
6455
forwardingManager, err := forwarding.NewManager(logger.Sublogger("forward"))
6556
if err != nil {
@@ -87,9 +78,6 @@ func runMain(_ *cobra.Command, _ []string) error {
8778
defer daemonServer.Shutdown()
8879
daemonsvc.RegisterDaemonServer(server, daemonServer)
8980

90-
// Register the licensing service. This is a no-op in non-SSPL builds.
91-
registerLicensingService(server)
92-
9381
// Create and register the prompt server.
9482
promptingsvc.RegisterPromptingServer(server, promptingsvc.NewServer())
9583

cmd/mutagen/daemon/run_nosspl.go

-28
This file was deleted.

cmd/mutagen/daemon/run_sspl.go

-47
This file was deleted.

cmd/mutagen/main.go

-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ func init() {
8080
legalCommand,
8181
generateCommand,
8282
)
83-
registerLicenseCommand()
8483

8584
// Enable color output support for all commands in the hierarchy.
8685
rootCommand.SetOut(color.Output)

cmd/mutagen/main_nosspl.go

-7
This file was deleted.

cmd/mutagen/main_sspl.go

-13
This file was deleted.

go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ require (
88
github.com/dustin/go-humanize v1.0.1
99
github.com/eknkc/basex v1.0.1
1010
github.com/fatih/color v1.16.0
11-
github.com/golang-jwt/jwt/v4 v4.5.0
1211
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da
1312
github.com/google/uuid v1.4.0
1413
github.com/hectane/go-acl v0.0.0-20230122075934-ca0b05cb1adb

go.sum

-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8
3737
github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
3838
github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
3939
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
40-
github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=
41-
github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
4240
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
4341
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
4442
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=

pkg/mutagen/licenses_sspl.go

-12
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,6 @@ Vendored inside http://github.com/klauspost/compress.
2929
3030
Copyright (c) 2016 Caleb Spare
3131
32-
Used under the terms of the MIT License. A copy of this license can be found
33-
later in this text or online at https://opensource.org/licenses/MIT.
34-
35-
--------------------------------------------------------------------------------
36-
37-
jwt-go
38-
39-
https://github.com/golang-jwt/jwt
40-
41-
Copyright (c) 2012 Dave Grijalva
42-
Copyright (c) 2021 golang-jwt maintainers
43-
4432
Used under the terms of the MIT License. A copy of this license can be found
4533
later in this text or online at https://opensource.org/licenses/MIT.
4634
`

pkg/synchronization/compression/zstandard_sspl.go

+5
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ import (
1010
"github.com/mutagen-io/mutagen/sspl/pkg/compression/zstd"
1111
)
1212

13+
// zstandardSupportStatus returns Zstandard compression support status.
14+
func zstandardSupportStatus() AlgorithmSupportStatus {
15+
return AlgorithmSupportStatusSupported
16+
}
17+
1318
// compressZstandard implements compression for Zstandard streams.
1419
func compressZstandard(compressed io.Writer) stream.WriteFlushCloser {
1520
return zstd.NewCompressor(compressed)

pkg/synchronization/compression/zstandard_sspl_cli.go

-16
This file was deleted.

pkg/synchronization/compression/zstandard_sspl_other.go

-8
This file was deleted.

pkg/synchronization/hashing/xxh128_sspl.go

+5
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ import (
88
"github.com/mutagen-io/mutagen/sspl/pkg/hashing/xxh128"
99
)
1010

11+
// xxh128SupportStatus returns XXH128 hashing support status.
12+
func xxh128SupportStatus() AlgorithmSupportStatus {
13+
return AlgorithmSupportStatusSupported
14+
}
15+
1116
// newXXH128Factory creates a new hasher factory for XXH128 hashers.
1217
func newXXH128Factory() func() hash.Hash {
1318
return xxh128.New

pkg/synchronization/hashing/xxh128_sspl_cli.go

-16
This file was deleted.

pkg/synchronization/hashing/xxh128_sspl_other.go

-8
This file was deleted.

sspl/cmd/mutagen/license/activate.go

-94
This file was deleted.

0 commit comments

Comments
 (0)