Skip to content

Commit

Permalink
Merge pull request #300 from jmpsec/v0.3.0
Browse files Browse the repository at this point in the history
Preparing for release v0.3.0
  • Loading branch information
javuto authored Sep 1, 2022
2 parents d0d5eb2 + b77bf9f commit 63f43ae
Show file tree
Hide file tree
Showing 15 changed files with 50 additions and 50 deletions.
2 changes: 1 addition & 1 deletion .env.example
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
OSCTRL_VERSION=0.2.9
OSCTRL_VERSION=0.3.0
OSQUERY_VERSION=5.4.0
NGINX_VERSION=1.21.6-alpine
POSTGRES_VERSION=13.5-alpine
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# osctrl Changelog

## 🔖 Release [0.2.9](https://github.com/jmpsec/osctrl/releases/tag/v0.2.9)
## 🔖 Release [0.3.0](https://github.com/jmpsec/osctrl/releases/tag/v0.3.0)

### 🚨 Breaking Changes

Expand Down
12 changes: 6 additions & 6 deletions admin/auth/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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.9
github.com/jmpsec/osctrl/settings v0.2.9
github.com/jmpsec/osctrl/users v0.2.9
github.com/jmpsec/osctrl/admin/sessions v0.3.0
github.com/jmpsec/osctrl/settings v0.3.0
github.com/jmpsec/osctrl/users v0.3.0
)

require (
Expand All @@ -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.9 // indirect
github.com/jmpsec/osctrl/queries v0.2.9 // indirect
github.com/jmpsec/osctrl/types v0.2.9 // indirect
github.com/jmpsec/osctrl/nodes v0.3.0 // indirect
github.com/jmpsec/osctrl/queries v0.3.0 // indirect
github.com/jmpsec/osctrl/types v0.3.0 // indirect
github.com/lib/pq v1.1.1 // indirect
golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce // indirect
)
2 changes: 1 addition & 1 deletion admin/handlers/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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.9
github.com/jmpsec/osctrl/queries v0.3.0
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
Expand Down
8 changes: 4 additions & 4 deletions admin/sessions/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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.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
github.com/jmpsec/osctrl/nodes v0.3.0 // indirect
github.com/jmpsec/osctrl/queries v0.3.0 // indirect
github.com/jmpsec/osctrl/types v0.3.0 // indirect
github.com/jmpsec/osctrl/users v0.3.0
)

require (
Expand Down
2 changes: 1 addition & 1 deletion carves/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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.9 // indirect
github.com/jmpsec/osctrl/queries v0.3.0 // indirect
github.com/jmpsec/osctrl/types v0.0.0-20220120232002-31ecf3b9f264
)

Expand Down
2 changes: 1 addition & 1 deletion deploy/docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.9#/)
* [osctrl-api](https://app.swaggerhub.com/apis-docs/jmpsec/osctrl-api/0.3.0#/)

### Docker

Expand Down
2 changes: 1 addition & 1 deletion deploy/docker/env.example
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
OSCTRL_VERSION=0.2.9
OSCTRL_VERSION=0.3.0
OSQUERY_VERSION=5.4.0
NGINX_VERSION=1.21.1-alpine
POSTGRES_VERSION=10-alpine
Expand Down
34 changes: 17 additions & 17 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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.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/jmpsec/osctrl/admin/handlers v0.3.0
github.com/jmpsec/osctrl/admin/sessions v0.3.0
github.com/jmpsec/osctrl/backend v0.3.0
github.com/jmpsec/osctrl/cache v0.3.0
github.com/jmpsec/osctrl/carves v0.3.0
github.com/jmpsec/osctrl/environments v0.3.0
github.com/jmpsec/osctrl/logging v0.3.0
github.com/jmpsec/osctrl/metrics v0.3.0
github.com/jmpsec/osctrl/nodes v0.3.0
github.com/jmpsec/osctrl/queries v0.3.0
github.com/jmpsec/osctrl/settings v0.3.0
github.com/jmpsec/osctrl/tags v0.3.0
github.com/jmpsec/osctrl/tls/handlers v0.3.0
github.com/jmpsec/osctrl/types v0.3.0
github.com/jmpsec/osctrl/users v0.3.0
github.com/jmpsec/osctrl/utils v0.3.0
github.com/jmpsec/osctrl/version v0.3.0
github.com/olekukonko/tablewriter v0.0.5
github.com/spf13/viper v1.10.1
github.com/urfave/cli/v2 v2.3.0
Expand Down
12 changes: 6 additions & 6 deletions logging/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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.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/jmpsec/osctrl/backend v0.3.0
github.com/jmpsec/osctrl/nodes v0.3.0
github.com/jmpsec/osctrl/queries v0.3.0
github.com/jmpsec/osctrl/settings v0.3.0
github.com/jmpsec/osctrl/types v0.3.0
github.com/jmpsec/osctrl/utils v0.3.0
github.com/rs/zerolog v1.26.1
github.com/spf13/viper v1.10.1
)
Expand Down
2 changes: 1 addition & 1 deletion osctrl-api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.9
version: 0.3.0
externalDocs:
description: osctrl documentation
url: https://osctrl.net
Expand Down
12 changes: 6 additions & 6 deletions tls/handlers/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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.9 // indirect
github.com/jmpsec/osctrl/backend v0.3.0 // 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.9
github.com/jmpsec/osctrl/queries v0.2.9
github.com/jmpsec/osctrl/settings v0.2.9
github.com/jmpsec/osctrl/nodes v0.3.0
github.com/jmpsec/osctrl/queries v0.3.0
github.com/jmpsec/osctrl/settings v0.3.0
github.com/jmpsec/osctrl/tags v0.0.0-20220120232002-31ecf3b9f264
github.com/jmpsec/osctrl/types v0.2.9
github.com/jmpsec/osctrl/utils v0.2.9
github.com/jmpsec/osctrl/types v0.3.0
github.com/jmpsec/osctrl/utils v0.3.0
github.com/segmentio/ksuid v1.0.4
github.com/stretchr/testify v1.7.0
)
Expand Down
4 changes: 2 additions & 2 deletions types/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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.9
require github.com/jmpsec/osctrl/queries v0.3.0

require (
github.com/jinzhu/gorm v1.9.16 // indirect
github.com/jinzhu/inflection v1.0.0 // indirect
github.com/jmpsec/osctrl/nodes v0.2.9 // indirect
github.com/jmpsec/osctrl/nodes v0.3.0 // indirect
)
2 changes: 1 addition & 1 deletion users/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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.9 // indirect
github.com/jmpsec/osctrl/queries v0.3.0 // indirect
github.com/lib/pq v1.10.4 // indirect
)
2 changes: 1 addition & 1 deletion version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package version

const (
// OsctrlVersion to have the version for all components
OsctrlVersion = "0.2.9"
OsctrlVersion = "0.3.0"
// OsqueryVersion to have the version for osquery defined
OsqueryVersion = "5.4.0"
)

0 comments on commit 63f43ae

Please sign in to comment.