diff --git a/.env.example b/.env.example index c2e54e83..e6c39d9e 100644 --- a/.env.example +++ b/.env.example @@ -1,4 +1,4 @@ -OSCTRL_VERSION=0.4.0 +OSCTRL_VERSION=0.4.1 OSQUERY_VERSION=5.13.1 NGINX_VERSION=1.21.6-alpine POSTGRES_VERSION=13.5-alpine diff --git a/CHANGELOG.md b/CHANGELOG.md index 132a32fa..d0072844 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # osctrl Changelog -## 🔖 Release [0.4.0](https://github.com/jmpsec/osctrl/releases/tag/v0.4.0) +## 🔖 Release [0.4.1](https://github.com/jmpsec/osctrl/releases/tag/v0.4.1) ### 🚨 Breaking Changes diff --git a/admin/handlers/go.mod b/admin/handlers/go.mod index c26e3327..65680aed 100644 --- a/admin/handlers/go.mod +++ b/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.4.0 - github.com/jmpsec/osctrl/carves v0.4.0 + github.com/jmpsec/osctrl/admin/sessions v0.4.1 + github.com/jmpsec/osctrl/carves v0.4.1 github.com/jmpsec/osctrl/environments v0.0.0-20241101192351-fd857b3403fb github.com/jmpsec/osctrl/metrics v0.0.0-20241101192351-fd857b3403fb - 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/nodes v0.4.1 + github.com/jmpsec/osctrl/queries v0.4.1 + github.com/jmpsec/osctrl/settings v0.4.1 github.com/jmpsec/osctrl/tags v0.0.0-20241030113721-8e7065db6643 - 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/types v0.4.1 + github.com/jmpsec/osctrl/users v0.4.1 + github.com/jmpsec/osctrl/utils v0.4.1 ) require ( @@ -72,7 +72,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.4.0 + github.com/jmpsec/osctrl/backend v0.4.1 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 @@ -114,7 +114,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-20241101192351-fd857b3403fb - github.com/jmpsec/osctrl/version v0.4.0 // indirect + github.com/jmpsec/osctrl/version v0.4.1 // 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 diff --git a/admin/sessions/go.mod b/admin/sessions/go.mod index e86c852f..55bd55f8 100644 --- a/admin/sessions/go.mod +++ b/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.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 + github.com/jmpsec/osctrl/nodes v0.4.1 // indirect + github.com/jmpsec/osctrl/queries v0.4.1 // indirect + github.com/jmpsec/osctrl/types v0.4.1 // indirect + github.com/jmpsec/osctrl/users v0.4.1 ) 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-20241101192351-fd857b3403fb // indirect - github.com/jmpsec/osctrl/settings v0.4.0 // indirect - github.com/jmpsec/osctrl/version v0.4.0 // indirect + github.com/jmpsec/osctrl/settings v0.4.1 // indirect + github.com/jmpsec/osctrl/version v0.4.1 // indirect github.com/rs/zerolog v1.33.0 github.com/segmentio/ksuid v1.0.4 // indirect golang.org/x/crypto v0.28.0 // indirect diff --git a/api/handlers/go.mod b/api/handlers/go.mod index 27ff7b98..10ac5ef2 100644 --- a/api/handlers/go.mod +++ b/api/handlers/go.mod @@ -36,11 +36,11 @@ require ( github.com/jmpsec/osctrl/environments v0.0.0-20241101192351-fd857b3403fb github.com/jmpsec/osctrl/logging v0.0.0-20241101192351-fd857b3403fb github.com/jmpsec/osctrl/metrics v0.0.0-20241101192351-fd857b3403fb - github.com/jmpsec/osctrl/nodes v0.4.0 - github.com/jmpsec/osctrl/queries v0.4.0 + github.com/jmpsec/osctrl/nodes v0.4.1 + github.com/jmpsec/osctrl/queries v0.4.1 github.com/jmpsec/osctrl/tags v0.0.0-20241030113721-8e7065db6643 github.com/jmpsec/osctrl/users v0.0.0-20241030113721-8e7065db6643 - github.com/jmpsec/osctrl/utils v0.4.0 + github.com/jmpsec/osctrl/utils v0.4.1 github.com/rs/zerolog v1.33.0 gorm.io/gorm v1.25.12 ) @@ -83,8 +83,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.4.0 // indirect - github.com/jmpsec/osctrl/version v0.4.0 // indirect + github.com/jmpsec/osctrl/backend v0.4.1 // indirect + github.com/jmpsec/osctrl/version v0.4.1 // indirect github.com/klauspost/compress v1.17.11 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect @@ -121,7 +121,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.4.0 - github.com/jmpsec/osctrl/types v0.4.0 + github.com/jmpsec/osctrl/settings v0.4.1 + github.com/jmpsec/osctrl/types v0.4.1 golang.org/x/text v0.19.0 // indirect ) diff --git a/cache/go.mod b/cache/go.mod index eb3e17ea..8aa39ff4 100644 --- a/cache/go.mod +++ b/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.4.0 // indirect - github.com/jmpsec/osctrl/queries v0.4.0 // indirect + github.com/jmpsec/osctrl/nodes v0.4.1 // indirect + github.com/jmpsec/osctrl/queries v0.4.1 // indirect github.com/jmpsec/osctrl/utils v0.0.0-20241101192351-fd857b3403fb // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect diff --git a/carves/go.mod b/carves/go.mod index 3b80bceb..880f4905 100644 --- a/carves/go.mod +++ b/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.4.0 // indirect - github.com/jmpsec/osctrl/queries v0.4.0 // indirect + github.com/jmpsec/osctrl/nodes v0.4.1 // indirect + github.com/jmpsec/osctrl/queries v0.4.1 // indirect github.com/jmpsec/osctrl/types v0.0.0-20241101192351-fd857b3403fb ) diff --git a/deploy/docker/conf/dev/.env.example b/deploy/docker/conf/dev/.env.example index 40446c3f..219ba48c 100644 --- a/deploy/docker/conf/dev/.env.example +++ b/deploy/docker/conf/dev/.env.example @@ -1,4 +1,4 @@ -OSCTRL_VERSION=0.4.0 +OSCTRL_VERSION=0.4.1 OSQUERY_VERSION=5.13.1 NGINX_VERSION=1.21.6-alpine POSTGRES_VERSION=13.5-alpine diff --git a/environments/go.mod b/environments/go.mod index 60e96b00..d131d70a 100644 --- a/environments/go.mod +++ b/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.4.0 // indirect - github.com/jmpsec/osctrl/queries v0.4.0 // indirect + github.com/jmpsec/osctrl/nodes v0.4.1 // indirect + github.com/jmpsec/osctrl/queries v0.4.1 // indirect github.com/jmpsec/osctrl/types v0.0.0-20241101192351-fd857b3403fb // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect diff --git a/go.mod b/go.mod index ddb3f172..5e948f42 100644 --- a/go.mod +++ b/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.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/jmpsec/osctrl/admin/handlers v0.4.1 + github.com/jmpsec/osctrl/admin/sessions v0.4.1 + github.com/jmpsec/osctrl/api/handlers v0.4.1 + github.com/jmpsec/osctrl/backend v0.4.1 + github.com/jmpsec/osctrl/cache v0.4.1 + github.com/jmpsec/osctrl/carves v0.4.1 + github.com/jmpsec/osctrl/environments v0.4.1 + github.com/jmpsec/osctrl/logging v0.4.1 + github.com/jmpsec/osctrl/metrics v0.4.1 + github.com/jmpsec/osctrl/nodes v0.4.1 + github.com/jmpsec/osctrl/queries v0.4.1 + github.com/jmpsec/osctrl/settings v0.4.1 + github.com/jmpsec/osctrl/tags v0.4.1 + github.com/jmpsec/osctrl/tls/handlers v0.4.1 + github.com/jmpsec/osctrl/types v0.4.1 + github.com/jmpsec/osctrl/users v0.4.1 + github.com/jmpsec/osctrl/utils v0.4.1 + github.com/jmpsec/osctrl/version v0.4.1 github.com/olekukonko/tablewriter v0.0.5 github.com/prometheus/client_golang v1.20.5 github.com/spf13/viper v1.19.0 diff --git a/logging/go.mod b/logging/go.mod index c9d7e86f..c734eec9 100644 --- a/logging/go.mod +++ b/logging/go.mod @@ -23,12 +23,12 @@ require ( github.com/aws/aws-sdk-go-v2/credentials v1.17.42 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.35 github.com/aws/aws-sdk-go-v2/service/s3 v1.66.2 - 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/jmpsec/osctrl/backend v0.4.1 + github.com/jmpsec/osctrl/nodes v0.4.1 + github.com/jmpsec/osctrl/queries v0.4.1 + github.com/jmpsec/osctrl/settings v0.4.1 + github.com/jmpsec/osctrl/types v0.4.1 + github.com/jmpsec/osctrl/utils v0.4.1 github.com/rs/zerolog v1.33.0 github.com/spf13/viper v1.19.0 github.com/twmb/franz-go v1.18.0 diff --git a/metrics/go.mod b/metrics/go.mod index 50ea378a..768441a1 100644 --- a/metrics/go.mod +++ b/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.4.0 // indirect + github.com/jmpsec/osctrl/nodes v0.4.1 // indirect github.com/jmpsec/osctrl/utils v0.0.0-20241101192351-fd857b3403fb // 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.4.0 // indirect + github.com/jmpsec/osctrl/queries v0.4.1 // indirect github.com/jmpsec/osctrl/types v0.0.0-20241101192351-fd857b3403fb github.com/magiconair/properties v1.8.7 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect diff --git a/osctrl-api.yaml b/osctrl-api.yaml index a1a2383b..5a7cdff0 100644 --- a/osctrl-api.yaml +++ b/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.4.0 + version: 0.4.1 externalDocs: description: osctrl documentation url: https://osctrl.net diff --git a/tls/handlers/go.mod b/tls/handlers/go.mod index cd6495a0..c0c27c2b 100644 --- a/tls/handlers/go.mod +++ b/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.4.0 // indirect + github.com/jmpsec/osctrl/backend v0.4.1 // indirect github.com/jmpsec/osctrl/environments v0.0.0-20241101192351-fd857b3403fb github.com/jmpsec/osctrl/metrics v0.0.0-20241101192351-fd857b3403fb - 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/nodes v0.4.1 + github.com/jmpsec/osctrl/queries v0.4.1 + github.com/jmpsec/osctrl/settings v0.4.1 github.com/jmpsec/osctrl/tags v0.0.0-20241030113721-8e7065db6643 - github.com/jmpsec/osctrl/types v0.4.0 - github.com/jmpsec/osctrl/utils v0.4.0 + github.com/jmpsec/osctrl/types v0.4.1 + github.com/jmpsec/osctrl/utils v0.4.1 github.com/segmentio/ksuid v1.0.4 github.com/stretchr/testify v1.9.0 ) diff --git a/users/go.mod b/users/go.mod index bd9bfd6e..79828a60 100644 --- a/users/go.mod +++ b/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.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/jmpsec/osctrl/nodes v0.4.1 // indirect + github.com/jmpsec/osctrl/queries v0.4.1 // indirect + github.com/jmpsec/osctrl/settings v0.4.1 // indirect + github.com/jmpsec/osctrl/version v0.4.1 // 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 diff --git a/version/version.go b/version/version.go index d920f30c..28c0b962 100644 --- a/version/version.go +++ b/version/version.go @@ -2,7 +2,7 @@ package version const ( // OsctrlVersion to have the version for all components - OsctrlVersion = "0.4.0" + OsctrlVersion = "0.4.1" // OsqueryVersion to have the version for osquery defined OsqueryVersion = "5.13.1" ) diff --git a/version/version_test.go b/version/version_test.go index abcfcede..73815207 100644 --- a/version/version_test.go +++ b/version/version_test.go @@ -11,5 +11,5 @@ func TestOsqueryVersion(t *testing.T) { } func TestOsctrlVersion(t *testing.T) { - assert.Equal(t, "0.4.0", OsctrlVersion) + assert.Equal(t, "0.4.1", OsctrlVersion) }