Fix oc policy remove-user to remove rolebindings too

simo5 · simo5 · commit 63d2cfd50183 · 2018-02-09T10:29:12.000-05:00
Followup to openshift#18102 Signed-off-by: Simo Sorce <simo@redhat.com>
diff --git a/pkg/oc/admin/policy/remove_from_project.go b/pkg/oc/admin/policy/remove_from_project.go
@@ -176,7 +176,11 @@ func (o *RemoveFromProjectOptions) Run() error {
 		}
 
 		if !o.DryRun {
-			_, err = o.Client.RoleBindings(o.BindingNamespace).Update(&currBinding)
+			if len(currBinding.Subjects) > 0 {
+				_, err = o.Client.RoleBindings(o.BindingNamespace).Update(&currBinding)
+			} else {
+				_, err = o.Client.RoleBindings(o.BindingNamespace).Delete(currBinding.Name, &metav1.DeleteOptions{})
+			}
 			if err != nil {
 				return err
 			}

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,11 @@ func (o *RemoveFromProjectOptions) Run() error {`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`if !o.DryRun {`
`179`		`- _, err = o.Client.RoleBindings(o.BindingNamespace).Update(&currBinding)`
	`179`	`+ if len(currBinding.Subjects) > 0 {`
	`180`	`+ _, err = o.Client.RoleBindings(o.BindingNamespace).Update(&currBinding)`
	`181`	`+ } else {`
	`182`	`+ _, err = o.Client.RoleBindings(o.BindingNamespace).Delete(currBinding.Name, &metav1.DeleteOptions{})`
	`183`	`+ }`
`180`	`184`	`if err != nil {`
`181`	`185`	`return err`
`182`	`186`	`}`