From 0477f8cb0307da00151e425af74b8d0211430c3e Mon Sep 17 00:00:00 2001 From: YiscahLevySilas1 Date: Tue, 26 Mar 2024 09:05:01 +0200 Subject: [PATCH] use regolibrary v2 Signed-off-by: YiscahLevySilas1 --- core/cautils/getter/downloadreleasedpolicy.go | 4 ++-- go.mod | 6 +++--- go.sum | 12 ++++++------ httphandler/go.mod | 6 +++--- httphandler/go.sum | 12 ++++++------ 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/core/cautils/getter/downloadreleasedpolicy.go b/core/cautils/getter/downloadreleasedpolicy.go index 5564f819..12fa4dfd 100644 --- a/core/cautils/getter/downloadreleasedpolicy.go +++ b/core/cautils/getter/downloadreleasedpolicy.go @@ -9,7 +9,7 @@ import ( "github.com/kubescape/opa-utils/reporthandling" "github.com/kubescape/opa-utils/reporthandling/attacktrack/v1alpha1" - "github.com/kubescape/regolibrary/gitregostore" + "github.com/kubescape/regolibrary/v2/gitregostore" ) // ======================================================================================================================= @@ -29,7 +29,7 @@ type DownloadReleasedPolicy struct { func NewDownloadReleasedPolicy() *DownloadReleasedPolicy { return &DownloadReleasedPolicy{ - gs: gitregostore.NewDefaultGitRegoStore(-1), + gs: gitregostore.NewGitRegoStoreV2(-1), } } diff --git a/go.mod b/go.mod index b2af9e63..143363c1 100644 --- a/go.mod +++ b/go.mod @@ -25,13 +25,13 @@ require ( github.com/johnfercher/maroto v1.0.0 github.com/json-iterator/go v1.1.12 github.com/jwalton/gchalk v1.3.0 - github.com/kubescape/backend v0.0.19 + github.com/kubescape/backend v0.0.20-0.20240325120349-9f7b2a07ff39 github.com/kubescape/go-git-url v0.0.30 github.com/kubescape/go-logger v0.0.22 github.com/kubescape/k8s-interface v0.0.161 - github.com/kubescape/opa-utils v0.0.278 + github.com/kubescape/opa-utils v0.0.279 github.com/kubescape/rbac-utils v0.0.21-0.20230806101615-07e36f555520 - github.com/kubescape/regolibrary v1.0.315 + github.com/kubescape/regolibrary/v2 v2.0.1 github.com/maruel/natural v1.1.1 github.com/matthyx/go-gitlog v0.0.0-20231005131906-9ffabe3c5bcd github.com/mattn/go-isatty v0.0.20 diff --git a/go.sum b/go.sum index d3b5ece2..6c1588f7 100644 --- a/go.sum +++ b/go.sum @@ -1140,20 +1140,20 @@ github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/kubescape/backend v0.0.19 h1:u8gp/VljTEFrdjtHo+IB9KeBhf+8n1St+J2kOFvPj+I= -github.com/kubescape/backend v0.0.19/go.mod h1:FpazfN+c3Ucuvv4jZYCnk99moSBRNMVIxl5aWCZAEBo= +github.com/kubescape/backend v0.0.20-0.20240325120349-9f7b2a07ff39 h1:8H9j+ALzJZgJHsFkkZJhaEj6bYyuOP6v3gCfPKS8f3k= +github.com/kubescape/backend v0.0.20-0.20240325120349-9f7b2a07ff39/go.mod h1:FpazfN+c3Ucuvv4jZYCnk99moSBRNMVIxl5aWCZAEBo= github.com/kubescape/go-git-url v0.0.30 h1:PIbg86ae0ftee/p/Tu/6CA1ju6VoJ51G3sQWNHOm6wg= github.com/kubescape/go-git-url v0.0.30/go.mod h1:3ddc1HEflms1vMhD9owt/3FBES070UaYTUarcjx8jDk= github.com/kubescape/go-logger v0.0.22 h1:gle7wH6emOiGv9ljdpVi82pWLQ3jGucrUucvil6JXHE= github.com/kubescape/go-logger v0.0.22/go.mod h1:x3HBpZo3cMT/WIdy18BxvVVd5D0e/PWFVk/HiwBNu3g= github.com/kubescape/k8s-interface v0.0.161 h1:v6b3/kmA4o/2niNrejrbXj5X9MLfH0UrpI3s+e/fdwc= github.com/kubescape/k8s-interface v0.0.161/go.mod h1:oF+Yxug3Kpfu9Yr2j63wy7gwswrKXpiqI0mLk/7gF/s= -github.com/kubescape/opa-utils v0.0.278 h1:x0akigrjYjocD0HzlRZ4+ZgL+ZK33286d2L48z6m0PE= -github.com/kubescape/opa-utils v0.0.278/go.mod h1:N/UnbZHpoiHQH7O50yadhIXZvVl0IVtTGBmePPrSQSg= +github.com/kubescape/opa-utils v0.0.279 h1:a+w9rAPVkNEKONVtswsVdRpw4LxwEdfkKsXvgzLAHhg= +github.com/kubescape/opa-utils v0.0.279/go.mod h1:N/UnbZHpoiHQH7O50yadhIXZvVl0IVtTGBmePPrSQSg= github.com/kubescape/rbac-utils v0.0.21-0.20230806101615-07e36f555520 h1:SqlwF8G+oFazeYmZQKoPczLEflBQpwpHCU8DoLLyfj8= github.com/kubescape/rbac-utils v0.0.21-0.20230806101615-07e36f555520/go.mod h1:wuxMUSDzGUyWd25IJfBzEJ/Udmw2Vy7npj+MV3u3GrU= -github.com/kubescape/regolibrary v1.0.315 h1:Oyr+K8QsOnOulzVkIqOcIoK+g+NDIdoRvTG54BhCh3Q= -github.com/kubescape/regolibrary v1.0.315/go.mod h1:xTXVzytnyytxl5RwEEYuL98/xMpdgDJeX4Ayx7CAxZc= +github.com/kubescape/regolibrary/v2 v2.0.1 h1:7lKj171gslgTbbcmmGVHk34AZNqxForOXZIINoQfdzQ= +github.com/kubescape/regolibrary/v2 v2.0.1/go.mod h1:s0/Mi9PYw7s91vIf1VJTkuu1Blsl5ZLpYn5UA7yk/vM= github.com/kubescape/tablewriter v0.0.6-0.20231106230230-aac7d2659c94 h1:uhabZUyrxo60JQrzGCQOp1gsJz06+6+PeDBTvXiKD7k= github.com/kubescape/tablewriter v0.0.6-0.20231106230230-aac7d2659c94/go.mod h1:clwQfF3MN2cpaf7R6hc84aB6fQsRr+bnm66pXXSNAv8= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= diff --git a/httphandler/go.mod b/httphandler/go.mod index 394a22cd..b5421f56 100644 --- a/httphandler/go.mod +++ b/httphandler/go.mod @@ -14,11 +14,11 @@ require ( github.com/google/uuid v1.6.0 github.com/gorilla/mux v1.8.1 github.com/gorilla/schema v1.2.0 - github.com/kubescape/backend v0.0.19 + github.com/kubescape/backend v0.0.20-0.20240325120349-9f7b2a07ff39 github.com/kubescape/go-logger v0.0.22 github.com/kubescape/k8s-interface v0.0.161 github.com/kubescape/kubescape/v3 v3.0.4 - github.com/kubescape/opa-utils v0.0.278 + github.com/kubescape/opa-utils v0.0.279 github.com/kubescape/storage v0.0.20 github.com/spf13/viper v1.18.2 github.com/stretchr/testify v1.8.4 @@ -291,7 +291,7 @@ require ( github.com/knqyf263/go-rpmdb v0.0.0-20230517124904-b97c85e63254 // indirect github.com/kubescape/go-git-url v0.0.30 // indirect github.com/kubescape/rbac-utils v0.0.21-0.20230806101615-07e36f555520 // indirect - github.com/kubescape/regolibrary v1.0.315 // indirect + github.com/kubescape/regolibrary/v2 v2.0.1 // indirect github.com/kylelemons/godebug v1.1.0 // indirect github.com/letsencrypt/boulder v0.0.0-20231026200631-000cd05d5491 // indirect github.com/lucasb-eyer/go-colorful v1.2.0 // indirect diff --git a/httphandler/go.sum b/httphandler/go.sum index 5e8283ea..02af045a 100644 --- a/httphandler/go.sum +++ b/httphandler/go.sum @@ -1146,20 +1146,20 @@ github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/kubescape/backend v0.0.19 h1:u8gp/VljTEFrdjtHo+IB9KeBhf+8n1St+J2kOFvPj+I= -github.com/kubescape/backend v0.0.19/go.mod h1:FpazfN+c3Ucuvv4jZYCnk99moSBRNMVIxl5aWCZAEBo= +github.com/kubescape/backend v0.0.20-0.20240325120349-9f7b2a07ff39 h1:8H9j+ALzJZgJHsFkkZJhaEj6bYyuOP6v3gCfPKS8f3k= +github.com/kubescape/backend v0.0.20-0.20240325120349-9f7b2a07ff39/go.mod h1:FpazfN+c3Ucuvv4jZYCnk99moSBRNMVIxl5aWCZAEBo= github.com/kubescape/go-git-url v0.0.30 h1:PIbg86ae0ftee/p/Tu/6CA1ju6VoJ51G3sQWNHOm6wg= github.com/kubescape/go-git-url v0.0.30/go.mod h1:3ddc1HEflms1vMhD9owt/3FBES070UaYTUarcjx8jDk= github.com/kubescape/go-logger v0.0.22 h1:gle7wH6emOiGv9ljdpVi82pWLQ3jGucrUucvil6JXHE= github.com/kubescape/go-logger v0.0.22/go.mod h1:x3HBpZo3cMT/WIdy18BxvVVd5D0e/PWFVk/HiwBNu3g= github.com/kubescape/k8s-interface v0.0.161 h1:v6b3/kmA4o/2niNrejrbXj5X9MLfH0UrpI3s+e/fdwc= github.com/kubescape/k8s-interface v0.0.161/go.mod h1:oF+Yxug3Kpfu9Yr2j63wy7gwswrKXpiqI0mLk/7gF/s= -github.com/kubescape/opa-utils v0.0.278 h1:x0akigrjYjocD0HzlRZ4+ZgL+ZK33286d2L48z6m0PE= -github.com/kubescape/opa-utils v0.0.278/go.mod h1:N/UnbZHpoiHQH7O50yadhIXZvVl0IVtTGBmePPrSQSg= +github.com/kubescape/opa-utils v0.0.279 h1:a+w9rAPVkNEKONVtswsVdRpw4LxwEdfkKsXvgzLAHhg= +github.com/kubescape/opa-utils v0.0.279/go.mod h1:N/UnbZHpoiHQH7O50yadhIXZvVl0IVtTGBmePPrSQSg= github.com/kubescape/rbac-utils v0.0.21-0.20230806101615-07e36f555520 h1:SqlwF8G+oFazeYmZQKoPczLEflBQpwpHCU8DoLLyfj8= github.com/kubescape/rbac-utils v0.0.21-0.20230806101615-07e36f555520/go.mod h1:wuxMUSDzGUyWd25IJfBzEJ/Udmw2Vy7npj+MV3u3GrU= -github.com/kubescape/regolibrary v1.0.315 h1:Oyr+K8QsOnOulzVkIqOcIoK+g+NDIdoRvTG54BhCh3Q= -github.com/kubescape/regolibrary v1.0.315/go.mod h1:xTXVzytnyytxl5RwEEYuL98/xMpdgDJeX4Ayx7CAxZc= +github.com/kubescape/regolibrary/v2 v2.0.1 h1:7lKj171gslgTbbcmmGVHk34AZNqxForOXZIINoQfdzQ= +github.com/kubescape/regolibrary/v2 v2.0.1/go.mod h1:s0/Mi9PYw7s91vIf1VJTkuu1Blsl5ZLpYn5UA7yk/vM= github.com/kubescape/storage v0.0.20 h1:m78XUf08QZRTw3pIRkGi54AtH4ugRYisG6xfxC1zZnQ= github.com/kubescape/storage v0.0.20/go.mod h1:rP6g1ukp4zlytnBcZw+fJHu0j6woOiQ/KfTZfrdM8kw= github.com/kubescape/tablewriter v0.0.6-0.20231106230230-aac7d2659c94 h1:uhabZUyrxo60JQrzGCQOp1gsJz06+6+PeDBTvXiKD7k=