tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-21 20:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

remove uncessary return value of pullComposeFiles function

Browse Source 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
This commit is contained in:
Guillaume Lours 2023-10-18 12:42:11 +02:00
parent 599e4b242a
commit 3d0207ebc8
No known key found for this signature in database
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/remote/oci.go
View File

@ -114,51 +114,51 @@ func (g ociRemoteLoader) Load(ctx context.Context, path string) (string, error)
return "", err return "", err
} }
s, err2 := g.pullComposeFiles(ctx, local, composeFile, manifest, ref, resolver) err2 := g.pullComposeFiles(ctx, local, composeFile, manifest, ref, resolver)
if err2 != nil { if err2 != nil {
return s, err2 return "", err2
} }
} }
return composeFile, nil return composeFile, nil
} }
func (g ociRemoteLoader) pullComposeFiles(ctx context.Context, local string, composeFile string, manifest v1.Manifest, ref reference.Named, resolver *imagetools.Resolver) (string, error) { func (g ociRemoteLoader) pullComposeFiles(ctx context.Context, local string, composeFile string, manifest v1.Manifest, ref reference.Named, resolver *imagetools.Resolver) error {
err := os.MkdirAll(local, 0o700) err := os.MkdirAll(local, 0o700)
if err != nil { if err != nil {
return "", err return err
} }
f, err := os.Create(composeFile) f, err := os.Create(composeFile)
if err != nil { if err != nil {
return "", err return err
} }
defer f.Close() //nolint:errcheck defer f.Close() //nolint:errcheck
if manifest.ArtifactType != "application/vnd.docker.compose.project" { if manifest.ArtifactType != "application/vnd.docker.compose.project" {
return "", fmt.Errorf("%s is not a compose project OCI artifact, but %s", ref.String(), manifest.ArtifactType) return fmt.Errorf("%s is not a compose project OCI artifact, but %s", ref.String(), manifest.ArtifactType)
} }
for i, layer := range manifest.Layers { for i, layer := range manifest.Layers {
digested, err := reference.WithDigest(ref, layer.Digest) digested, err := reference.WithDigest(ref, layer.Digest)
if err != nil { if err != nil {
return "", err return err
} }
content, _, err := resolver.Get(ctx, digested.String()) content, _, err := resolver.Get(ctx, digested.String())
if err != nil { if err != nil {
return "", err return err
} }
if i > 0 { if i > 0 {
_, err = f.Write([]byte("\n---\n")) _, err = f.Write([]byte("\n---\n"))
if err != nil { if err != nil {
return "", err return err
} }
} }
_, err = f.Write(content) _, err = f.Write(content)
if err != nil { if err != nil {
return "", err return err
} }
} }
return "", nil return nil
} }
var _ loader.ResourceLoader = ociRemoteLoader{} var _ loader.ResourceLoader = ociRemoteLoader{}