Refactor various components

.tool-versions

@@ -13,7 +13,7 @@ yq 4.27.2
 helm 3.9.2
 kubectl 1.24.3
 kustomize 4.5.5
-kind 0.14.0
+kind 0.15.0
 jb 0.5.1
 tanka 0.22.1
 tilt 0.30.7

api/aperture/policy/wrappers/v1/decisions.proto

@@ -0,0 +1,38 @@
+syntax = "proto3";
+
+package aperture.policy.wrappers.v1;
+
+import "aperture/policy/decisions/v1/decisions.proto";
+
+message LoadShedDecsisionWrapper {
+  // Load Shed Decision
+  policy.decisions.v1.LoadShedDecision load_shed_decision = 1;
+  // The index of Component in the Circuit.
+  int64 component_index = 2;
+  // Name of the Policy.
+  string policy_name = 3;
+  // Hash of the entire Policy spec.
+  string policy_hash = 4;
+}
+
+message TokensDecisionWrapper {
+  // Tokens Decision
+  policy.decisions.v1.TokensDecision tokens_decision = 1;
+  // The index of Component in the Circuit.
+  int64 component_index = 2;
+  // Name of the Policy.
+  string policy_name = 3;
+  // Hash of the entire Policy spec.
+  string policy_hash = 4;
+}
+
+message RateLimiterDecisionWrapper {
+  // Rate Limiter Decision
+  policy.decisions.v1.RateLimiterDecision rate_limiter_decision = 1;
+  // The index of Component in the Circuit.
+  int64 component_index = 2;
+  // Name of the Policy.
+  string policy_name = 3;
+  // Hash of the entire Policy spec.
+  string policy_hash = 4;
+}

api/aperture/common/config/v1/config_properties_wrapper.proto → api/aperture/policy/wrappers/v1/policy.proto

@@ -1,8 +1,7 @@
 syntax = "proto3";
 
-package aperture.common.config.v1;
+package aperture.policy.wrappers.v1;
 
-import "aperture/policy/decisions/v1/decisions.proto";
 import "aperture/policy/language/v1/fluxmeter.proto";
 import "aperture/policy/language/v1/policy.proto";
 
@@ -43,36 +42,3 @@ message RateLimiterWrapper {
   // Hash of the entire Policy spec.
   string policy_hash = 4;
 }
-
-message LoadShedDecsisionWrapper {
-  // Load Shed Decision
-  policy.decisions.v1.LoadShedDecision load_shed_decision = 1;
-  // The index of Component in the Circuit.
-  int64 component_index = 2;
-  // Name of the Policy.
-  string policy_name = 3;
-  // Hash of the entire Policy spec.
-  string policy_hash = 4;
-}
-
-message TokensDecisionWrapper {
-  // Tokens Decision
-  policy.decisions.v1.TokensDecision tokens_decision = 1;
-  // The index of Component in the Circuit.
-  int64 component_index = 2;
-  // Name of the Policy.
-  string policy_name = 3;
-  // Hash of the entire Policy spec.
-  string policy_hash = 4;
-}
-
-message RateLimiterDecisionWrapper {
-  // Rate Limiter Decision
-  policy.decisions.v1.RateLimiterDecision rate_limiter_decision = 1;
-  // The index of Component in the Circuit.
-  int64 component_index = 2;
-  // Name of the Policy.
-  string policy_name = 3;
-  // Hash of the entire Policy spec.
-  string policy_hash = 4;
-}

api/gen/openapiv2/aperture.swagger.yaml

@@ -3,12 +3,12 @@ info:
   title: Aperture API
   version: "1.0"
 tags:
-  - name: PolicyService
   - name: EntityCacheService
   - name: InfoService
   - name: StatusService
   - name: FlowControlService
   - name: FluxNinjaService
+  - name: PolicyService
 consumes:
   - application/json
 produces: