Skip to content

Commit 99bdbad

Browse files
committed
internal/registrytest: do not check that dependencies exist
Since we've changed the module storage format to avoid storing dependencies, we don't _need_ to check that dependencies exist, and it's convenient to be able to omit them for testing error cases. Signed-off-by: Roger Peppe <[email protected]> Change-Id: I4839cc68388f221b348e96b33f0c16528ec2a980 Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1172860 TryBot-Result: CUEcueckoo <[email protected]> Unity-Result: CUE porcuepine <[email protected]> Reviewed-by: Daniel Martí <[email protected]>
1 parent 79033c2 commit 99bdbad

File tree

1 file changed

+5
-29
lines changed

1 file changed

+5
-29
lines changed

internal/registrytest/registry.go

+5-29
Original file line numberDiff line numberDiff line change
@@ -103,40 +103,16 @@ func AuthHandler(handler http.Handler, cfg *AuthConfig) http.Handler {
103103
}
104104

105105
func pushContent(client *modregistry.Client, mods map[module.Version]*moduleContent) error {
106-
pushed := make(map[module.Version]bool)
107-
for v := range mods {
108-
err := visitDepthFirst(mods, v, func(v module.Version, m *moduleContent) error {
109-
if pushed[v] {
110-
return nil
111-
}
112-
var zipContent bytes.Buffer
113-
if err := m.writeZip(&zipContent); err != nil {
114-
return err
115-
}
116-
if err := client.PutModule(context.Background(), v, bytes.NewReader(zipContent.Bytes()), int64(zipContent.Len())); err != nil {
117-
return err
118-
}
119-
pushed[v] = true
120-
return nil
121-
})
122-
if err != nil {
106+
for v, m := range mods {
107+
var zipContent bytes.Buffer
108+
if err := m.writeZip(&zipContent); err != nil {
123109
return err
124110
}
125-
}
126-
return nil
127-
}
128-
129-
func visitDepthFirst(mods map[module.Version]*moduleContent, v module.Version, f func(module.Version, *moduleContent) error) error {
130-
m := mods[v]
131-
if m == nil {
132-
return fmt.Errorf("no module found for version %v", v)
133-
}
134-
for _, depv := range m.modFile.DepVersions() {
135-
if err := visitDepthFirst(mods, depv, f); err != nil {
111+
if err := client.PutModule(context.Background(), v, bytes.NewReader(zipContent.Bytes()), int64(zipContent.Len())); err != nil {
136112
return err
137113
}
138114
}
139-
return f(v, m)
115+
return nil
140116
}
141117

142118
type Registry struct {

0 commit comments

Comments
 (0)