Skip to content

Commit 1c327cb

Browse files
authored
chore: bump dep version, check dep monthly (#1992)
* chore: bump dep version, check dep monthly Signed-off-by: Keming <kemingyang@tensorchord.ai> * fix lint Signed-off-by: Keming <kemingyang@tensorchord.ai> --------- Signed-off-by: Keming <kemingyang@tensorchord.ai>
1 parent 207c30e commit 1c327cb

File tree

10 files changed

+449
-367
lines changed

10 files changed

+449
-367
lines changed

.github/dependabot.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,9 @@ updates:
33
- package-ecosystem: "gomod"
44
directory: "/"
55
schedule:
6-
interval: "weekly"
7-
day: "monday"
8-
time: "10:00"
9-
timezone: "Asia/Shanghai"
10-
open-pull-requests-limit: 5
6+
interval: "monthly"
117

128
- package-ecosystem: "github-actions"
139
directory: "/"
1410
schedule:
15-
interval: "weekly"
16-
day: "monday"
17-
time: "10:00"
18-
timezone: "Asia/Shanghai"
19-
open-pull-requests-limit: 5
11+
interval: "monthly"

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
with:
7070
python-version: '3.11'
7171
- name: Build wheels
72-
uses: pypa/cibuildwheel@v2.22.0
72+
uses: pypa/cibuildwheel@v2.23.0
7373
env:
7474
CIBW_ARCHS_MACOS: arm64, x86_64
7575
CIBW_ARCHS_LINUX: auto64

go.mod

Lines changed: 128 additions & 105 deletions
Large diffs are not rendered by default.

go.sum

Lines changed: 280 additions & 236 deletions
Large diffs are not rendered by default.

pkg/builder/build.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,14 @@ func (b generalBuilder) build(ctx context.Context, pw progresswriter.Writer) err
238238
for _, entry := range b.entries {
239239
// Set up docker config auth.
240240
dockerConfig := config.LoadDefaultConfigFile(os.Stderr)
241-
attachable := []session.Attachable{authprovider.NewDockerAuthProvider(dockerConfig, map[string]*authprovider.AuthTLSConfig{})}
241+
attachable := []session.Attachable{
242+
authprovider.NewDockerAuthProvider(
243+
authprovider.DockerAuthProviderConfig{
244+
ConfigFile: dockerConfig,
245+
TLSConfigs: map[string]*authprovider.AuthTLSConfig{},
246+
},
247+
),
248+
}
242249
b.logger.WithFields(logrus.Fields{
243250
"type": entry.Type,
244251
}).Debug("build image with buildkit")

pkg/driver/docker/docker.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
package docker
1616

1717
import (
18+
"bytes"
1819
"context"
1920
"encoding/base64"
2021
"encoding/json"
@@ -267,7 +268,8 @@ func (c dockerClient) StartBuildkitd(ctx context.Context, tag, name string, bc *
267268
"buildkit-config": bc,
268269
})
269270
logger.Debug("starting buildkitd")
270-
if _, _, err := c.ImageInspectWithRaw(ctx, tag); err != nil {
271+
var buf bytes.Buffer
272+
if _, err := c.ImageInspect(ctx, tag, client.ImageInspectWithRawResponse(&buf)); err != nil {
271273
if !client.IsErrNotFound(err) {
272274
return "", errors.Wrap(err, "failed to inspect image")
273275
}
@@ -386,7 +388,7 @@ func (c dockerClient) GetStatus(ctx context.Context, cname string) (containerTyp
386388
// Load loads the docker image from the reader into the docker host.
387389
// It's up to the caller to close the io.ReadCloser.
388390
func (c dockerClient) Load(ctx context.Context, r io.ReadCloser, quiet bool) error {
389-
resp, err := c.ImageLoad(ctx, r, quiet)
391+
resp, err := c.ImageLoad(ctx, r, client.ImageLoadWithQuiet(quiet))
390392
if err != nil {
391393
return err
392394
}

pkg/driver/nerdctl/nerdctl.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"time"
2525

2626
"github.com/cockroachdb/errors"
27-
"github.com/docker/docker/api/types"
27+
"github.com/docker/docker/api/types/container"
2828
dockerimage "github.com/docker/docker/api/types/image"
2929
"github.com/sirupsen/logrus"
3030

@@ -287,14 +287,14 @@ func (nc *nerdctlClient) containerExists(ctx context.Context, tag string) (bool,
287287
return err == nil, err
288288
}
289289

290-
func (nc *nerdctlClient) containerInspect(ctx context.Context, tag string) (*types.ContainerJSON, error) {
290+
func (nc *nerdctlClient) containerInspect(ctx context.Context, tag string) (*container.InspectResponse, error) {
291291
out, err := nc.exec(ctx, "inspect", tag)
292292
if err != nil {
293293
// TODO(kweizh): check not found
294294
return nil, err
295295
}
296296

297-
cs := []types.ContainerJSON{}
297+
cs := []container.InspectResponse{}
298298
err = json.Unmarshal([]byte(out), &cs)
299299
if err != nil {
300300
logrus.WithError(err).Error(cs)

pkg/lang/frontend/starlark/v1/interpreter.go

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626
"github.com/cockroachdb/errors"
2727
"github.com/sirupsen/logrus"
2828
"go.starlark.net/starlark"
29+
"go.starlark.net/syntax"
2930

3031
interp "github.com/tensorchord/envd/pkg/lang/frontend/starlark"
3132
"github.com/tensorchord/envd/pkg/lang/frontend/starlark/v1/config"
@@ -42,6 +43,19 @@ type entry struct {
4243
err error
4344
}
4445

46+
func envdStarlarkResolveOptions() *syntax.FileOptions {
47+
return &syntax.FileOptions{
48+
// resolver
49+
Set: false,
50+
While: false,
51+
TopLevelControl: false,
52+
GlobalReassign: false,
53+
LoadBindsGlobally: false,
54+
// compiler
55+
Recursion: true,
56+
}
57+
}
58+
4559
// generalInterpreter is the interpreter implementation for Starlark.
4660
// Please refer to https://github.com/google/starlark-go
4761
type generalInterpreter struct {
@@ -104,7 +118,7 @@ func (s *generalInterpreter) exec(thread *starlark.Thread, module string) (starl
104118

105119
if !strings.HasPrefix(module, universe.GitPrefix) {
106120
var data interface{}
107-
globals, err := starlark.ExecFile(thread, module, data, s.predeclared)
121+
globals, err := starlark.ExecFileOptions(envdStarlarkResolveOptions(), thread, module, data, s.predeclared)
108122
e = &entry{globals, err}
109123
} else {
110124
// exec remote git repo
@@ -135,7 +149,7 @@ func (s *generalInterpreter) loadGitModule(thread *starlark.Thread, path string)
135149
if d.IsDir() || !strings.HasSuffix(d.Name(), ".envd") {
136150
return nil
137151
}
138-
dict, err := starlark.ExecFile(thread, path, src, s.predeclared)
152+
dict, err := starlark.ExecFileOptions(envdStarlarkResolveOptions(), thread, path, src, s.predeclared)
139153
if err != nil {
140154
return err
141155
}
@@ -181,7 +195,7 @@ func (s generalInterpreter) ExecFile(filename string, funcname string) (interfac
181195

182196
func (s generalInterpreter) Eval(script string) (interface{}, error) {
183197
thread := s.NewThread(script)
184-
return starlark.ExecFile(thread, "", script, s.predeclared)
198+
return starlark.ExecFileOptions(envdStarlarkResolveOptions(), thread, "", script, s.predeclared)
185199
}
186200

187201
func GetEnvdProgramHash(filename string) (string, error) {
@@ -193,7 +207,7 @@ func GetEnvdProgramHash(filename string) (string, error) {
193207
funcAlwaysHas := func(x string) bool {
194208
return true
195209
}
196-
_, prog, err := starlark.SourceProgram(filename, envdSrc, funcAlwaysHas)
210+
_, prog, err := starlark.SourceProgramOptions(envdStarlarkResolveOptions(), filename, envdSrc, funcAlwaysHas)
197211
if err != nil {
198212
return "", err
199213
}

pkg/lang/frontend/starlark/v1/interpreter_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ var _ = Describe("Starlark", func() {
2424
filename := "testdata/test.envd"
2525
hash, err := GetEnvdProgramHash(filename)
2626
Expect(err).NotTo(HaveOccurred())
27-
Expect(hash).To(Equal("1292b11c2ac16f70"))
27+
Expect(hash).To(Equal("42bc7dd445dbc5a0"))
2828
})
2929
})

pkg/types/envd.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"fmt"
2020

2121
"github.com/cockroachdb/errors"
22-
"github.com/docker/docker/api/types"
22+
"github.com/docker/docker/api/types/container"
2323
"github.com/docker/docker/api/types/image"
2424
dockersystem "github.com/docker/docker/api/types/system"
2525
"github.com/moby/buildkit/util/system"
@@ -205,7 +205,7 @@ func NewImageFromMeta(meta servertypes.ImageMeta) (*EnvdImage, error) {
205205
return &img, nil
206206
}
207207

208-
func NewEnvironmentFromContainer(ctr types.Container) (*EnvdEnvironment, error) {
208+
func NewEnvironmentFromContainer(ctr container.Summary) (*EnvdEnvironment, error) {
209209
env := EnvdEnvironment{
210210
Environment: servertypes.Environment{
211211
Spec: servertypes.EnvironmentSpec{Image: ctr.Image},
@@ -265,15 +265,15 @@ func newManifest(labels map[string]string) (EnvdManifest, error) {
265265
return manifest, nil
266266
}
267267

268-
func NewDependencyFromContainerJSON(ctr types.ContainerJSON) (*Dependency, error) {
268+
func NewDependencyFromContainerJSON(ctr container.InspectResponse) (*Dependency, error) {
269269
return NewDependencyFromLabels(ctr.Config.Labels)
270270
}
271271

272272
func NewDependencyFromImageSummary(img image.Summary) (*Dependency, error) {
273273
return NewDependencyFromLabels(img.Labels)
274274
}
275275

276-
func NewPortBindingFromContainerJSON(ctr types.ContainerJSON) ([]PortBinding, error) {
276+
func NewPortBindingFromContainerJSON(ctr container.InspectResponse) ([]PortBinding, error) {
277277
var labels []servertypes.EnvironmentPort
278278
err := json.Unmarshal([]byte(ctr.Config.Labels[ImageLabelPorts]), &labels)
279279
if err != nil {

0 commit comments

Comments
 (0)