GCS: fix the WithoutAuthentication option (#290)

* GCS: fix the WithoutAuthentication option * fix test
vesoft-inc · Sep 20, 2023 · bc8b40d · bc8b40d
1 parent 1cbec84
commit bc8b40d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -146,7 +146,7 @@ log:
   level: INFO
   console: true
   files:
-   - logs/nebula-importer.log
+    - logs/nebula-importer.log
 ```
 
 * `log.level`: **Optional**. Specifies the log level, optional values is `DEBUG`, `INFO`, `WARN`, `ERROR`, `PANIC` or `FATAL`. The default value is `INFO`.
@@ -299,13 +299,15 @@ gcs:
   key: <key>
   credentialsFile: <Service account or refresh token JSON credentials file>
   credentialsJSON: <Service account or refresh token JSON credentials>
+  withoutAuthentication: <false | true>
 ```
 
 * `endpoint`: **Optional**. The endpoint of GCS service.
 * `bucket`: **Required**. The bucket of file in GCS service.
 * `key`: **Required**. The object key of file in GCS service.
 * `credentialsFile`: **Optional**. Path to the service account or refresh token JSON credentials file. Not required for public data.
 * `credentialsJSON`: **Optional**. Content of the service account or refresh token JSON credentials file. Not required for public data.
+* `withoutAuthentication`: **Optional**. Specifies that no authentication should be used, defaults to `false`.
 
 #### batch
 

diff --git a/pkg/source/gcs.go b/pkg/source/gcs.go
@@ -13,11 +13,12 @@ var _ Source = (*gcsSource)(nil)
 
 type (
 	GCSConfig struct {
-		Endpoint        string `yaml:"endpoint,omitempty"`
-		CredentialsFile string `yaml:"credentialsFile,omitempty"`
-		CredentialsJSON string `yaml:"credentialsJSON,omitempty"`
-		Bucket          string `yaml:"bucket,omitempty"`
-		Key             string `yaml:"key,omitempty"`
+		Endpoint              string `yaml:"endpoint,omitempty"`
+		CredentialsFile       string `yaml:"credentialsFile,omitempty"`
+		CredentialsJSON       string `yaml:"credentialsJSON,omitempty"`
+		WithoutAuthentication bool   `yaml:"withoutAuthentication,omitempty"`
+		Bucket                string `yaml:"bucket,omitempty"`
+		Key                   string `yaml:"key,omitempty"`
 	}
 
 	gcsSource struct {
@@ -46,7 +47,7 @@ func (s *gcsSource) Open() error {
 		gcsOptions = append(gcsOptions, option.WithCredentialsFile(s.c.GCS.CredentialsFile))
 	} else if s.c.GCS.CredentialsJSON != "" {
 		gcsOptions = append(gcsOptions, option.WithCredentialsJSON([]byte(s.c.GCS.CredentialsJSON)))
-	} else {
+	} else if s.c.GCS.WithoutAuthentication {
 		gcsOptions = append(gcsOptions, option.WithoutAuthentication())
 	}
 

diff --git a/pkg/source/gcs_test.go b/pkg/source/gcs_test.go
@@ -38,9 +38,10 @@ var _ = Describe("gcsSource", func() {
 
 		c := Config{
 			GCS: &GCSConfig{
-				Endpoint: httpServer.URL,
-				Bucket:   "bucket",
-				Key:      "key",
+				Endpoint:              httpServer.URL,
+				Bucket:                "bucket",
+				Key:                   "key",
+				WithoutAuthentication: true,
 			},
 		}