Merge pull request #521 from jmpsec/prepare-osctrl-0.4.0

Preparing release 0.4.0

.env.example

@@ -1,4 +1,4 @@
-OSCTRL_VERSION=0.3.9
+OSCTRL_VERSION=0.4.0
 OSQUERY_VERSION=5.12.1
 NGINX_VERSION=1.21.6-alpine
 POSTGRES_VERSION=13.5-alpine

CHANGELOG.md

@@ -1,6 +1,6 @@
 # osctrl Changelog
 
-## 🔖 Release [0.3.9](https://github.com/jmpsec/osctrl/releases/tag/v0.3.9)
+## 🔖 Release [0.4.0](https://github.com/jmpsec/osctrl/releases/tag/v0.4.0)
 
 ### 🚨 Breaking Changes
 

admin/handlers/go.mod

@@ -33,17 +33,17 @@ replace github.com/jmpsec/osctrl/utils => ../../utils
 replace github.com/jmpsec/osctrl/version => ../../version
 
 require (
-	github.com/jmpsec/osctrl/admin/sessions v0.3.9
-	github.com/jmpsec/osctrl/carves v0.3.9
+	github.com/jmpsec/osctrl/admin/sessions v0.4.0
+	github.com/jmpsec/osctrl/carves v0.4.0
 	github.com/jmpsec/osctrl/environments v0.0.0-20240926152724-6f0cf5eace97
 	github.com/jmpsec/osctrl/metrics v0.0.0-20240926152724-6f0cf5eace97
-	github.com/jmpsec/osctrl/nodes v0.3.9
-	github.com/jmpsec/osctrl/queries v0.3.9
-	github.com/jmpsec/osctrl/settings v0.3.9
+	github.com/jmpsec/osctrl/nodes v0.4.0
+	github.com/jmpsec/osctrl/queries v0.4.0
+	github.com/jmpsec/osctrl/settings v0.4.0
 	github.com/jmpsec/osctrl/tags v0.0.0-20240926152724-6f0cf5eace97
-	github.com/jmpsec/osctrl/types v0.3.9
-	github.com/jmpsec/osctrl/users v0.3.9
-	github.com/jmpsec/osctrl/utils v0.3.9
+	github.com/jmpsec/osctrl/types v0.4.0
+	github.com/jmpsec/osctrl/users v0.4.0
+	github.com/jmpsec/osctrl/utils v0.4.0
 )
 
 require (
@@ -56,7 +56,7 @@ require (
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
 	github.com/jackc/puddle/v2 v2.2.2 // indirect
-	github.com/jmpsec/osctrl/backend v0.3.9
+	github.com/jmpsec/osctrl/backend v0.4.0
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/rs/zerolog v1.33.0
@@ -98,7 +98,7 @@ require (
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/jmpsec/osctrl/logging v0.0.0-20240926110606-74392bf45499
-	github.com/jmpsec/osctrl/version v0.3.9 // indirect
+	github.com/jmpsec/osctrl/version v0.4.0 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/pelletier/go-toml/v2 v2.2.3 // indirect

admin/sessions/go.mod

@@ -21,10 +21,10 @@ replace github.com/jmpsec/osctrl/version => ../../version
 require (
 	github.com/gorilla/securecookie v1.1.2
 	github.com/gorilla/sessions v1.4.0
-	github.com/jmpsec/osctrl/nodes v0.3.9 // indirect
-	github.com/jmpsec/osctrl/queries v0.3.9 // indirect
-	github.com/jmpsec/osctrl/types v0.3.9 // indirect
-	github.com/jmpsec/osctrl/users v0.3.9
+	github.com/jmpsec/osctrl/nodes v0.4.0 // indirect
+	github.com/jmpsec/osctrl/queries v0.4.0 // indirect
+	github.com/jmpsec/osctrl/types v0.4.0 // indirect
+	github.com/jmpsec/osctrl/users v0.4.0
 )
 
 require (
@@ -44,8 +44,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-20240926152724-6f0cf5eace97 // indirect
-	github.com/jmpsec/osctrl/settings v0.3.9 // indirect
-	github.com/jmpsec/osctrl/version v0.3.9 // indirect
+	github.com/jmpsec/osctrl/settings v0.4.0 // indirect
+	github.com/jmpsec/osctrl/version v0.4.0 // indirect
 	github.com/rs/zerolog v1.33.0
 	github.com/segmentio/ksuid v1.0.4 // indirect
 	golang.org/x/crypto v0.27.0 // indirect

api/handlers/go.mod

@@ -36,11 +36,11 @@ require (
 	github.com/jmpsec/osctrl/environments v0.0.0-20240926152724-6f0cf5eace97
 	github.com/jmpsec/osctrl/logging v0.0.0-20240926110606-74392bf45499
 	github.com/jmpsec/osctrl/metrics v0.0.0-20240926152724-6f0cf5eace97
-	github.com/jmpsec/osctrl/nodes v0.3.9
-	github.com/jmpsec/osctrl/queries v0.3.9
+	github.com/jmpsec/osctrl/nodes v0.4.0
+	github.com/jmpsec/osctrl/queries v0.4.0
 	github.com/jmpsec/osctrl/tags v0.0.0-20240926152724-6f0cf5eace97
 	github.com/jmpsec/osctrl/users v0.0.0-20240926152724-6f0cf5eace97
-	github.com/jmpsec/osctrl/utils v0.3.9
+	github.com/jmpsec/osctrl/utils v0.4.0
 	github.com/rs/zerolog v1.33.0
 	gorm.io/gorm v1.25.12
 )
@@ -78,8 +78,8 @@ require (
 	github.com/jackc/pgx/v5 v5.7.1 // indirect
 	github.com/jackc/puddle/v2 v2.2.2 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
-	github.com/jmpsec/osctrl/backend v0.3.9 // indirect
-	github.com/jmpsec/osctrl/version v0.3.9 // indirect
+	github.com/jmpsec/osctrl/backend v0.4.0 // indirect
+	github.com/jmpsec/osctrl/version v0.4.0 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
@@ -108,7 +108,7 @@ require (
 require (
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
-	github.com/jmpsec/osctrl/settings v0.3.9
-	github.com/jmpsec/osctrl/types v0.3.9
+	github.com/jmpsec/osctrl/settings v0.4.0
+	github.com/jmpsec/osctrl/types v0.4.0
 	golang.org/x/text v0.18.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.9 // indirect
-	github.com/jmpsec/osctrl/queries v0.3.9 // indirect
+	github.com/jmpsec/osctrl/nodes v0.4.0 // indirect
+	github.com/jmpsec/osctrl/queries v0.4.0 // indirect
 	github.com/jmpsec/osctrl/utils v0.0.0-20240926152724-6f0cf5eace97 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // 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.9 // indirect
-	github.com/jmpsec/osctrl/queries v0.3.9 // indirect
+	github.com/jmpsec/osctrl/nodes v0.4.0 // indirect
+	github.com/jmpsec/osctrl/queries v0.4.0 // indirect
 	github.com/jmpsec/osctrl/types v0.0.0-20240926152724-6f0cf5eace97
 )
 

deploy/docker/conf/dev/.env.example

@@ -1,4 +1,4 @@
-OSCTRL_VERSION=0.3.9
+OSCTRL_VERSION=0.4.0
 OSQUERY_VERSION=5.12.1
 NGINX_VERSION=1.21.6-alpine
 POSTGRES_VERSION=13.5-alpine

environments/go.mod

@@ -30,8 +30,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.9 // indirect
-	github.com/jmpsec/osctrl/queries v0.3.9 // indirect
+	github.com/jmpsec/osctrl/nodes v0.4.0 // indirect
+	github.com/jmpsec/osctrl/queries v0.4.0 // indirect
 	github.com/jmpsec/osctrl/types v0.0.0-20240926152724-6f0cf5eace97 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect

go.mod

@@ -43,24 +43,24 @@ replace github.com/jmpsec/osctrl/version => ./version
 require (
 	github.com/crewjam/saml v0.4.14
 	github.com/golang-jwt/jwt/v4 v4.5.0
-	github.com/jmpsec/osctrl/admin/handlers v0.3.9
-	github.com/jmpsec/osctrl/admin/sessions v0.3.9
-	github.com/jmpsec/osctrl/api/handlers v0.3.9
-	github.com/jmpsec/osctrl/backend v0.3.9
-	github.com/jmpsec/osctrl/cache v0.3.9
-	github.com/jmpsec/osctrl/carves v0.3.9
-	github.com/jmpsec/osctrl/environments v0.3.9
-	github.com/jmpsec/osctrl/logging v0.3.9
-	github.com/jmpsec/osctrl/metrics v0.3.9
-	github.com/jmpsec/osctrl/nodes v0.3.9
-	github.com/jmpsec/osctrl/queries v0.3.9
-	github.com/jmpsec/osctrl/settings v0.3.9
-	github.com/jmpsec/osctrl/tags v0.3.9
-	github.com/jmpsec/osctrl/tls/handlers v0.3.9
-	github.com/jmpsec/osctrl/types v0.3.9
-	github.com/jmpsec/osctrl/users v0.3.9
-	github.com/jmpsec/osctrl/utils v0.3.9
-	github.com/jmpsec/osctrl/version v0.3.9
+	github.com/jmpsec/osctrl/admin/handlers v0.4.0
+	github.com/jmpsec/osctrl/admin/sessions v0.4.0
+	github.com/jmpsec/osctrl/api/handlers v0.4.0
+	github.com/jmpsec/osctrl/backend v0.4.0
+	github.com/jmpsec/osctrl/cache v0.4.0
+	github.com/jmpsec/osctrl/carves v0.4.0
+	github.com/jmpsec/osctrl/environments v0.4.0
+	github.com/jmpsec/osctrl/logging v0.4.0
+	github.com/jmpsec/osctrl/metrics v0.4.0
+	github.com/jmpsec/osctrl/nodes v0.4.0
+	github.com/jmpsec/osctrl/queries v0.4.0
+	github.com/jmpsec/osctrl/settings v0.4.0
+	github.com/jmpsec/osctrl/tags v0.4.0
+	github.com/jmpsec/osctrl/tls/handlers v0.4.0
+	github.com/jmpsec/osctrl/types v0.4.0
+	github.com/jmpsec/osctrl/users v0.4.0
+	github.com/jmpsec/osctrl/utils v0.4.0
+	github.com/jmpsec/osctrl/version v0.4.0
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/spf13/viper v1.19.0
 	github.com/urfave/cli/v2 v2.25.7

logging/go.mod

@@ -23,12 +23,12 @@ require (
 	github.com/aws/aws-sdk-go-v2/credentials v1.17.36
 	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.24
 	github.com/aws/aws-sdk-go-v2/service/s3 v1.63.2
-	github.com/jmpsec/osctrl/backend v0.3.9
-	github.com/jmpsec/osctrl/nodes v0.3.9
-	github.com/jmpsec/osctrl/queries v0.3.9
-	github.com/jmpsec/osctrl/settings v0.3.9
-	github.com/jmpsec/osctrl/types v0.3.9
-	github.com/jmpsec/osctrl/utils v0.3.9
+	github.com/jmpsec/osctrl/backend v0.4.0
+	github.com/jmpsec/osctrl/nodes v0.4.0
+	github.com/jmpsec/osctrl/queries v0.4.0
+	github.com/jmpsec/osctrl/settings v0.4.0
+	github.com/jmpsec/osctrl/types v0.4.0
+	github.com/jmpsec/osctrl/utils v0.4.0
 	github.com/rs/zerolog v1.33.0
 	github.com/spf13/viper v1.19.0
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1

metrics/go.mod

@@ -21,7 +21,7 @@ require (
 require (
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/jackc/puddle/v2 v2.2.1 // indirect
-	github.com/jmpsec/osctrl/nodes v0.3.9 // indirect
+	github.com/jmpsec/osctrl/nodes v0.4.0 // indirect
 	github.com/jmpsec/osctrl/utils v0.0.0-20240926152724-6f0cf5eace97 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
@@ -45,7 +45,7 @@ require (
 	github.com/jackc/pgx/v5 v5.5.5 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
-	github.com/jmpsec/osctrl/queries v0.3.9 // indirect
+	github.com/jmpsec/osctrl/queries v0.4.0 // indirect
 	github.com/jmpsec/osctrl/types v0.0.0-20240926152724-6f0cf5eace97
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect

osctrl-api.yaml

@@ -7,7 +7,7 @@ servers:
 info:
   title: osctrl-api
   description: "This the API for osctrl, a fast and efficient osquery management solution."
-  version: 0.3.9
+  version: 0.4.0
 externalDocs:
   description: osctrl documentation
   url: https://osctrl.net

tls/handlers/go.mod

@@ -31,15 +31,15 @@ replace github.com/jmpsec/osctrl/version => ../../version
 replace github.com/jmpsec/osctrl/tls/handlers => ../handlers
 
 require (
-	github.com/jmpsec/osctrl/backend v0.3.9 // indirect
+	github.com/jmpsec/osctrl/backend v0.4.0 // indirect
 	github.com/jmpsec/osctrl/environments v0.0.0-20240926152724-6f0cf5eace97
 	github.com/jmpsec/osctrl/metrics v0.0.0-20240926152724-6f0cf5eace97
-	github.com/jmpsec/osctrl/nodes v0.3.9
-	github.com/jmpsec/osctrl/queries v0.3.9
-	github.com/jmpsec/osctrl/settings v0.3.9
+	github.com/jmpsec/osctrl/nodes v0.4.0
+	github.com/jmpsec/osctrl/queries v0.4.0
+	github.com/jmpsec/osctrl/settings v0.4.0
 	github.com/jmpsec/osctrl/tags v0.0.0-20240926152724-6f0cf5eace97
-	github.com/jmpsec/osctrl/types v0.3.9
-	github.com/jmpsec/osctrl/utils v0.3.9
+	github.com/jmpsec/osctrl/types v0.4.0
+	github.com/jmpsec/osctrl/utils v0.4.0
 	github.com/segmentio/ksuid v1.0.4
 	github.com/stretchr/testify v1.9.0
 )

users/go.mod

@@ -49,10 +49,10 @@ require (
 	github.com/jackc/pgx/v4 v4.18.2 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
-	github.com/jmpsec/osctrl/nodes v0.3.9 // indirect
-	github.com/jmpsec/osctrl/queries v0.3.9 // indirect
-	github.com/jmpsec/osctrl/settings v0.3.9 // indirect
-	github.com/jmpsec/osctrl/version v0.3.9 // indirect
+	github.com/jmpsec/osctrl/nodes v0.4.0 // indirect
+	github.com/jmpsec/osctrl/queries v0.4.0 // indirect
+	github.com/jmpsec/osctrl/settings v0.4.0 // indirect
+	github.com/jmpsec/osctrl/version v0.4.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rs/zerolog v1.33.0
 	github.com/segmentio/ksuid v1.0.4 // indirect

version/version.go

@@ -2,7 +2,7 @@ package version
 
 const (
 	// OsctrlVersion to have the version for all components
-	OsctrlVersion = "0.3.9"
+	OsctrlVersion = "0.4.0"
 	// OsqueryVersion to have the version for osquery defined
 	OsqueryVersion = "5.12.1"
 )

version/version_test.go

@@ -11,5 +11,5 @@ func TestOsqueryVersion(t *testing.T) {
 }
 
 func TestOsctrlVersion(t *testing.T) {
-	assert.Equal(t, "0.3.9", OsctrlVersion)
+	assert.Equal(t, "0.4.0", OsctrlVersion)
 }