Skip to content

Commit ee925e2

Browse files
integration: updated upstream with lucy
1 parent 116614b commit ee925e2

5 files changed

Lines changed: 12 additions & 85 deletions

File tree

internal/integration/lucy/artifact.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func (s *ArtifactService) Analyze(ctx context.Context, filePath string) ([]Artif
3434
result := make([]ArtifactInfo, len(infos))
3535
for i, info := range infos {
3636
result[i] = ArtifactInfo{
37-
Platform: string(info.Ref.Platform),
37+
Platform: string(info.Ref.Eco),
3838
Name: string(info.Ref.Name),
3939
Version: string(info.Version),
4040
}

internal/integration/lucy/install.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ func (s *InstallService) Install(ctx context.Context, req PackageRequest) error
4141
lucyReq := lucytypes.PackageRequest{
4242
FullPackageRef: lucytypes.FullPackageRef{
4343
PackageRef: lucytypes.PackageRef{
44-
Platform: lucytypes.PlatformId(req.Platform),
45-
Name: lucytypes.BarePackageName(req.Name),
44+
Eco: lucytypes.Ecosystem(req.Platform),
45+
Name: lucytypes.BarePackageName(req.Name),
4646
},
4747
Scope: lucytypes.ParseSource(req.Scope),
4848
Version: lucytypes.BareVersion(req.Version),
@@ -68,8 +68,8 @@ func (s *InstallService) InstallMany(ctx context.Context, requests []PackageRequ
6868
lucyReqs[i] = lucytypes.PackageRequest{
6969
FullPackageRef: lucytypes.FullPackageRef{
7070
PackageRef: lucytypes.PackageRef{
71-
Platform: lucytypes.PlatformId(req.Platform),
72-
Name: lucytypes.BarePackageName(req.Name),
71+
Eco: lucytypes.Ecosystem(req.Platform),
72+
Name: lucytypes.BarePackageName(req.Name),
7373
},
7474
Scope: lucytypes.ParseSource(req.Scope),
7575
Version: lucytypes.BareVersion(req.Version),
@@ -170,7 +170,7 @@ func NewProbeService(workDir string) *ProbeService {
170170

171171
// ServerInfo returns the current server environment information.
172172
func (s *ProbeService) ServerInfo() (map[string]interface{}, error) {
173-
info := lucyworkspace.ServerInfoAt(s.workDir)
173+
info := lucyworkspace.NewAt(s.workDir)
174174
ws := lucyworkspace.Workspace{
175175
Runtime: info.Runtime,
176176
Topology: info.Topology,
@@ -187,7 +187,7 @@ func (s *ProbeService) ServerInfo() (map[string]interface{}, error) {
187187

188188
// Invalidate marks the cached server info as stale.
189189
func (s *ProbeService) Invalidate() {
190-
lucyworkspace.InvalidateServerInfo()
190+
lucyworkspace.Invalidate()
191191
}
192192

193193
// LockIntegrityResult reports whether all locked packages are present and intact.

internal/integration/lucy/real_backend.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ func (b *LucyProjectBackend) Lock(ctx context.Context, spec EnvironmentSpec) (En
8686
}
8787
lucyRequests := lucyInstallRequests(requests)
8888
var installResult *lucyinstall.Result
89-
serverInfo := lucyworkspace.ServerInfoAt(b.serverDir)
89+
serverInfo := lucyworkspace.NewAt(b.serverDir)
9090
opts := lucyinstall.DefaultOptions()
91-
opts.ServerInfo = func() lucyworkspace.Workspace { return serverInfo }
91+
opts.Workspace = func() lucyworkspace.Workspace { return serverInfo }
9292
err := NewInstallService(b.workDir).withWorkDir(ctx, func() error {
9393
var installErr error
9494
installResult, installErr = lucyinstall.InstallMany(ctx, lucyRequests, opts)
@@ -277,8 +277,8 @@ func lucyInstallRequests(requests []PackageRequest) []lucytypes.PackageRequest {
277277
converted = append(converted, lucytypes.PackageRequest{
278278
FullPackageRef: lucytypes.FullPackageRef{
279279
PackageRef: lucytypes.PackageRef{
280-
Platform: lucytypes.PlatformId(req.Platform),
281-
Name: lucytypes.BarePackageName(req.Name),
280+
Eco: lucytypes.Ecosystem(req.Platform),
281+
Name: lucytypes.BarePackageName(req.Name),
282282
},
283283
Scope: lucytypes.ParseSource(req.Scope),
284284
Version: lucytypes.BareVersion(req.Version),

internal/integration/lucy/real_backend_test.go

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

tools/lucy

Submodule lucy updated 167 files

0 commit comments

Comments
 (0)