Skip to content

Commit

Permalink
Preparing release 0.4.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@javuto
javuto committed Jan 10, 2025
1 parent d06a2bd commit 99ac7bd
Show file tree
Hide file tree
Showing 16 changed files with 69 additions and 69 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.4.1
OSCTRL_VERSION=0.4.2
OSQUERY_VERSION=5.14.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.4.1](https://github.com/jmpsec/osctrl/releases/tag/v0.4.1)
## 🔖 Release [0.4.2](https://github.com/jmpsec/osctrl/releases/tag/v0.4.2)

### 🚨 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.4.1
github.com/jmpsec/osctrl/carves v0.4.1
github.com/jmpsec/osctrl/admin/sessions v0.4.2
github.com/jmpsec/osctrl/carves v0.4.2
github.com/jmpsec/osctrl/environments v0.0.0-20250107100834-63b2a2991001
github.com/jmpsec/osctrl/metrics v0.0.0-20250107100834-63b2a2991001
github.com/jmpsec/osctrl/nodes v0.4.1
github.com/jmpsec/osctrl/queries v0.4.1
github.com/jmpsec/osctrl/settings v0.4.1
github.com/jmpsec/osctrl/nodes v0.4.2
github.com/jmpsec/osctrl/queries v0.4.2
github.com/jmpsec/osctrl/settings v0.4.2
github.com/jmpsec/osctrl/tags v0.0.0-20250107100834-63b2a2991001
github.com/jmpsec/osctrl/types v0.4.1
github.com/jmpsec/osctrl/users v0.4.1
github.com/jmpsec/osctrl/utils v0.4.1
github.com/jmpsec/osctrl/types v0.4.2
github.com/jmpsec/osctrl/users v0.4.2
github.com/jmpsec/osctrl/utils v0.4.2
)

