Skip to content

Commit

Permalink
Merge pull request #502 from jmpsec/prepare-osctrl-0.3.9
Browse files Browse the repository at this point in the history 
Preparing release 0.3.9
  • Loading branch information
@javuto
javuto authored Sep 8, 2024
2 parents 53291f1 + 8c7a2dc commit 378777b
Show file tree
Hide file tree
Showing 18 changed files with 67 additions and 67 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.8
OSCTRL_VERSION=0.3.9
OSQUERY_VERSION=5.12.1
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.8](https://github.com/jmpsec/osctrl/releases/tag/v0.3.8)
## 🔖 Release [0.3.9](https://github.com/jmpsec/osctrl/releases/tag/v0.3.9)

### 🚨 Breaking Changes

Expand Down
20 changes: 10 additions & 10 deletions admin/handlers/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.3.8
github.com/jmpsec/osctrl/carves v0.3.8
github.com/jmpsec/osctrl/admin/sessions v0.3.9
github.com/jmpsec/osctrl/carves v0.3.9
github.com/jmpsec/osctrl/environments v0.0.0-20240904183539-155969b2e259
github.com/jmpsec/osctrl/metrics v0.0.0-20240904183539-155969b2e259
github.com/jmpsec/osctrl/nodes v0.3.8
github.com/jmpsec/osctrl/queries v0.3.8
github.com/jmpsec/osctrl/settings v0.3.8
github.com/jmpsec/osctrl/nodes v0.3.9
github.com/jmpsec/osctrl/queries v0.3.9
github.com/jmpsec/osctrl/settings v0.3.9
github.com/jmpsec/osctrl/tags v0.0.0-20240904183539-155969b2e259
github.com/jmpsec/osctrl/types v0.3.8
github.com/jmpsec/osctrl/users v0.3.8
github.com/jmpsec/osctrl/utils v0.3.8
github.com/jmpsec/osctrl/types v0.3.9
github.com/jmpsec/osctrl/users v0.3.9
github.com/jmpsec/osctrl/utils v0.3.9
)

require (
Expand All @@ -56,7 +56,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.1 // indirect
github.com/jmpsec/osctrl/backend v0.3.8
github.com/jmpsec/osctrl/backend v0.3.9
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 // indirect
Expand Down Expand Up @@ -98,7 +98,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-20240904183539-155969b2e259
github.com/jmpsec/osctrl/version v0.3.8 // indirect
github.com/jmpsec/osctrl/version v0.3.9 // 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
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.4.0
github.com/jmpsec/osctrl/nodes v0.3.8 // indirect
github.com/jmpsec/osctrl/queries v0.3.8 // indirect
github.com/jmpsec/osctrl/types v0.3.8 // indirect
github.com/jmpsec/osctrl/users v0.3.8
github.com/jmpsec/osctrl/nodes v0.3.9 // indirect
github.com/jmpsec/osctrl/queries v0.3.9 // indirect
github.com/jmpsec/osctrl/types v0.3.9 // indirect
github.com/jmpsec/osctrl/users v0.3.9
)

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-20240904183539-155969b2e259 // indirect
github.com/jmpsec/osctrl/settings v0.3.8 // indirect
github.com/jmpsec/osctrl/version v0.3.8 // indirect
github.com/jmpsec/osctrl/settings v0.3.9 // indirect
github.com/jmpsec/osctrl/version v0.3.9 // indirect
github.com/segmentio/ksuid v1.0.4 // indirect
golang.org/x/crypto v0.26.0 // indirect
golang.org/x/text v0.18.0 // indirect
Expand Down
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.8 // indirect
github.com/jmpsec/osctrl/queries v0.3.8 // indirect
github.com/jmpsec/osctrl/nodes v0.3.9 // indirect
github.com/jmpsec/osctrl/queries v0.3.9 // indirect
github.com/jmpsec/osctrl/utils v0.0.0-20240904183539-155969b2e259 // 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 cache/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -388,8 +388,8 @@ golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.8/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.8/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.3.9/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.9/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
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.8 // indirect
github.com/jmpsec/osctrl/queries v0.3.8 // indirect
github.com/jmpsec/osctrl/nodes v0.3.9 // indirect
github.com/jmpsec/osctrl/queries v0.3.9 // indirect
github.com/jmpsec/osctrl/types v0.0.0-20240904183539-155969b2e259
)

