From 1ab5b26bdb88b4f7d0bb14cb1f29feed7f221d10 Mon Sep 17 00:00:00 2001 From: Javier Marcos <1271349+javuto@users.noreply.github.com> Date: Sat, 10 Feb 2024 20:40:25 +0100 Subject: [PATCH] Prepare for new release v0.3.5 --- .env.example | 2 +- CHANGELOG.md | 2 +- admin/auth/go.mod | 18 +++++++-------- admin/handlers/go.mod | 18 +++++++-------- admin/sessions/go.mod | 12 +++++----- cache/go.mod | 4 ++-- carves/go.mod | 4 ++-- deploy/docker/README.md | 2 +- deploy/docker/conf/dev/.env.example | 2 +- environments/go.mod | 4 ++-- go.mod | 34 ++++++++++++++--------------- logging/go.mod | 12 +++++----- metrics/go.mod | 4 ++-- osctrl-api.yaml | 2 +- settings/go.mod | 4 ++-- tls/handlers/go.mod | 12 +++++----- types/go.mod | 4 ++-- users/go.mod | 8 +++---- version/version.go | 2 +- version/version_test.go | 2 +- 20 files changed, 76 insertions(+), 76 deletions(-) diff --git a/.env.example b/.env.example index f7cf5c1f..c3e015f6 100644 --- a/.env.example +++ b/.env.example @@ -1,4 +1,4 @@ -OSCTRL_VERSION=0.3.4 +OSCTRL_VERSION=0.3.5 OSQUERY_VERSION=5.10.2 NGINX_VERSION=1.21.6-alpine POSTGRES_VERSION=13.5-alpine diff --git a/CHANGELOG.md b/CHANGELOG.md index 368a1af0..02098fd3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # osctrl Changelog -## 🔖 Release [0.3.4](https://github.com/jmpsec/osctrl/releases/tag/v0.3.4) +## 🔖 Release [0.3.5](https://github.com/jmpsec/osctrl/releases/tag/v0.3.5) ### 🚨 Breaking Changes diff --git a/admin/auth/go.mod b/admin/auth/go.mod index 9ef22f54..534c0323 100644 --- a/admin/auth/go.mod +++ b/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.4 - github.com/jmpsec/osctrl/settings v0.3.4 - github.com/jmpsec/osctrl/users v0.3.4 + github.com/jmpsec/osctrl/admin/sessions v0.3.5 + github.com/jmpsec/osctrl/settings v0.3.5 + github.com/jmpsec/osctrl/users v0.3.5 ) require ( @@ -33,12 +33,12 @@ require ( github.com/gorilla/sessions v1.2.2 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect - github.com/jmpsec/osctrl/environments v0.3.4 // indirect - github.com/jmpsec/osctrl/nodes v0.3.4 // indirect - github.com/jmpsec/osctrl/queries v0.3.4 // indirect - github.com/jmpsec/osctrl/types v0.3.4 // indirect - github.com/jmpsec/osctrl/utils v0.3.4 // indirect - github.com/jmpsec/osctrl/version v0.3.4 // indirect + github.com/jmpsec/osctrl/environments v0.3.5 // indirect + github.com/jmpsec/osctrl/nodes v0.3.5 // indirect + github.com/jmpsec/osctrl/queries v0.3.5 // indirect + github.com/jmpsec/osctrl/types v0.3.5 // indirect + github.com/jmpsec/osctrl/utils v0.3.5 // indirect + github.com/jmpsec/osctrl/version v0.3.5 // indirect github.com/segmentio/ksuid v1.0.4 // indirect golang.org/x/crypto v0.17.0 // indirect gorm.io/gorm v1.25.5 // indirect diff --git a/admin/handlers/go.mod b/admin/handlers/go.mod index 8b7857ce..26bc6740 100644 --- a/admin/handlers/go.mod +++ b/admin/handlers/go.mod @@ -34,17 +34,17 @@ replace github.com/jmpsec/osctrl/version => ../../version require ( github.com/gorilla/mux v1.8.1 - github.com/jmpsec/osctrl/admin/sessions v0.3.4 - github.com/jmpsec/osctrl/carves v0.3.4 + github.com/jmpsec/osctrl/admin/sessions v0.3.5 + github.com/jmpsec/osctrl/carves v0.3.5 github.com/jmpsec/osctrl/environments v0.0.0-20231221224851-87ae6d485538 github.com/jmpsec/osctrl/metrics v0.0.0-20231221224851-87ae6d485538 - github.com/jmpsec/osctrl/nodes v0.3.4 - github.com/jmpsec/osctrl/queries v0.3.4 - github.com/jmpsec/osctrl/settings v0.3.4 + github.com/jmpsec/osctrl/nodes v0.3.5 + github.com/jmpsec/osctrl/queries v0.3.5 + github.com/jmpsec/osctrl/settings v0.3.5 github.com/jmpsec/osctrl/tags v0.0.0-20231221224851-87ae6d485538 - github.com/jmpsec/osctrl/types v0.3.4 - github.com/jmpsec/osctrl/users v0.3.4 - github.com/jmpsec/osctrl/utils v0.3.4 + github.com/jmpsec/osctrl/types v0.3.5 + github.com/jmpsec/osctrl/users v0.3.5 + github.com/jmpsec/osctrl/utils v0.3.5 ) require ( @@ -85,7 +85,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.4 // indirect + github.com/jmpsec/osctrl/version v0.3.5 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/pelletier/go-toml/v2 v2.1.1 // indirect diff --git a/admin/sessions/go.mod b/admin/sessions/go.mod index b678b03c..8c16de0c 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.2.2 - github.com/jmpsec/osctrl/nodes v0.3.4 // indirect - github.com/jmpsec/osctrl/queries v0.3.4 // indirect - github.com/jmpsec/osctrl/types v0.3.4 // indirect - github.com/jmpsec/osctrl/users v0.3.4 + github.com/jmpsec/osctrl/nodes v0.3.5 // indirect + github.com/jmpsec/osctrl/queries v0.3.5 // indirect + github.com/jmpsec/osctrl/types v0.3.5 // indirect + github.com/jmpsec/osctrl/users v0.3.5 ) require ( @@ -38,8 +38,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-20231221224851-87ae6d485538 // indirect - github.com/jmpsec/osctrl/settings v0.3.4 // indirect - github.com/jmpsec/osctrl/version v0.3.4 // indirect + github.com/jmpsec/osctrl/settings v0.3.5 // indirect + github.com/jmpsec/osctrl/version v0.3.5 // indirect github.com/segmentio/ksuid v1.0.4 // indirect golang.org/x/crypto v0.17.0 // indirect ) diff --git a/cache/go.mod b/cache/go.mod index 5dac2d02..37dd75b9 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.3.4 // indirect - github.com/jmpsec/osctrl/queries v0.3.4 // indirect + github.com/jmpsec/osctrl/nodes v0.3.5 // indirect + github.com/jmpsec/osctrl/queries v0.3.5 // indirect github.com/jmpsec/osctrl/utils v0.0.0-20231221224851-87ae6d485538 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect diff --git a/carves/go.mod b/carves/go.mod index 4ec93d81..4692f3b4 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.3.4 // indirect - github.com/jmpsec/osctrl/queries v0.3.4 // indirect + github.com/jmpsec/osctrl/nodes v0.3.5 // indirect + github.com/jmpsec/osctrl/queries v0.3.5 // indirect github.com/jmpsec/osctrl/types v0.0.0-20231221224851-87ae6d485538 ) diff --git a/deploy/docker/README.md b/deploy/docker/README.md index 81f98311..6d88a944 100644 --- a/deploy/docker/README.md +++ b/deploy/docker/README.md @@ -56,7 +56,7 @@ You can generate a random enough JWT secret to be used with the `osctrl-api` and ## References * [What is osctrl?](https://osctrl.net/) -* [osctrl-api](https://app.swaggerhub.com/apis-docs/jmpsec/osctrl-api/0.3.4#/) +* [osctrl-api](https://app.swaggerhub.com/apis-docs/jmpsec/osctrl-api/0.3.5#/) ### Docker diff --git a/deploy/docker/conf/dev/.env.example b/deploy/docker/conf/dev/.env.example index 44627298..db2e2024 100644 --- a/deploy/docker/conf/dev/.env.example +++ b/deploy/docker/conf/dev/.env.example @@ -1,4 +1,4 @@ -OSCTRL_VERSION=0.3.4 +OSCTRL_VERSION=0.3.5 OSQUERY_VERSION=5.10.2 NGINX_VERSION=1.21.6-alpine POSTGRES_VERSION=13.5-alpine diff --git a/environments/go.mod b/environments/go.mod index e078fdf2..09e35fc0 100644 --- a/environments/go.mod +++ b/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.4 // indirect - github.com/jmpsec/osctrl/queries v0.3.4 // indirect + github.com/jmpsec/osctrl/nodes v0.3.5 // indirect + github.com/jmpsec/osctrl/queries v0.3.5 // indirect github.com/jmpsec/osctrl/types v0.0.0-20231221224851-87ae6d485538 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.mod b/go.mod index 07e1cc34..ef9d0d2e 100644 --- a/go.mod +++ b/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.1 - github.com/jmpsec/osctrl/admin/handlers v0.3.4 - github.com/jmpsec/osctrl/admin/sessions v0.3.4 - github.com/jmpsec/osctrl/backend v0.3.4 - github.com/jmpsec/osctrl/cache v0.3.4 - github.com/jmpsec/osctrl/carves v0.3.4 - github.com/jmpsec/osctrl/environments v0.3.4 - github.com/jmpsec/osctrl/logging v0.3.4 - github.com/jmpsec/osctrl/metrics v0.3.4 - github.com/jmpsec/osctrl/nodes v0.3.4 - github.com/jmpsec/osctrl/queries v0.3.4 - github.com/jmpsec/osctrl/settings v0.3.4 - github.com/jmpsec/osctrl/tags v0.3.4 - github.com/jmpsec/osctrl/tls/handlers v0.3.4 - github.com/jmpsec/osctrl/types v0.3.4 - github.com/jmpsec/osctrl/users v0.3.4 - github.com/jmpsec/osctrl/utils v0.3.4 - github.com/jmpsec/osctrl/version v0.3.4 + github.com/jmpsec/osctrl/admin/handlers v0.3.5 + github.com/jmpsec/osctrl/admin/sessions v0.3.5 + github.com/jmpsec/osctrl/backend v0.3.5 + github.com/jmpsec/osctrl/cache v0.3.5 + github.com/jmpsec/osctrl/carves v0.3.5 + github.com/jmpsec/osctrl/environments v0.3.5 + github.com/jmpsec/osctrl/logging v0.3.5 + github.com/jmpsec/osctrl/metrics v0.3.5 + github.com/jmpsec/osctrl/nodes v0.3.5 + github.com/jmpsec/osctrl/queries v0.3.5 + github.com/jmpsec/osctrl/settings v0.3.5 + github.com/jmpsec/osctrl/tags v0.3.5 + github.com/jmpsec/osctrl/tls/handlers v0.3.5 + github.com/jmpsec/osctrl/types v0.3.5 + github.com/jmpsec/osctrl/users v0.3.5 + github.com/jmpsec/osctrl/utils v0.3.5 + github.com/jmpsec/osctrl/version v0.3.5 github.com/olekukonko/tablewriter v0.0.5 github.com/spf13/viper v1.18.2 github.com/urfave/cli/v2 v2.25.7 diff --git a/logging/go.mod b/logging/go.mod index 94acb02e..40b3e8d3 100644 --- a/logging/go.mod +++ b/logging/go.mod @@ -23,13 +23,13 @@ require ( github.com/aws/aws-sdk-go-v2/credentials v1.16.13 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.15.9 github.com/aws/aws-sdk-go-v2/service/s3 v1.47.7 - github.com/jmpsec/osctrl/backend v0.3.4 + github.com/jmpsec/osctrl/backend v0.3.5 github.com/jmpsec/osctrl/cache v0.0.0-20231221224851-87ae6d485538 - github.com/jmpsec/osctrl/nodes v0.3.4 - github.com/jmpsec/osctrl/queries v0.3.4 - github.com/jmpsec/osctrl/settings v0.3.4 - github.com/jmpsec/osctrl/types v0.3.4 - github.com/jmpsec/osctrl/utils v0.3.4 + github.com/jmpsec/osctrl/nodes v0.3.5 + github.com/jmpsec/osctrl/queries v0.3.5 + github.com/jmpsec/osctrl/settings v0.3.5 + github.com/jmpsec/osctrl/types v0.3.5 + github.com/jmpsec/osctrl/utils v0.3.5 github.com/rs/zerolog v1.31.0 github.com/spf13/viper v1.18.2 gopkg.in/natefinch/lumberjack.v2 v2.2.1 diff --git a/metrics/go.mod b/metrics/go.mod index 1aa4c677..fe16eded 100644 --- a/metrics/go.mod +++ b/metrics/go.mod @@ -20,7 +20,7 @@ require ( require ( github.com/google/uuid v1.5.0 // indirect - github.com/jmpsec/osctrl/nodes v0.3.4 // indirect + github.com/jmpsec/osctrl/nodes v0.3.5 // indirect github.com/jmpsec/osctrl/utils v0.0.0-20231221224851-87ae6d485538 // indirect github.com/pelletier/go-toml/v2 v2.1.1 // indirect github.com/sagikazarmark/locafero v0.4.0 // indirect @@ -41,7 +41,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.4 // indirect + github.com/jmpsec/osctrl/queries v0.3.5 // indirect github.com/jmpsec/osctrl/types v0.0.0-20231221224851-87ae6d485538 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 d79d2db8..1d4ea29f 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.3.4 + version: 0.3.5 externalDocs: description: osctrl documentation url: https://osctrl.net diff --git a/settings/go.mod b/settings/go.mod index 2565189f..696944e1 100644 --- a/settings/go.mod +++ b/settings/go.mod @@ -20,8 +20,8 @@ require ( github.com/google/uuid v1.5.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.4 // indirect - github.com/jmpsec/osctrl/queries v0.3.4 // indirect + github.com/jmpsec/osctrl/nodes v0.3.5 // indirect + github.com/jmpsec/osctrl/queries v0.3.5 // indirect github.com/jmpsec/osctrl/utils v0.0.0-20231221224851-87ae6d485538 // indirect github.com/segmentio/ksuid v1.0.4 // indirect ) diff --git a/tls/handlers/go.mod b/tls/handlers/go.mod index fe48b7a3..faf8921c 100644 --- a/tls/handlers/go.mod +++ b/tls/handlers/go.mod @@ -32,17 +32,17 @@ replace github.com/jmpsec/osctrl/tls/handlers => ../handlers require ( github.com/gorilla/mux v1.8.1 - github.com/jmpsec/osctrl/backend v0.3.4 // indirect + github.com/jmpsec/osctrl/backend v0.3.5 // indirect github.com/jmpsec/osctrl/carves v0.0.0-20231221224851-87ae6d485538 github.com/jmpsec/osctrl/environments v0.0.0-20231221224851-87ae6d485538 github.com/jmpsec/osctrl/logging v0.0.0-20231221224851-87ae6d485538 github.com/jmpsec/osctrl/metrics v0.0.0-20231221224851-87ae6d485538 - github.com/jmpsec/osctrl/nodes v0.3.4 - github.com/jmpsec/osctrl/queries v0.3.4 - github.com/jmpsec/osctrl/settings v0.3.4 + github.com/jmpsec/osctrl/nodes v0.3.5 + github.com/jmpsec/osctrl/queries v0.3.5 + github.com/jmpsec/osctrl/settings v0.3.5 github.com/jmpsec/osctrl/tags v0.0.0-20231221224851-87ae6d485538 - github.com/jmpsec/osctrl/types v0.3.4 - github.com/jmpsec/osctrl/utils v0.3.4 + github.com/jmpsec/osctrl/types v0.3.5 + github.com/jmpsec/osctrl/utils v0.3.5 github.com/segmentio/ksuid v1.0.4 github.com/stretchr/testify v1.8.4 ) diff --git a/types/go.mod b/types/go.mod index 8989c82b..27ea009c 100644 --- a/types/go.mod +++ b/types/go.mod @@ -8,14 +8,14 @@ replace github.com/jmpsec/osctrl/queries => ../queries replace github.com/jmpsec/osctrl/utils => ../utils -require github.com/jmpsec/osctrl/queries v0.3.4 +require github.com/jmpsec/osctrl/queries v0.3.5 require ( github.com/google/uuid v1.5.0 // indirect 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/nodes v0.3.4 // indirect + github.com/jmpsec/osctrl/nodes v0.3.5 // indirect github.com/jmpsec/osctrl/utils v0.0.0-20231221224851-87ae6d485538 // indirect github.com/segmentio/ksuid v1.0.4 // indirect gorm.io/gorm v1.25.5 // indirect diff --git a/users/go.mod b/users/go.mod index 1682505d..39c59572 100644 --- a/users/go.mod +++ b/users/go.mod @@ -43,10 +43,10 @@ require ( github.com/jackc/pgx/v4 v4.17.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.4 // indirect - github.com/jmpsec/osctrl/queries v0.3.4 // indirect - github.com/jmpsec/osctrl/settings v0.3.4 // indirect - github.com/jmpsec/osctrl/version v0.3.4 // indirect + github.com/jmpsec/osctrl/nodes v0.3.5 // indirect + github.com/jmpsec/osctrl/queries v0.3.5 // indirect + github.com/jmpsec/osctrl/settings v0.3.5 // indirect + github.com/jmpsec/osctrl/version v0.3.5 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/segmentio/ksuid v1.0.4 // indirect golang.org/x/text v0.14.0 // indirect diff --git a/version/version.go b/version/version.go index 9b806a5b..d6526072 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.3.4" + OsctrlVersion = "0.3.5" // OsqueryVersion to have the version for osquery defined OsqueryVersion = "5.10.2" ) diff --git a/version/version_test.go b/version/version_test.go index 748bc03f..d73c91db 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.3.4", OsctrlVersion) + assert.Equal(t, "0.3.5", OsctrlVersion) }