Skip to content

Commit bc27449

Browse files
mmetcmmetc
committed
Merge branch 'master' into releases/1.6.x
2 parents ccc278a + 627eb35 commit bc27449

File tree

14 files changed

+209
-168
lines changed

14 files changed

+209
-168
lines changed

‎.github/codecov.yml‎

Lines changed: 152 additions & 130 deletions
Original file line numberDiff line numberDiff line change
@@ -15,150 +15,172 @@ coverage:
1515
# if a directory is ignored, there is no way to un-ignore files like pkg/models/helpers.go
1616
# so we make a full list
1717
ignore:
18-
- "./pkg/modelscapi/success_response.go"
19-
- "./pkg/modelscapi/get_decisions_stream_response_deleted.go"
20-
- "./pkg/modelscapi/login_request.go"
21-
- "./pkg/modelscapi/get_decisions_stream_response_links.go"
22-
- "./pkg/modelscapi/login_response.go"
23-
- "./pkg/modelscapi/add_signals_request_item.go"
24-
- "./pkg/modelscapi/blocklist_link.go"
25-
- "./pkg/modelscapi/get_decisions_stream_response_deleted_item.go"
26-
- "./pkg/modelscapi/decisions_sync_request.go"
27-
- "./pkg/modelscapi/get_decisions_stream_response.go"
28-
- "./pkg/modelscapi/metrics_request_machines_item.go"
29-
- "./pkg/modelscapi/metrics_request.go"
30-
- "./pkg/modelscapi/get_decisions_stream_response_new.go"
31-
- "./pkg/modelscapi/add_signals_request_item_decisions_item.go"
32-
- "./pkg/modelscapi/metrics_request_bouncers_item.go"
33-
- "./pkg/modelscapi/decisions_sync_request_item_decisions_item.go"
34-
- "./pkg/modelscapi/decisions_delete_request_item.go"
35-
- "./pkg/modelscapi/get_decisions_stream_response_new_item.go"
36-
- "./pkg/modelscapi/decisions_sync_request_item.go"
37-
- "./pkg/modelscapi/add_signals_request.go"
38-
- "./pkg/modelscapi/reset_password_request.go"
39-
- "./pkg/modelscapi/add_signals_request_item_decisions.go"
40-
- "./pkg/modelscapi/decisions_sync_request_item_source.go"
41-
- "./pkg/modelscapi/error_response.go"
42-
- "./pkg/modelscapi/decisions_delete_request.go"
43-
- "./pkg/modelscapi/decisions_sync_request_item_decisions.go"
44-
- "./pkg/modelscapi/enroll_request.go"
45-
- "./pkg/modelscapi/register_request.go"
46-
- "./pkg/modelscapi/add_signals_request_item_source.go"
47-
- "./pkg/models/success_response.go"
48-
- "./pkg/models/hub_items.go"
49-
- "./pkg/models/alert.go"
50-
- "./pkg/models/metrics_bouncer_info.go"
51-
- "./pkg/models/add_signals_request_item.go"
52-
- "./pkg/models/metrics_meta.go"
53-
- "./pkg/models/metrics_detail_item.go"
54-
- "./pkg/models/add_signals_request_item_decisions_item.go"
55-
- "./pkg/models/hub_item.go"
56-
- "./pkg/models/get_alerts_response.go"
57-
- "./pkg/models/metrics_labels.go"
58-
- "./pkg/models/watcher_auth_request.go"
59-
- "./pkg/models/add_alerts_request.go"
60-
- "./pkg/models/event.go"
61-
- "./pkg/models/decisions_delete_request_item.go"
62-
- "./pkg/models/meta.go"
63-
- "./pkg/models/detailed_metrics.go"
64-
- "./pkg/models/delete_alerts_response.go"
65-
- "./pkg/models/remediation_components_metrics.go"
66-
- "./pkg/models/console_options.go"
67-
- "./pkg/models/topx_response.go"
68-
- "./pkg/models/add_signals_request.go"
69-
- "./pkg/models/delete_decision_response.go"
70-
- "./pkg/models/get_decisions_response.go"
71-
- "./pkg/models/add_signals_request_item_decisions.go"
72-
- "./pkg/models/source.go"
73-
- "./pkg/models/decisions_stream_response.go"
74-
- "./pkg/models/error_response.go"
75-
- "./pkg/models/all_metrics.go"
76-
- "./pkg/models/o_sversion.go"
77-
- "./pkg/models/decision.go"
78-
- "./pkg/models/decisions_delete_request.go"
79-
- "./pkg/models/flush_decision_response.go"
80-
- "./pkg/models/watcher_auth_response.go"
81-
- "./pkg/models/lapi_metrics.go"
82-
- "./pkg/models/watcher_registration_request.go"
83-
- "./pkg/models/metrics_agent_info.go"
84-
- "./pkg/models/log_processors_metrics.go"
85-
- "./pkg/models/add_signals_request_item_source.go"
86-
- "./pkg/models/base_metrics.go"
87-
- "./pkg/models/add_alerts_response.go"
88-
- "./pkg/models/metrics.go"
89-
- "./pkg/protobufs/notifier.pb.go"
90-
- "./pkg/protobufs/notifier_grpc.pb.go"
91-
- "./pkg/database/ent/metric_update.go"
92-
- "./pkg/database/ent/machine_delete.go"
93-
- "./pkg/database/ent/decision_query.go"
94-
- "./pkg/database/ent/meta_query.go"
95-
- "./pkg/database/ent/metric/where.go"
96-
- "./pkg/database/ent/metric/metric.go"
97-
- "./pkg/database/ent/machine_create.go"
98-
- "./pkg/database/ent/alert.go"
99-
- "./pkg/database/ent/event_update.go"
18+
- "./pkg/database/ent/alert/alert.go"
10019
- "./pkg/database/ent/alert_create.go"
20+
- "./pkg/database/ent/alert_delete.go"
21+
- "./pkg/database/ent/alert.go"
10122
- "./pkg/database/ent/alert_query.go"
102-
- "./pkg/database/ent/metric_delete.go"
103-
- "./pkg/database/ent/lock_create.go"
104-
- "./pkg/database/ent/bouncer_update.go"
105-
- "./pkg/database/ent/meta_update.go"
106-
- "./pkg/database/ent/decision_create.go"
107-
- "./pkg/database/ent/configitem_update.go"
108-
- "./pkg/database/ent/machine_query.go"
109-
- "./pkg/database/ent/client.go"
110-
- "./pkg/database/ent/predicate/predicate.go"
111-
- "./pkg/database/ent/lock/where.go"
112-
- "./pkg/database/ent/lock/lock.go"
113-
- "./pkg/database/ent/mutation.go"
114-
- "./pkg/database/ent/migrate/migrate.go"
115-
- "./pkg/database/ent/migrate/schema.go"
116-
- "./pkg/database/ent/configitem.go"
117-
- "./pkg/database/ent/metric_query.go"
118-
- "./pkg/database/ent/event.go"
119-
- "./pkg/database/ent/event_query.go"
120-
- "./pkg/database/ent/lock_update.go"
121-
- "./pkg/database/ent/meta.go"
122-
- "./pkg/database/ent/configitem_query.go"
123-
- "./pkg/database/ent/bouncer.go"
12423
- "./pkg/database/ent/alert_update.go"
125-
- "./pkg/database/ent/meta/meta.go"
126-
- "./pkg/database/ent/meta/where.go"
127-
- "./pkg/database/ent/decision_update.go"
128-
- "./pkg/database/ent/alert_delete.go"
129-
- "./pkg/database/ent/lock.go"
130-
- "./pkg/database/ent/runtime/runtime.go"
131-
- "./pkg/database/ent/alert/alert.go"
13224
- "./pkg/database/ent/alert/where.go"
133-
- "./pkg/database/ent/runtime.go"
25+
- "./pkg/database/ent/allowlist/allowlist.go"
26+
- "./pkg/database/ent/allowlist_create.go"
27+
- "./pkg/database/ent/allowlist_delete.go"
28+
- "./pkg/database/ent/allowlist.go"
29+
- "./pkg/database/ent/allowlistitem/allowlistitem.go"
30+
- "./pkg/database/ent/allowlistitem_create.go"
31+
- "./pkg/database/ent/allowlistitem_delete.go"
32+
- "./pkg/database/ent/allowlistitem.go"
33+
- "./pkg/database/ent/allowlistitem_query.go"
34+
- "./pkg/database/ent/allowlistitem_update.go"
35+
- "./pkg/database/ent/allowlistitem/where.go"
36+
- "./pkg/database/ent/allowlist_query.go"
37+
- "./pkg/database/ent/allowlist_update.go"
38+
- "./pkg/database/ent/allowlist/where.go"
13439
- "./pkg/database/ent/bouncer/bouncer.go"
40+
- "./pkg/database/ent/bouncer_create.go"
41+
- "./pkg/database/ent/bouncer_delete.go"
42+
- "./pkg/database/ent/bouncer.go"
43+
- "./pkg/database/ent/bouncer_query.go"
44+
- "./pkg/database/ent/bouncer_update.go"
13545
- "./pkg/database/ent/bouncer/where.go"
136-
- "./pkg/database/ent/hook/hook.go"
137-
- "./pkg/database/ent/metric.go"
46+
- "./pkg/database/ent/client.go"
47+
- "./pkg/database/ent/configitem/configitem.go"
13848
- "./pkg/database/ent/configitem_create.go"
13949
- "./pkg/database/ent/configitem_delete.go"
140-
- "./pkg/database/ent/tx.go"
141-
- "./pkg/database/ent/decision.go"
142-
- "./pkg/database/ent/lock_delete.go"
50+
- "./pkg/database/ent/configitem.go"
51+
- "./pkg/database/ent/configitem_query.go"
52+
- "./pkg/database/ent/configitem_update.go"
53+
- "./pkg/database/ent/configitem/where.go"
54+
- "./pkg/database/ent/decision_create.go"
55+
- "./pkg/database/ent/decision/decision.go"
14356
- "./pkg/database/ent/decision_delete.go"
144-
- "./pkg/database/ent/machine/where.go"
145-
- "./pkg/database/ent/machine/machine.go"
146-
- "./pkg/database/ent/event_create.go"
147-
- "./pkg/database/ent/metric_create.go"
57+
- "./pkg/database/ent/decision.go"
58+
- "./pkg/database/ent/decision_query.go"
59+
- "./pkg/database/ent/decision_update.go"
14860
- "./pkg/database/ent/decision/where.go"
149-
- "./pkg/database/ent/decision/decision.go"
61+
- "./pkg/database/ent/ent.go"
15062
- "./pkg/database/ent/enttest/enttest.go"
151-
- "./pkg/database/ent/lock_query.go"
152-
- "./pkg/database/ent/bouncer_create.go"
63+
- "./pkg/database/ent/event_create.go"
15364
- "./pkg/database/ent/event_delete.go"
154-
- "./pkg/database/ent/bouncer_delete.go"
15565
- "./pkg/database/ent/event/event.go"
66+
- "./pkg/database/ent/event.go"
67+
- "./pkg/database/ent/event_query.go"
68+
- "./pkg/database/ent/event_update.go"
15669
- "./pkg/database/ent/event/where.go"
70+
- "./pkg/database/ent/hook/hook.go"
71+
- "./pkg/database/ent/lock_create.go"
72+
- "./pkg/database/ent/lock_delete.go"
73+
- "./pkg/database/ent/lock.go"
74+
- "./pkg/database/ent/lock/lock.go"
75+
- "./pkg/database/ent/lock_query.go"
76+
- "./pkg/database/ent/lock_update.go"
77+
- "./pkg/database/ent/lock/where.go"
78+
- "./pkg/database/ent/machine_create.go"
79+
- "./pkg/database/ent/machine_delete.go"
15780
- "./pkg/database/ent/machine.go"
158-
- "./pkg/database/ent/ent.go"
81+
- "./pkg/database/ent/machine/machine.go"
82+
- "./pkg/database/ent/machine_query.go"
83+
- "./pkg/database/ent/machine_update.go"
84+
- "./pkg/database/ent/machine/where.go"
15985
- "./pkg/database/ent/meta_create.go"
160-
- "./pkg/database/ent/bouncer_query.go"
16186
- "./pkg/database/ent/meta_delete.go"
162-
- "./pkg/database/ent/machine_update.go"
163-
- "./pkg/database/ent/configitem/configitem.go"
164-
- "./pkg/database/ent/configitem/where.go"
87+
- "./pkg/database/ent/meta.go"
88+
- "./pkg/database/ent/meta/meta.go"
89+
- "./pkg/database/ent/meta_query.go"
90+
- "./pkg/database/ent/meta_update.go"
91+
- "./pkg/database/ent/meta/where.go"
92+
- "./pkg/database/ent/metric_create.go"
93+
- "./pkg/database/ent/metric_delete.go"
94+
- "./pkg/database/ent/metric.go"
95+
- "./pkg/database/ent/metric/metric.go"
96+
- "./pkg/database/ent/metric_query.go"
97+
- "./pkg/database/ent/metric_update.go"
98+
- "./pkg/database/ent/metric/where.go"
99+
- "./pkg/database/ent/migrate/migrate.go"
100+
- "./pkg/database/ent/migrate/schema.go"
101+
- "./pkg/database/ent/mutation.go"
102+
- "./pkg/database/ent/predicate/predicate.go"
103+
- "./pkg/database/ent/runtime.go"
104+
- "./pkg/database/ent/runtime/runtime.go"
105+
- "./pkg/database/ent/tx.go"
106+
- "./pkg/models/add_alerts_request.go"
107+
- "./pkg/models/add_alerts_response.go"
108+
- "./pkg/models/add_signals_request.go"
109+
- "./pkg/models/add_signals_request_item_decisions.go"
110+
- "./pkg/models/add_signals_request_item_decisions_item.go"
111+
- "./pkg/models/add_signals_request_item.go"
112+
- "./pkg/models/add_signals_request_item_source.go"
113+
- "./pkg/models/alert.go"
114+
- "./pkg/models/all_metrics.go"
115+
- "./pkg/models/allowlist_item.go"
116+
- "./pkg/models/base_metrics.go"
117+
- "./pkg/models/bulk_check_allowlist_request.go"
118+
- "./pkg/models/bulk_check_allowlist_response.go"
119+
- "./pkg/models/bulk_check_allowlist_result.go"
120+
- "./pkg/modelscapi/add_signals_request.go"
121+
- "./pkg/modelscapi/add_signals_request_item_decisions.go"
122+
- "./pkg/modelscapi/add_signals_request_item_decisions_item.go"
123+
- "./pkg/modelscapi/add_signals_request_item.go"
124+
- "./pkg/modelscapi/add_signals_request_item_source.go"
125+
- "./pkg/modelscapi/allowlist_link.go"
126+
- "./pkg/modelscapi/blocklist_link.go"
127+
- "./pkg/modelscapi/decisions_delete_request.go"
128+
- "./pkg/modelscapi/decisions_delete_request_item.go"
129+
- "./pkg/modelscapi/decisions_sync_request.go"
130+
- "./pkg/modelscapi/decisions_sync_request_item_decisions.go"
131+
- "./pkg/modelscapi/decisions_sync_request_item_decisions_item.go"
132+
- "./pkg/modelscapi/decisions_sync_request_item.go"
133+
- "./pkg/modelscapi/decisions_sync_request_item_source.go"
134+
- "./pkg/modelscapi/enroll_request.go"
135+
- "./pkg/modelscapi/error_response.go"
136+
- "./pkg/modelscapi/get_decisions_stream_response_deleted.go"
137+
- "./pkg/modelscapi/get_decisions_stream_response_deleted_item.go"
138+
- "./pkg/modelscapi/get_decisions_stream_response.go"
139+
- "./pkg/modelscapi/get_decisions_stream_response_links.go"
140+
- "./pkg/modelscapi/get_decisions_stream_response_new.go"
141+
- "./pkg/modelscapi/get_decisions_stream_response_new_item.go"
142+
- "./pkg/modelscapi/login_request.go"
143+
- "./pkg/modelscapi/login_response.go"
144+
- "./pkg/modelscapi/metrics_request_bouncers_item.go"
145+
- "./pkg/modelscapi/metrics_request.go"
146+
- "./pkg/modelscapi/metrics_request_machines_item.go"
147+
- "./pkg/modelscapi/register_request.go"
148+
- "./pkg/modelscapi/reset_password_request.go"
149+
- "./pkg/modelscapi/success_response.go"
150+
- "./pkg/models/check_allowlist_response.go"
151+
- "./pkg/models/console_options.go"
152+
- "./pkg/models/decision.go"
153+
- "./pkg/models/decisions_delete_request.go"
154+
- "./pkg/models/decisions_delete_request_item.go"
155+
- "./pkg/models/decisions_stream_response.go"
156+
- "./pkg/models/delete_alerts_response.go"
157+
- "./pkg/models/delete_decision_response.go"
158+
- "./pkg/models/detailed_metrics.go"
159+
- "./pkg/models/error_response.go"
160+
- "./pkg/models/event.go"
161+
- "./pkg/models/flush_decision_response.go"
162+
- "./pkg/models/get_alerts_response.go"
163+
- "./pkg/models/get_allowlist_response.go"
164+
- "./pkg/models/get_allowlists_response.go"
165+
- "./pkg/models/get_decisions_response.go"
166+
- "./pkg/models/hub_item.go"
167+
- "./pkg/models/hub_items.go"
168+
- "./pkg/models/lapi_metrics.go"
169+
- "./pkg/models/log_processors_metrics.go"
170+
- "./pkg/models/meta.go"
171+
- "./pkg/models/metrics_agent_info.go"
172+
- "./pkg/models/metrics_bouncer_info.go"
173+
- "./pkg/models/metrics_detail_item.go"
174+
- "./pkg/models/metrics.go"
175+
- "./pkg/models/metrics_labels.go"
176+
- "./pkg/models/metrics_meta.go"
177+
- "./pkg/models/o_sversion.go"
178+
- "./pkg/models/remediation_components_metrics.go"
179+
- "./pkg/models/source.go"
180+
- "./pkg/models/success_response.go"
181+
- "./pkg/models/topx_response.go"
182+
- "./pkg/models/watcher_auth_request.go"
183+
- "./pkg/models/watcher_auth_response.go"
184+
- "./pkg/models/watcher_registration_request.go"
185+
- "./pkg/protobufs/notifier_grpc.pb.go"
186+
- "./pkg/protobufs/notifier.pb.go"