require (
Expand Down Expand Up @@ -73,7 +73,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.4.1
github.com/jmpsec/osctrl/backend v0.4.2
github.com/mattn/go-colorable v0.1.14 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/rs/zerolog v1.33.0
Expand Down Expand Up @@ -115,7 +115,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-20250107100834-63b2a2991001
github.com/jmpsec/osctrl/version v0.4.1 // indirect
github.com/jmpsec/osctrl/version v0.4.2 // indirect
github.com/magiconair/properties v1.8.9 // 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.4.1 // indirect
github.com/jmpsec/osctrl/queries v0.4.1 // indirect
github.com/jmpsec/osctrl/types v0.4.1 // indirect
github.com/jmpsec/osctrl/users v0.4.1
github.com/jmpsec/osctrl/nodes v0.4.2 // indirect
github.com/jmpsec/osctrl/queries v0.4.2 // indirect
github.com/jmpsec/osctrl/types v0.4.2 // indirect
github.com/jmpsec/osctrl/users v0.4.2
)

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-20250107100834-63b2a2991001 // indirect
github.com/jmpsec/osctrl/settings v0.4.1 // indirect
github.com/jmpsec/osctrl/version v0.4.1 // indirect
github.com/jmpsec/osctrl/settings v0.4.2 // indirect
github.com/jmpsec/osctrl/version v0.4.2 // indirect
github.com/rs/zerolog v1.33.0
github.com/segmentio/ksuid v1.0.4 // indirect
golang.org/x/crypto v0.32.0 // indirect
Expand Down
14 changes: 7 additions & 7 deletions api/handlers/go.mod
View file
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-20250107100834-63b2a2991001
github.com/jmpsec/osctrl/logging v0.0.0-20250107100834-63b2a2991001
github.com/jmpsec/osctrl/metrics v0.0.0-20250107100834-63b2a2991001
github.com/jmpsec/osctrl/nodes v0.4.1
github.com/jmpsec/osctrl/queries v0.4.1
github.com/jmpsec/osctrl/nodes v0.4.2
github.com/jmpsec/osctrl/queries v0.4.2
github.com/jmpsec/osctrl/tags v0.0.0-20250107100834-63b2a2991001
github.com/jmpsec/osctrl/users v0.0.0-20250107100834-63b2a2991001
github.com/jmpsec/osctrl/utils v0.4.1
github.com/jmpsec/osctrl/utils v0.4.2
github.com/rs/zerolog v1.33.0
gorm.io/gorm v1.25.12
)
Expand Down Expand Up @@ -83,8 +83,8 @@ require (
github.com/jackc/pgx/v5 v5.7.2 // 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.4.1 // indirect
github.com/jmpsec/osctrl/version v0.4.1 // indirect
github.com/jmpsec/osctrl/backend v0.4.2 // indirect
github.com/jmpsec/osctrl/version v0.4.2 // indirect
github.com/klauspost/compress v1.17.11 // indirect
github.com/magiconair/properties v1.8.9 // indirect
github.com/mattn/go-colorable v0.1.14 // indirect
Expand Down Expand Up @@ -122,7 +122,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.4.1
github.com/jmpsec/osctrl/types v0.4.1
github.com/jmpsec/osctrl/settings v0.4.2
github.com/jmpsec/osctrl/types v0.4.2
golang.org/x/text v0.21.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.4.1 // indirect
github.com/jmpsec/osctrl/queries v0.4.1 // indirect
github.com/jmpsec/osctrl/nodes v0.4.2 // indirect
github.com/jmpsec/osctrl/queries v0.4.2 // indirect
github.com/jmpsec/osctrl/utils v0.0.0-20250107100834-63b2a2991001 // indirect
github.com/magiconair/properties v1.8.9 // indirect
github.com/mattn/go-colorable v0.1.14 // 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.4.1 // indirect
github.com/jmpsec/osctrl/queries v0.4.1 // indirect
github.com/jmpsec/osctrl/nodes v0.4.2 // indirect
github.com/jmpsec/osctrl/queries v0.4.2 // indirect
github.com/jmpsec/osctrl/types v0.0.0-20250107100834-63b2a2991001
)

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.4.1
OSCTRL_VERSION=0.4.2
OSQUERY_VERSION=5.14.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 @@ -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.4.1 // indirect
github.com/jmpsec/osctrl/queries v0.4.1 // indirect
github.com/jmpsec/osctrl/nodes v0.4.2 // indirect
github.com/jmpsec/osctrl/queries v0.4.2 // indirect
github.com/jmpsec/osctrl/types v0.0.0-20250107100834-63b2a2991001 // indirect
github.com/mattn/go-colorable v0.1.14 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
Expand Down
36 changes: 18 additions & 18 deletions go.mod
View file
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.1
github.com/jmpsec/osctrl/admin/handlers v0.4.1
github.com/jmpsec/osctrl/admin/sessions v0.4.1
github.com/jmpsec/osctrl/api/handlers v0.4.1
github.com/jmpsec/osctrl/backend v0.4.1
github.com/jmpsec/osctrl/cache v0.4.1
github.com/jmpsec/osctrl/carves v0.4.1
github.com/jmpsec/osctrl/environments v0.4.1
github.com/jmpsec/osctrl/logging v0.4.1
github.com/jmpsec/osctrl/metrics v0.4.1
github.com/jmpsec/osctrl/nodes v0.4.1
github.com/jmpsec/osctrl/queries v0.4.1
github.com/jmpsec/osctrl/settings v0.4.1
github.com/jmpsec/osctrl/tags v0.4.1
github.com/jmpsec/osctrl/tls/handlers v0.4.1
github.com/jmpsec/osctrl/types v0.4.1
github.com/jmpsec/osctrl/users v0.4.1
github.com/jmpsec/osctrl/utils v0.4.1
github.com/jmpsec/osctrl/version v0.4.1
github.com/jmpsec/osctrl/admin/handlers v0.4.2
github.com/jmpsec/osctrl/admin/sessions v0.4.2
github.com/jmpsec/osctrl/api/handlers v0.4.2
github.com/jmpsec/osctrl/backend v0.4.2
github.com/jmpsec/osctrl/cache v0.4.2
github.com/jmpsec/osctrl/carves v0.4.2
github.com/jmpsec/osctrl/environments v0.4.2
github.com/jmpsec/osctrl/logging v0.4.2
github.com/jmpsec/osctrl/metrics v0.4.2
github.com/jmpsec/osctrl/nodes v0.4.2
github.com/jmpsec/osctrl/queries v0.4.2
github.com/jmpsec/osctrl/settings v0.4.2
github.com/jmpsec/osctrl/tags v0.4.2
github.com/jmpsec/osctrl/tls/handlers v0.4.2
github.com/jmpsec/osctrl/types v0.4.2
github.com/jmpsec/osctrl/users v0.4.2
github.com/jmpsec/osctrl/utils v0.4.2
github.com/jmpsec/osctrl/version v0.4.2
github.com/olekukonko/tablewriter v0.0.5
github.com/prometheus/client_golang v1.20.5
github.com/spf13/viper v1.19.0
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.50
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.47
github.com/aws/aws-sdk-go-v2/service/s3 v1.72.2
github.com/jmpsec/osctrl/backend v0.4.1
github.com/jmpsec/osctrl/nodes v0.4.1
github.com/jmpsec/osctrl/queries v0.4.1
github.com/jmpsec/osctrl/settings v0.4.1
github.com/jmpsec/osctrl/types v0.4.1
github.com/jmpsec/osctrl/utils v0.4.1
github.com/jmpsec/osctrl/backend v0.4.2
github.com/jmpsec/osctrl/nodes v0.4.2
github.com/jmpsec/osctrl/queries v0.4.2
github.com/jmpsec/osctrl/settings v0.4.2
github.com/jmpsec/osctrl/types v0.4.2
github.com/jmpsec/osctrl/utils v0.4.2
github.com/rs/zerolog v1.33.0
github.com/spf13/viper v1.19.0
github.com/twmb/franz-go v1.18.0
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.4.1
version: 0.4.2
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.4.1 // indirect
github.com/jmpsec/osctrl/backend v0.4.2 // indirect
github.com/jmpsec/osctrl/environments v0.0.0-20250107100834-63b2a2991001
github.com/jmpsec/osctrl/metrics v0.0.0-20250107100834-63b2a2991001
github.com/jmpsec/osctrl/nodes v0.4.1
github.com/jmpsec/osctrl/queries v0.4.1
github.com/jmpsec/osctrl/settings v0.4.1
github.com/jmpsec/osctrl/nodes v0.4.2
github.com/jmpsec/osctrl/queries v0.4.2
github.com/jmpsec/osctrl/settings v0.4.2
github.com/jmpsec/osctrl/tags v0.0.0-20250107100834-63b2a2991001
github.com/jmpsec/osctrl/types v0.4.1
github.com/jmpsec/osctrl/utils v0.4.1
github.com/jmpsec/osctrl/types v0.4.2
github.com/jmpsec/osctrl/utils v0.4.2
github.com/segmentio/ksuid v1.0.4
github.com/stretchr/testify v1.10.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 @@ -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.4.1 // indirect
github.com/jmpsec/osctrl/queries v0.4.1 // indirect
github.com/jmpsec/osctrl/settings v0.4.1 // indirect
github.com/jmpsec/osctrl/version v0.4.1 // indirect
github.com/jmpsec/osctrl/nodes v0.4.2 // indirect
github.com/jmpsec/osctrl/queries v0.4.2 // indirect
github.com/jmpsec/osctrl/settings v0.4.2 // indirect
github.com/jmpsec/osctrl/version v0.4.2 // 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
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.4.1"
OsctrlVersion = "0.4.2"
// OsqueryVersion to have the version for osquery defined
OsqueryVersion = "5.14.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.4.1", OsctrlVersion)
assert.Equal(t, "0.4.2", OsctrlVersion)
}

0 comments on commit 99ac7bd

Please sign in to comment.