Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Preparing release 0.4.0 #521

Merged
merged 1 commit into from
Sep 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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.3.9
OSCTRL_VERSION=0.4.0
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
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# osctrl Changelog

## 🔖 Release [0.3.9](https://github.com/jmpsec/osctrl/releases/tag/v0.3.9)
## 🔖 Release [0.4.0](https://github.com/jmpsec/osctrl/releases/tag/v0.4.0)

### 🚨 Breaking Changes

Expand Down
20 changes: 10 additions & 10 deletions admin/handlers/go.mod
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.9
github.com/jmpsec/osctrl/carves v0.3.9
github.com/jmpsec/osctrl/admin/sessions v0.4.0
github.com/jmpsec/osctrl/carves v0.4.0
github.com/jmpsec/osctrl/environments v0.0.0-20240926152724-6f0cf5eace97
github.com/jmpsec/osctrl/metrics v0.0.0-20240926152724-6f0cf5eace97
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/nodes v0.4.0
github.com/jmpsec/osctrl/queries v0.4.0
github.com/jmpsec/osctrl/settings v0.4.0
github.com/jmpsec/osctrl/tags v0.0.0-20240926152724-6f0cf5eace97
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/types v0.4.0
github.com/jmpsec/osctrl/users v0.4.0
github.com/jmpsec/osctrl/utils v0.4.0
)

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.2 // indirect
github.com/jmpsec/osctrl/backend v0.3.9
github.com/jmpsec/osctrl/backend v0.4.0
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
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-20240926110606-74392bf45499
github.com/jmpsec/osctrl/version v0.3.9 // indirect
github.com/jmpsec/osctrl/version v0.4.0 // 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
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.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
github.com/jmpsec/osctrl/nodes v0.4.0 // indirect
github.com/jmpsec/osctrl/queries v0.4.0 // indirect
github.com/jmpsec/osctrl/types v0.4.0 // indirect
github.com/jmpsec/osctrl/users v0.4.0
)