‎.github/generate-codecov-yml.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# Run this from the repository root:
44
#
5-
# .github/generate-codecov-yml.sh >> .github/codecov.yml
5+
# .github/generate-codecov-yml.sh > .github/codecov.yml
66

77
cat <<EOT
88
# we measure coverage but don't enforce it
@@ -24,7 +24,7 @@ coverage:
2424
ignore:
2525
EOT
2626

27-
find . -name "*.go" | while read -r file; do
27+
find . -name "*.go" | sort | while read -r file; do
2828
if head -n 1 "$file" | grep -q "Code generated by"; then
2929
echo " - \"$file\""
3030
fi

‎.github/workflows/go-tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ jobs:
167167
168168
- name: Generate codecov configuration
169169
run: |
170-
.github/generate-codecov-yml.sh >> .github/codecov.yml
170+
.github/generate-codecov-yml.sh > .github/codecov.yml
171171
172172
- name: Ensure we can do a dynamic build
173173
run: |

‎azure-pipelines.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ stages:
2121
- task: GoTool@0
2222
displayName: "Install Go"
2323
inputs:
24-
version: '1.24.1'
24+
version: '1.24.3'
2525

2626
- pwsh: |
2727
choco install -y make

‎cmd/crowdsec-cli/cliconfig/show.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func (cli *cliConfig) showKey(key string) error {
2525
}
2626

