From dc99e693d2e711039f9393e90c3a960e651190c6 Mon Sep 17 00:00:00 2001
From: Christoph Hartmann <chris@lollyrock.com>
Date: Mon, 30 Dec 2024 11:06:50 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=B9=20update=20berglas=20to=20v2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 go.mod                                            | 2 +-
 go.sum                                            | 4 ++--
 providers-sdk/v1/vault/gcpberglas/berglas.go      | 2 +-
 providers-sdk/v1/vault/gcpberglas/berglas_test.go | 5 ++---
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/go.mod b/go.mod
index 65e9a821c5..90a74400a2 100644
--- a/go.mod
+++ b/go.mod
@@ -11,7 +11,6 @@ require (
 	github.com/99designs/keyring v1.2.2
 	github.com/BurntSushi/toml v1.4.0
 	github.com/CycloneDX/cyclonedx-go v0.9.1
-	github.com/GoogleCloudPlatform/berglas v1.0.3
 	github.com/Masterminds/semver v1.5.0
 	github.com/ProtonMail/go-crypto v1.1.3
 	github.com/StackExchange/wmi v1.2.1
@@ -288,6 +287,7 @@ require (
 )
 
 require (
+	github.com/GoogleCloudPlatform/berglas/v2 v2.0.6
 	github.com/moby/buildkit v0.18.1
 	github.com/moby/sys/mount v0.3.4
 )
diff --git a/go.sum b/go.sum
index af3616bcb6..f6b2bdc4f8 100644
--- a/go.sum
+++ b/go.sum
@@ -104,8 +104,8 @@ github.com/ChrisTrenkamp/goxpath v0.0.0-20210404020558-97928f7e12b6/go.mod h1:nu
 github.com/CycloneDX/cyclonedx-go v0.9.1 h1:yffaWOZsv77oTJa/SdVZYdgAgFioCeycBUKkqS2qzQM=
 github.com/CycloneDX/cyclonedx-go v0.9.1/go.mod h1:NE/EWvzELOFlG6+ljX/QeMlVt9VKcTwu8u0ccsACEsw=
 github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
-github.com/GoogleCloudPlatform/berglas v1.0.3 h1:NjJYDz13vWct7+joxkBkIZhD6Cmwf5XP5t0jGTvHyJk=
-github.com/GoogleCloudPlatform/berglas v1.0.3/go.mod h1:JBsGyi6Z5RwyHXMdEebok6MChukLE+dWXzPor2aeMtw=
+github.com/GoogleCloudPlatform/berglas/v2 v2.0.6 h1:c6WHIgUQIQA0aApsBL2y0d41EH8JHRtGALzXwh28ilw=
+github.com/GoogleCloudPlatform/berglas/v2 v2.0.6/go.mod h1:GjFzxOKcz57OGKVAIsSWxTlNLXIPXn2AItkAMVWchx0=
 github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.25.0 h1:3c8yed4lgqTt+oTQ+JNMDo+F4xprBf+O/il4ZC0nRLw=
 github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.25.0/go.mod h1:obipzmGjfSjam60XLwGfqUkJsfiheAl+TUjG+4yzyPM=
 github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.49.0 h1:o90wcURuxekmXrtxmYWTyNla0+ZEHhud6DI1ZTxd1vI=
diff --git a/providers-sdk/v1/vault/gcpberglas/berglas.go b/providers-sdk/v1/vault/gcpberglas/berglas.go
index 273965e724..1f28f203ee 100644
--- a/providers-sdk/v1/vault/gcpberglas/berglas.go
+++ b/providers-sdk/v1/vault/gcpberglas/berglas.go
@@ -9,7 +9,7 @@ import (
 	"fmt"
 	"strings"
 
-	berglas "github.com/GoogleCloudPlatform/berglas/pkg/berglas"
+	berglas "github.com/GoogleCloudPlatform/berglas/v2/pkg/berglas"
 	"go.mondoo.com/cnquery/v11/providers-sdk/v1/vault"
 	"go.mondoo.com/cnquery/v11/utils/multierr"
 )
diff --git a/providers-sdk/v1/vault/gcpberglas/berglas_test.go b/providers-sdk/v1/vault/gcpberglas/berglas_test.go
index 5ecf912d82..06868da738 100644
--- a/providers-sdk/v1/vault/gcpberglas/berglas_test.go
+++ b/providers-sdk/v1/vault/gcpberglas/berglas_test.go
@@ -1,9 +1,6 @@
 // Copyright (c) Mondoo, Inc.
 // SPDX-License-Identifier: BUSL-1.1
 
-//go:build debugtest
-// +build debugtest
-
 package gcpberglas
 
 import (
@@ -17,6 +14,8 @@ import (
 )
 
 func TestGcpBerglas(t *testing.T) {
+	t.Skip("Skip test as it requires actual GCP project and bucket")
+	
 	// replace with actual values to test this
 	projectID := "project-id-here"
 	bucketName := " bucket-name"