Skip to content

Commit

Permalink
Merge pull request #433 from jmpsec/prepare-osctrl-0.3.6
Browse files Browse the repository at this point in the history 
Preparing release 0.3.6
  • Loading branch information
@javuto
javuto authored Apr 8, 2024
2 parents 86e7b60 + b46194d commit c7dfecb
Show file tree
Hide file tree
Showing 20 changed files with 76 additions and 76 deletions.
2 changes: 1 addition & 1 deletion .env.example
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
OSCTRL_VERSION=0.3.5
OSCTRL_VERSION=0.3.6
OSQUERY_VERSION=5.11.0
NGINX_VERSION=1.21.6-alpine
POSTGRES_VERSION=13.5-alpine
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# osctrl Changelog

## 🔖 Release [0.3.5](https://github.com/jmpsec/osctrl/releases/tag/v0.3.5)
## 🔖 Release [0.3.6](https://github.com/jmpsec/osctrl/releases/tag/v0.3.6)

### 🚨 Breaking Changes

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

require (
Expand All @@ -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.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/jmpsec/osctrl/environments v0.3.6 // indirect
github.com/jmpsec/osctrl/nodes v0.3.6 // indirect
github.com/jmpsec/osctrl/queries v0.3.6 // indirect
github.com/jmpsec/osctrl/types v0.3.6 // indirect
github.com/jmpsec/osctrl/utils v0.3.6 // indirect
github.com/jmpsec/osctrl/version v0.3.6 // indirect
github.com/segmentio/ksuid v1.0.4 // indirect
golang.org/x/crypto v0.22.0 // indirect
gorm.io/gorm v1.25.9 // indirect
Expand Down
18 changes: 9 additions & 9 deletions admin/handlers/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.5
github.com/jmpsec/osctrl/carves v0.3.5
github.com/jmpsec/osctrl/admin/sessions v0.3.6
github.com/jmpsec/osctrl/carves v0.3.6
github.com/jmpsec/osctrl/environments v0.0.0-20240406145525-19acb3c03380
github.com/jmpsec/osctrl/metrics v0.0.0-20240406145525-19acb3c03380
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/nodes v0.3.6
github.com/jmpsec/osctrl/queries v0.3.6
github.com/jmpsec/osctrl/settings v0.3.6
github.com/jmpsec/osctrl/tags v0.0.0-20240406145525-19acb3c03380
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/types v0.3.6
github.com/jmpsec/osctrl/users v0.3.6
github.com/jmpsec/osctrl/utils v0.3.6
)

require (
Expand Down Expand Up @@ -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.5 // indirect
github.com/jmpsec/osctrl/version v0.3.6 // 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.0 // indirect
Expand Down
12 changes: 6 additions & 6 deletions admin/sessions/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.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
github.com/jmpsec/osctrl/nodes v0.3.6 // indirect
github.com/jmpsec/osctrl/queries v0.3.6 // indirect
github.com/jmpsec/osctrl/types v0.3.6 // indirect
github.com/jmpsec/osctrl/users v0.3.6
)

require (
Expand All @@ -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-20240406145525-19acb3c03380 // indirect
github.com/jmpsec/osctrl/settings v0.3.5 // indirect
github.com/jmpsec/osctrl/version v0.3.5 // indirect
github.com/jmpsec/osctrl/settings v0.3.6 // indirect
github.com/jmpsec/osctrl/version v0.3.6 // indirect
github.com/segmentio/ksuid v1.0.4 // indirect
golang.org/x/crypto v0.22.0 // indirect
)
4 changes: 2 additions & 2 deletions cache/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.5 // indirect
github.com/jmpsec/osctrl/queries v0.3.5 // indirect
github.com/jmpsec/osctrl/nodes v0.3.6 // indirect
github.com/jmpsec/osctrl/queries v0.3.6 // indirect
github.com/jmpsec/osctrl/utils v0.0.0-20240406145525-19acb3c03380 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions carves/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.5 // indirect
github.com/jmpsec/osctrl/queries v0.3.5 // indirect
github.com/jmpsec/osctrl/nodes v0.3.6 // indirect
github.com/jmpsec/osctrl/queries v0.3.6 // indirect
github.com/jmpsec/osctrl/types v0.0.0-20240406145525-19acb3c03380
)

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

### Docker