2727
opts := []expr.Option{}
28-
opts = append(opts, exprhelpers.GetExprOptions(map[string]interface{}{})...)
28+
opts = append(opts, exprhelpers.GetExprOptions(map[string]any{})...)
2929
opts = append(opts, expr.Env(Env{}))
3030

3131
program, err := expr.Compile(key, opts...)
@@ -44,7 +44,7 @@ func (cli *cliConfig) showKey(key string) error {
4444
// that would break compatibility with previous versions
4545
switch output.(type) {
4646
case string:
47-
fmt.Println(output)
47+
fmt.Fprintln(os.Stdout, output)
4848
default:
4949
litter.Dump(output)
5050
}
@@ -54,7 +54,7 @@ func (cli *cliConfig) showKey(key string) error {
5454
return fmt.Errorf("failed to serialize configuration: %w", err)
5555
}
5656

57-
fmt.Println(string(data))
57+
fmt.Fprintln(os.Stdout, string(data))
5858
}
5959

6060
return nil
@@ -67,6 +67,7 @@ func (cli *cliConfig) template() string {
6767
- Configuration Folder : {{.ConfigPaths.ConfigDir}}
6868
- Data Folder : {{.ConfigPaths.DataDir}}
6969
- Hub Folder : {{.ConfigPaths.HubDir}}
70+
- Notification Folder : {{.ConfigPaths.NotificationDir}}
7071
- Simulation File : {{.ConfigPaths.SimulationFilePath}}
7172
{{- end }}
7273
@@ -216,14 +217,14 @@ func (cli *cliConfig) show() error {
216217
return fmt.Errorf("failed to serialize configuration: %w", err)
217218
}
218219

219-
fmt.Println(string(data))
220+
fmt.Fprintln(os.Stdout, string(data))
220221
case "raw":
221222
data, err := yaml.Marshal(cfg)
222223
if err != nil {
223224
return fmt.Errorf("failed to serialize configuration: %w", err)
224225
}
225226

226-
fmt.Println(string(data))
227+
fmt.Fprintln(os.Stdout, string(data))
227228
}
228229

229230
return nil

0 commit comments

Comments
 (0)