Skip to content

Commit 15ae963

Browse files
javutojavuto
authored
Merge pull request #521 from jmpsec/prepare-osctrl-0.4.0
Preparing release 0.4.0
2 parents f3d689d + 6ac57ef commit 15ae963

File tree

17 files changed

+71
-71
lines changed

17 files changed

+71
-71
lines changed

‎.env.example‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
OSCTRL_VERSION=0.3.9
1+
OSCTRL_VERSION=0.4.0
22
OSQUERY_VERSION=5.12.1
33
NGINX_VERSION=1.21.6-alpine
44
POSTGRES_VERSION=13.5-alpine

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# osctrl Changelog
22

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

55
### 🚨 Breaking Changes
66

‎admin/handlers/go.mod‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,17 @@ replace github.com/jmpsec/osctrl/utils => ../../utils
3333
replace github.com/jmpsec/osctrl/version => ../../version
3434

3535
require (
36-
github.com/jmpsec/osctrl/admin/sessions v0.3.9
37-
github.com/jmpsec/osctrl/carves v0.3.9
36+
github.com/jmpsec/osctrl/admin/sessions v0.4.0
37+
github.com/jmpsec/osctrl/carves v0.4.0
3838
github.com/jmpsec/osctrl/environments v0.0.0-20240926152724-6f0cf5eace97
3939
github.com/jmpsec/osctrl/metrics v0.0.0-20240926152724-6f0cf5eace97
40-
github.com/jmpsec/osctrl/nodes v0.3.9
41-
github.com/jmpsec/osctrl/queries v0.3.9
42-
github.com/jmpsec/osctrl/settings v0.3.9
40+
github.com/jmpsec/osctrl/nodes v0.4.0
41+
github.com/jmpsec/osctrl/queries v0.4.0
42+
github.com/jmpsec/osctrl/settings v0.4.0
4343
github.com/jmpsec/osctrl/tags v0.0.0-20240926152724-6f0cf5eace97
44-
github.com/jmpsec/osctrl/types v0.3.9
45-
github.com/jmpsec/osctrl/users v0.3.9
46-
github.com/jmpsec/osctrl/utils v0.3.9
44+
github.com/jmpsec/osctrl/types v0.4.0
45+
github.com/jmpsec/osctrl/users v0.4.0
46+
github.com/jmpsec/osctrl/utils v0.4.0
4747
)
4848

4949
require (
@@ -56,7 +56,7 @@ require (
5656
github.com/jackc/pgpassfile v1.0.0 // indirect
5757
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
5858
github.com/jackc/puddle/v2 v2.2.2 // indirect
59-
github.com/jmpsec/osctrl/backend v0.3.9
59+
github.com/jmpsec/osctrl/backend v0.4.0
6060
github.com/mattn/go-colorable v0.1.13 // indirect
6161
github.com/mattn/go-isatty v0.0.20 // indirect
6262
github.com/rs/zerolog v1.33.0
@@ -98,7 +98,7 @@ require (
9898
github.com/jinzhu/now v1.1.5 // indirect
9999
github.com/jmespath/go-jmespath v0.4.0 // indirect
100100
github.com/jmpsec/osctrl/logging v0.0.0-20240926110606-74392bf45499
101-
github.com/jmpsec/osctrl/version v0.3.9 // indirect
101+
github.com/jmpsec/osctrl/version v0.4.0 // indirect
102102
github.com/magiconair/properties v1.8.7 // indirect
103103
github.com/mitchellh/mapstructure v1.5.0 // indirect
104104
github.com/pelletier/go-toml/v2 v2.2.3 // indirect

‎admin/sessions/go.mod‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ replace github.com/jmpsec/osctrl/version => ../../version
2121
require (
2222
github.com/gorilla/securecookie v1.1.2
2323
github.com/gorilla/sessions v1.4.0
24-
github.com/jmpsec/osctrl/nodes v0.3.9 // indirect
25-
github.com/jmpsec/osctrl/queries v0.3.9 // indirect
26-
github.com/jmpsec/osctrl/types v0.3.9 // indirect
27-
github.com/jmpsec/osctrl/users v0.3.9
24+
github.com/jmpsec/osctrl/nodes v0.4.0 // indirect
25+
github.com/jmpsec/osctrl/queries v0.4.0 // indirect
26+
github.com/jmpsec/osctrl/types v0.4.0 // indirect
27+
github.com/jmpsec/osctrl/users v0.4.0
2828
)
2929

3030
require (
@@ -44,8 +44,8 @@ require (
4444
github.com/jinzhu/inflection v1.0.0 // indirect
4545
github.com/jinzhu/now v1.1.5 // indirect
4646
github.com/jmpsec/osctrl/environments v0.0.0-20240926152724-6f0cf5eace97 // indirect
47-
github.com/jmpsec/osctrl/settings v0.3.9 // indirect
48-
github.com/jmpsec/osctrl/version v0.3.9 // indirect
47+
github.com/jmpsec/osctrl/settings v0.4.0 // indirect
48+
github.com/jmpsec/osctrl/version v0.4.0 // indirect
4949
github.com/rs/zerolog v1.33.0
5050
github.com/segmentio/ksuid v1.0.4 // indirect
5151
golang.org/x/crypto v0.27.0 // indirect

‎api/handlers/go.mod‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ require (
3636
github.com/jmpsec/osctrl/environments v0.0.0-20240926152724-6f0cf5eace97
3737
github.com/jmpsec/osctrl/logging v0.0.0-20240926110606-74392bf45499
3838
github.com/jmpsec/osctrl/metrics v0.0.0-20240926152724-6f0cf5eace97
39-
github.com/jmpsec/osctrl/nodes v0.3.9
40-
github.com/jmpsec/osctrl/queries v0.3.9
39+
github.com/jmpsec/osctrl/nodes v0.4.0
40+
github.com/jmpsec/osctrl/queries v0.4.0
4141
github.com/jmpsec/osctrl/tags v0.0.0-20240926152724-6f0cf5eace97
4242
github.com/jmpsec/osctrl/users v0.0.0-20240926152724-6f0cf5eace97
43-
github.com/jmpsec/osctrl/utils v0.3.9
43+
github.com/jmpsec/osctrl/utils v0.4.0
4444
github.com/rs/zerolog v1.33.0
4545
gorm.io/gorm v1.25.12
4646
)
@@ -78,8 +78,8 @@ require (
7878
github.com/jackc/pgx/v5 v5.7.1 // indirect
7979
github.com/jackc/puddle/v2 v2.2.2 // indirect
8080
github.com/jmespath/go-jmespath v0.4.0 // indirect
81-
github.com/jmpsec/osctrl/backend v0.3.9 // indirect
82-
github.com/jmpsec/osctrl/version v0.3.9 // indirect
81+
github.com/jmpsec/osctrl/backend v0.4.0 // indirect
82+
github.com/jmpsec/osctrl/version v0.4.0 // indirect
8383
github.com/magiconair/properties v1.8.7 // indirect
8484
github.com/mattn/go-colorable v0.1.13 // indirect
8585
github.com/mattn/go-isatty v0.0.20 // indirect
@@ -108,7 +108,7 @@ require (
108108
require (
109109
github.com/jinzhu/inflection v1.0.0 // indirect
110110
github.com/jinzhu/now v1.1.5 // indirect
111-
github.com/jmpsec/osctrl/settings v0.3.9
112-
github.com/jmpsec/osctrl/types v0.3.9
111+
github.com/jmpsec/osctrl/settings v0.4.0
112+
github.com/jmpsec/osctrl/types v0.4.0
113113
golang.org/x/text v0.18.0 // indirect
114114
)

‎cache/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ require (
2424
github.com/hashicorp/hcl v1.0.0 // indirect
2525
github.com/jinzhu/inflection v1.0.0 // indirect
2626
github.com/jinzhu/now v1.1.5 // indirect
27-
github.com/jmpsec/osctrl/nodes v0.3.9 // indirect
28-
github.com/jmpsec/osctrl/queries v0.3.9 // indirect
27+
github.com/jmpsec/osctrl/nodes v0.4.0 // indirect
28+
github.com/jmpsec/osctrl/queries v0.4.0 // indirect
2929
github.com/jmpsec/osctrl/utils v0.0.0-20240926152724-6f0cf5eace97 // indirect
3030
github.com/magiconair/properties v1.8.7 // indirect
3131
github.com/mattn/go-colorable v0.1.13 // indirect

‎carves/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ replace github.com/jmpsec/osctrl/utils => ../utils
1414

1515
require (
1616
github.com/jinzhu/gorm v1.9.16
17-
github.com/jmpsec/osctrl/nodes v0.3.9 // indirect
18-
github.com/jmpsec/osctrl/queries v0.3.9 // indirect
17+
github.com/jmpsec/osctrl/nodes v0.4.0 // indirect
18+
github.com/jmpsec/osctrl/queries v0.4.0 // indirect
1919
github.com/jmpsec/osctrl/types v0.0.0-20240926152724-6f0cf5eace97
2020
)
2121

‎deploy/docker/conf/dev/.env.example‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
OSCTRL_VERSION=0.3.9
1+
OSCTRL_VERSION=0.4.0
22
OSQUERY_VERSION=5.12.1
33
NGINX_VERSION=1.21.6-alpine
44
POSTGRES_VERSION=13.5-alpine

‎environments/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ require (
3030
github.com/davecgh/go-spew v1.1.1 // indirect
3131
github.com/jinzhu/inflection v1.0.0 // indirect
3232
github.com/jinzhu/now v1.1.5 // indirect
33-
github.com/jmpsec/osctrl/nodes v0.3.9 // indirect
34-
github.com/jmpsec/osctrl/queries v0.3.9 // indirect
33+
github.com/jmpsec/osctrl/nodes v0.4.0 // indirect
34+
github.com/jmpsec/osctrl/queries v0.4.0 // indirect
3535
github.com/jmpsec/osctrl/types v0.0.0-20240926152724-6f0cf5eace97 // indirect
3636
github.com/mattn/go-colorable v0.1.13 // indirect
3737
github.com/mattn/go-isatty v0.0.20 // indirect

‎go.mod‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -43,24 +43,24 @@ replace github.com/jmpsec/osctrl/version => ./version
4343
require (
4444
github.com/crewjam/saml v0.4.14
4545
github.com/golang-jwt/jwt/v4 v4.5.0
46-
github.com/jmpsec/osctrl/admin/handlers v0.3.9
47-
github.com/jmpsec/osctrl/admin/sessions v0.3.9
48-
github.com/jmpsec/osctrl/api/handlers v0.3.9
49-
github.com/jmpsec/osctrl/backend v0.3.9
50-
github.com/jmpsec/osctrl/cache v0.3.9
51-
github.com/jmpsec/osctrl/carves v0.3.9
52-
github.com/jmpsec/osctrl/environments v0.3.9
53-
github.com/jmpsec/osctrl/logging v0.3.9
54-
github.com/jmpsec/osctrl/metrics v0.3.9
55-
github.com/jmpsec/osctrl/nodes v0.3.9
56-
github.com/jmpsec/osctrl/queries v0.3.9
57-
github.com/jmpsec/osctrl/settings v0.3.9
58-
github.com/jmpsec/osctrl/tags v0.3.9
59-
github.com/jmpsec/osctrl/tls/handlers v0.3.9
60-
github.com/jmpsec/osctrl/types v0.3.9
61-
github.com/jmpsec/osctrl/users v0.3.9
62-
github.com/jmpsec/osctrl/utils v0.3.9
63-
github.com/jmpsec/osctrl/version v0.3.9
46+
github.com/jmpsec/osctrl/admin/handlers v0.4.0
47+
github.com/jmpsec/osctrl/admin/sessions v0.4.0
48+
github.com/jmpsec/osctrl/api/handlers v0.4.0
49+
github.com/jmpsec/osctrl/backend v0.4.0
50+
github.com/jmpsec/osctrl/cache v0.4.0
51+
github.com/jmpsec/osctrl/carves v0.4.0
52+
github.com/jmpsec/osctrl/environments v0.4.0
53+
github.com/jmpsec/osctrl/logging v0.4.0
54+
github.com/jmpsec/osctrl/metrics v0.4.0
55+
github.com/jmpsec/osctrl/nodes v0.4.0
56+
github.com/jmpsec/osctrl/queries v0.4.0
57+
github.com/jmpsec/osctrl/settings v0.4.0
58+
github.com/jmpsec/osctrl/tags v0.4.0
59+
github.com/jmpsec/osctrl/tls/handlers v0.4.0
60+
github.com/jmpsec/osctrl/types v0.4.0
61+
github.com/jmpsec/osctrl/users v0.4.0
62+
github.com/jmpsec/osctrl/utils v0.4.0
63+
github.com/jmpsec/osctrl/version v0.4.0
6464
github.com/olekukonko/tablewriter v0.0.5
6565
github.com/spf13/viper v1.19.0
6666
github.com/urfave/cli/v2 v2.25.7

0 commit comments

Comments
 (0)