diff --git a/go.mod b/go.mod index ba3c49e..cc5d1f3 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,7 @@ module github.com/blinklabs-io/cardano-up go 1.21 require ( + github.com/Masterminds/sprig/v3 v3.2.3 github.com/blinklabs-io/gouroboros v0.72.0 github.com/docker/docker v25.0.3+incompatible github.com/docker/go-connections v0.5.0 @@ -12,6 +13,8 @@ require ( ) require ( + github.com/Masterminds/goutils v1.1.1 // indirect + github.com/Masterminds/semver/v3 v3.2.0 // indirect github.com/Microsoft/go-winio v0.4.14 // indirect github.com/containerd/log v0.1.0 // indirect github.com/distribution/reference v0.5.0 // indirect @@ -21,13 +24,20 @@ require ( github.com/go-logr/logr v1.4.1 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/gogo/protobuf v1.3.2 // indirect + github.com/google/uuid v1.1.1 // indirect + github.com/huandu/xstrings v1.3.3 // indirect + github.com/imdario/mergo v0.3.11 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jinzhu/copier v0.4.0 // indirect + github.com/mitchellh/copystructure v1.0.0 // indirect + github.com/mitchellh/reflectwalk v1.0.0 // indirect github.com/moby/term v0.5.0 // indirect github.com/morikuni/aec v1.0.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.0.2 // indirect github.com/pkg/errors v0.9.1 // indirect + github.com/shopspring/decimal v1.2.0 // indirect + github.com/spf13/cast v1.3.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/utxorpc/go-codegen v0.4.0 // indirect github.com/x448/float16 v0.8.4 // indirect diff --git a/go.sum b/go.sum index ab16c77..a7f5f29 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,11 @@ github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= +github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI= +github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= +github.com/Masterminds/semver/v3 v3.2.0 h1:3MEsd0SM6jqZojhjLWWeBY+Kcjy9i6MQAeY7YgDP83g= +github.com/Masterminds/semver/v3 v3.2.0/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= +github.com/Masterminds/sprig/v3 v3.2.3 h1:eL2fZNezLomi0uOLqjQoN6BfsDD+fyLtgbJMAj9n6YA= +github.com/Masterminds/sprig/v3 v3.2.3/go.mod h1:rXcFaZ2zZbLRJv/xSysmlgIM1u11eBaRMhvYXJNkGuM= github.com/Microsoft/go-winio v0.4.14 h1:+hMXMk01us9KgxGb7ftKQt2Xpf5hH/yky+TDA+qxleU= github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= github.com/blinklabs-io/gouroboros v0.72.0 h1:HI9DFQ3wi+pr8iOPH7jOr31rNRf2ij7jA2v3dv+2vOQ= @@ -9,6 +15,7 @@ github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyY github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo= github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0= @@ -34,10 +41,16 @@ github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= +github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 h1:Wqo399gCIufwto+VfwCSvsnfGpF/w5E9CNxSwbpD6No= github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0/go.mod h1:qmOFXW2epJhM0qSnUUYpldc7gVz2KMQwJ/QYCDIa7XU= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/huandu/xstrings v1.3.3 h1:/Gcsuc1x8JVbJ9/rlye4xZnVAbEkGauT8lbebqcQws4= +github.com/huandu/xstrings v1.3.3/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= +github.com/imdario/mergo v0.3.11 h1:3tnifQM4i+fbajXKBHXWEH+KvNHqojZ778UH75j3bGA= +github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/jinzhu/copier v0.4.0 h1:w3ciUoD19shMCRargcpm0cm91ytaBhDvuRpz1ODO/U8= @@ -45,6 +58,10 @@ github.com/jinzhu/copier v0.4.0/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ= +github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= +github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/IfikLNY= +github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0= github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y= github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= @@ -59,15 +76,21 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ= +github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng= +github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/utxorpc/go-codegen v0.4.0 h1:9YzCURt5Jrnwii8VmQYeKH6K/wYXMQx+DmdjzieSZpM= @@ -76,6 +99,7 @@ github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0 h1:doUP+ExOpH3spVTLS0FcWGLnQrPct/hD/bCPbDRUEAU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0/go.mod h1:rdENBZMT2OE6Ne/KLwpiXudnAsbdrdBaqBvTN8M8BgA= go.opentelemetry.io/otel v1.23.1 h1:Za4UzOqJYS+MUczKI320AtqZHZb7EqxO00jAHE0jmQY= @@ -95,28 +119,45 @@ go.opentelemetry.io/proto/otlp v1.1.0/go.mod h1:GpBHCBWiqvVLDqmHZsoMM3C5ySeKTC7e golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo= golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= @@ -125,6 +166,7 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -139,6 +181,9 @@ google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7 google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= +gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU= diff --git a/pkgmgr/installed_package.go b/pkgmgr/installed_package.go index 27d1db9..ca10cbf 100644 --- a/pkgmgr/installed_package.go +++ b/pkgmgr/installed_package.go @@ -23,14 +23,16 @@ type InstalledPackage struct { InstalledTime time.Time Context string PostInstallNotes string + Options map[string]bool } -func NewInstalledPackage(pkg Package, context string, postInstallNotes string) InstalledPackage { +func NewInstalledPackage(pkg Package, context string, postInstallNotes string, options map[string]bool) InstalledPackage { return InstalledPackage{ Package: pkg, InstalledTime: time.Now(), Context: context, PostInstallNotes: postInstallNotes, + Options: options, } } diff --git a/pkgmgr/package.go b/pkgmgr/package.go index 596dc31..a4d3dd8 100644 --- a/pkgmgr/package.go +++ b/pkgmgr/package.go @@ -31,6 +31,21 @@ type Package struct { Dependencies []string `yaml:"dependencies"` Tags []string `yaml:"tags"` PostInstallNotes string `yaml:"postInstallNotes"` + Options []PackageOption `yaml:"options"` +} + +type PackageOption struct { + Name string `yaml:"name"` + Description string `yaml:"description"` + Default bool `yaml:"default"` +} + +func (p Package) defaultOpts() map[string]bool { + ret := make(map[string]bool) + for _, opt := range p.Options { + ret[opt.Name] = opt.Default + } + return ret } func (p Package) hasTags(tags []string) bool { @@ -49,7 +64,7 @@ func (p Package) hasTags(tags []string) bool { return true } -func (p Package) install(cfg Config, context string) (string, error) { +func (p Package) install(cfg Config, context string, opts map[string]bool) (string, error) { // Update template vars pkgName := fmt.Sprintf("%s-%s-%s", p.Name, p.Version, context) pkgCacheDir := filepath.Join( @@ -66,6 +81,7 @@ func (p Package) install(cfg Config, context string) (string, error) { "Name": pkgName, "ShortName": p.Name, "Version": p.Version, + "Options": opts, }, "Paths": map[string]string{ "CacheDir": pkgCacheDir, diff --git a/pkgmgr/pkgmgr.go b/pkgmgr/pkgmgr.go index 2fc7583..d42c4fa 100644 --- a/pkgmgr/pkgmgr.go +++ b/pkgmgr/pkgmgr.go @@ -155,25 +155,31 @@ func (p *PackageManager) Install(pkgs ...string) error { p.config.Logger.Info( fmt.Sprintf( "Installing package %s (= %s)", - installPkg.Name, - installPkg.Version, + installPkg.Install.Name, + installPkg.Install.Version, ), ) - notes, err := installPkg.install(p.config, activeContextName) + // Build package options + tmpPkgOpts := installPkg.Install.defaultOpts() + for k, v := range installPkg.Options { + tmpPkgOpts[k] = v + } + // Install package + notes, err := installPkg.Install.install(p.config, activeContextName, tmpPkgOpts) if err != nil { return err } - installedPkg := NewInstalledPackage(installPkg, activeContextName, notes) + installedPkg := NewInstalledPackage(installPkg.Install, activeContextName, notes, tmpPkgOpts) p.state.InstalledPackages = append(p.state.InstalledPackages, installedPkg) if err := p.state.Save(); err != nil { return err } - installedPkgs = append(installedPkgs, installPkg.Name) + installedPkgs = append(installedPkgs, installPkg.Install.Name) if notes != "" { notesOutput += fmt.Sprintf( "\nPost-install notes for %s (= %s):\n\n%s\n", - installPkg.Name, - installPkg.Version, + installPkg.Install.Name, + installPkg.Install.Version, notes, ) } @@ -218,16 +224,18 @@ func (p *PackageManager) Upgrade(pkgs ...string) error { upgradePkg.Upgrade.Version, ), ) + // Capture options from existing package + pkgOpts := upgradePkg.Installed.Options // Uninstall old version if err := p.uninstallPackage(upgradePkg.Installed, true); err != nil { return err } // Install new version - notes, err := upgradePkg.Upgrade.install(p.config, activeContextName) + notes, err := upgradePkg.Upgrade.install(p.config, activeContextName, pkgOpts) if err != nil { return err } - installedPkg := NewInstalledPackage(upgradePkg.Upgrade, activeContextName, notes) + installedPkg := NewInstalledPackage(upgradePkg.Upgrade, activeContextName, notes, pkgOpts) p.state.InstalledPackages = append(p.state.InstalledPackages, installedPkg) if err := p.state.Save(); err != nil { return err diff --git a/pkgmgr/registry.go b/pkgmgr/registry.go index cae66c0..adad06d 100644 --- a/pkgmgr/registry.go +++ b/pkgmgr/registry.go @@ -148,7 +148,8 @@ docker run --rm -ti ghcr.io/blinklabs-io/mithril-client:0.7.0-1 $@ Version: "0.1.0", Tags: []string{"docker", "linux", "darwin", "amd64", "arm64"}, Dependencies: []string{ - "test-packageA < 2.0.0, >= 1.0.2", + "test-packageA[fooA,-fooB] < 2.0.0, >= 1.0.2", }, + PostInstallNotes: "Values:\n\n{{ toPrettyJson . }}", }, } diff --git a/pkgmgr/resolver.go b/pkgmgr/resolver.go index 67847bb..09af950 100644 --- a/pkgmgr/resolver.go +++ b/pkgmgr/resolver.go @@ -30,9 +30,16 @@ type Resolver struct { installedConstraints map[string]version.Constraints } +type ResolverInstallSet struct { + Install Package + Options map[string]bool + Selected bool +} + type ResolverUpgradeSet struct { Installed InstalledPackage Upgrade Package + Options map[string]bool } func NewResolver(installedPkgs []InstalledPackage, availablePkgs []Package, context string, logger *slog.Logger) (*Resolver, error) { @@ -47,7 +54,7 @@ func NewResolver(installedPkgs []InstalledPackage, availablePkgs []Package, cont for _, installedPkg := range installedPkgs { // Add constraint for each explicit dependency for _, dep := range installedPkg.Package.Dependencies { - depPkgName, depPkgVersionSpec := r.splitPackage(dep) + depPkgName, depPkgVersionSpec, _ := r.splitPackage(dep) tmpConstraints, err := version.NewConstraint(depPkgVersionSpec) if err != nil { return nil, err @@ -69,10 +76,10 @@ func NewResolver(installedPkgs []InstalledPackage, availablePkgs []Package, cont return r, nil } -func (r *Resolver) Install(pkgs ...string) ([]Package, error) { - var ret []Package +func (r *Resolver) Install(pkgs ...string) ([]ResolverInstallSet, error) { + var ret []ResolverInstallSet for _, pkg := range pkgs { - pkgName, pkgVersionSpec := r.splitPackage(pkg) + pkgName, pkgVersionSpec, pkgOpts := r.splitPackage(pkg) if pkg, err := r.findInstalled(pkgName, ""); err != nil { return nil, err } else if !pkg.IsEmpty() { @@ -89,7 +96,14 @@ func (r *Resolver) Install(pkgs ...string) ([]Package, error) { } ret = append(ret, neededPkgs...) // Add selected package - ret = append(ret, latestPkg) + ret = append( + ret, + ResolverInstallSet{ + Install: latestPkg, + Selected: true, + Options: pkgOpts, + }, + ) } return ret, nil } @@ -97,7 +111,7 @@ func (r *Resolver) Install(pkgs ...string) ([]Package, error) { func (r *Resolver) Upgrade(pkgs ...string) ([]ResolverUpgradeSet, error) { var ret []ResolverUpgradeSet for _, pkg := range pkgs { - pkgName, pkgVersionSpec := r.splitPackage(pkg) + pkgName, pkgVersionSpec, pkgOpts := r.splitPackage(pkg) installedPkg, err := r.findInstalled(pkgName, "") if err != nil { return nil, err @@ -116,6 +130,7 @@ func (r *Resolver) Upgrade(pkgs ...string) ([]ResolverUpgradeSet, error) { ResolverUpgradeSet{ Installed: installedPkg, Upgrade: latestPkg, + Options: pkgOpts, }, ) // Calculate dependencies @@ -124,7 +139,7 @@ func (r *Resolver) Upgrade(pkgs ...string) ([]ResolverUpgradeSet, error) { return nil, err } for _, neededPkg := range neededPkgs { - tmpInstalled, err := r.findInstalled(neededPkg.Name, "") + tmpInstalled, err := r.findInstalled(neededPkg.Install.Name, "") if err != nil { return nil, err } @@ -132,7 +147,8 @@ func (r *Resolver) Upgrade(pkgs ...string) ([]ResolverUpgradeSet, error) { ret, ResolverUpgradeSet{ Installed: tmpInstalled, - Upgrade: neededPkg, + Upgrade: neededPkg.Install, + Options: neededPkg.Options, }, ) } @@ -148,7 +164,7 @@ func (r *Resolver) Uninstall(pkgs ...InstalledPackage) error { } for _, installedPkg := range r.installedPkgs { for _, dep := range installedPkg.Package.Dependencies { - depPkgName, depPkgVersionSpec := r.splitPackage(dep) + depPkgName, depPkgVersionSpec, _ := r.splitPackage(dep) // Skip installed package if it doesn't match dep package name if pkg.Package.Name != depPkgName { continue @@ -175,11 +191,11 @@ func (r *Resolver) Uninstall(pkgs ...InstalledPackage) error { return nil } -func (r *Resolver) getNeededDeps(pkg Package) ([]Package, error) { +func (r *Resolver) getNeededDeps(pkg Package) ([]ResolverInstallSet, error) { // NOTE: this function is very naive and only works for a single level of dependencies - var ret []Package + var ret []ResolverInstallSet for _, dep := range pkg.Dependencies { - depPkgName, depPkgVersionSpec := r.splitPackage(dep) + depPkgName, depPkgVersionSpec, depPkgOpts := r.splitPackage(dep) // Check if we already have an installed package that satisfies the dependency if pkg, err := r.findInstalled(depPkgName, depPkgVersionSpec); err != nil { return nil, err @@ -203,21 +219,49 @@ func (r *Resolver) getNeededDeps(pkg Package) ([]Package, error) { if err != nil { return nil, err } - ret = append(ret, latestPkg) + ret = append( + ret, + ResolverInstallSet{ + Install: latestPkg, + Options: depPkgOpts, + }, + ) } return ret, nil } -func (r *Resolver) splitPackage(pkg string) (string, string) { - versionSpecIdx := strings.IndexAny(pkg, ` <>=~!`) +func (r *Resolver) splitPackage(pkg string) (string, string, map[string]bool) { var pkgName, pkgVersionSpec string - if versionSpecIdx == -1 { - pkgName = pkg - } else { - pkgName = pkg[:versionSpecIdx] + pkgOpts := make(map[string]bool) + // Extract any package option flags + optsOpenIdx := strings.Index(pkg, `[`) + optsCloseIdx := strings.Index(pkg, `]`) + if optsOpenIdx > 0 && optsCloseIdx > optsOpenIdx { + pkgName = pkg[:optsOpenIdx] + tmpOpts := pkg[optsOpenIdx+1 : optsCloseIdx] + tmpFlags := strings.Split(tmpOpts, `,`) + for _, tmpFlag := range tmpFlags { + flagVal := true + if strings.HasPrefix(tmpFlag, `-`) { + flagVal = false + tmpFlag = tmpFlag[1:] + } + pkgOpts[tmpFlag] = flagVal + } + } + // Extract version spec + versionSpecIdx := strings.IndexAny(pkg, ` <>=~!`) + if versionSpecIdx > 0 { + if pkgName == "" { + pkgName = pkg[:versionSpecIdx] + } pkgVersionSpec = strings.TrimSpace(pkg[versionSpecIdx:]) } - return pkgName, pkgVersionSpec + // Use the original package name if we don't already have one from above + if pkgName == "" { + pkgName = pkg + } + return pkgName, pkgVersionSpec, pkgOpts } func (r *Resolver) findInstalled(pkgName string, pkgVersionSpec string) (InstalledPackage, error) { diff --git a/pkgmgr/resolver_test.go b/pkgmgr/resolver_test.go new file mode 100644 index 0000000..d3ac69b --- /dev/null +++ b/pkgmgr/resolver_test.go @@ -0,0 +1,67 @@ +// Copyright 2024 Blink Labs Software +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package pkgmgr + +import ( + "reflect" + "testing" +) + +func TestSplitPackage(t *testing.T) { + testDefs := []struct { + Package string + Name string + VersionSpec string + Options map[string]bool + }{ + { + Package: "test-packageB[foo,-bar] >= 1.2.3", + Name: "test-packageB", + VersionSpec: ">= 1.2.3", + Options: map[string]bool{ + "foo": true, + "bar": false, + }, + }, + { + Package: "test-package<1.2.4", + Name: "test-package", + VersionSpec: "<1.2.4", + }, + { + Package: "test-package", + Name: "test-package", + }, + { + Package: "test-package[foo", + Name: "test-package[foo", + }, + } + for _, testDef := range testDefs { + tmpResolver := &Resolver{} + pkgName, pkgVersionSpec, pkgOpts := tmpResolver.splitPackage(testDef.Package) + if pkgName != testDef.Name { + t.Fatalf("did not get expected package name: got %q, expected %q", pkgName, testDef.Name) + } + if pkgVersionSpec != testDef.VersionSpec { + t.Fatalf("did not get expected package version spec: got %q, expected %q", pkgVersionSpec, testDef.VersionSpec) + } + if len(pkgOpts) > 0 && len(testDef.Options) > 0 { + if !reflect.DeepEqual(pkgOpts, testDef.Options) { + t.Fatalf("did not get expected package options\n got: %#v\n expected: %#v", pkgOpts, testDef.Options) + } + } + } +} diff --git a/pkgmgr/template.go b/pkgmgr/template.go index 1369273..a7f71e3 100644 --- a/pkgmgr/template.go +++ b/pkgmgr/template.go @@ -17,6 +17,8 @@ package pkgmgr import ( "bytes" "text/template" + + "github.com/Masterminds/sprig/v3" ) type Template struct { @@ -26,7 +28,7 @@ type Template struct { func NewTemplate(baseVars map[string]any) *Template { return &Template{ - tmpl: template.New("main"), + tmpl: template.New("main").Funcs(sprig.FuncMap()), baseVars: baseVars, } } @@ -62,9 +64,6 @@ func (t *Template) WithVars(extraVars map[string]any) *Template { for k, v := range extraVars { tmpVars[k] = v } - tmpl := &Template{ - tmpl: template.New("main"), - baseVars: tmpVars, - } + tmpl := NewTemplate(tmpVars) return tmpl }