updated sdk client

narval-xyz · Nov 8, 2024 · a10836f · a10836f
1 parent 2924b76
commit a10836f
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 22 deletions.
diff --git a/apps/policy-engine/src/open-policy-agent/core/__test__/unit/open-policy-agent.engine.spec.ts b/apps/policy-engine/src/open-policy-agent/core/__test__/unit/open-policy-agent.engine.spec.ts
@@ -73,8 +73,7 @@ describe('OpenPolicyAgentEngine', () => {
         credentials: [],
         tokens: [],
         userGroupMembers: [],
-        accountGroups: [],
-        userGroups: [],
+        groups: [],
         userAccounts: [],
         users: [],
         accountGroupMembers: [],

diff --git a/packages/armory-e2e-testing/src/__test__/e2e/criterion/check-rate-limit.spec.ts b/packages/armory-e2e-testing/src/__test__/e2e/criterion/check-rate-limit.spec.ts
@@ -17,6 +17,13 @@ const systemManagerHexPk = FIXTURE.UNSAFE_PRIVATE_KEY.Root
 const ericPrivateKey = FIXTURE.UNSAFE_PRIVATE_KEY.Eric
 const alicePrivateKey = FIXTURE.UNSAFE_PRIVATE_KEY.Alice
 
+// !! This criteria is not meant to be used alone in a policy.
+// !! This criteria matches ALL incoming requests.
+// !! Filters of the criteria are used to filter historical data, not incoming request
+// !! If you have one policy that permits based on a group spendings
+// !! It will allow anyone even if they are not in the group to spend until the aggregated limit is reached
+// !! Spendings of people not in the group will not be counted against the group limit
+
 describe('checkRateLimit', () => {
   describe('rate limiting by principal', () => {
     const request: Request = {

diff --git a/...testing/src/__test__/e2e/criterion/check-spending-limit-legacy-overlapping-groups.spec.ts b/...testing/src/__test__/e2e/criterion/check-spending-limit-legacy-overlapping-groups.spec.ts
@@ -19,6 +19,13 @@ const ericPrivateKey = FIXTURE.UNSAFE_PRIVATE_KEY.Eric
 const alicePrivateKey = FIXTURE.UNSAFE_PRIVATE_KEY.Alice
 const davePrivateKey = FIXTURE.UNSAFE_PRIVATE_KEY.Dave
 
+// !! This criteria is not meant to be used alone in a policy.
+// !! This criteria matches ALL incoming requests.
+// !! Filters of the criteria are used to filter historical data, not incoming request
+// !! If you have one policy that permits based on a group spendings
+// !! It will allow anyone even if they are not in the group to spend until the aggregated limit is reached
+// !! Spendings of people not in the group will not be counted against the group limit
+
 describe('checkSpendingLimit with overlapping legacy group entities', () => {
   describe('by groupId', () => {
     const request: Request = {

diff --git a/packages/armory-e2e-testing/src/__test__/e2e/criterion/check-spending-limit.spec.ts b/packages/armory-e2e-testing/src/__test__/e2e/criterion/check-spending-limit.spec.ts
@@ -19,6 +19,12 @@ const ericPrivateKey = FIXTURE.UNSAFE_PRIVATE_KEY.Eric
 const alicePrivateKey = FIXTURE.UNSAFE_PRIVATE_KEY.Alice
 const davePrivateKey = FIXTURE.UNSAFE_PRIVATE_KEY.Dave
 
+// !! This criteria is not meant to be used alone in a policy.
+// !! This criteria matches ALL incoming requests.
+// !! Filters of the criteria are used to filter historical data, not incoming request
+// !! If you have one policy that permits based on a group spendings
+// !! It will allow anyone even if they are not in the group to spend until the aggregated limit is reached
+// !! Spendings of people not in the group will not be counted against the group limit
 describe('checkSpendingLimit', () => {
   describe('by groupId', () => {
     const request: Request = {

diff --git a/packages/armory-sdk/src/lib/data-store/client.ts b/packages/armory-sdk/src/lib/data-store/client.ts
@@ -68,7 +68,7 @@ export class EntityStoreClient {
    */
   async push(store: { data: Partial<Entities>; signature: string }): Promise<SetEntityStoreResponse> {
     const { data } = await this.dataStoreHttp.setEntities(this.config.clientId, {
-      data: this.populate(store.data) as any,
+      data: this.populate(store.data),
       signature: store.signature
     })
 

diff --git a/packages/armory-sdk/src/lib/http/client/auth/api.ts b/packages/armory-sdk/src/lib/http/client/auth/api.ts
@@ -1692,10 +1692,22 @@ export interface EntityDataStoreDtoEntityData {
     'accountGroupMembers': Array<EntityDataStoreDtoEntityDataAccountGroupMembersInner>;
     /**
      * 
-     * @type {Array<EntityDataStoreDtoEntityDataGroupsInner>}
+     * @type {Array<EntityDataStoreDtoEntityDataAccountGroupsInner>}
      * @memberof EntityDataStoreDtoEntityData
      */
-    'groups': Array<EntityDataStoreDtoEntityDataGroupsInner>;
+    'accountGroups'?: Array<EntityDataStoreDtoEntityDataAccountGroupsInner>;
+    /**
+     * 
+     * @type {Array<EntityDataStoreDtoEntityDataAccountGroupsInner>}
+     * @memberof EntityDataStoreDtoEntityData
+     */
+    'groups'?: Array<EntityDataStoreDtoEntityDataAccountGroupsInner>;
+    /**
+     * 
+     * @type {Array<EntityDataStoreDtoEntityDataAccountGroupsInner>}
+     * @memberof EntityDataStoreDtoEntityData
+     */
+    'userGroups'?: Array<EntityDataStoreDtoEntityDataAccountGroupsInner>;
     /**
      * 
      * @type {Array<EntityDataStoreDtoEntityDataAccountsInner>}
@@ -1722,6 +1734,19 @@ export interface EntityDataStoreDtoEntityDataAccountGroupMembersInner {
      */
     'groupId': string;
 }
+/**
+ * 
+ * @export
+ * @interface EntityDataStoreDtoEntityDataAccountGroupsInner
+ */
+export interface EntityDataStoreDtoEntityDataAccountGroupsInner {
+    /**
+     * 
+     * @type {string}
+     * @memberof EntityDataStoreDtoEntityDataAccountGroupsInner
+     */
+    'id': string;
+}
 /**
  * 
  * @export
@@ -1827,19 +1852,6 @@ export interface EntityDataStoreDtoEntityDataCredentialsInner {
      */
     'key': CreateClientResponseDtoPolicyEngineNodesInnerPublicKey;
 }
-/**
- * 
- * @export
- * @interface EntityDataStoreDtoEntityDataGroupsInner
- */
-export interface EntityDataStoreDtoEntityDataGroupsInner {
-    /**
-     * 
-     * @type {string}
-     * @memberof EntityDataStoreDtoEntityDataGroupsInner
-     */
-    'id': string;
-}
 /**
  * 
  * @export

diff --git a/packages/policy-engine-shared/src/lib/schema/entity.schema.ts b/packages/policy-engine-shared/src/lib/schema/entity.schema.ts
@@ -101,8 +101,14 @@ export const entitiesSchema = z.object({
   userAccounts: z.array(userAccountEntitySchema),
   users: z.array(userEntitySchema),
   accountGroupMembers: z.array(accountGroupMemberEntitySchema),
+  /**
+   * @deprecated use groups instead
+   */
   accountGroups: z.array(accountGroupEntitySchema).optional(),
-  groups: z.array(groupEntitySchema).optional(),
+  /**
+   * @deprecated use groups instead
+   */
   userGroups: z.array(userGroupEntitySchema).optional(),
-  accounts: z.array(accountEntitySchema)
+  accounts: z.array(accountEntitySchema),
+  groups: z.array(groupEntitySchema).optional()
 })
diff --git a/packages/policy-engine-shared/src/lib/util/entity.util.ts b/packages/policy-engine-shared/src/lib/util/entity.util.ts
@@ -194,8 +194,7 @@ export const empty = (): Entities => ({
   users: [],
   accountGroupMembers: [],
   accounts: [],
-  userGroups: [],
-  accountGroups: []
+  groups: []
 })
 
 export const removeUserById = (entities: Entities, userId: string): Entities => {