Add environment wise key support

adapter/internal/discovery/xds/marshaller.go

@@ -629,6 +629,7 @@ func marshalKeyMapping(keyMappingInternal *types.ApplicationKeyMapping) *subscri
 		TenantId:        keyMappingInternal.TenantID,
 		TenantDomain:    keyMappingInternal.TenantDomain,
 		Timestamp:       keyMappingInternal.TimeStamp,
+		EnvId:           keyMappingInternal.EnvID,
 	}
 }
 

adapter/internal/messaging/notification_listener.go

@@ -287,6 +287,8 @@ func handleLifeCycleEvents(data []byte) {
 
 // handleApplicationEvents to process application related events
 func handleApplicationEvents(data []byte, eventType string) {
+	//todo  Need to check this event handling.
+	logger.LoggerInternalMsg.Infof("Application event type : %s", eventType)
 	if strings.EqualFold(applicationRegistration, eventType) ||
 		strings.EqualFold(removeApplicationKeyMapping, eventType) {
 		var applicationRegistrationEvent msg.ApplicationRegistrationEvent
@@ -302,10 +304,13 @@ func handleApplicationEvents(data []byte, eventType string) {
 			return
 		}
 
+		logger.LoggerInternalMsg.Infof("Application Key Mapping event for the Consumer Key : %+v", applicationRegistrationEvent)
+
 		applicationKeyMapping := types.ApplicationKeyMapping{ApplicationID: applicationRegistrationEvent.ApplicationID,
 			ConsumerKey: applicationRegistrationEvent.ConsumerKey, KeyType: applicationRegistrationEvent.KeyType,
 			KeyManager: applicationRegistrationEvent.KeyManager, TenantID: -1, TenantDomain: applicationRegistrationEvent.TenantDomain,
-			TimeStamp: applicationRegistrationEvent.TimeStamp, ApplicationUUID: applicationRegistrationEvent.ApplicationUUID}
+			TimeStamp: applicationRegistrationEvent.TimeStamp, ApplicationUUID: applicationRegistrationEvent.ApplicationUUID,
+			EnvID: applicationRegistrationEvent.EnvID}
 
 		applicationKeyMappingReference := xds.GetApplicationKeyMappingReference(&applicationKeyMapping)
 
@@ -335,6 +340,8 @@ func handleApplicationEvents(data []byte, eventType string) {
 			return
 		}
 
+		logger.LoggerInternalMsg.Infof("Application Key Mapping event for the Consumer Key : %+v", applicationEvent)
+
 		app := types.Application{UUID: applicationEvent.UUID, ID: applicationEvent.ApplicationID,
 			Name: applicationEvent.ApplicationName, SubName: applicationEvent.Subscriber,
 			Policy: applicationEvent.ApplicationPolicy, TokenType: applicationEvent.TokenType,

adapter/pkg/eventhub/types/types.go

@@ -66,6 +66,7 @@ type ApplicationKeyMapping struct {
 	ConsumerKey     string `json:"consumerKey"`
 	KeyType         string `json:"keyType"`
 	KeyManager      string `json:"keyManager"`
+	EnvID           string `json:"EnvId"`
 	TenantID        int32  `json:"tenanId,omitempty"`
 	TenantDomain    string `json:"tenanDomain,omitempty"`
 	TimeStamp       int64  `json:"timeStamp,omitempty"`

adapter/pkg/messaging/event_types.go

@@ -138,6 +138,7 @@ type ApplicationRegistrationEvent struct {
 	ConsumerKey     string `json:"consumerKey"`
 	KeyType         string `json:"keyType"`
 	KeyManager      string `json:"keyManager"`
+	EnvID           string `json:"EnvId"`
 	Event
 }
 

api/proto/wso2/discovery/subscription/application_key_mapping.proto

@@ -19,4 +19,5 @@ message ApplicationKeyMapping {
     string tenantDomain = 6;
     int64 timestamp = 7;
     string applicationUUID = 8;
+    string envId = 9;
 }

enforcer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/constants/APIConstants.java

@@ -182,7 +182,7 @@ public static class JwtTokenConstants {
         public static final String ENV_NAME_PREFIX = "choreo:environment:";
         public static final String PRODUCTION_KEY_TYPE = "PRODUCTION";
         public static final String SANDBOX_KEY_TYPE = "SANDBOX";
-
+        public static final String DEFAULT_CHOREO_ENV_ID = "ALL";
     }
 
     /**