Skip to content

Commit

Permalink
Merge pull request #1375 from ripienaar/0230
Browse files Browse the repository at this point in the history
(misc) Release 0.23.0
  • Loading branch information
ripienaar authored Aug 24, 2021
2 parents afc03a5 + ef0e851 commit d2bc0b8
Show file tree
Hide file tree
Showing 12 changed files with 32 additions and 31 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
|Date |Issue |Description |
|----------|------|---------------------------------------------------------------------------------------------------------|
|2021/08/24| |Release 0.23.0 |
|2021/08/24| |Support Debian 11 |
|2021/08/23|1367 |Enable the `choria_provision` agent when provisioning is supported |
|2021/08/18|1359 |Support sorting `choria req` output by identity using `--sort` |
|2021/08/18|1358 |Ensure SSL Cache is created if needed during provisioning |
Expand Down
4 changes: 2 additions & 2 deletions build/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
)

// Version the application version
var Version = "0.22.0"
var Version = "0.23.0"

// SHA is the git reference used to build this package
var SHA = "unknown"
Expand Down Expand Up @@ -36,7 +36,7 @@ var ProvisionBrokerSRVDomain = ""
var ProvisionModeDefault = "false"

// ProvisionAgent determines if the supplied provisioning agent should be started
// this lets you programatically or via the additional agents system supply your own
// this lets you programmatically or via the additional agents system supply your own
// agent to perform the provisioning duties
var ProvisionAgent = "true"

Expand Down
13 changes: 6 additions & 7 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/choria-io/go-choria
go 1.16

