11package app
22
33import (
4- "io "
4+ "bufio "
55 "os"
66 "path/filepath"
7+ "strings"
78 "time"
89
910 "github.com/aserto-dev/runtime"
10- containerd_content "github.com/containerd/containerd/content"
1111 "github.com/containerd/containerd/errdefs"
1212 "github.com/containerd/containerd/reference/docker"
13- "github.com/google/uuid"
13+
1414 "github.com/opcr-io/policy/pkg/oci"
1515 "github.com/opcr-io/policy/pkg/parser"
1616 "github.com/opencontainers/go-digest"
1717 ocispec "github.com/opencontainers/image-spec/specs-go/v1"
1818 "github.com/pkg/errors"
19- "oras.land/oras-go/pkg /content"
19+ orasoci "oras.land/oras-go/v2 /content/oci "
2020)
2121
2222const (
@@ -84,11 +84,7 @@ func (c *PolicyApp) Build(ref string, path []string, annotations map[string]stri
8484 return errors .Wrap (err , "failed to build opa policy bundle" )
8585 }
8686
87- ociStore , err := content .NewOCI (c .Configuration .PoliciesRoot ())
88- if err != nil {
89- return err
90- }
91- err = ociStore .LoadIndex ()
87+ ociStore , err := orasoci .New (c .Configuration .PoliciesRoot ())
9288 if err != nil {
9389 return err
9490 }
@@ -97,27 +93,31 @@ func (c *PolicyApp) Build(ref string, path []string, annotations map[string]stri
9793 annotations = map [string ]string {}
9894 }
9995
100- parsedRef , err := docker .ParseDockerRef (ref )
96+ familiarezedRef , err := parser .CalculatePolicyRef (ref , c .Configuration .DefaultDomain )
97+ if err != nil {
98+ return errors .Wrap (err , "failed to calculate policy reference" )
99+ }
100+
101+ parsedRef , err := docker .ParseDockerRef (familiarezedRef )
101102 if err != nil {
102103 return err
103104 }
105+
104106 annotations [ocispec .AnnotationTitle ] = docker .TrimNamed (parsedRef ).String ()
105107 annotations [AnnotationPolicyRegistryType ] = PolicyTypePolicy
106108 annotations [ocispec .AnnotationCreated ] = time .Now ().UTC ().Format (time .RFC3339 )
107109
108- descriptor , err := c .createImage (ociStore , outfile , annotations )
110+ desc , err := c .createImage (ociStore , outfile , annotations )
109111 if err != nil {
110112 return err
111113 }
112114
113- parsed , err := parser . CalculatePolicyRef ( ref , c . Configuration . DefaultDomain )
115+ err = ociStore . Tag ( c . Context , desc , parsedRef . String () )
114116 if err != nil {
115- return errors . Wrap ( err , "failed to calculate policy reference" )
117+ return err
116118 }
117119
118- ociStore .AddReference (parsed , descriptor )
119-
120- c .UI .Normal ().WithStringValue ("reference" , ref ).Msg ("Tagging image." )
120+ c .UI .Normal ().WithStringValue ("reference" , parsedRef .String ()).Msg ("Tagging image." )
121121
122122 err = ociStore .SaveIndex ()
123123 if err != nil {
@@ -127,27 +127,19 @@ func (c *PolicyApp) Build(ref string, path []string, annotations map[string]stri
127127 return nil
128128}
129129
130- func (c * PolicyApp ) createImage (ociStore * content. OCI , tarball string , annotations map [string ]string ) (ocispec.Descriptor , error ) {
130+ func (c * PolicyApp ) createImage (ociStore * orasoci. Store , tarball string , annotations map [string ]string ) (ocispec.Descriptor , error ) {
131131 descriptor := ocispec.Descriptor {}
132-
132+ ociStore . AutoSaveIndex = true
133133 fDigest , err := c .fileDigest (tarball )
134134 if err != nil {
135135 return descriptor , err
136136 }
137137
138- _ , err = ociStore . Info ( c . Context , fDigest )
139- if err != nil && ! errors . Is ( err , errdefs . ErrNotFound ) {
138+ tarballFile , err := os . Open ( tarball )
139+ if err != nil {
140140 return descriptor , err
141141 }
142-
143- if err == nil {
144- err = ociStore .Delete (c .Context , fDigest )
145- if err != nil {
146- return descriptor , errors .Wrap (err , "couldn't overwrite existing image" )
147- }
148- }
149-
150- tarballFile , err := os .Open (tarball )
142+ fileInfo , err := tarballFile .Stat ()
151143 if err != nil {
152144 return descriptor , err
153145 }
@@ -158,44 +150,35 @@ func (c *PolicyApp) createImage(ociStore *content.OCI, tarball string, annotatio
158150 }
159151 }()
160152
161- fileInfo , err := tarballFile .Stat ()
162- if err != nil {
163- return descriptor , err
164- }
165-
166- descriptor = ocispec.Descriptor {
167- MediaType : oci .MediaTypeImageLayer ,
168- Digest : fDigest ,
169- Size : fileInfo .Size (),
170- Annotations : annotations ,
171- }
153+ descriptor .Digest = fDigest
154+ descriptor .Size = fileInfo .Size ()
155+ descriptor .Annotations = annotations
156+ descriptor .MediaType = oci .MediaTypeImageLayer
172157
173- ociWriter , err := ociStore .Writer (
174- c .Context ,
175- containerd_content .WithDescriptor (descriptor ),
176- containerd_content .WithRef (uuid .NewString ()))
177- if err != nil {
158+ exists , err := ociStore .Exists (c .Context , descriptor )
159+ if err != nil && ! errors .Is (err , errdefs .ErrNotFound ) {
178160 return descriptor , err
179161 }
180- defer func () {
181- err := ociWriter .Close ()
162+
163+ if exists {
164+ // Hack to remove the existing digest until ocistore deleter is implemented
165+ // https://github.com/oras-project/oras-go/issues/454
166+ digestPath := filepath .Join (strings .Split (descriptor .Digest .String (), ":" )... )
167+ blob := filepath .Join (c .Configuration .PoliciesRoot (), "blobs" , digestPath )
168+ err = os .Remove (blob )
182169 if err != nil {
183- c . UI . Problem (). WithErr ( err ). Msg ( "Failed to close local OCI store." )
170+ return descriptor , err
184171 }
185- }()
186-
187- _ , err = io .Copy (ociWriter , tarballFile )
188- if err != nil {
189- return descriptor , err
190172 }
191173
192- err = ociWriter .Commit (c .Context , fileInfo .Size (), fDigest )
174+ reader := bufio .NewReader (tarballFile )
175+
176+ err = ociStore .Push (c .Context , descriptor , reader )
193177 if err != nil {
194178 return descriptor , err
195179 }
196-
197180 c .UI .Normal ().
198- WithStringValue ("digest" , ociWriter .Digest () .String ()).
181+ WithStringValue ("digest" , descriptor .Digest .String ()).
199182 Msg ("Created new image." )
200183
201184 return descriptor , nil
0 commit comments