From 7d11142aeb0be4726842e59e9b594cb6999873d2 Mon Sep 17 00:00:00 2001 From: kubasobon Date: Wed, 24 Apr 2024 11:06:51 +0200 Subject: [PATCH 1/3] bump Golang to v1.22 --- .go-version | 2 +- docs/version.asciidoc | 2 +- go.mod | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.go-version b/.go-version index 428abfd24f..6fee2fedb0 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.21.8 +1.22.2 diff --git a/docs/version.asciidoc b/docs/version.asciidoc index a9fc828c85..29c55d938e 100644 --- a/docs/version.asciidoc +++ b/docs/version.asciidoc @@ -1,6 +1,6 @@ // doc-branch can be: master, 8.1, 8.2, etc. :doc-branch: master -:go-version: 1.21.8 +:go-version: 1.22.2 :python: 3.7 :docker: 1.12 :docker-compose: 1.11 diff --git a/go.mod b/go.mod index 1282d1ea09..a4ed1cab70 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/elastic/cloudbeat -go 1.21 +go 1.22 require ( cloud.google.com/go/asset v1.17.1 From fa2b50adf705d99e0278a57c1fe0698af8cf8762 Mon Sep 17 00:00:00 2001 From: kubasobon Date: Wed, 24 Apr 2024 11:26:02 +0200 Subject: [PATCH 2/3] bump Golang to v1.22.2 for hermit --- bin/{.go-1.21.8.pkg => .go-1.22.2.pkg} | 0 bin/go | 2 +- bin/gofmt | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename bin/{.go-1.21.8.pkg => .go-1.22.2.pkg} (100%) diff --git a/bin/.go-1.21.8.pkg b/bin/.go-1.22.2.pkg similarity index 100% rename from bin/.go-1.21.8.pkg rename to bin/.go-1.22.2.pkg diff --git a/bin/go b/bin/go index 62a68bb896..d9bfd8800f 120000 --- a/bin/go +++ b/bin/go @@ -1 +1 @@ -.go-1.21.8.pkg \ No newline at end of file +.go-1.22.2.pkg \ No newline at end of file diff --git a/bin/gofmt b/bin/gofmt index 62a68bb896..d9bfd8800f 120000 --- a/bin/gofmt +++ b/bin/gofmt @@ -1 +1 @@ -.go-1.21.8.pkg \ No newline at end of file +.go-1.22.2.pkg \ No newline at end of file From ade160083d4595819c4cb5bd641cc6e9d2680653 Mon Sep 17 00:00:00 2001 From: kubasobon Date: Wed, 24 Apr 2024 13:35:05 +0200 Subject: [PATCH 3/3] add missing test markers --- tests/pyproject.toml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/tests/pyproject.toml b/tests/pyproject.toml index fab6dac7a2..10582dfd35 100644 --- a/tests/pyproject.toml +++ b/tests/pyproject.toml @@ -42,14 +42,9 @@ markers = [ "pre_merge_agent", "sanity", # test target markers - "file_system_rules", - "k8s_object_rules", - "process_api_server_rules", - "process_controller_manager_rules", - "process_etcd_rules", - "process_api_server_rules", - "process_scheduler_rules", - "process_kubelet_rules", + "k8s_file_system_rules", + "k8s_object_psp_rules", + "k8s_process_rules", "eks_file_system_rules", "eks_process_rules", "eks_k8s_objects_rules", @@ -69,4 +64,5 @@ markers = [ "azure_networking_rules", "azure_storage_account_rules", "azure_virtual_machine_rules", + "azure_microsoft_defender_rules", ]