Delete unused organization related entries from internal map

adapter/internal/discovery/xds/server.go

@@ -846,6 +846,20 @@ func RemoveAPICacheForEnv(adapterInternalAPI model.AdapterInternalAPI, envType s
 	}	
 }
 
+// RemoveAPIFromOrgAPIMap removes api from orgAPI map
+func RemoveAPIFromOrgAPIMap(uuid string, orgID string) {
+	if orgMap, ok := orgAPIMap[orgID]; ok {
+		for apiName := range orgMap {
+			if strings.Contains(apiName, uuid) {
+				delete(orgMap, apiName)
+			}
+		}
+		if len(orgMap) == 0 {
+			delete(orgAPIMap, orgID)
+		}
+	}
+}
+
 // UpdateAPICache updates the xDS cache related to the API Lifecycle event.
 func UpdateAPICache(vHosts []string, newLabels []string, newlistenersForRoutes []string, adapterInternalAPI model.AdapterInternalAPI) error {
 	mutexForInternalMapUpdate.Lock()
@@ -906,7 +920,6 @@ func UpdateAPICache(vHosts []string, newLabels []string, newlistenersForRoutes [
 			endpointAddresses:  endpoints,
 			enforcerAPI:        oasParser.GetEnforcerAPI(adapterInternalAPI, vHost),
 		}
-
 		if _, ok := listenerToRouteArrayMap[newlistenersForRoutes[0]]; ok {
 			listenerToRouteArrayMap[newlistenersForRoutes[0]] = append(listenerToRouteArrayMap[newlistenersForRoutes[0]], routes...)
 		} else {

adapter/internal/operator/synchronizer/api_state.go

@@ -38,6 +38,7 @@ type APIState struct {
 	InterceptorServiceMapping map[string]v1alpha1.InterceptorService
 	BackendJWTMapping         map[string]v1alpha1.BackendJWT
 	APIDefinitionFile         []byte
+	OldOrganizationID         string
 }
 
 // HTTPRouteState holds the state of the deployed httpRoutes. This state is compared with

adapter/internal/operator/synchronizer/data_store.go

@@ -70,6 +70,7 @@ func (ods *OperatorDataStore) processAPIState(apiNamespacedName types.Namespaced
 	cachedAPI := ods.apiStore[apiNamespacedName]
 
 	if apiState.APIDefinition.Generation > cachedAPI.APIDefinition.Generation {
+		cachedAPI.OldOrganizationID = cachedAPI.APIDefinition.Spec.Organization
 		cachedAPI.APIDefinition = apiState.APIDefinition
 		updated = true
 		events = append(events, "API Definition")

adapter/internal/operator/synchronizer/synchronizer.go

@@ -125,6 +125,9 @@ func deleteAPIFromEnv(httpRoute *gwapiv1b1.HTTPRoute, apiState APIState) error {
 // deployAPIInGateway deploys the related API in CREATE and UPDATE events.
 func deployAPIInGateway(apiState APIState) error {
 	var err error
+	if len(apiState.OldOrganizationID) != 0 {
+		xds.RemoveAPIFromOrgAPIMap(string((*apiState.APIDefinition).ObjectMeta.UID), apiState.OldOrganizationID)
+	}
 	if apiState.ProdHTTPRoute == nil {
 		var adapterInternalAPI model.AdapterInternalAPI
 		adapterInternalAPI.SetInfoAPICR(*apiState.APIDefinition)

test/integration/integration/tests/resources/base/manifests.yaml

@@ -365,4 +365,22 @@ spec:
     group: gateway.networking.k8s.io
     kind: Gateway
     name: default   
-
+---
+# This is a API with wrong organization(jwt issuer not set). 
+# When test cases apply the correct API it should overrite the wrong value to correct value
+apiVersion: dp.wso2.com/v1alpha1
+kind: API
+metadata:
+  name: all-http-methods-for-wildcard
+  namespace: gateway-integration-test-infra
+spec:
+  apiDisplayName: API with Backend Base Path
+  apiType: REST
+  apiVersion: v1.0.0
+  context: /all-http-methods-for-wildcard/v1.0.0
+  isDefaultVersion: true
+  #definitionFileRef: definition-file
+  production:
+    - httpRouteRefs:
+      - all-http-methods-for-wildcard-httproute
+  organization: wso2-org1111