From d8a9fb2c1bb8b1c1983b759771abc82b4637f7f8 Mon Sep 17 00:00:00 2001 From: Javier Marcos <1271349+javuto@users.noreply.github.com> Date: Sun, 8 May 2022 16:33:41 +0200 Subject: [PATCH] Bump to version 0.2.9 --- CHANGELOG.md | 31 +++++++++++-------------------- admin/auth/go.mod | 12 ++++++------ admin/handlers/go.mod | 2 +- admin/sessions/go.mod | 8 ++++---- carves/go.mod | 2 +- deploy/docker/README.md | 2 +- deploy/docker/env.example | 2 +- go.mod | 34 +++++++++++++++++----------------- logging/go.mod | 12 ++++++------ osctrl-api.yaml | 2 +- tls/handlers/go.mod | 12 ++++++------ types/go.mod | 4 ++-- users/go.mod | 2 +- version/version.go | 2 +- 14 files changed, 59 insertions(+), 68 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6bf5306c..bcec707c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,32 +1,23 @@ # osctrl Changelog - -## [0.2.6](https://github.com/jmpsec/osctrl/releases/tag/v0.2.6) +## 🔖 Release [0.2.9](https://github.com/jmpsec/osctrl/releases/tag/v0.2.9) -[Git Commits](https://github.com/jmpsec/osctrl/compare/0.2.5...v0.2.6) +[Git Commits](https://github.com/jmpsec/osctrl/compare/0.2.8...v0.2.9) -### New Features +### 🚨 Breaking Changes -None -### UI Changes +### ✨ New Features -None +### 🛠 Improvements and ⚡️ Performance -### Under the Hood improvements +### 🐛 Bug Fixes -None +### 🔒 Security -### Bug Fixes +### ♻️ Refactoring and 🏗 Chores -- Fix for file carving bug ([#164](https://github.com/jmpsec/osctrl/pull/164)) -- ([#<PR>](<PR URL>)) +### 📚 Documentation -### Documentation +### 📦 Build -None - -### Build - -- Initial CI/CD pipeline ([#162](https://github.com/jmpsec/osctrl/pull/162)) -- CI/CD pipeline for Dockerhub ([#163](https://github.com/jmpsec/osctrl/pull/163)) -- Change repo branch name to `main` ([#165](https://github.com/jmpsec/osctrl/pull/165)) +### 🚦 Test diff --git a/admin/auth/go.mod b/admin/auth/go.mod index 50be3b92..a90d3c85 100644 --- a/admin/auth/go.mod +++ b/admin/auth/go.mod @@ -15,9 +15,9 @@ replace github.com/jmpsec/osctrl/types => ../../types replace github.com/jmpsec/osctrl/users => ../../users require ( - github.com/jmpsec/osctrl/admin/sessions v0.2.8 - github.com/jmpsec/osctrl/settings v0.2.8 - github.com/jmpsec/osctrl/users v0.2.8 + github.com/jmpsec/osctrl/admin/sessions v0.2.9 + github.com/jmpsec/osctrl/settings v0.2.9 + github.com/jmpsec/osctrl/users v0.2.9 ) require ( @@ -26,9 +26,9 @@ require ( github.com/gorilla/sessions v1.2.1 // indirect github.com/jinzhu/gorm v1.9.16 // indirect github.com/jinzhu/inflection v1.0.0 // indirect - github.com/jmpsec/osctrl/nodes v0.2.8 // indirect - github.com/jmpsec/osctrl/queries v0.2.8 // indirect - github.com/jmpsec/osctrl/types v0.2.8 // indirect + github.com/jmpsec/osctrl/nodes v0.2.9 // indirect + github.com/jmpsec/osctrl/queries v0.2.9 // indirect + github.com/jmpsec/osctrl/types v0.2.9 // indirect github.com/lib/pq v1.1.1 // indirect golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce // indirect ) diff --git a/admin/handlers/go.mod b/admin/handlers/go.mod index 246d8658..a8ea311f 100644 --- a/admin/handlers/go.mod +++ b/admin/handlers/go.mod @@ -37,7 +37,7 @@ require ( github.com/jmpsec/osctrl/logging v0.0.0-20220120232002-31ecf3b9f264 github.com/jmpsec/osctrl/metrics v0.0.0-20220120232002-31ecf3b9f264 github.com/jmpsec/osctrl/nodes v0.0.0-20220120232002-31ecf3b9f264 - github.com/jmpsec/osctrl/queries v0.2.8 + github.com/jmpsec/osctrl/queries v0.2.9 github.com/jmpsec/osctrl/settings v0.0.0-20220120232002-31ecf3b9f264 github.com/jmpsec/osctrl/tags v0.0.0-20220120232002-31ecf3b9f264 github.com/jmpsec/osctrl/types v0.0.0-20220120232002-31ecf3b9f264 diff --git a/admin/sessions/go.mod b/admin/sessions/go.mod index 35cb7142..1ec2699f 100644 --- a/admin/sessions/go.mod +++ b/admin/sessions/go.mod @@ -14,10 +14,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.2.8 // indirect - github.com/jmpsec/osctrl/queries v0.2.8 // indirect - github.com/jmpsec/osctrl/types v0.2.8 // indirect - github.com/jmpsec/osctrl/users v0.2.8 + github.com/jmpsec/osctrl/nodes v0.2.9 // indirect + github.com/jmpsec/osctrl/queries v0.2.9 // indirect + github.com/jmpsec/osctrl/types v0.2.9 // indirect + github.com/jmpsec/osctrl/users v0.2.9 ) require ( diff --git a/carves/go.mod b/carves/go.mod index 15ef1cdd..56a22c19 100644 --- a/carves/go.mod +++ b/carves/go.mod @@ -11,7 +11,7 @@ replace github.com/jmpsec/osctrl/types => ../types require ( github.com/jinzhu/gorm v1.9.16 github.com/jmpsec/osctrl/nodes v0.0.0-20220120232002-31ecf3b9f264 // indirect - github.com/jmpsec/osctrl/queries v0.2.8 // indirect + github.com/jmpsec/osctrl/queries v0.2.9 // indirect github.com/jmpsec/osctrl/types v0.0.0-20220120232002-31ecf3b9f264 ) diff --git a/deploy/docker/README.md b/deploy/docker/README.md index 08884742..9e2c562b 100644 --- a/deploy/docker/README.md +++ b/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.2.8#/) +* [osctrl-api](https://app.swaggerhub.com/apis-docs/jmpsec/osctrl-api/0.2.9#/) ### Docker diff --git a/deploy/docker/env.example b/deploy/docker/env.example index 3966662a..89f8a687 100644 --- a/deploy/docker/env.example +++ b/deploy/docker/env.example @@ -1,4 +1,4 @@ -OSCTRL_VERSION=0.2.8 +OSCTRL_VERSION=0.2.9 OSQUERY_VERSION=5.2.2 NGINX_VERSION=1.21.1-alpine POSTGRES_VERSION=10-alpine diff --git a/go.mod b/go.mod index fa818b1e..0c61dbd0 100644 --- a/go.mod +++ b/go.mod @@ -44,23 +44,23 @@ require ( github.com/crewjam/saml v0.4.6 github.com/golang-jwt/jwt/v4 v4.2.0 github.com/gorilla/mux v1.8.0 - github.com/jmpsec/osctrl/admin/handlers v0.2.8 - github.com/jmpsec/osctrl/admin/sessions v0.2.8 - github.com/jmpsec/osctrl/backend v0.2.8 - github.com/jmpsec/osctrl/cache v0.2.8 - github.com/jmpsec/osctrl/carves v0.2.8 - github.com/jmpsec/osctrl/environments v0.2.8 - github.com/jmpsec/osctrl/logging v0.2.8 - github.com/jmpsec/osctrl/metrics v0.2.8 - github.com/jmpsec/osctrl/nodes v0.2.8 - github.com/jmpsec/osctrl/queries v0.2.8 - github.com/jmpsec/osctrl/settings v0.2.8 - github.com/jmpsec/osctrl/tags v0.2.8 - github.com/jmpsec/osctrl/tls/handlers v0.2.8 - github.com/jmpsec/osctrl/types v0.2.8 - github.com/jmpsec/osctrl/users v0.2.8 - github.com/jmpsec/osctrl/utils v0.2.8 - github.com/jmpsec/osctrl/version v0.2.8 + github.com/jmpsec/osctrl/admin/handlers v0.2.9 + github.com/jmpsec/osctrl/admin/sessions v0.2.9 + github.com/jmpsec/osctrl/backend v0.2.9 + github.com/jmpsec/osctrl/cache v0.2.9 + github.com/jmpsec/osctrl/carves v0.2.9 + github.com/jmpsec/osctrl/environments v0.2.9 + github.com/jmpsec/osctrl/logging v0.2.9 + github.com/jmpsec/osctrl/metrics v0.2.9 + github.com/jmpsec/osctrl/nodes v0.2.9 + github.com/jmpsec/osctrl/queries v0.2.9 + github.com/jmpsec/osctrl/settings v0.2.9 + github.com/jmpsec/osctrl/tags v0.2.9 + github.com/jmpsec/osctrl/tls/handlers v0.2.9 + github.com/jmpsec/osctrl/types v0.2.9 + github.com/jmpsec/osctrl/users v0.2.9 + github.com/jmpsec/osctrl/utils v0.2.9 + github.com/jmpsec/osctrl/version v0.2.9 github.com/olekukonko/tablewriter v0.0.5 github.com/spf13/viper v1.10.1 github.com/urfave/cli/v2 v2.3.0 diff --git a/logging/go.mod b/logging/go.mod index f9a45255..a9ff9142 100644 --- a/logging/go.mod +++ b/logging/go.mod @@ -16,12 +16,12 @@ replace github.com/jmpsec/osctrl/utils => ../utils require ( github.com/jinzhu/gorm v1.9.16 - github.com/jmpsec/osctrl/backend v0.2.8 - github.com/jmpsec/osctrl/nodes v0.2.8 - github.com/jmpsec/osctrl/queries v0.2.8 - github.com/jmpsec/osctrl/settings v0.2.8 - github.com/jmpsec/osctrl/types v0.2.8 - github.com/jmpsec/osctrl/utils v0.2.8 + github.com/jmpsec/osctrl/backend v0.2.9 + github.com/jmpsec/osctrl/nodes v0.2.9 + github.com/jmpsec/osctrl/queries v0.2.9 + github.com/jmpsec/osctrl/settings v0.2.9 + github.com/jmpsec/osctrl/types v0.2.9 + github.com/jmpsec/osctrl/utils v0.2.9 github.com/rs/zerolog v1.26.1 github.com/spf13/viper v1.10.1 ) diff --git a/osctrl-api.yaml b/osctrl-api.yaml index 9ca8dd38..2eb6d493 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.2.8 + version: 0.2.9 externalDocs: description: osctrl documentation (https://osctrl.net) url: https://osctrl.net diff --git a/tls/handlers/go.mod b/tls/handlers/go.mod index 32055777..2f60c3b6 100644 --- a/tls/handlers/go.mod +++ b/tls/handlers/go.mod @@ -28,17 +28,17 @@ replace github.com/jmpsec/osctrl/tls/handlers => ../handlers require ( github.com/gorilla/mux v1.8.0 - github.com/jmpsec/osctrl/backend v0.2.8 // indirect + github.com/jmpsec/osctrl/backend v0.2.9 // indirect github.com/jmpsec/osctrl/carves v0.0.0-20220120232002-31ecf3b9f264 github.com/jmpsec/osctrl/environments v0.0.0-20220120232002-31ecf3b9f264 github.com/jmpsec/osctrl/logging v0.0.0-20220120232002-31ecf3b9f264 github.com/jmpsec/osctrl/metrics v0.0.0-20220120232002-31ecf3b9f264 - github.com/jmpsec/osctrl/nodes v0.2.8 - github.com/jmpsec/osctrl/queries v0.2.8 - github.com/jmpsec/osctrl/settings v0.2.8 + github.com/jmpsec/osctrl/nodes v0.2.9 + github.com/jmpsec/osctrl/queries v0.2.9 + github.com/jmpsec/osctrl/settings v0.2.9 github.com/jmpsec/osctrl/tags v0.0.0-20220120232002-31ecf3b9f264 - github.com/jmpsec/osctrl/types v0.2.8 - github.com/jmpsec/osctrl/utils v0.2.8 + github.com/jmpsec/osctrl/types v0.2.9 + github.com/jmpsec/osctrl/utils v0.2.9 github.com/segmentio/ksuid v1.0.4 github.com/stretchr/testify v1.7.0 ) diff --git a/types/go.mod b/types/go.mod index db19db5e..418e4152 100644 --- a/types/go.mod +++ b/types/go.mod @@ -6,10 +6,10 @@ replace github.com/jmpsec/osctrl/nodes => ../nodes replace github.com/jmpsec/osctrl/queries => ../queries -require github.com/jmpsec/osctrl/queries v0.2.8 +require github.com/jmpsec/osctrl/queries v0.2.9 require ( github.com/jinzhu/gorm v1.9.16 // indirect github.com/jinzhu/inflection v1.0.0 // indirect - github.com/jmpsec/osctrl/nodes v0.2.8 // indirect + github.com/jmpsec/osctrl/nodes v0.2.9 // indirect ) diff --git a/users/go.mod b/users/go.mod index 5fa39ba9..4db7c874 100644 --- a/users/go.mod +++ b/users/go.mod @@ -18,6 +18,6 @@ require ( require ( github.com/jinzhu/inflection v1.0.0 // indirect github.com/jmpsec/osctrl/nodes v0.0.0-20220120232002-31ecf3b9f264 // indirect - github.com/jmpsec/osctrl/queries v0.2.8 // indirect + github.com/jmpsec/osctrl/queries v0.2.9 // indirect github.com/lib/pq v1.10.4 // indirect ) diff --git a/version/version.go b/version/version.go index 06414a56..2be07517 100644 --- a/version/version.go +++ b/version/version.go @@ -2,5 +2,5 @@ package version const ( // OsctrlVersion to have the version for all components - OsctrlVersion string = "0.2.8" + OsctrlVersion string = "0.2.9" )