@@ -114,51 +114,51 @@ func (g ociRemoteLoader) Load(ctx context.Context, path string) (string, error)
114114 return "" , err
115115 }
116116
117- s , err2 := g .pullComposeFiles (ctx , local , composeFile , manifest , ref , resolver )
117+ err2 := g .pullComposeFiles (ctx , local , composeFile , manifest , ref , resolver )
118118 if err2 != nil {
119- return s , err2
119+ return "" , err2
120120 }
121121 }
122122 return composeFile , nil
123123}
124124
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 {
126126 err := os .MkdirAll (local , 0o700 )
127127 if err != nil {
128- return "" , err
128+ return err
129129 }
130130
131131 f , err := os .Create (composeFile )
132132 if err != nil {
133- return "" , err
133+ return err
134134 }
135135 defer f .Close () //nolint:errcheck
136136
137137 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 )
139139 }
140140
141141 for i , layer := range manifest .Layers {
142142 digested , err := reference .WithDigest (ref , layer .Digest )
143143 if err != nil {
144- return "" , err
144+ return err
145145 }
146146 content , _ , err := resolver .Get (ctx , digested .String ())
147147 if err != nil {
148- return "" , err
148+ return err
149149 }
150150 if i > 0 {
151151 _ , err = f .Write ([]byte ("\n ---\n " ))
152152 if err != nil {
153- return "" , err
153+ return err
154154 }
155155 }
156156 _ , err = f .Write (content )
157157 if err != nil {
158- return "" , err
158+ return err
159159 }
160160 }
161- return "" , nil
161+ return nil
162162}
163163
164164var _ loader.ResourceLoader = ociRemoteLoader {}
0 commit comments