flag test

flags.go

@@ -187,6 +187,11 @@ func newApp() (app *cli.App) {
 				Usage: "File chunk size to read from GCS in one call. Need to specify the value in MB. ChunkSize less than 1MB is not supported",
 			},
 
+			cli.BoolFlag{
+				Name:  "disable-auth",
+				Usage: "Disable authorization",
+			},
+
 			/////////////////////////
 			// Tuning
 			/////////////////////////
@@ -378,6 +383,7 @@ type flagStorage struct {
 	EgressBandwidthLimitBytesPerSecond float64
 	OpRateLimitHz                      float64
 	SequentialReadSizeMb               int32
+	DisableAuth                        bool
 
 	// Tuning
 	MaxRetrySleep              time.Duration
@@ -488,6 +494,7 @@ func populateFlags(c *cli.Context) (flags *flagStorage, err error) {
 		EgressBandwidthLimitBytesPerSecond: c.Float64("limit-bytes-per-sec"),
 		OpRateLimitHz:                      c.Float64("limit-ops-per-sec"),
 		SequentialReadSizeMb:               int32(c.Int("sequential-read-size-mb")),
+		DisableAuth:                        c.Bool("disable-auth"),
 
 		// Tuning,
 		MaxRetrySleep:              c.Duration("max-retry-sleep"),

flags_test.go

@@ -80,6 +80,7 @@ func (t *FlagsTest) Defaults() {
 	ExpectEq(-1, f.OpRateLimitHz)
 	ExpectTrue(f.ReuseTokenFromUrl)
 	ExpectEq(nil, f.CustomEndpoint)
+	ExpectFalse(f.DisableAuth)
 
 	// Tuning
 	ExpectEq(4096, f.StatCacheCapacity)
@@ -111,6 +112,7 @@ func (t *FlagsTest) Bools() {
 		"debug_invariants",
 		"enable-nonexistent-type-cache",
 		"experimental-enable-json-read",
+		"disable-auth",
 	}
 
 	var args []string
@@ -132,6 +134,7 @@ func (t *FlagsTest) Bools() {
 	ExpectTrue(f.DebugInvariants)
 	ExpectTrue(f.EnableNonexistentTypeCache)
 	ExpectTrue(f.ExperimentalEnableJsonRead)
+	ExpectTrue(f.DisableAuth)
 
 	// --foo=false form
 	args = nil
@@ -148,6 +151,7 @@ func (t *FlagsTest) Bools() {
 	ExpectFalse(f.DebugHTTP)
 	ExpectFalse(f.DebugInvariants)
 	ExpectFalse(f.EnableNonexistentTypeCache)
+	ExpectFalse(f.DisableAuth)
 
 	// --foo=true form
 	args = nil
@@ -164,6 +168,7 @@ func (t *FlagsTest) Bools() {
 	ExpectTrue(f.DebugHTTP)
 	ExpectTrue(f.DebugInvariants)
 	ExpectTrue(f.EnableNonexistentTypeCache)
+	ExpectTrue(f.DisableAuth)
 }
 
 func (t *FlagsTest) DecimalNumbers() {

internal/storage/storageutil/client.go

@@ -40,6 +40,7 @@ type StorageClientConfig struct {
 	TokenUrl                   string
 	ReuseTokenFromUrl          bool
 	ExperimentalEnableJsonRead bool
+	DisableAuth                bool
 }
 
 func CreateHttpClient(storageClientConfig *StorageClientConfig) (httpClient *http.Client, err error) {
@@ -91,9 +92,9 @@ func CreateHttpClient(storageClientConfig *StorageClientConfig) (httpClient *htt
 // is nil, it creates the token-source from the provided key-file or using ADC search
 // order (https://cloud.google.com/docs/authentication/application-default-credentials#order).
 func createTokenSource(storageClientConfig *StorageClientConfig) (tokenSrc oauth2.TokenSource, err error) {
-	if storageClientConfig.CustomEndpoint == nil {
+	// Create token src only if disable-auth flag is false.
+	if !storageClientConfig.DisableAuth {
 		return auth.GetTokenSource(context.Background(), storageClientConfig.KeyFile, storageClientConfig.TokenUrl, storageClientConfig.ReuseTokenFromUrl)
-	} else {
-		return oauth2.StaticTokenSource(&oauth2.Token{}), nil
 	}
+	return nil, nil
 }

internal/storage/storageutil/client_test.go

@@ -29,21 +29,49 @@ type clientTest struct {
 
 func init() { RegisterTestSuite(&clientTest{}) }
 
-func (t *clientTest) TestCreateTokenSrcWithCustomEndpoint() {
+func (t *clientTest) TestCreateTokenSrcWithCustomEndpointWhenDisableAuthIsTrue() {
 	url, err := url.Parse(CustomEndpoint)
 	AssertEq(nil, err)
 	sc := GetDefaultStorageClientConfig()
 	sc.CustomEndpoint = url
+	sc.DisableAuth = true
 
 	tokenSrc, err := createTokenSource(&sc)
 
 	ExpectEq(nil, err)
 	ExpectNe(nil, &tokenSrc)
 }
 
-func (t *clientTest) TestCreateTokenSrcWhenCustomEndpointIsNil() {
+func (t *clientTest) TestCreateTokenSrcWithCustomEndpointWhenDisableAuthIsFalse() {
+	url, err := url.Parse(CustomEndpoint)
+	AssertEq(nil, err)
+	sc := GetDefaultStorageClientConfig()
+	sc.CustomEndpoint = url
+	sc.DisableAuth = false
+
+	// It will try to create the actual auth token and fail since key-file doesn't exist.
+	tokenSrc, err := createTokenSource(&sc)
+
+	ExpectNe(nil, err)
+	ExpectThat(err, oglematchers.Error(oglematchers.HasSubstr("no such file or directory")))
+	ExpectNe(nil, &tokenSrc)
+}
+
+func (t *clientTest) TestCreateTokenSrcWhenCustomEndpointIsNilAndDisableAuthIsTrue() {
+	sc := GetDefaultStorageClientConfig()
+	sc.CustomEndpoint = nil
+	sc.DisableAuth = true
+
+	tokenSrc, err := createTokenSource(&sc)
+
+	ExpectEq(nil, err)
+	ExpectEq(nil, tokenSrc)
+}
+
+func (t *clientTest) TestCreateTokenSrcWhenCustomEndpointIsNilAndDisableAuthIsFalse() {
 	sc := GetDefaultStorageClientConfig()
 	sc.CustomEndpoint = nil
+	sc.DisableAuth = false
 
 	// It will try to create the actual auth token and fail since key-file doesn't exist.
 	tokenSrc, err := createTokenSource(&sc)
@@ -55,6 +83,7 @@ func (t *clientTest) TestCreateTokenSrcWhenCustomEndpointIsNil() {
 
 func (t *clientTest) TestCreateHttpClientWithHttp1() {
 	sc := GetDefaultStorageClientConfig() // By default http1 enabled
+	sc.DisableAuth = true
 
 	// Act: this method add tokenSource and clientOptions.
 	httpClient, err := CreateHttpClient(&sc)
@@ -67,6 +96,7 @@ func (t *clientTest) TestCreateHttpClientWithHttp1() {
 
 func (t *clientTest) TestCreateHttpClientWithHttp2() {
 	sc := GetDefaultStorageClientConfig()
+	sc.DisableAuth = true
 
 	// Act: this method add tokenSource and clientOptions.
 	httpClient, err := CreateHttpClient(&sc)

main.go

@@ -95,6 +95,7 @@ func createStorageHandle(flags *flagStorage) (storageHandle storage.StorageHandl
 		TokenUrl:                   flags.TokenUrl,
 		ReuseTokenFromUrl:          flags.ReuseTokenFromUrl,
 		ExperimentalEnableJsonRead: flags.ExperimentalEnableJsonRead,
+		DisableAuth:                flags.DisableAuth,
 	}
 
 	storageHandle, err = storage.NewStorageHandle(context.Background(), storageClientConfig)