Remove Admin rest api from enforcer

wso2 · Oct 10, 2023 · db2b6a9 · db2b6a9
1 parent afa5ea5
commit db2b6a9
Show file tree

Hide file tree

Showing 24 changed files with 268 additions and 2,093 deletions.
diff --git a/adapter/api/proto/wso2/discovery/config/enforcer/config.proto b/adapter/api/proto/wso2/discovery/config/enforcer/config.proto
@@ -9,7 +9,6 @@ import "wso2/discovery/config/enforcer/cache.proto";
 import "wso2/discovery/config/enforcer/analytics.proto";
 import "wso2/discovery/config/enforcer/security.proto";
 import "wso2/discovery/config/enforcer/management.proto";
-import "wso2/discovery/config/enforcer/rest_server.proto";
 import "wso2/discovery/config/enforcer/filter.proto";
 import "wso2/discovery/config/enforcer/tracing.proto";
 import "wso2/discovery/config/enforcer/metrics.proto";
@@ -34,20 +33,17 @@ message Config {
 
     JWTGenerator jwtGenerator = 5;
 
-    Cache cache = 7;
+    Cache cache = 6;
 
+    Analytics analytics = 7;
 
-    Analytics analytics = 8;
+    Management management = 8;
 
-    Management management = 9;
+    Tracing tracing = 9;
 
-    RestServer restServer = 10;
+    Metrics metrics = 10;
 
-    Tracing tracing = 11;
+    repeated Filter filters = 11;
 
-    Metrics metrics = 12;
-
-    repeated Filter filters = 13;
-
-    Soap soap = 14;
+    Soap soap = 12;
 }
diff --git a/adapter/api/proto/wso2/discovery/config/enforcer/rest_server.proto b/adapter/api/proto/wso2/discovery/config/enforcer/rest_server.proto
diff --git a/adapter/config/default_config.go b/adapter/config/default_config.go
@@ -145,9 +145,6 @@ var defaultConfig = &Config{
 			Username: "admin",
 			Password: "admin",
 		},
-		RestServer: restServer{
-			Enabled: true,
-		},
 		Security: security{
 			APIkey: apiKey{
 				Enabled:             true,

diff --git a/adapter/internal/discovery/xds/marshaller.go b/adapter/internal/discovery/xds/marshaller.go
@@ -127,10 +127,6 @@ func MarshalConfig(config *config.Config) *enforcer.Config {
 		Password: config.Enforcer.Management.Password,
 	}
 
-	restServer := &enforcer.RestServer{
-		Enable: config.Enforcer.RestServer.Enabled,
-	}
-
 	soap := &enforcer.Soap{
 		SoapErrorInXMLEnabled: config.Adapter.SoapErrorInXMLEnabled,
 	}
@@ -174,7 +170,6 @@ func MarshalConfig(config *config.Config) *enforcer.Config {
 		Metrics:    metrics,
 		Analytics:  analytics,
 		Management: management,
-		RestServer: restServer,
 		Filters:    filters,
 		Soap:       soap,
 	}

diff --git a/adapter/pkg/discovery/api/wso2/discovery/config/enforcer/config.pb.go b/adapter/pkg/discovery/api/wso2/discovery/config/enforcer/config.pb.go
diff --git a/adapter/pkg/discovery/api/wso2/discovery/config/enforcer/rest_server.pb.go b/adapter/pkg/discovery/api/wso2/discovery/config/enforcer/rest_server.pb.go