Merge pull request #15 from reactiveops/rs/gke-fixes

Adding better error handling, moving to read only scope for GCP calls
FairwindsOps · Mar 15, 2019 · 87d01d7 · 87d01d7
2 parents 635e287 + ea85425
commit 87d01d7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/cmd/version.go b/cmd/version.go
@@ -28,6 +28,6 @@ var versionCmd = &cobra.Command{
 	Use:   "version",
 	Short: "Print the version number of rbac-lookup",
 	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Println("rbac-lookup version 0.3.0")
+		fmt.Println("rbac-lookup version 0.3.1")
 	},
 }
diff --git a/lookup/lister.go b/lookup/lister.go
@@ -105,6 +105,7 @@ func (l *lister) loadRoleBindings() error {
 	roleBindings, err := l.clientset.RbacV1().RoleBindings("").List(metav1.ListOptions{})
 
 	if err != nil {
+		fmt.Println("Error loading role bindings")
 		return err
 	}
 
@@ -132,6 +133,7 @@ func (l *lister) loadClusterRoleBindings() error {
 	clusterRoleBindings, err := l.clientset.RbacV1().ClusterRoleBindings().List(metav1.ListOptions{})
 
 	if err != nil {
+		fmt.Println("Error loading cluster role bindings")
 		return err
 	}
 
@@ -182,13 +184,15 @@ func (l *lister) loadGkeIamPolicy(policy *cloudresourcemanager.Policy) {
 func (l *lister) loadGkeRoleBindings() error {
 	ctx := context.Background()
 
-	c, err := google.DefaultClient(ctx, cloudresourcemanager.CloudPlatformScope)
+	c, err := google.DefaultClient(ctx, cloudresourcemanager.CloudPlatformReadOnlyScope)
 	if err != nil {
+		fmt.Println("Error initializing Google API client")
 		return err
 	}
 
 	crmService, err := cloudresourcemanager.New(c)
 	if err != nil {
+		fmt.Println("Error initializing Google Cloud Resource Manager")
 		return err
 	}
 
@@ -197,6 +201,7 @@ func (l *lister) loadGkeRoleBindings() error {
 
 	policy, err := crmService.Projects.GetIamPolicy(resource, ipr).Context(ctx).Do()
 	if err != nil {
+		fmt.Printf("Error loading Google Cloud IAM Policy for project: %s\n", resource)
 		return err
 	}