Address review comments

wso2 · Nov 1, 2023 · f415ea4 · f415ea4
1 parent 1069553
commit f415ea4
Show file tree

Hide file tree

Showing 33 changed files with 558 additions and 706 deletions.
diff --git a/adapter/api/proto/wso2/discovery/subscription/application.proto b/adapter/api/proto/wso2/discovery/subscription/application.proto
@@ -27,11 +27,11 @@ option java_multiple_files = true;
 
 // Application data model
 message Application {
-    string eventId = 1;
-    string uuid = 2;
-    string name = 3;
-    string owner = 4;
-    map<string, string> attributes = 5;
+    string uuid = 1;
+    string name = 2;
+    string owner = 3;
+    map<string, string> attributes = 4;
+    string timestamp = 5;
 }
 
 message SecuritySchemes { 

diff --git a/adapter/api/proto/wso2/discovery/subscription/subscription.proto b/adapter/api/proto/wso2/discovery/subscription/subscription.proto
@@ -27,12 +27,11 @@ option java_multiple_files = true;
 
 // Subscription data model
 message Subscription {
-    string eventId = 1;
-    string subStatus = 2;
-    string uuid = 3;
-    string organization = 4;
-    SubscribedAPI subscribedApi = 5;
-    string timeStamp = 6;
+    string subStatus = 1;
+    string uuid = 2;
+    string organization = 3;
+    SubscribedAPI subscribedApi = 4;
+    string timestamp = 5;
 }
 
 message SubscribedAPI {

diff --git a/adapter/internal/operator/controllers/dp/gateway_controller.go b/adapter/internal/operator/controllers/dp/gateway_controller.go
@@ -298,7 +298,7 @@ func (gatewayReconciler *GatewayReconciler) getInterceptorServicesForGateway(ctx
 			}
 		}
 	}
-	return interceptorServices, nil
+	return interceptorServices, nil // TODO(Ashera): Handle global subscription validation enable disable 
 }
 
 func (gatewayReconciler *GatewayReconciler) getResolvedBackendsMapping(ctx context.Context,

diff --git a/adapter/pkg/discovery/api/wso2/discovery/subscription/application.pb.go b/adapter/pkg/discovery/api/wso2/discovery/subscription/application.pb.go
diff --git a/adapter/pkg/discovery/api/wso2/discovery/subscription/subscription.pb.go b/adapter/pkg/discovery/api/wso2/discovery/subscription/subscription.pb.go
-Original file line number
+Diff line change
@@ Expand Up @@
     			}
     		}
     	}
-    	return interceptorServices, nil
+    	return interceptorServices, nil // TODO(Ashera): Handle global subscription validation enable disable
     }
     func (gatewayReconciler *GatewayReconciler) getResolvedBackendsMapping(ctx context.Context,
@@ Expand Down @@