Expand Down
4 changes: 2 additions & 2 deletions carves/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -748,8 +748,8 @@ golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.8/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.8/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.3.9/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.9/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
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.8
OSCTRL_VERSION=0.3.9
OSQUERY_VERSION=5.12.1
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.8 // indirect
github.com/jmpsec/osctrl/queries v0.3.8 // indirect
github.com/jmpsec/osctrl/nodes v0.3.9 // indirect
github.com/jmpsec/osctrl/queries v0.3.9 // indirect
github.com/jmpsec/osctrl/types v0.0.0-20240904183539-155969b2e259 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
golang.org/x/text v0.18.0 // 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 @@ -43,23 +43,23 @@ 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.3.8
github.com/jmpsec/osctrl/admin/sessions v0.3.8
github.com/jmpsec/osctrl/backend v0.3.8
github.com/jmpsec/osctrl/cache v0.3.8
github.com/jmpsec/osctrl/carves v0.3.8
github.com/jmpsec/osctrl/environments v0.3.8
github.com/jmpsec/osctrl/logging v0.3.8
github.com/jmpsec/osctrl/metrics v0.3.8
github.com/jmpsec/osctrl/nodes v0.3.8
github.com/jmpsec/osctrl/queries v0.3.8
github.com/jmpsec/osctrl/settings v0.3.8
github.com/jmpsec/osctrl/tags v0.3.8
github.com/jmpsec/osctrl/tls/handlers v0.3.8
github.com/jmpsec/osctrl/types v0.3.8
github.com/jmpsec/osctrl/users v0.3.8
github.com/jmpsec/osctrl/utils v0.3.8
github.com/jmpsec/osctrl/version v0.3.8
github.com/jmpsec/osctrl/admin/handlers v0.3.9
github.com/jmpsec/osctrl/admin/sessions v0.3.9
github.com/jmpsec/osctrl/backend v0.3.9
github.com/jmpsec/osctrl/cache v0.3.9
github.com/jmpsec/osctrl/carves v0.3.9
github.com/jmpsec/osctrl/environments v0.3.9
github.com/jmpsec/osctrl/logging v0.3.9
github.com/jmpsec/osctrl/metrics v0.3.9
github.com/jmpsec/osctrl/nodes v0.3.9
github.com/jmpsec/osctrl/queries v0.3.9
github.com/jmpsec/osctrl/settings v0.3.9
github.com/jmpsec/osctrl/tags v0.3.9
github.com/jmpsec/osctrl/tls/handlers v0.3.9
github.com/jmpsec/osctrl/types v0.3.9
github.com/jmpsec/osctrl/users v0.3.9
github.com/jmpsec/osctrl/utils v0.3.9
github.com/jmpsec/osctrl/version v0.3.9
github.com/olekukonko/tablewriter v0.0.5
github.com/spf13/viper v1.19.0
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,12 +23,12 @@ require (
github.com/aws/aws-sdk-go-v2/credentials v1.17.32
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.18
github.com/aws/aws-sdk-go-v2/service/s3 v1.61.2
github.com/jmpsec/osctrl/backend v0.3.8
github.com/jmpsec/osctrl/nodes v0.3.8
github.com/jmpsec/osctrl/queries v0.3.8
github.com/jmpsec/osctrl/settings v0.3.8
github.com/jmpsec/osctrl/types v0.3.8
github.com/jmpsec/osctrl/utils v0.3.8
github.com/jmpsec/osctrl/backend v0.3.9
github.com/jmpsec/osctrl/nodes v0.3.9
github.com/jmpsec/osctrl/queries v0.3.9
github.com/jmpsec/osctrl/settings v0.3.9
github.com/jmpsec/osctrl/types v0.3.9
github.com/jmpsec/osctrl/utils v0.3.9
github.com/rs/zerolog v1.33.0
github.com/spf13/viper v1.19.0
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.8 // indirect
github.com/jmpsec/osctrl/nodes v0.3.9 // indirect
github.com/jmpsec/osctrl/utils v0.0.0-20240904183539-155969b2e259 // indirect
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
github.com/sagikazarmark/locafero v0.6.0 // indirect
Expand All @@ -43,7 +43,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.3.8 // indirect
github.com/jmpsec/osctrl/queries v0.3.9 // indirect
github.com/jmpsec/osctrl/types v0.0.0-20240904183539-155969b2e259
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.8
version: 0.3.9
externalDocs:
description: osctrl documentation
url: https://osctrl.net
Expand Down
12 changes: 6 additions & 6 deletions tls/handlers/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.3.8 // indirect
github.com/jmpsec/osctrl/backend v0.3.9 // indirect
github.com/jmpsec/osctrl/environments v0.0.0-20240904183539-155969b2e259
github.com/jmpsec/osctrl/metrics v0.0.0-20240904183539-155969b2e259
github.com/jmpsec/osctrl/nodes v0.3.8
github.com/jmpsec/osctrl/queries v0.3.8
github.com/jmpsec/osctrl/settings v0.3.8
github.com/jmpsec/osctrl/nodes v0.3.9
github.com/jmpsec/osctrl/queries v0.3.9
github.com/jmpsec/osctrl/settings v0.3.9
github.com/jmpsec/osctrl/tags v0.0.0-20240904183539-155969b2e259
github.com/jmpsec/osctrl/types v0.3.8
github.com/jmpsec/osctrl/utils v0.3.8
github.com/jmpsec/osctrl/types v0.3.9
github.com/jmpsec/osctrl/utils v0.3.9
github.com/segmentio/ksuid v1.0.4
github.com/stretchr/testify v1.9.0
)
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.8 // indirect
github.com/jmpsec/osctrl/queries v0.3.8 // indirect
github.com/jmpsec/osctrl/settings v0.3.8 // indirect
github.com/jmpsec/osctrl/version v0.3.8 // indirect
github.com/jmpsec/osctrl/nodes v0.3.9 // indirect
github.com/jmpsec/osctrl/queries v0.3.9 // indirect
github.com/jmpsec/osctrl/settings v0.3.9 // indirect
github.com/jmpsec/osctrl/version v0.3.9 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/segmentio/ksuid v1.0.4 // indirect
golang.org/x/text v0.18.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.8"
OsctrlVersion = "0.3.9"
// OsqueryVersion to have the version for osquery defined
OsqueryVersion = "5.12.1"
)
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.8", OsctrlVersion)
assert.Equal(t, "0.3.9", OsctrlVersion)
}

0 comments on commit 378777b

Please sign in to comment.