Merge branch '8.x' into mergify/bp/8.x/pr-2665

elastic · Nov 4, 2024 · 4d6735c · 4d6735c
2 parents 0aff601 + 34aa780
commit 4d6735c
Show file tree

Hide file tree

Showing 18 changed files with 15 additions and 15 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -60,7 +60,7 @@ repos:
         args: ["--profile", "black"]
 
   - repo: https://github.com/psf/black
-    rev: 24.8.0
+    rev: 24.10.0
     hooks:
       - id: black
 
@@ -77,7 +77,7 @@ repos:
         files: deploy/cloudformation/.*yml
 
   - repo: https://github.com/aws-cloudformation/cfn-lint
-    rev: v1.16.0
+    rev: v1.17.2
     hooks:
       - id: cfn-python-lint
         files: deploy/cloudformation/.*.yml
@@ -184,7 +184,7 @@ repos:
         files: security-policies/.*\.(md|markdown)$
 
   - repo: https://github.com/StyraInc/regal
-    rev: v0.27.0
+    rev: v0.28.0
     hooks:
       - id: regal-lint
         args: [security-policies/bundle]

diff --git a/bin/.elastic-package-0.104.0.pkg → bin/.elastic-package-0.106.0.pkg b/bin/.elastic-package-0.104.0.pkg → bin/.elastic-package-0.106.0.pkg
diff --git a/bin/.gcloud-495.0.0.pkg → bin/.gcloud-497.0.0.pkg b/bin/.gcloud-495.0.0.pkg → bin/.gcloud-497.0.0.pkg
diff --git a/bin/.gh-2.58.0.pkg → bin/.gh-2.59.0.pkg b/bin/.gh-2.58.0.pkg → bin/.gh-2.59.0.pkg
diff --git a/bin/.pre-commit-4.0.0.pkg → bin/.pre-commit-4.0.1.pkg b/bin/.pre-commit-4.0.0.pkg → bin/.pre-commit-4.0.1.pkg
diff --git a/bin/.regal-0.27.0.pkg → bin/.regal-0.28.0.pkg b/bin/.regal-0.27.0.pkg → bin/.regal-0.28.0.pkg
diff --git a/bin/.shfmt-3.9.0.pkg → bin/.shfmt-3.10.0.pkg b/bin/.shfmt-3.9.0.pkg → bin/.shfmt-3.10.0.pkg
diff --git a/bin/bq b/bin/bq
@@ -1 +1 @@
-.gcloud-495.0.0.pkg
+.gcloud-497.0.0.pkg
diff --git a/bin/docker-credential-gcloud b/bin/docker-credential-gcloud
@@ -1 +1 @@
-.gcloud-495.0.0.pkg
+.gcloud-497.0.0.pkg
diff --git a/bin/elastic-package b/bin/elastic-package
@@ -1 +1 @@
-.elastic-package-0.104.0.pkg
+.elastic-package-0.106.0.pkg
diff --git a/bin/gcloud b/bin/gcloud
@@ -1 +1 @@
-.gcloud-495.0.0.pkg
+.gcloud-497.0.0.pkg
diff --git a/bin/gh b/bin/gh
@@ -1 +1 @@
-.gh-2.58.0.pkg
+.gh-2.59.0.pkg
diff --git a/bin/git-credential-gcloud.sh b/bin/git-credential-gcloud.sh
@@ -1 +1 @@
-.gcloud-495.0.0.pkg
+.gcloud-497.0.0.pkg
diff --git a/bin/gsutil b/bin/gsutil
@@ -1 +1 @@
-.gcloud-495.0.0.pkg
+.gcloud-497.0.0.pkg
diff --git a/bin/pre-commit b/bin/pre-commit
@@ -1 +1 @@
-.pre-commit-4.0.0.pkg
+.pre-commit-4.0.1.pkg
diff --git a/bin/regal b/bin/regal
@@ -1 +1 @@
-.regal-0.27.0.pkg
+.regal-0.28.0.pkg
diff --git a/bin/shfmt b/bin/shfmt
@@ -1 +1 @@
-.shfmt-3.9.0.pkg
+.shfmt-3.10.0.pkg
diff --git a/internal/vulnerability/runner.go b/internal/vulnerability/runner.go
@@ -60,8 +60,8 @@ func NewVulnerabilityRunner(log *logp.Logger) (VulnerabilityRunner, error) {
 		},
 		DBOptions: flag.DBOptions{
 			NoProgress:       true,
-			DBRepository:     name.MustParseReference("ghcr.io/aquasecurity/trivy-db:2"),
-			JavaDBRepository: name.MustParseReference("ghcr.io/aquasecurity/trivy-java-db:1"),
+			DBRepository:     name.MustParseReference("public.ecr.aws/aquasecurity/trivy-db:2"),
+			JavaDBRepository: name.MustParseReference("public.ecr.aws/aquasecurity/trivy-java-db:1"),
 		},
 	}