From 83ece20c3428f0767a506a2b9dcd24d34f306e89 Mon Sep 17 00:00:00 2001
From: Jeff Swenson <jeffswenson@betterthannull.com>
Date: Mon, 18 Nov 2024 09:42:01 -0500
Subject: [PATCH] gcs: remove test that asserts buckets produce not found error

The behavior of GCS appears to have changed. If a bucket does not exist,
it will return a 403 forbidden. So we can't disambiguate a bucket that
does not exist from a bucket we can't access.

Overall, this is annoying but fine. The main value of not found as a
sentinel error the program can check is it indicates the name is free
and can be used. This property doesn't apply if the bucket does not
exist because CRDB will never create a bucket.

Release Justification: Test only change
Release Note: None
Fixes: #135307
Fixes: #135348
Fixes: #135349
Fixes: #135350
Fixes: #135351
Fixes: #135352
---
 pkg/cloud/external_storage.go     |  4 +++
 pkg/cloud/gcp/gcs_storage_test.go | 52 +++++++++----------------------
 2 files changed, 19 insertions(+), 37 deletions(-)

diff --git a/pkg/cloud/external_storage.go b/pkg/cloud/external_storage.go
index f726d80fe063..bae20674f731 100644
--- a/pkg/cloud/external_storage.go
+++ b/pkg/cloud/external_storage.go
@@ -128,6 +128,10 @@ type SQLConnI interface {
 // ErrFileDoesNotExist is a sentinel error for indicating that a specified
 // bucket/object/key/file (depending on storage terminology) does not exist.
 // This error is raised by the ReadFile method.
+//
+// On GCS, a non-existent bucket returns a 403 forbidden, so a not found is
+// only returned if the bucket exists and the user has the permissions needed
+// to interact with the bucket.
 var ErrFileDoesNotExist = errors.New("external_storage: file doesn't exist")
 
 // ErrListingUnsupported is a marker for indicating listing is unsupported.
diff --git a/pkg/cloud/gcp/gcs_storage_test.go b/pkg/cloud/gcp/gcs_storage_test.go
index e1454f9ee816..0d0e9bc42d7a 100644
--- a/pkg/cloud/gcp/gcs_storage_test.go
+++ b/pkg/cloud/gcp/gcs_storage_test.go
@@ -25,7 +25,6 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/testutils/skip"
 	"github.com/cockroachdb/cockroach/pkg/util/ioctx"
 	"github.com/cockroachdb/cockroach/pkg/util/leaktest"
-	"github.com/cockroachdb/errors"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/oauth2/google"
 )
@@ -327,8 +326,8 @@ func TestAntagonisticGCSRead(t *testing.T) {
 	cloudtestutils.CheckAntagonisticRead(t, conf, testSettings)
 }
 
-// TestFileDoesNotExist ensures that the ReadFile method of google cloud storage
-// returns a sentinel error when the `Bucket` or `Object` being read do not
+// TestFileDoesNotExist ensures that the ReadFile method of google cloud
+// storage returns a sentinel error when the `Object` being read does not
 // exist.
 func TestFileDoesNotExist(t *testing.T) {
 	defer leaktest.AfterTest(t)()
@@ -341,41 +340,20 @@ func TestFileDoesNotExist(t *testing.T) {
 
 	testSettings := cluster.MakeTestingClusterSettings()
 
-	{
-		// Invalid gsFile.
-		gsFile := "gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/invalid_region.tbl?AUTH=implicit"
-		conf, err := cloud.ExternalStorageConfFromURI(gsFile, user)
-		require.NoError(t, err)
-
-		s, err := cloud.MakeExternalStorage(context.Background(), conf, base.ExternalIODirConfig{}, testSettings,
-			nil, /* blobClientFactory */
-			nil, /* db */
-			nil, /* limiters */
-			cloud.NilMetrics,
-		)
-		require.NoError(t, err)
-		_, _, err = s.ReadFile(context.Background(), "", cloud.ReadOptions{NoFileSize: true})
-		require.Error(t, err, "")
-		require.True(t, errors.Is(err, cloud.ErrFileDoesNotExist))
-	}
-
-	{
-		// Invalid gsBucket.
-		gsFile := "gs://cockroach-fixtures-us-east1-invalid/tpch-csv/sf-1/region.tbl?AUTH=implicit"
-		conf, err := cloud.ExternalStorageConfFromURI(gsFile, user)
-		require.NoError(t, err)
+	// Invalid gsFile.
+	gsFile := "gs://cockroach-fixtures-us-east1/tpch-csv/sf-1/invalid_region.tbl?AUTH=implicit"
+	conf, err := cloud.ExternalStorageConfFromURI(gsFile, user)
+	require.NoError(t, err)
 
-		s, err := cloud.MakeExternalStorage(context.Background(), conf, base.ExternalIODirConfig{}, testSettings,
-			nil, /* blobClientFactory */
-			nil, /* db */
-			nil, /* limiters */
-			cloud.NilMetrics,
-		)
-		require.NoError(t, err)
-		_, _, err = s.ReadFile(context.Background(), "", cloud.ReadOptions{NoFileSize: true})
-		require.Error(t, err, "")
-		require.True(t, errors.Is(err, cloud.ErrFileDoesNotExist))
-	}
+	s, err := cloud.MakeExternalStorage(context.Background(), conf, base.ExternalIODirConfig{}, testSettings,
+		nil, /* blobClientFactory */
+		nil, /* db */
+		nil, /* limiters */
+		cloud.NilMetrics,
+	)
+	require.NoError(t, err)
+	_, _, err = s.ReadFile(context.Background(), "", cloud.ReadOptions{NoFileSize: true})
+	require.ErrorIs(t, err, cloud.ErrFileDoesNotExist)
 }
 
 func TestCompressedGCS(t *testing.T) {