@cloud-copilot/iam-expand 0.1.6 → 0.1.8

package/src/expand.ts

@@ -37,15 +37,7 @@ export interface ExpandIamActionsOptions {
    * If false, an empty array will be returned
    * Default: false
    */
-  errorOnMissingService: boolean
-
-  /**
-   * If true, only unique values will be returned, while maintaining order
-   * If false, all values will be returned, even if they are duplicates
-   * Default: false
-   */
-  distinct: boolean
-
+  errorOnInvalidService: boolean
 
   /**
    * The behavior to use when an invalid action is encountered without wildcards
@@ -56,23 +48,14 @@ export interface ExpandIamActionsOptions {
    * Default: InvalidActionBehavior.Remove
    */
   invalidActionBehavior: InvalidActionBehavior
-
-  /**
-   * If true, the returned array will be sorted
-   * If false, the returned array will be in the order they were expanded
-   * Default: false
-   */
-  sort: boolean
 }
 
 const defaultOptions: ExpandIamActionsOptions = {
   expandAsterisk: false,
   expandServiceAsterisk: false,
   errorOnInvalidFormat: false,
-  errorOnMissingService: false,
+  errorOnInvalidService: false,
   invalidActionBehavior: InvalidActionBehavior.Remove,
-  distinct: false,
-  sort: false
 }
 
 const allAsterisksPattern = /^\*+$/i
@@ -101,21 +84,9 @@ export async function expandIamActions(actionStringOrStrings: string | string[],
       return expandIamActions(actionString, options);
     }))
 
-    let allMatches = actionLists.flat()
-
-    if(options.distinct) {
-      const aSet = new Set<string>()
-      allMatches = allMatches.filter((value) => {
-        if(aSet.has(value)) {
-          return false
-        }
-        aSet.add(value)
-        return true
-      })
-    }
-    if(options.sort) {
-      allMatches.sort()
-    }
+    const allMatches = Array.from(new Set(actionLists.flat()))
+    allMatches.sort()
+
     return allMatches
   }
 
@@ -152,7 +123,7 @@ export async function expandIamActions(actionStringOrStrings: string | string[],
 
   const [service, wildcardActions] = parts.map(part => part.toLowerCase())
   if(!await iamServiceExists(service)) {
-    if(options.errorOnMissingService) {
+    if(options.errorOnInvalidService) {
       throw new Error(`Service not found: ${service}`)
     }
     return []
@@ -189,9 +160,7 @@ export async function expandIamActions(actionStringOrStrings: string | string[],
   const pattern = "^" + wildcardActions.replace(/\*/g, '.*?') + "$"
   const regex = new RegExp(pattern, 'i')
   const matchingActions = allActions.filter(action => regex.test(action)).map(action => `${service}:${action}`)
-  if(options.sort) {
-    matchingActions.sort()
-  }
+  matchingActions.sort()
 
   return matchingActions
 }

package/src/expand_file.test.ts

@@ -55,7 +55,6 @@ describe('expand_file', () => {
         }
       }
       vi.mocked(expandIamActions).mockImplementation(async (actions, options) =>{
-        expect(options?.distinct).toBe(true)
         return ["s3:GetObject", "s3:GetBucket", "s3:PutObject", "s3:PutBucket"]
       })
 
@@ -134,7 +133,6 @@ describe('expand_file', () => {
         }
       }
       vi.mocked(expandIamActions).mockImplementation(async (actions, options) =>{
-        expect(options?.distinct).toBe(true)
         return ["s3:GetObject", "s3:GetBucket", "s3:PutObject", "s3:PutBucket"]
       })
 

package/src/expand_file.ts

@@ -14,7 +14,7 @@ export async function expandJsonDocument(options: Partial<ExpandIamActionsOption
       return await expandIamActions(document, options)
     }
     if(Array.isArray(document) && document.length > 0 && typeof document[0] === 'string') {
-      const value =  await expandIamActions(document, {...options, distinct: true})
+      const value =  await expandIamActions(document, {...options})
       return value
     }
   }