@@ -114,51 +114,51 @@ func (g ociRemoteLoader) Load(ctx context.Context, path string) (string, error)
114
114
return "" , err
115
115
}
116
116
117
- s , err2 := g .pullComposeFiles (ctx , local , composeFile , manifest , ref , resolver )
117
+ err2 := g .pullComposeFiles (ctx , local , composeFile , manifest , ref , resolver )
118
118
if err2 != nil {
119
- return s , err2
119
+ return "" , err2
120
120
}
121
121
}
122
122
return composeFile , nil
123
123
}
124
124
125
- func (g ociRemoteLoader ) pullComposeFiles (ctx context.Context , local string , composeFile string , manifest v1.Manifest , ref reference.Named , resolver * imagetools.Resolver ) ( string , error ) {
125
+ func (g ociRemoteLoader ) pullComposeFiles (ctx context.Context , local string , composeFile string , manifest v1.Manifest , ref reference.Named , resolver * imagetools.Resolver ) error {
126
126
err := os .MkdirAll (local , 0o700 )
127
127
if err != nil {
128
- return "" , err
128
+ return err
129
129
}
130
130
131
131
f , err := os .Create (composeFile )
132
132
if err != nil {
133
- return "" , err
133
+ return err
134
134
}
135
135
defer f .Close () //nolint:errcheck
136
136
137
137
if manifest .ArtifactType != "application/vnd.docker.compose.project" {
138
- return "" , fmt .Errorf ("%s is not a compose project OCI artifact, but %s" , ref .String (), manifest .ArtifactType )
138
+ return fmt .Errorf ("%s is not a compose project OCI artifact, but %s" , ref .String (), manifest .ArtifactType )
139
139
}
140
140
141
141
for i , layer := range manifest .Layers {
142
142
digested , err := reference .WithDigest (ref , layer .Digest )
143
143
if err != nil {
144
- return "" , err
144
+ return err
145
145
}
146
146
content , _ , err := resolver .Get (ctx , digested .String ())
147
147
if err != nil {
148
- return "" , err
148
+ return err
149
149
}
150
150
if i > 0 {
151
151
_ , err = f .Write ([]byte ("\n ---\n " ))
152
152
if err != nil {
153
- return "" , err
153
+ return err
154
154
}
155
155
}
156
156
_ , err = f .Write (content )
157
157
if err != nil {
158
- return "" , err
158
+ return err
159
159
}
160
160
}
161
- return "" , nil
161
+ return nil
162
162
}
163
163
164
164
var _ loader.ResourceLoader = ociRemoteLoader {}
0 commit comments