MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-02-03 01:46:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove checkGCSProjectID() as it needs extra permission setting (#5210)

Browse Source 
fixes #5209
This commit is contained in:
Krishna Srinivas 2017-11-21 10:43:39 -08:00 committed by Dee Koder
parent 1a53734477
commit 4393afb7e2
1 changed files with 0 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
cmd/gateway-gcs.go
View File

@ -35,8 +35,6 @@ import (
minio "github.com/minio/minio-go" minio "github.com/minio/minio-go"
"github.com/minio/minio-go/pkg/policy" "github.com/minio/minio-go/pkg/policy"
"github.com/minio/minio/pkg/hash" "github.com/minio/minio/pkg/hash"
"golang.org/x/oauth2/google"
cloudresourcemanager "google.golang.org/api/cloudresourcemanager/v1"
"google.golang.org/api/googleapi" "google.golang.org/api/googleapi"
"google.golang.org/api/iterator" "google.golang.org/api/iterator"
"google.golang.org/api/option" "google.golang.org/api/option"
@ -297,47 +295,6 @@ func isValidGCSProjectIDFormat(projectID string) bool {
return gcsProjectIDRegex.MatchString(projectID) return gcsProjectIDRegex.MatchString(projectID)
} }
// checkGCSProjectID - checks if the project ID does really exist using resource manager API.
func checkGCSProjectID(ctx context.Context, projectID string) error {
// Check if a project id associated to the current account does really exist
resourceManagerClient, err := google.DefaultClient(ctx, cloudresourcemanager.CloudPlatformReadOnlyScope)
if err != nil {
return err
}
baseSvc, err := cloudresourcemanager.New(resourceManagerClient)
if err != nil {
return err
}
projectSvc := cloudresourcemanager.NewProjectsService(baseSvc)
curPageToken := ""
// Iterate over projects list result pages and immediately return nil when
// the project ID is found.
for {
resp, err := projectSvc.List().PageToken(curPageToken).Context(ctx).Do()
if err != nil {
return fmt.Errorf("Error getting projects list: %s", err.Error())
}
for _, p := range resp.Projects {
if p.ProjectId == projectID {
return nil
}
}
if resp.NextPageToken != "" {
curPageToken = resp.NextPageToken
} else {
break
}
}
return errGCSProjectIDNotFound
}
// gcsGateway - Implements gateway for Minio and GCS compatible object storage servers. // gcsGateway - Implements gateway for Minio and GCS compatible object storage servers.
type gcsGateway struct { type gcsGateway struct {
gatewayUnsupported gatewayUnsupported
@ -376,11 +333,6 @@ func newGCSGatewayLayer(projectID string) (GatewayLayer, error) {
} }
} }
err = checkGCSProjectID(ctx, projectID)
if err != nil {
return nil, err
}
// Initialize a GCS client. // Initialize a GCS client.
// Send user-agent in this format for Google to obtain usage insights while participating in the // Send user-agent in this format for Google to obtain usage insights while participating in the
// Google Cloud Technology Partners (https://cloud.google.com/partners/) // Google Cloud Technology Partners (https://cloud.google.com/partners/)