Merge pull request #361 from jmpsec/new-release-0.3.2

Updated release to prepare v0.3.2

.env.example

@@ -1,4 +1,4 @@
-OSCTRL_VERSION=0.3.1
+OSCTRL_VERSION=0.3.2
 OSQUERY_VERSION=5.8.2
 NGINX_VERSION=1.21.6-alpine
 POSTGRES_VERSION=13.5-alpine

CHANGELOG.md

@@ -1,6 +1,6 @@
 # osctrl Changelog
 
-## 🔖 Release [0.3.1](https://github.com/jmpsec/osctrl/releases/tag/v0.3.1)
+## 🔖 Release [0.3.2](https://github.com/jmpsec/osctrl/releases/tag/v0.3.2)
 
 ### 🚨 Breaking Changes
 

admin/auth/go.mod

@@ -21,9 +21,9 @@ replace github.com/jmpsec/osctrl/utils => ../../utils
 replace github.com/jmpsec/osctrl/version => ../../version
 
 require (
-	github.com/jmpsec/osctrl/admin/sessions v0.3.1
-	github.com/jmpsec/osctrl/settings v0.3.1
-	github.com/jmpsec/osctrl/users v0.3.1
+	github.com/jmpsec/osctrl/admin/sessions v0.3.2
+	github.com/jmpsec/osctrl/settings v0.3.2
+	github.com/jmpsec/osctrl/users v0.3.2
 )
 
 require (
@@ -34,12 +34,12 @@ require (
 	github.com/jinzhu/gorm v1.9.16 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
-	github.com/jmpsec/osctrl/environments v0.0.0-20231103085153-d61207d0ce25 // indirect
-	github.com/jmpsec/osctrl/nodes v0.3.1 // indirect
-	github.com/jmpsec/osctrl/queries v0.3.1 // indirect
-	github.com/jmpsec/osctrl/types v0.3.1 // indirect
-	github.com/jmpsec/osctrl/utils v0.0.0-20231103085153-d61207d0ce25 // indirect
-	github.com/jmpsec/osctrl/version v0.3.1 // indirect
+	github.com/jmpsec/osctrl/environments v0.3.2 // indirect
+	github.com/jmpsec/osctrl/nodes v0.3.2 // indirect
+	github.com/jmpsec/osctrl/queries v0.3.2 // indirect
+	github.com/jmpsec/osctrl/types v0.3.2 // indirect
+	github.com/jmpsec/osctrl/utils v0.3.2 // indirect
+	github.com/jmpsec/osctrl/version v0.3.2 // indirect
 	github.com/lib/pq v1.10.4 // indirect
 	github.com/segmentio/ksuid v1.0.4 // indirect
 	golang.org/x/crypto v0.14.0 // indirect

admin/handlers/go.mod

@@ -34,19 +34,19 @@ replace github.com/jmpsec/osctrl/version => ../../version
 
 require (
 	github.com/gorilla/mux v1.8.0
-	github.com/jmpsec/osctrl/admin/sessions v0.0.0-20231103085153-d61207d0ce25
-	github.com/jmpsec/osctrl/backend v0.3.1 // indirect
-	github.com/jmpsec/osctrl/carves v0.0.0-20231103085153-d61207d0ce25
+	github.com/jmpsec/osctrl/admin/sessions v0.3.2
+	github.com/jmpsec/osctrl/backend v0.3.2 // indirect
+	github.com/jmpsec/osctrl/carves v0.3.2
 	github.com/jmpsec/osctrl/environments v0.0.0-20231103085153-d61207d0ce25
 	github.com/jmpsec/osctrl/logging v0.0.0-20220120232002-31ecf3b9f264
 	github.com/jmpsec/osctrl/metrics v0.0.0-20231103085153-d61207d0ce25
-	github.com/jmpsec/osctrl/nodes v0.3.1
-	github.com/jmpsec/osctrl/queries v0.3.1
-	github.com/jmpsec/osctrl/settings v0.3.1
+	github.com/jmpsec/osctrl/nodes v0.3.2
+	github.com/jmpsec/osctrl/queries v0.3.2
+	github.com/jmpsec/osctrl/settings v0.3.2
 	github.com/jmpsec/osctrl/tags v0.0.0-20231103085153-d61207d0ce25
-	github.com/jmpsec/osctrl/types v0.3.1
-	github.com/jmpsec/osctrl/users v0.3.1
-	github.com/jmpsec/osctrl/utils v0.3.1
+	github.com/jmpsec/osctrl/types v0.3.2
+	github.com/jmpsec/osctrl/users v0.3.2
+	github.com/jmpsec/osctrl/utils v0.3.2
 )
 
 require (
@@ -86,7 +86,7 @@ require (
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
-	github.com/jmpsec/osctrl/version v0.3.1 // indirect
+	github.com/jmpsec/osctrl/version v0.3.2 // indirect
 	github.com/lib/pq v1.10.4 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect

admin/sessions/go.mod

@@ -22,10 +22,10 @@ require (
 	github.com/gorilla/securecookie v1.1.1
 	github.com/gorilla/sessions v1.2.1
 	github.com/jinzhu/gorm v1.9.16
-	github.com/jmpsec/osctrl/nodes v0.3.1 // indirect
-	github.com/jmpsec/osctrl/queries v0.3.1 // indirect
-	github.com/jmpsec/osctrl/types v0.3.1 // indirect
-	github.com/jmpsec/osctrl/users v0.3.1
+	github.com/jmpsec/osctrl/nodes v0.3.2 // indirect
+	github.com/jmpsec/osctrl/queries v0.3.2 // indirect
+	github.com/jmpsec/osctrl/types v0.3.2 // indirect
+	github.com/jmpsec/osctrl/users v0.3.2
 )
 
 require (
@@ -39,8 +39,8 @@ require (
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/jmpsec/osctrl/environments v0.0.0-20231103085153-d61207d0ce25 // indirect
-	github.com/jmpsec/osctrl/settings v0.3.1 // indirect
-	github.com/jmpsec/osctrl/version v0.3.1 // indirect
+	github.com/jmpsec/osctrl/settings v0.3.2 // indirect
+	github.com/jmpsec/osctrl/version v0.3.2 // indirect
 	github.com/lib/pq v1.10.4 // indirect
 	github.com/segmentio/ksuid v1.0.4 // indirect
 	golang.org/x/crypto v0.14.0 // indirect

cache/go.mod

@@ -24,8 +24,8 @@ require (
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
-	github.com/jmpsec/osctrl/nodes v0.3.1 // indirect
-	github.com/jmpsec/osctrl/queries v0.3.1 // indirect
+	github.com/jmpsec/osctrl/nodes v0.3.2 // indirect
+	github.com/jmpsec/osctrl/queries v0.3.2 // indirect
 	github.com/jmpsec/osctrl/utils v0.0.0-20231103085153-d61207d0ce25 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect

carves/go.mod

@@ -14,8 +14,8 @@ replace github.com/jmpsec/osctrl/utils => ../utils
 
 require (
 	github.com/jinzhu/gorm v1.9.16
-	github.com/jmpsec/osctrl/nodes v0.3.1 // indirect
-	github.com/jmpsec/osctrl/queries v0.3.1 // indirect
+	github.com/jmpsec/osctrl/nodes v0.3.2 // indirect
+	github.com/jmpsec/osctrl/queries v0.3.2 // indirect
 	github.com/jmpsec/osctrl/types v0.0.0-20231103085153-d61207d0ce25
 )
 

deploy/docker/README.md

@@ -59,7 +59,7 @@ You can generate a random enough JWT secret to be used with the `osctrl-api` and
 ### osctrl
 
 * [What is osctrl?](https://osctrl.net/)
-* [osctrl-api](https://app.swaggerhub.com/apis-docs/jmpsec/osctrl-api/0.3.1#/)
+* [osctrl-api](https://app.swaggerhub.com/apis-docs/jmpsec/osctrl-api/0.3.2#/)
 
 ### Docker
 

deploy/docker/env.example

@@ -1,4 +1,4 @@
-OSCTRL_VERSION=0.3.1
+OSCTRL_VERSION=0.3.2
 OSQUERY_VERSION=5.8.2
 NGINX_VERSION=1.21.1-alpine
 POSTGRES_VERSION=10-alpine

environments/go.mod

@@ -28,8 +28,8 @@ require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
-	github.com/jmpsec/osctrl/nodes v0.3.1 // indirect
-	github.com/jmpsec/osctrl/queries v0.3.1 // indirect
+	github.com/jmpsec/osctrl/nodes v0.3.2 // indirect
+	github.com/jmpsec/osctrl/queries v0.3.2 // indirect
 	github.com/jmpsec/osctrl/types v0.0.0-20231103085153-d61207d0ce25 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect

go.mod

@@ -44,23 +44,23 @@ require (
 	github.com/crewjam/saml v0.4.14
 	github.com/golang-jwt/jwt/v4 v4.5.0
 	github.com/gorilla/mux v1.8.0
-	github.com/jmpsec/osctrl/admin/handlers v0.3.1
-	github.com/jmpsec/osctrl/admin/sessions v0.3.1
-	github.com/jmpsec/osctrl/backend v0.3.1
-	github.com/jmpsec/osctrl/cache v0.3.1
-	github.com/jmpsec/osctrl/carves v0.3.1
-	github.com/jmpsec/osctrl/environments v0.3.1
-	github.com/jmpsec/osctrl/logging v0.3.1
-	github.com/jmpsec/osctrl/metrics v0.3.1
-	github.com/jmpsec/osctrl/nodes v0.3.1
-	github.com/jmpsec/osctrl/queries v0.3.1
-	github.com/jmpsec/osctrl/settings v0.3.1
-	github.com/jmpsec/osctrl/tags v0.3.1
-	github.com/jmpsec/osctrl/tls/handlers v0.3.1
-	github.com/jmpsec/osctrl/types v0.3.1
-	github.com/jmpsec/osctrl/users v0.3.1
-	github.com/jmpsec/osctrl/utils v0.3.1
-	github.com/jmpsec/osctrl/version v0.3.1
+	github.com/jmpsec/osctrl/admin/handlers v0.3.2
+	github.com/jmpsec/osctrl/admin/sessions v0.3.2
+	github.com/jmpsec/osctrl/backend v0.3.2
+	github.com/jmpsec/osctrl/cache v0.3.2
+	github.com/jmpsec/osctrl/carves v0.3.2
+	github.com/jmpsec/osctrl/environments v0.3.2
+	github.com/jmpsec/osctrl/logging v0.3.2
+	github.com/jmpsec/osctrl/metrics v0.3.2
+	github.com/jmpsec/osctrl/nodes v0.3.2
+	github.com/jmpsec/osctrl/queries v0.3.2
+	github.com/jmpsec/osctrl/settings v0.3.2
+	github.com/jmpsec/osctrl/tags v0.3.2
+	github.com/jmpsec/osctrl/tls/handlers v0.3.2
+	github.com/jmpsec/osctrl/types v0.3.2
+	github.com/jmpsec/osctrl/users v0.3.2
+	github.com/jmpsec/osctrl/utils v0.3.2
+	github.com/jmpsec/osctrl/version v0.3.2
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/spf13/viper v1.17.0
 	github.com/urfave/cli/v2 v2.25.7

logging/go.mod

@@ -24,13 +24,13 @@ require (
 	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.13.1
 	github.com/aws/aws-sdk-go-v2/service/s3 v1.42.0
 	github.com/jinzhu/gorm v1.9.16
-	github.com/jmpsec/osctrl/backend v0.3.1
+	github.com/jmpsec/osctrl/backend v0.3.2
 	github.com/jmpsec/osctrl/cache v0.0.0-20231103085153-d61207d0ce25
-	github.com/jmpsec/osctrl/nodes v0.3.1
-	github.com/jmpsec/osctrl/queries v0.3.1
-	github.com/jmpsec/osctrl/settings v0.3.1
-	github.com/jmpsec/osctrl/types v0.3.1
-	github.com/jmpsec/osctrl/utils v0.3.1
+	github.com/jmpsec/osctrl/nodes v0.3.2
+	github.com/jmpsec/osctrl/queries v0.3.2
+	github.com/jmpsec/osctrl/settings v0.3.2
+	github.com/jmpsec/osctrl/types v0.3.2
+	github.com/jmpsec/osctrl/utils v0.3.2
 	github.com/rs/zerolog v1.31.0
 	github.com/spf13/viper v1.17.0
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1

metrics/go.mod

@@ -20,7 +20,7 @@ require (
 
 require (
 	github.com/google/uuid v1.4.0 // indirect
-	github.com/jmpsec/osctrl/nodes v0.3.1 // indirect
+	github.com/jmpsec/osctrl/nodes v0.3.2 // indirect
 	github.com/jmpsec/osctrl/utils v0.0.0-20231103085153-d61207d0ce25 // indirect
 	github.com/pelletier/go-toml/v2 v2.1.0 // indirect
 	github.com/sagikazarmark/locafero v0.3.0 // indirect
@@ -42,7 +42,7 @@ require (
 	github.com/jackc/pgx/v5 v5.2.0 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
-	github.com/jmpsec/osctrl/queries v0.3.1 // indirect
+	github.com/jmpsec/osctrl/queries v0.3.2 // indirect
 	github.com/jmpsec/osctrl/types v0.0.0-20231103085153-d61207d0ce25
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect