Skip to content

Commit bdba30d

Browse files
javutojavuto
authored
Merge pull request #556 from jmpsec/prepare-osctrl-0.4.1
Preparing release 0.4.1
2 parents fa9eda8 + 29b9653 commit bdba30d

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.4.0
1+
OSCTRL_VERSION=0.4.1
22
OSQUERY_VERSION=5.13.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.4.0](https://github.com/jmpsec/osctrl/releases/tag/v0.4.0)
3+
## 🔖 Release [0.4.1](https://github.com/jmpsec/osctrl/releases/tag/v0.4.1)
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.4.0
37-
github.com/jmpsec/osctrl/carves v0.4.0
36+
github.com/jmpsec/osctrl/admin/sessions v0.4.1
37+
github.com/jmpsec/osctrl/carves v0.4.1
3838
github.com/jmpsec/osctrl/environments v0.0.0-20241101192351-fd857b3403fb
3939
github.com/jmpsec/osctrl/metrics v0.0.0-20241101192351-fd857b3403fb
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
40+
github.com/jmpsec/osctrl/nodes v0.4.1
41+
github.com/jmpsec/osctrl/queries v0.4.1
42+
github.com/jmpsec/osctrl/settings v0.4.1
4343
github.com/jmpsec/osctrl/tags v0.0.0-20241030113721-8e7065db6643
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
44+
github.com/jmpsec/osctrl/types v0.4.1
45+
github.com/jmpsec/osctrl/users v0.4.1
46+
github.com/jmpsec/osctrl/utils v0.4.1
4747
)
4848

