Skip to content

Commit 2177f95

Browse files
authored
revert: "feat: add distribution API (#92)" (runfinch#110)
This reverts commit 0e413d7. Signed-off-by: Swagat Bora <[email protected]>
1 parent 9905569 commit 2177f95

File tree

15 files changed

+109
-1161
lines changed

15 files changed

+109
-1161
lines changed

api/handlers/distribution/distribution.go

Lines changed: 0 additions & 77 deletions
This file was deleted.

api/handlers/distribution/distribution_test.go

Lines changed: 0 additions & 122 deletions
This file was deleted.

api/router/router.go

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717

1818
"github.com/runfinch/finch-daemon/api/handlers/builder"
1919
"github.com/runfinch/finch-daemon/api/handlers/container"
20-
"github.com/runfinch/finch-daemon/api/handlers/distribution"
2120
"github.com/runfinch/finch-daemon/api/handlers/exec"
2221
"github.com/runfinch/finch-daemon/api/handlers/image"
2322
"github.com/runfinch/finch-daemon/api/handlers/network"
@@ -32,15 +31,14 @@ import (
3231

3332
// Options defines the router options to be passed into the handlers.
3433
type Options struct {
35-
Config *config.Config
36-
ContainerService container.Service
37-
ImageService image.Service
38-
NetworkService network.Service
39-
SystemService system.Service
40-
BuilderService builder.Service
41-
VolumeService volume.Service
42-
ExecService exec.Service
43-
DistributionService distribution.Service
34+
Config *config.Config
35+
ContainerService container.Service
36+
ImageService image.Service
37+
NetworkService network.Service
38+
SystemService system.Service
39+
BuilderService builder.Service
40+
VolumeService volume.Service
41+
ExecService exec.Service
4442

4543
// NerdctlWrapper wraps the interactions with nerdctl to build
4644
NerdctlWrapper *backend.NerdctlWrapper
@@ -61,7 +59,6 @@ func New(opts *Options) http.Handler {
6159
builder.RegisterHandlers(vr, opts.BuilderService, opts.Config, logger, opts.NerdctlWrapper)
6260
volume.RegisterHandlers(vr, opts.VolumeService, opts.Config, logger)
6361
exec.RegisterHandlers(vr, opts.ExecService, opts.Config, logger)
64-
distribution.RegisterHandlers(vr, opts.DistributionService, opts.Config, logger)
6562
return ghandlers.LoggingHandler(os.Stderr, r)
6663
}
6764

cmd/finch-daemon/router_utils.go

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717
"github.com/runfinch/finch-daemon/internal/backend"
1818
"github.com/runfinch/finch-daemon/internal/service/builder"
1919
"github.com/runfinch/finch-daemon/internal/service/container"
20-
"github.com/runfinch/finch-daemon/internal/service/distribution"
2120
"github.com/runfinch/finch-daemon/internal/service/exec"
2221
"github.com/runfinch/finch-daemon/internal/service/image"
2322
"github.com/runfinch/finch-daemon/internal/service/network"
@@ -102,15 +101,14 @@ func createRouterOptions(
102101
tarExtractor := archive.NewTarExtractor(ecc.NewExecCmdCreator(), logger)
103102

104103
return &router.Options{
105-
Config: conf,
106-
ContainerService: container.NewService(clientWrapper, ncWrapper, logger, fs, tarCreator, tarExtractor),
107-
ImageService: image.NewService(clientWrapper, ncWrapper, logger),
108-
NetworkService: network.NewService(clientWrapper, ncWrapper, logger),
109-
SystemService: system.NewService(clientWrapper, ncWrapper, logger),
110-
BuilderService: builder.NewService(clientWrapper, ncWrapper, logger, tarExtractor),
111-
VolumeService: volume.NewService(ncWrapper, logger),
112-
ExecService: exec.NewService(clientWrapper, logger),
113-
DistributionService: distribution.NewService(clientWrapper, ncWrapper, logger),
114-
NerdctlWrapper: ncWrapper,
104+
Config: conf,
105+
ContainerService: container.NewService(clientWrapper, ncWrapper, logger, fs, tarCreator, tarExtractor),
106+
ImageService: image.NewService(clientWrapper, ncWrapper, logger),
107+
NetworkService: network.NewService(clientWrapper, ncWrapper, logger),
108+
SystemService: system.NewService(clientWrapper, ncWrapper, logger),
109+
BuilderService: builder.NewService(clientWrapper, ncWrapper, logger, tarExtractor),
110+
VolumeService: volume.NewService(ncWrapper, logger),
111+
ExecService: exec.NewService(clientWrapper, logger),
112+
NerdctlWrapper: ncWrapper,
115113
}
116114
}

0 commit comments

Comments
 (0)