require (
Expand All @@ -44,8 +44,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-20240926152724-6f0cf5eace97 // indirect
github.com/jmpsec/osctrl/settings v0.3.9 // indirect
github.com/jmpsec/osctrl/version v0.3.9 // indirect
github.com/jmpsec/osctrl/settings v0.4.0 // indirect
github.com/jmpsec/osctrl/version v0.4.0 // indirect
github.com/rs/zerolog v1.33.0
github.com/segmentio/ksuid v1.0.4 // indirect
golang.org/x/crypto v0.27.0 // indirect
Expand Down
14 changes: 7 additions & 7 deletions api/handlers/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ require (
github.com/jmpsec/osctrl/environments v0.0.0-20240926152724-6f0cf5eace97
github.com/jmpsec/osctrl/logging v0.0.0-20240926110606-74392bf45499
github.com/jmpsec/osctrl/metrics v0.0.0-20240926152724-6f0cf5eace97
github.com/jmpsec/osctrl/nodes v0.3.9
github.com/jmpsec/osctrl/queries v0.3.9
github.com/jmpsec/osctrl/nodes v0.4.0
github.com/jmpsec/osctrl/queries v0.4.0
github.com/jmpsec/osctrl/tags v0.0.0-20240926152724-6f0cf5eace97
github.com/jmpsec/osctrl/users v0.0.0-20240926152724-6f0cf5eace97
github.com/jmpsec/osctrl/utils v0.3.9
github.com/jmpsec/osctrl/utils v0.4.0
github.com/rs/zerolog v1.33.0
gorm.io/gorm v1.25.12
)
Expand Down Expand Up @@ -78,8 +78,8 @@ require (
github.com/jackc/pgx/v5 v5.7.1 // indirect
github.com/jackc/puddle/v2 v2.2.2 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/jmpsec/osctrl/backend v0.3.9 // indirect
github.com/jmpsec/osctrl/version v0.3.9 // indirect
github.com/jmpsec/osctrl/backend v0.4.0 // indirect
github.com/jmpsec/osctrl/version v0.4.0 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
Expand Down Expand Up @@ -108,7 +108,7 @@ require (
require (
github.com/jinzhu/inflection v1.0.0 // indirect
github.com/jinzhu/now v1.1.5 // indirect
github.com/jmpsec/osctrl/settings v0.3.9
github.com/jmpsec/osctrl/types v0.3.9
github.com/jmpsec/osctrl/settings v0.4.0
github.com/jmpsec/osctrl/types v0.4.0
golang.org/x/text v0.18.0 // indirect
)
4 changes: 2 additions & 2 deletions cache/go.mod
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.9 // indirect
github.com/jmpsec/osctrl/queries v0.3.9 // indirect
github.com/jmpsec/osctrl/nodes v0.4.0 // indirect
github.com/jmpsec/osctrl/queries v0.4.0 // indirect
github.com/jmpsec/osctrl/utils v0.0.0-20240926152724-6f0cf5eace97 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
Expand Down
4 changes: 2 additions & 2 deletions carves/go.mod
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.9 // indirect
github.com/jmpsec/osctrl/queries v0.3.9 // indirect
github.com/jmpsec/osctrl/nodes v0.4.0 // indirect
github.com/jmpsec/osctrl/queries v0.4.0 // indirect
github.com/jmpsec/osctrl/types v0.0.0-20240926152724-6f0cf5eace97
)

Expand Down
2 changes: 1 addition & 1 deletion deploy/docker/conf/dev/.env.example
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
OSCTRL_VERSION=0.3.9
OSCTRL_VERSION=0.4.0
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
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,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.9 // indirect
github.com/jmpsec/osctrl/queries v0.3.9 // indirect
github.com/jmpsec/osctrl/nodes v0.4.0 // indirect
github.com/jmpsec/osctrl/queries v0.4.0 // indirect
github.com/jmpsec/osctrl/types v0.0.0-20240926152724-6f0cf5eace97 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
Expand Down
36 changes: 18 additions & 18 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -43,24 +43,24 @@ 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.9
github.com/jmpsec/osctrl/admin/sessions v0.3.9
github.com/jmpsec/osctrl/api/handlers 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/jmpsec/osctrl/admin/handlers v0.4.0
github.com/jmpsec/osctrl/admin/sessions v0.4.0
github.com/jmpsec/osctrl/api/handlers v0.4.0
github.com/jmpsec/osctrl/backend v0.4.0
github.com/jmpsec/osctrl/cache v0.4.0
github.com/jmpsec/osctrl/carves v0.4.0
github.com/jmpsec/osctrl/environments v0.4.0
github.com/jmpsec/osctrl/logging v0.4.0
github.com/jmpsec/osctrl/metrics v0.4.0
github.com/jmpsec/osctrl/nodes v0.4.0
github.com/jmpsec/osctrl/queries v0.4.0
github.com/jmpsec/osctrl/settings v0.4.0
github.com/jmpsec/osctrl/tags v0.4.0
github.com/jmpsec/osctrl/tls/handlers v0.4.0
github.com/jmpsec/osctrl/types v0.4.0
github.com/jmpsec/osctrl/users v0.4.0
github.com/jmpsec/osctrl/utils v0.4.0
github.com/jmpsec/osctrl/version v0.4.0
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
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.36
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.24
github.com/aws/aws-sdk-go-v2/service/s3 v1.63.2
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/jmpsec/osctrl/backend v0.4.0
github.com/jmpsec/osctrl/nodes v0.4.0
github.com/jmpsec/osctrl/queries v0.4.0
github.com/jmpsec/osctrl/settings v0.4.0
github.com/jmpsec/osctrl/types v0.4.0
github.com/jmpsec/osctrl/utils v0.4.0
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
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.9 // indirect
github.com/jmpsec/osctrl/nodes v0.4.0 // indirect
github.com/jmpsec/osctrl/utils v0.0.0-20240926152724-6f0cf5eace97 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
Expand All @@ -45,7 +45,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.9 // indirect
github.com/jmpsec/osctrl/queries v0.4.0 // indirect
github.com/jmpsec/osctrl/types v0.0.0-20240926152724-6f0cf5eace97
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
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.9
version: 0.4.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 @@ -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.9 // indirect
github.com/jmpsec/osctrl/backend v0.4.0 // indirect
github.com/jmpsec/osctrl/environments v0.0.0-20240926152724-6f0cf5eace97
github.com/jmpsec/osctrl/metrics v0.0.0-20240926152724-6f0cf5eace97
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/nodes v0.4.0
github.com/jmpsec/osctrl/queries v0.4.0
github.com/jmpsec/osctrl/settings v0.4.0
github.com/jmpsec/osctrl/tags v0.0.0-20240926152724-6f0cf5eace97
github.com/jmpsec/osctrl/types v0.3.9
github.com/jmpsec/osctrl/utils v0.3.9
github.com/jmpsec/osctrl/types v0.4.0
github.com/jmpsec/osctrl/utils v0.4.0
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
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,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.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/jmpsec/osctrl/nodes v0.4.0 // indirect
github.com/jmpsec/osctrl/queries v0.4.0 // indirect
github.com/jmpsec/osctrl/settings v0.4.0 // indirect
github.com/jmpsec/osctrl/version v0.4.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rs/zerolog v1.33.0
github.com/segmentio/ksuid v1.0.4 // indirect
Expand Down
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.3.9"
OsctrlVersion = "0.4.0"
// OsqueryVersion to have the version for osquery defined
OsqueryVersion = "5.12.1"
)
2 changes: 1 addition & 1 deletion version/version_test.go
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.9", OsctrlVersion)
assert.Equal(t, "0.4.0", OsctrlVersion)
}
Loading