4949
require (
@@ -72,7 +72,7 @@ require (
7272
github.com/jackc/pgpassfile v1.0.0 // indirect
7373
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
7474
github.com/jackc/puddle/v2 v2.2.2 // indirect
75-
github.com/jmpsec/osctrl/backend v0.4.0
75+
github.com/jmpsec/osctrl/backend v0.4.1
7676
github.com/mattn/go-colorable v0.1.13 // indirect
7777
github.com/mattn/go-isatty v0.0.20 // indirect
7878
github.com/rs/zerolog v1.33.0
@@ -114,7 +114,7 @@ require (
114114
github.com/jinzhu/now v1.1.5 // indirect
115115
github.com/jmespath/go-jmespath v0.4.0 // indirect
116116
github.com/jmpsec/osctrl/logging v0.0.0-20241101192351-fd857b3403fb
117-
github.com/jmpsec/osctrl/version v0.4.0 // indirect
117+
github.com/jmpsec/osctrl/version v0.4.1 // indirect
118118
github.com/magiconair/properties v1.8.7 // indirect
119119
github.com/mitchellh/mapstructure v1.5.0 // indirect
120120
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.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
24+
github.com/jmpsec/osctrl/nodes v0.4.1 // indirect
25+
github.com/jmpsec/osctrl/queries v0.4.1 // indirect
26+
github.com/jmpsec/osctrl/types v0.4.1 // indirect
27+
github.com/jmpsec/osctrl/users v0.4.1
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-20241101192351-fd857b3403fb // indirect
47-
github.com/jmpsec/osctrl/settings v0.4.0 // indirect
48-
github.com/jmpsec/osctrl/version v0.4.0 // indirect
47+
github.com/jmpsec/osctrl/settings v0.4.1 // indirect
48+
github.com/jmpsec/osctrl/version v0.4.1 // indirect
4949
github.com/rs/zerolog v1.33.0
5050
github.com/segmentio/ksuid v1.0.4 // indirect
5151
golang.org/x/crypto v0.28.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-20241101192351-fd857b3403fb
3737
github.com/jmpsec/osctrl/logging v0.0.0-20241101192351-fd857b3403fb
3838
github.com/jmpsec/osctrl/metrics v0.0.0-20241101192351-fd857b3403fb
39-
github.com/jmpsec/osctrl/nodes v0.4.0
40-
github.com/jmpsec/osctrl/queries v0.4.0
39+
github.com/jmpsec/osctrl/nodes v0.4.1
40+
github.com/jmpsec/osctrl/queries v0.4.1
4141
github.com/jmpsec/osctrl/tags v0.0.0-20241030113721-8e7065db6643
4242
github.com/jmpsec/osctrl/users v0.0.0-20241030113721-8e7065db6643
43-
github.com/jmpsec/osctrl/utils v0.4.0
43+
github.com/jmpsec/osctrl/utils v0.4.1
4444
github.com/rs/zerolog v1.33.0
4545
gorm.io/gorm v1.25.12
4646
)
@@ -83,8 +83,8 @@ require (
8383
github.com/jackc/pgx/v5 v5.7.1 // indirect
8484
github.com/jackc/puddle/v2 v2.2.2 // indirect
8585
github.com/jmespath/go-jmespath v0.4.0 // indirect
86-
github.com/jmpsec/osctrl/backend v0.4.0 // indirect
87-
github.com/jmpsec/osctrl/version v0.4.0 // indirect
86+
github.com/jmpsec/osctrl/backend v0.4.1 // indirect
87+
github.com/jmpsec/osctrl/version v0.4.1 // indirect
8888
github.com/klauspost/compress v1.17.11 // indirect
8989
github.com/magiconair/properties v1.8.7 // indirect
9090
github.com/mattn/go-colorable v0.1.13 // indirect
@@ -121,7 +121,7 @@ require (
121121
require (
122122
github.com/jinzhu/inflection v1.0.0 // indirect
123123
github.com/jinzhu/now v1.1.5 // indirect
124-
github.com/jmpsec/osctrl/settings v0.4.0
125-
github.com/jmpsec/osctrl/types v0.4.0
124+
github.com/jmpsec/osctrl/settings v0.4.1
125+
github.com/jmpsec/osctrl/types v0.4.1
126126
golang.org/x/text v0.19.0 // indirect
127127
)

‎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.4.0 // indirect
28-
github.com/jmpsec/osctrl/queries v0.4.0 // indirect
27+
github.com/jmpsec/osctrl/nodes v0.4.1 // indirect
28+
github.com/jmpsec/osctrl/queries v0.4.1 // indirect
2929
github.com/jmpsec/osctrl/utils v0.0.0-20241101192351-fd857b3403fb // 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.4.0 // indirect
18-
github.com/jmpsec/osctrl/queries v0.4.0 // indirect
17+
github.com/jmpsec/osctrl/nodes v0.4.1 // indirect
18+
github.com/jmpsec/osctrl/queries v0.4.1 // indirect
1919
github.com/jmpsec/osctrl/types v0.0.0-20241101192351-fd857b3403fb
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.4.0
1+
OSCTRL_VERSION=0.4.1
22
OSQUERY_VERSION=5.13.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.4.0 // indirect
34-
github.com/jmpsec/osctrl/queries v0.4.0 // indirect
33+
github.com/jmpsec/osctrl/nodes v0.4.1 // indirect
34+
github.com/jmpsec/osctrl/queries v0.4.1 // indirect
3535
github.com/jmpsec/osctrl/types v0.0.0-20241101192351-fd857b3403fb // 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.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
46+
github.com/jmpsec/osctrl/admin/handlers v0.4.1
47+
github.com/jmpsec/osctrl/admin/sessions v0.4.1
48+
github.com/jmpsec/osctrl/api/handlers v0.4.1
49+
github.com/jmpsec/osctrl/backend v0.4.1
50+
github.com/jmpsec/osctrl/cache v0.4.1
51+
github.com/jmpsec/osctrl/carves v0.4.1
52+
github.com/jmpsec/osctrl/environments v0.4.1
53+
github.com/jmpsec/osctrl/logging v0.4.1
54+
github.com/jmpsec/osctrl/metrics v0.4.1
55+
github.com/jmpsec/osctrl/nodes v0.4.1
56+
github.com/jmpsec/osctrl/queries v0.4.1
57+
github.com/jmpsec/osctrl/settings v0.4.1
58+
github.com/jmpsec/osctrl/tags v0.4.1
59+
github.com/jmpsec/osctrl/tls/handlers v0.4.1
60+
github.com/jmpsec/osctrl/types v0.4.1
61+
github.com/jmpsec/osctrl/users v0.4.1
62+
github.com/jmpsec/osctrl/utils v0.4.1
63+
github.com/jmpsec/osctrl/version v0.4.1
6464
github.com/olekukonko/tablewriter v0.0.5
6565
github.com/prometheus/client_golang v1.20.5
6666
github.com/spf13/viper v1.19.0

0 commit comments

Comments
 (0)