Merge pull request #63 from sighupio/bug/fix-template

fixes templateRoles not populated correctly

web-client/src/components/Summary.tsx

@@ -17,20 +17,20 @@ export default function Summary({ pairItems }: SummaryParameters) {
 
   const ruleSets: RuleSet[] = pairItems
     .reduce((acc, p) => {
-      const crs = clusterRoles.filter(c => c.metadata.name === p.roleName)
+      const crs = clusterRoles.filter(c => c.metadata.name === p.template)
 
       const rules = crs.reduce((acc, v) => {
         acc = acc.concat(v.rules)
         return acc
       }, [])
 
       const ruleset = {
-        template: p.roleName,
+        template: p.template,
         rules,
         namespaces: p.namespaces === 'ALL_NAMESPACES' ? ['all'] : p.namespaces
       }
 
-      const itemForSameTemplate = acc.find(rs => rs.template === p.roleName)
+      const itemForSameTemplate = acc.find(rs => rs.template === p.template)
       if (itemForSameTemplate) {
         if (
           itemForSameTemplate.namespaces.includes('all') ||

web-client/src/components/TemplatePairSelect.tsx

@@ -15,7 +15,7 @@ interface TemplatePairSelectParameters {
 export default function TemplatePairSelect({onSave, initialValues}: TemplatePairSelectParameters) {
   const [namespaces, setNamespaces] = useState<AggregatedRoleBindingNamespace>(initialValues.namespaces || [])
   const [allNamespace, setAllNamespaces] = useState<boolean>(initialValues.namespaces === 'ALL_NAMESPACES' ? true : null)
-  const [template, setTemplate] = useState(initialValues.roleName)
+  const [template, setTemplate] = useState(initialValues.template)
 
   useEffect(() => {
     if (allNamespace === null) {
@@ -33,7 +33,7 @@ export default function TemplatePairSelect({onSave, initialValues}: TemplatePair
     onSave({
       id: initialValues.id,
       namespaces,
-      roleName: template
+      template: template
     })
   }, [initialValues.id, namespaces, onSave, template])
 
@@ -45,7 +45,7 @@ export default function TemplatePairSelect({onSave, initialValues}: TemplatePair
         </div>
         <TemplateSelect
           onSelect={t => setTemplate(t)}
-          initialValue={initialValues.roleName}
+          initialValue={initialValues.template}
         />
       </div>
       <div style={{marginLeft: 20, flex: 3}} data-testid="namespaces-select">

web-client/src/components/Templates.tsx

@@ -10,7 +10,7 @@ interface TemplatesParameters extends AggregatedRoleBindingManager {
 export default function Templates({pairItems, savePair, setPairItems, addEmptyPair}: TemplatesParameters) {
   const lastPair = pairItems[pairItems.length - 1]
   const addButtonDisabled =
-    lastPair && lastPair.roleName && lastPair.namespaces.length === 0
+    lastPair && lastPair.template && lastPair.namespaces.length === 0
 
   return (
     <div>

web-client/src/components/edit-user.tsx

@@ -131,7 +131,7 @@ export default function EditUser({user}: EditUserParameters) {
   }, [])
 
   const addEmptyPair = useCallback(() => {
-    setAggregatedRoleBindings(state => [...state, {id: uuid.v4(), namespaces: [], roleName: ''}])
+    setAggregatedRoleBindings(state => [...state, {id: uuid.v4(), namespaces: [], template: ''}])
   }, [])
 
   const saveButtonDisabled = aggregatedRoleBindings.length === 0 || aggregatedRoleBindings.some(p => p.namespaces.length === 0)

web-client/src/components/new-user-wizard.tsx

@@ -104,7 +104,7 @@ export default function NewUserWizard() {
   }, [])
 
   const addEmptyPair = useCallback(() => {
-    setAggregatedRoleBindings(state => [...state, {id: uuid.v4(), namespaces: [], roleName: ''}])
+    setAggregatedRoleBindings(state => [...state, {id: uuid.v4(), namespaces: [], template: ''}])
   }, [])
 
   useEffect(addEmptyPair, [])

web-client/src/deadcode/components/cluster-rolebindings.tsx

@@ -115,7 +115,7 @@ function NewClusterRoleBindingForm({fetchData}) {
         ...s,
         namespace: 'permission-manager'
       })),
-      roleName,
+      template: roleName,
       clusterRolebindingName,
     })
 

web-client/src/deadcode/components/rolebindings.tsx

@@ -98,7 +98,7 @@ function NewRoleBindingForm({fetchData}: { fetchData(): void }) {
 
     await httpRequests.rolebindingRequests.create.rolebinding({
       namespace,
-      roleName,
+      template: roleName,
       roleBindingName: rolebindingName,
       roleKind,
       subjects: subjects.map(s => ({

web-client/src/services/role.tsx

@@ -29,9 +29,10 @@ export interface AggregatedRoleBinding {
 
   readonly namespaces: AggregatedRoleBindingNamespace
   /**
+   * DO NOT REFACTOR THIS NAME
    * example: template-namespaced-resources___developer
    */
-  readonly roleName: string
+  readonly template: string
 }
 
 

web-client/src/services/rolebindingCreateRequests.tsx

@@ -7,9 +7,10 @@ import {Subject} from "../hooks/useRbac";
 
 interface RoleCreate {
   /**
+   * DO NOT REFACTOR THIS NAME
    * rolename
    */
-  readonly roleName: string,
+  readonly template: string,
   /**
    * this field adds generated_for_user to the http request
    */
@@ -61,7 +62,7 @@ export class RolebindingCreateRequests {
    */
   private async httpCreateClusterRolebinding(params: ClusterRolebindingCreate) {
     const request = {
-      roleName: params.roleName,
+      roleName: params.template,
       subjects: params.subjects,
       clusterRolebindingName: params.clusterRolebindingName
     };
@@ -83,7 +84,7 @@ export class RolebindingCreateRequests {
 
     return await this.httpCreateClusterRolebinding({
       clusterRolebindingName: params.clusterRolebindingName,
-      roleName: params.roleName,
+      template: params.template,
       username: params.username,
       subjects: params.subjects
     })
@@ -96,7 +97,7 @@ export class RolebindingCreateRequests {
    */
   public async rolebinding(params: RolebindingCreate) {
     const request = {
-      roleName: params.roleName,
+      roleName: params.template,
       namespace: params.namespace,
       roleKind: params.roleKind,
       subjects: params.subjects,
@@ -144,15 +145,15 @@ export class RolebindingCreateRequests {
     // we grab all the 'ALL_NAMESPACE' rolebindings and create them on the backend
     for (const allNamespaceRolebinding of aggregatedRoleBindings.filter(e => e.namespaces === 'ALL_NAMESPACES')) {
       // we construct the resource name
-      const clusterRolebindingName = username + resourceSeparator + allNamespaceRolebinding.roleName + 'all_namespaces'
+      const clusterRolebindingName = username + resourceSeparator + allNamespaceRolebinding.template + 'all_namespaces'
 
       // means that we already created the resource
       if (consumed.includes(clusterRolebindingName)) continue;
 
       await this.rolebindingAllNamespaces({
         clusterRolebindingName: clusterRolebindingName,
         // addGeneratedForUser: false,
-        roleName: allNamespaceRolebinding.roleName,
+        template: allNamespaceRolebinding.template,
         // username: params.username,
         subjects: subjects
       })
@@ -165,13 +166,13 @@ export class RolebindingCreateRequests {
       for (const namespace of namespacedRoleBinding.namespaces) {
 
         // we construct the resource name
-        const rolebindingName = username + resourceSeparator + namespacedRoleBinding.roleName + resourceSeparator + namespace
+        const rolebindingName = username + resourceSeparator + namespacedRoleBinding.template + resourceSeparator + namespace
 
         // means that we already created the resource
         if (consumed.includes(rolebindingName)) continue;
 
         await this.rolebinding({
-          roleName: namespacedRoleBinding.roleName,
+          template: namespacedRoleBinding.template,
           username: username,
           namespace: namespace,
           roleBindingName: rolebindingName,
@@ -197,7 +198,7 @@ export class RolebindingCreateRequests {
 
     //todo this must be changed in the future to support dynamic cluster roles. Right now it's just a single api call based on a radio select
     await this.clusterRolebinding({
-      roleName: roleName,
+      template: roleName,
       clusterRolebindingName: clusterRolebindingName,
       // username: params.username,
       // addGeneratedForUser: false,