Expand Down
2 changes: 1 addition & 1 deletion deploy/docker/conf/dev/.env.example
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
OSCTRL_VERSION=0.3.5
OSCTRL_VERSION=0.3.6
OSQUERY_VERSION=5.11.0
NGINX_VERSION=1.21.6-alpine
POSTGRES_VERSION=13.5-alpine
Expand Down
4 changes: 2 additions & 2 deletions environments/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.5 // indirect
github.com/jmpsec/osctrl/queries v0.3.5 // indirect
github.com/jmpsec/osctrl/nodes v0.3.6 // indirect
github.com/jmpsec/osctrl/queries v0.3.6 // indirect
github.com/jmpsec/osctrl/types v0.0.0-20240406145525-19acb3c03380 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
34 changes: 17 additions & 17 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.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/jmpsec/osctrl/admin/handlers v0.3.6
github.com/jmpsec/osctrl/admin/sessions v0.3.6
github.com/jmpsec/osctrl/backend v0.3.6
github.com/jmpsec/osctrl/cache v0.3.6
github.com/jmpsec/osctrl/carves v0.3.6
github.com/jmpsec/osctrl/environments v0.3.6
github.com/jmpsec/osctrl/logging v0.3.6
github.com/jmpsec/osctrl/metrics v0.3.6
github.com/jmpsec/osctrl/nodes v0.3.6
github.com/jmpsec/osctrl/queries v0.3.6
github.com/jmpsec/osctrl/settings v0.3.6
github.com/jmpsec/osctrl/tags v0.3.6
github.com/jmpsec/osctrl/tls/handlers v0.3.6
github.com/jmpsec/osctrl/types v0.3.6
github.com/jmpsec/osctrl/users v0.3.6
github.com/jmpsec/osctrl/utils v0.3.6
github.com/jmpsec/osctrl/version v0.3.6
github.com/olekukonko/tablewriter v0.0.5
github.com/spf13/viper v1.18.2
github.com/urfave/cli/v2 v2.25.7
Expand Down
12 changes: 6 additions & 6 deletions logging/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ require (
github.com/aws/aws-sdk-go-v2/credentials v1.17.11
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.16.15
github.com/aws/aws-sdk-go-v2/service/s3 v1.53.1
github.com/jmpsec/osctrl/backend v0.3.5
github.com/jmpsec/osctrl/backend v0.3.6
github.com/jmpsec/osctrl/cache v0.0.0-20240406145525-19acb3c03380
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/jmpsec/osctrl/nodes v0.3.6
github.com/jmpsec/osctrl/queries v0.3.6
github.com/jmpsec/osctrl/settings v0.3.6
github.com/jmpsec/osctrl/types v0.3.6
github.com/jmpsec/osctrl/utils v0.3.6
github.com/rs/zerolog v1.32.0
github.com/spf13/viper v1.18.2
gopkg.in/natefinch/lumberjack.v2 v2.2.1
Expand Down
4 changes: 2 additions & 2 deletions metrics/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.5 // indirect
github.com/jmpsec/osctrl/nodes v0.3.6 // indirect
github.com/jmpsec/osctrl/utils v0.0.0-20240406145525-19acb3c03380 // indirect
github.com/pelletier/go-toml/v2 v2.2.0 // indirect
github.com/sagikazarmark/locafero v0.4.0 // indirect
Expand All @@ -43,7 +43,7 @@ require (
github.com/jackc/pgx/v5 v5.5.4 // indirect
github.com/jinzhu/inflection v1.0.0 // indirect
github.com/jinzhu/now v1.1.5 // indirect
github.com/jmpsec/osctrl/queries v0.3.5 // indirect
github.com/jmpsec/osctrl/queries v0.3.6 // indirect
github.com/jmpsec/osctrl/types v0.0.0-20240406145525-19acb3c03380
github.com/magiconair/properties v1.8.7 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
Expand Down
2 changes: 1 addition & 1 deletion osctrl-api.yaml
View file
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.3.5
version: 0.3.6
externalDocs:
description: osctrl documentation
url: https://osctrl.net
Expand Down
4 changes: 2 additions & 2 deletions settings/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ require (
github.com/google/uuid v1.6.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.5 // indirect
github.com/jmpsec/osctrl/queries v0.3.5 // indirect
github.com/jmpsec/osctrl/nodes v0.3.6 // indirect
github.com/jmpsec/osctrl/queries v0.3.6 // indirect
github.com/jmpsec/osctrl/utils v0.0.0-20240406145525-19acb3c03380 // indirect
github.com/segmentio/ksuid v1.0.4 // indirect
)
12 changes: 6 additions & 6 deletions tls/handlers/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.5 // indirect
github.com/jmpsec/osctrl/backend v0.3.6 // indirect
github.com/jmpsec/osctrl/carves v0.0.0-20240406145525-19acb3c03380
github.com/jmpsec/osctrl/environments v0.0.0-20240406145525-19acb3c03380
github.com/jmpsec/osctrl/logging v0.0.0-20240406145525-19acb3c03380
github.com/jmpsec/osctrl/metrics v0.0.0-20240406145525-19acb3c03380
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/nodes v0.3.6
github.com/jmpsec/osctrl/queries v0.3.6
github.com/jmpsec/osctrl/settings v0.3.6
github.com/jmpsec/osctrl/tags v0.0.0-20240406145525-19acb3c03380
github.com/jmpsec/osctrl/types v0.3.5
github.com/jmpsec/osctrl/utils v0.3.5
github.com/jmpsec/osctrl/types v0.3.6
github.com/jmpsec/osctrl/utils v0.3.6
github.com/segmentio/ksuid v1.0.4
github.com/stretchr/testify v1.9.0
)
Expand Down
4 changes: 2 additions & 2 deletions types/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.5
require github.com/jmpsec/osctrl/queries v0.3.6

require (
github.com/google/uuid v1.6.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.5 // indirect
github.com/jmpsec/osctrl/nodes v0.3.6 // indirect
github.com/jmpsec/osctrl/utils v0.0.0-20240406145525-19acb3c03380 // indirect
github.com/segmentio/ksuid v1.0.4 // indirect
gorm.io/gorm v1.25.9 // indirect
Expand Down
8 changes: 4 additions & 4 deletions users/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,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.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/jmpsec/osctrl/nodes v0.3.6 // indirect
github.com/jmpsec/osctrl/queries v0.3.6 // indirect
github.com/jmpsec/osctrl/settings v0.3.6 // indirect
github.com/jmpsec/osctrl/version v0.3.6 // 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
Expand Down
2 changes: 1 addition & 1 deletion version/version.go
View file
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.3.5"
OsctrlVersion = "0.3.6"
// OsqueryVersion to have the version for osquery defined
OsqueryVersion = "5.11.0"
)
2 changes: 1 addition & 1 deletion version/version_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ func TestOsqueryVersion(t *testing.T) {
}

func TestOsctrlVersion(t *testing.T) {
assert.Equal(t, "0.3.5", OsctrlVersion)
assert.Equal(t, "0.3.6", OsctrlVersion)
}

0 comments on commit c7dfecb

Please sign in to comment.