require (
github.com/AlecAivazis/survey/v2 v2.2.16
github.com/AlecAivazis/survey/v2 v2.3.1
github.com/Freman/eventloghook v0.0.0-20191003051739-e4d803b6b48b
github.com/Netflix/go-expect v0.0.0-20210722184520-ef0bf57d82b3 // indirect
github.com/aelsabbahy/goss v0.3.16
Expand All @@ -13,7 +13,6 @@ require (
github.com/choria-io/go-updater v0.0.3
github.com/cloudevents/sdk-go/v2 v2.5.0
github.com/fatih/color v1.12.0
github.com/fatih/structtag v1.2.0 // indirect
github.com/ghodss/yaml v1.0.0
github.com/gofrs/uuid v4.0.0+incompatible
github.com/golang-jwt/jwt v3.2.2+incompatible
Expand All @@ -28,14 +27,14 @@ require (
github.com/looplab/fsm v0.3.0
github.com/miekg/pkcs11 v1.0.3
github.com/mitchellh/mapstructure v1.4.1
github.com/nats-io/jsm.go v0.0.26-0.20210817170503-e4962a5e1452
github.com/nats-io/nats-server/v2 v2.3.5-0.20210820234538-059aa5e23a91
github.com/nats-io/jsm.go v0.0.26-0.20210823125634-aec587a14205
github.com/nats-io/nats-server/v2 v2.3.5-0.20210824151719-104e2168106f
github.com/nats-io/nats-streaming-server v0.22.1 // indirect
github.com/nats-io/nats.go v1.11.1-0.20210819195927-9053aa4200f0
github.com/nats-io/nats.go v1.11.1-0.20210823195900-fc13b0b1218c
github.com/nats-io/stan.go v0.10.0
github.com/olekukonko/tablewriter v0.0.5
github.com/onsi/ginkgo v1.16.4
github.com/onsi/gomega v1.15.0
github.com/onsi/gomega v1.16.0
github.com/open-policy-agent/opa v0.31.0
github.com/prometheus/client_golang v1.11.0
github.com/prometheus/client_model v0.2.0
Expand All @@ -47,7 +46,7 @@ require (
go.uber.org/atomic v1.9.0
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
golang.org/x/mod v0.5.0 // indirect
golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c
golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b
golang.org/x/tools v0.1.5
gopkg.in/alecthomas/kingpin.v2 v2.2.6
Expand Down
28 changes: 14 additions & 14 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
github.com/AlecAivazis/survey/v2 v2.2.16 h1:KJ4fLFqY/NfR5OaFLcf4pThxrlV2YCHGCnCHAKLsJ+U=
github.com/AlecAivazis/survey/v2 v2.2.16/go.mod h1:TH2kPCDU3Kqq7pLbnCWwZXDBjnhZtmsCle5EiYDJ2fg=
github.com/AlecAivazis/survey/v2 v2.3.1 h1:lzkuHA60pER7L4eYL8qQJor4bUWlJe4V0gqAT19tdOA=
github.com/AlecAivazis/survey/v2 v2.3.1/go.mod h1:TH2kPCDU3Kqq7pLbnCWwZXDBjnhZtmsCle5EiYDJ2fg=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
Expand Down Expand Up @@ -136,8 +136,6 @@ github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5Kwzbycv
github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
github.com/fatih/color v1.12.0 h1:mRhaKNwANqRgUBGKmnI5ZxEk7QXmjQeCcuYFMX2bfcc=
github.com/fatih/color v1.12.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4=
github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94=
github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw=
github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
Expand Down Expand Up @@ -312,8 +310,9 @@ github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:C
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/klauspost/compress v1.11.12/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
github.com/klauspost/compress v1.12.1 h1:/+xsCsk06wE38cyiqOR/o7U2fSftcH72xD+BQXmja/g=
github.com/klauspost/compress v1.12.1/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
github.com/klauspost/compress v1.13.4 h1:0zhec2I8zGnjWcKyLl6i3gPqKANCCn5e9xmviEEeX6s=
github.com/klauspost/compress v1.13.4/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
Expand Down Expand Up @@ -381,23 +380,24 @@ github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9
github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
github.com/nats-io/jsm.go v0.0.26-0.20210817170503-e4962a5e1452 h1:N2baAxPcgdpkedO+3Iy42h6OhbpVN6GwHwFLy3yEA+8=
github.com/nats-io/jsm.go v0.0.26-0.20210817170503-e4962a5e1452/go.mod h1:q2xj/9fFILUnEv7CVEuSvmYqfzsBxXN89tEwiePuAE0=
github.com/nats-io/jsm.go v0.0.26-0.20210823125634-aec587a14205 h1:2oYuwu0h8n7Kt1mLbGvDJ+LLPLFvuzNolA5PCvKf3go=
github.com/nats-io/jsm.go v0.0.26-0.20210823125634-aec587a14205/go.mod h1:q2xj/9fFILUnEv7CVEuSvmYqfzsBxXN89tEwiePuAE0=
github.com/nats-io/jwt v1.2.2 h1:w3GMTO969dFg+UOKTmmyuu7IGdusK+7Ytlt//OYH/uU=
github.com/nats-io/jwt v1.2.2/go.mod h1:/xX356yQA6LuXI9xWW7mZNpxgF2mBmGecH+Fj34sP5Q=
github.com/nats-io/jwt/v2 v2.0.3 h1:i/O6cmIsjpcQyWDYNcq2JyZ3/VTF8SJ4JWluI5OhpvI=
github.com/nats-io/jwt/v2 v2.0.3/go.mod h1:VRP+deawSXyhNjXmxPCHskrR6Mq50BqpEI5SEcNiGlY=
github.com/nats-io/nats-server/v2 v2.3.3/go.mod h1:3mtbaN5GkCo/Z5T3nNj0I0/W1fPkKzLiDC6jjWJKp98=
github.com/nats-io/nats-server/v2 v2.3.5-0.20210815194728-bf8fdf132077/go.mod h1:7mTh0KSxKc63xAVop97cFCIGRkWCv6HoX9lMXRSNOhU=
github.com/nats-io/nats-server/v2 v2.3.5-0.20210820234538-059aa5e23a91 h1:LXDNiLydX2WGUPe8yblUDAfQKYOiRauabQU61PKrWoQ=
github.com/nats-io/nats-server/v2 v2.3.5-0.20210820234538-059aa5e23a91/go.mod h1:qlB3H+x9WkGUS1heNr3IMHC7ZHSigBYrTzexYc11LM4=
github.com/nats-io/nats-server/v2 v2.3.5-0.20210824151719-104e2168106f h1:/ZopKiPe7GIePYV3VzfzGM3CWn7FN/1/8Ph/fblm36o=
github.com/nats-io/nats-server/v2 v2.3.5-0.20210824151719-104e2168106f/go.mod h1:jgHRB+EfZisUr6j50/g7Gcah7AR8qtk3as42DJmESCk=
github.com/nats-io/nats-streaming-server v0.22.1 h1:YKDdLAWZud3UnEBvUPaYppMxSDuh+9czTCDriq19tJY=
github.com/nats-io/nats-streaming-server v0.22.1/go.mod h1:1WpVkVV5NyZbHuGGxkaPWopLFnxNthO/TK/BkzFdnPE=
github.com/nats-io/nats.go v1.11.0/go.mod h1:BPko4oXsySz4aSWeFgOHLZs3G4Jq4ZAyE6/zMCxRT6w=
github.com/nats-io/nats.go v1.11.1-0.20210623165838-4b75fc59ae30/go.mod h1:BPko4oXsySz4aSWeFgOHLZs3G4Jq4ZAyE6/zMCxRT6w=
github.com/nats-io/nats.go v1.11.1-0.20210813172934-9c00d13a8a19/go.mod h1:BPko4oXsySz4aSWeFgOHLZs3G4Jq4ZAyE6/zMCxRT6w=
github.com/nats-io/nats.go v1.11.1-0.20210819195927-9053aa4200f0 h1:lffRgFiHXqxwf8lYNSXXeOZdOgAIOabGwOSwdttqCn0=
github.com/nats-io/nats.go v1.11.1-0.20210819195927-9053aa4200f0/go.mod h1:BPko4oXsySz4aSWeFgOHLZs3G4Jq4ZAyE6/zMCxRT6w=
github.com/nats-io/nats.go v1.11.1-0.20210823195900-fc13b0b1218c h1:1zr35G7swi18hkNWJaVH/ZbkuXiZGd/XrpthwuvO4pE=
github.com/nats-io/nats.go v1.11.1-0.20210823195900-fc13b0b1218c/go.mod h1:BPko4oXsySz4aSWeFgOHLZs3G4Jq4ZAyE6/zMCxRT6w=
github.com/nats-io/nkeys v0.2.0/go.mod h1:XdZpAbhgyyODYqjTawOnIOI7VlbKSarI9Gfy1tqEu/s=
github.com/nats-io/nkeys v0.3.0 h1:cgM5tL53EvYRU+2YLXIK0G2mJtK12Ft9oeooSZMA2G8=
github.com/nats-io/nkeys v0.3.0/go.mod h1:gvUNGjVcM2IPr5rCsRsC6Wb3Hr2CQAm08dsxtV6A5y4=
Expand All @@ -421,8 +421,8 @@ github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vv
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
github.com/onsi/gomega v1.10.4/go.mod h1:g/HbgYopi++010VEqkFgJHKC09uJiW9UkXvMUuKHUCQ=
github.com/onsi/gomega v1.15.0 h1:WjP/FQ/sk43MRmnEcT+MlDw2TFvkrXlprrPST/IudjU=
github.com/onsi/gomega v1.15.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0=
github.com/onsi/gomega v1.16.0 h1:6gjqkI8iiRHMvdccRJM8rVKjCWk6ZIm6FTm3ddIe4/c=
github.com/onsi/gomega v1.16.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
github.com/open-policy-agent/opa v0.31.0 h1:sVxgdUZz426hpPfeIP+XGIwy8yfVkETerRojY3nQTc4=
github.com/open-policy-agent/opa v0.31.0/go.mod h1:aeLYiWaZe9ikcX67qLzmtRTOxj7psNYh6YGTbTW6V+s=
github.com/opencontainers/runc v0.0.0-20161107232042-8779fa57eb4a h1:wvqfuQnd/Z9zDxpkyaabmBVf/3RYUmn4B4A1mG0pf3I=
Expand Down Expand Up @@ -743,8 +743,8 @@ golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c h1:Lyn7+CqXIiC+LOR9aHD6jDK+hPcmAuCfuXztd1v4w1Q=
golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf h1:2ucpDCmfkl8Bd/FsLtiD653Wf96cW37s+iGx93zsu4k=
golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210503060354-a79de5458b56/go.mod h1:tfny5GFUkzUvx4ps4ajbZsCe5lw1metzhBm9T3x7oIY=
Expand Down
2 changes: 1 addition & 1 deletion internal/fs/ddl/cache/agent/choria_provision.ddl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ metadata :name => "choria_provision",
:description => "Choria Provisioner",
:author => "R.I.Pienaar <[email protected]>",
:license => "Apache-2.0",
:version => "0.22.0",
:version => "0.23.0",
:url => "https://choria.io",
:timeout => 20

Expand Down
2 changes: 1 addition & 1 deletion internal/fs/ddl/cache/agent/choria_provision.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"description": "Choria Provisioner",
"author": "R.I.Pienaar <[email protected]>",
"license": "Apache-2.0",
"version": "0.22.0",
"version": "0.23.0",
"url": "https://choria.io",
"timeout": 20
},
Expand Down
2 changes: 1 addition & 1 deletion internal/fs/ddl/cache/agent/choria_util.ddl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ metadata :name => "choria_util",
:description => "Choria Utilities",
:author => "R.I.Pienaar <[email protected]>",
:license => "Apache-2.0",
:version => "0.22.0",
:version => "0.23.0",
:url => "https://choria.io",
:timeout => 2

Expand Down
2 changes: 1 addition & 1 deletion internal/fs/ddl/cache/agent/choria_util.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"description": "Choria Utilities",
"author": "R.I.Pienaar <[email protected]>",
"license": "Apache-2.0",
"version": "0.22.0",
"version": "0.23.0",
"url": "https://choria.io",
"timeout": 2
},
Expand Down
2 changes: 1 addition & 1 deletion internal/fs/ddl/cache/agent/rpcutil.ddl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ metadata :name => "rpcutil",
:description => "Utility actions that expose information about the state of the running Server",
:author => "R.I.Pienaar <[email protected]>",
:license => "Apache-2.0",
:version => "0.22.0",
:version => "0.23.0",
:url => "https://choria.io/",
:timeout => 2

Expand Down
2 changes: 1 addition & 1 deletion internal/fs/ddl/cache/agent/rpcutil.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"description": "Utility actions that expose information about the state of the running Server",
"author": "R.I.Pienaar <[email protected]>",
"license": "Apache-2.0",
"version": "0.22.0",
"version": "0.23.0",
"url": "https://choria.io/",
"timeout": 2
},
Expand Down
2 changes: 1 addition & 1 deletion internal/fs/ddl/cache/agent/scout.ddl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ metadata :name => "scout",
:description => "Choria Scout Agent Management API",
:author => "R.I.Pienaar <[email protected]>",
:license => "Apache-2.0",
:version => "0.22.0",
:version => "0.23.0",
:url => "https://choria.io",
:provider => "golang",
:timeout => 5
Expand Down
2 changes: 1 addition & 1 deletion internal/fs/ddl/cache/agent/scout.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"author": "R.I.Pienaar <[email protected]>",
"timeout": 5,
"name": "scout",
"version": "0.22.0",
"version": "0.23.0",
"url": "https://choria.io",
"description": "Choria Scout Agent Management API",
"provider": "golang"
Expand Down

0 comments on commit d2bc0b8

Please sign in to comment.