From fe2bc7023308936feae6936e83536aae80a655a3 Mon Sep 17 00:00:00 2001 From: Jordan McClintock Date: Tue, 29 Aug 2023 06:41:53 -0600 Subject: [PATCH] Update Zarf to fix deploy bug when init package is present in bundle (#27) Co-authored-by: unclegedd --- go.mod | 5 ++--- go.sum | 6 ++++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 2eb245d7..1849260c 100644 --- a/go.mod +++ b/go.mod @@ -2,15 +2,13 @@ module github.com/defenseunicorns/uds-cli go 1.19 -replace github.com/defenseunicorns/zarf => github.com/defenseunicorns/zarf v0.29.1-0.20230825161338-d03c3e539b87 - // TODO (@WSTARR) remove this temporary replacement of oras-go 1.2.2 with defenseunicorns version due to upgraded docker lib replace oras.land/oras-go v1.2.3 => github.com/defenseunicorns/oras-go v1.2.4-0.20230605015028-85c595ed4b64 require ( github.com/AlecAivazis/survey/v2 v2.3.7 github.com/alecthomas/jsonschema v0.0.0-20220216202328-9eeeec9d044b - github.com/defenseunicorns/zarf v0.29.0 + github.com/defenseunicorns/zarf v0.29.1 github.com/goccy/go-yaml v1.11.0 github.com/mholt/archiver/v3 v3.5.1 github.com/mholt/archiver/v4 v4.0.0-alpha.8 @@ -189,6 +187,7 @@ require ( github.com/go-playground/validator/v10 v10.11.0 // indirect github.com/go-restruct/restruct v1.2.0-alpha // indirect github.com/gobwas/glob v0.2.3 // indirect + github.com/gofrs/flock v0.8.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt/v4 v4.5.0 // indirect github.com/golang/glog v1.1.0 // indirect diff --git a/go.sum b/go.sum index ef6210e9..6fbb70a2 100644 --- a/go.sum +++ b/go.sum @@ -428,8 +428,8 @@ github.com/daviddengcn/go-colortext v1.0.0 h1:ANqDyC0ys6qCSvuEK7l3g5RaehL/Xck9EX github.com/daviddengcn/go-colortext v1.0.0/go.mod h1:zDqEI5NVUop5QPpVJUxE9UO10hRnmkD5G4Pmri9+m4c= github.com/defenseunicorns/oras-go v1.2.4-0.20230605015028-85c595ed4b64 h1:SCwmnKa2RSZtW50bKudiPdYUucX3xqlbbUt8AJiu5SA= github.com/defenseunicorns/oras-go v1.2.4-0.20230605015028-85c595ed4b64/go.mod h1:9YC1InrDJmkX0HhBLTXIixGH+l8bsPjRURmmaI2TvBk= -github.com/defenseunicorns/zarf v0.29.1-0.20230825161338-d03c3e539b87 h1:oKjzUfVGJQ1sQ0RQtW/oQg5kg1sdtSRIKItBm6t4pv4= -github.com/defenseunicorns/zarf v0.29.1-0.20230825161338-d03c3e539b87/go.mod h1:q1BnqTjMgyPh7mN++KcXRmHGVxN2mjgPS2GdxVKkwSw= +github.com/defenseunicorns/zarf v0.29.1 h1:WIGv6iaNaHTd73Jo8t1uhoPPIpmYcwvhClpYlok9UAQ= +github.com/defenseunicorns/zarf v0.29.1/go.mod h1:8rrjdUoLdG21RkSFj2DsqgMTMcXS2hBqQhLcdY74QWM= github.com/deitch/magic v0.0.0-20230404182410-1ff89d7342da h1:ZOjWpVsFZ06eIhnh4mkaceTiVoktdU67+M7KDHJ268M= github.com/deitch/magic v0.0.0-20230404182410-1ff89d7342da/go.mod h1:B3tI9iGHi4imdLi4Asdha1Sc6feLMTfPLXh9IUYmysk= github.com/denisenkom/go-mssqldb v0.9.0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= @@ -677,6 +677,8 @@ github.com/goccy/go-yaml v1.11.0/go.mod h1:H+mJrWtjPTJAHvRbV09MCK9xYwODM+wRTVFFT github.com/godbus/dbus v4.1.0+incompatible/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godror/godror v0.24.2/go.mod h1:wZv/9vPiUib6tkoDl+AZ/QLf5YZgMravZ7jxH2eQWAE= +github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw= +github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=