Fixed rule testing (#5)

* Fixing rule testing * Updated config * re-added enterprise * Addressed PR comments * Copied over missing permission * Updated integration tests * Fixed formatting
glerb · Jan 21, 2020 · e745e38 · e745e38
1 parent 50a986b
commit e745e38
Show file tree

Hide file tree

Showing 13 changed files with 312 additions and 331 deletions.
diff --git a/api/gateway/analysis/api.yml b/api/gateway/analysis/api.yml
@@ -742,6 +742,13 @@ definitions:
     items:
       $ref: '#/definitions/UnitTest'
 
+  AnalysisType:
+    type: string
+    enum:
+      - POLICY
+      - RULE
+
+
   UpdatePolicy:
     type: object
     properties:
@@ -951,10 +958,13 @@ definitions:
         $ref: '#/definitions/TypeSet'
       tests:
         $ref: '#/definitions/TestSuite'
+      analysisType:
+        $ref: '#/definitions/AnalysisType'
     required:
       - body
       - resourceTypes
       - tests
+      - analysisType
 
   TestPolicyResult:
     type: object

diff --git a/api/gateway/analysis/models/analysis_type.go b/api/gateway/analysis/models/analysis_type.go
diff --git a/api/gateway/analysis/models/test_policy.go b/api/gateway/analysis/models/test_policy.go
diff --git a/deployments/core/analysis_api.yml b/deployments/core/analysis_api.yml
@@ -96,7 +96,8 @@ Resources:
           COMPLIANCE_API_HOST: !Sub '${ComplianceApiId}.execute-api.${AWS::Region}.amazonaws.com'
           COMPLIANCE_API_PATH: v1
           DEBUG: !Ref Debug
-          ENGINE: panther-policy-engine
+          POLICY_ENGINE: panther-policy-engine
+          RULES_ENGINE: panther-rules-engine
           RESOURCE_QUEUE_URL: !Sub https://sqs.${AWS::Region}.amazonaws.com/${AWS::AccountId}/panther-resources
           TABLE: !Ref Table
       FunctionName: panther-analysis-api
@@ -122,7 +123,9 @@ Resources:
             -
               Effect: Allow
               Action: lambda:InvokeFunction
-              Resource: !Sub arn:${AWS::Partition}:lambda:${AWS::Region}:${AWS::AccountId}:function:panther-policy-engine
+              Resource:
+                - !Sub arn:${AWS::Partition}:lambda:${AWS::Region}:${AWS::AccountId}:function:panther-policy-engine
+                - !Sub arn:${AWS::Partition}:lambda:${AWS::Region}:${AWS::AccountId}:function:panther-rules-engine
         -
           Id: ManageDataStores
           Version: 2012-10-17

diff --git a/enterprise/web/build-utils/dir-content-replacement-plugin.js b/enterprise/web/build-utils/dir-content-replacement-plugin.js