You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by is...@apache.org on 2022/05/19 16:39:35 UTC

[airavata-custos] branch develop updated: remove unwanted proto files

This is an automated email from the ASF dual-hosted git repository.

isjarana pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata-custos.git


The following commit(s) were added to refs/heads/develop by this push:
     new 8eb9372f remove unwanted proto files
     new 3a29db89 Merge pull request #281 from isururanawaka/develop
8eb9372f is described below

commit 8eb9372f7730c90a67fe14a8d9ec86fcc8ccbebf
Author: Isuru Ranawaka <ir...@gmail.com>
AuthorDate: Thu May 19 12:38:27 2022 -0400

    remove unwanted proto files
---
 .../resources/protos/AgentProfileService.proto     |  66 ---
 .../protos/ClusterManagementService.proto          |  42 --
 .../resources/protos/CredentialStoreService.proto  | 143 ------
 .../src/main/resources/protos/LoggingService.proto |  78 ----
 .../src/main/resources/protos/EmailService.proto   | 112 -----
 .../main/resources/protos/MessagingService.proto   |  63 ---
 .../protos/FederatedAuthenticationService.proto    | 143 ------
 .../main/resources/protos/IamAdminService.proto    | 507 ---------------------
 .../main/resources/protos/IdentityService.proto    | 137 ------
 .../resources/protos/ResourceSecretService.proto   | 203 ---------
 .../src/main/resources/protos/SharingService.proto | 222 ---------
 .../resources/protos/TenantProfileService.proto    | 174 -------
 .../main/resources/protos/UserProfileService.proto | 215 ---------
 .../user/profile/service/UserProfileService.java   |   2 +-
 .../resources/protos/AgentManagementService.proto  | 148 ------
 .../resources/protos/GroupManagementService.proto  | 211 ---------
 .../protos/IdentityManagementService.proto         | 156 -------
 .../resources/protos/LogManagementService.proto    |  53 ---
 .../protos/ResourceSecretManagementService.proto   | 156 -------
 .../protos/SharingManagementService.proto          | 206 ---------
 .../resources/protos/TenantManagementService.proto | 285 ------------
 .../resources/protos/UserManagementService.proto   | 279 ------------
 pom.xml                                            |  58 +--
 23 files changed, 30 insertions(+), 3629 deletions(-)

diff --git a/custos-core-services/agent-profile-core-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/AgentProfileService.proto b/custos-core-services/agent-profile-core-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/AgentProfileService.proto
deleted file mode 100644
index 7d26877e..00000000
--- a/custos-core-services/agent-profile-core-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/AgentProfileService.proto
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-syntax = "proto3";
-
-option java_multiple_files = true;
-package org.apache.custos.agent.profile.service;
-
-option go_package = "./pb";
-
-message Agent {
-    string id = 1;
-    AgentStatus status = 2;
-    int64 created_at = 3;
-    int64 last_modified_at = 4;
-    repeated string roles = 5;
-    repeated AgentAttribute attributes = 6;
-    repeated string agent_client_roles = 8;
-
-}
-
-enum AgentStatus {
-    ENABLED = 0;
-    DISABLED = 1;
-}
-
-message AgentAttribute {
-    string id = 1;
-    string key = 2;
-    repeated string value = 3;
-}
-
-message AgentRequest {
-    int64 tenant_id = 1;
-    Agent agent = 2;
-}
-
-message OperationStatus {
-    bool status = 1;
-}
-
-service AgentProfileService {
-
-    rpc createAgent (AgentRequest) returns (Agent);
-    rpc updateAgent (AgentRequest) returns (Agent);
-    rpc deleteAgent (AgentRequest) returns (OperationStatus);
-    rpc getAgent (AgentRequest) returns (Agent);
-
-}
\ No newline at end of file
diff --git a/custos-core-services/cluster-management-core-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/ClusterManagementService.proto b/custos-core-services/cluster-management-core-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/ClusterManagementService.proto
deleted file mode 100644
index 6c58702b..00000000
--- a/custos-core-services/cluster-management-core-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/ClusterManagementService.proto
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-syntax = "proto3";
-
-option java_multiple_files = true;
-package org.apache.custos.cluster.management.service;
-option go_package = "./pb";
-message GetServerCertificateRequest {
-    string secretName = 1;
-    string namespace = 2;
-}
-
-message GetServerCertificateResponse {
-    string certificate = 1;
-}
-
-
-
-
-service ClusterManagementService {
-
-    rpc getCustosServerCertificate (GetServerCertificateRequest) returns (GetServerCertificateResponse);
-
-}
\ No newline at end of file
diff --git a/custos-core-services/credential-store-core-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/CredentialStoreService.proto b/custos-core-services/credential-store-core-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/CredentialStoreService.proto
deleted file mode 100644
index 691df794..00000000
--- a/custos-core-services/credential-store-core-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/CredentialStoreService.proto
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-syntax = "proto3";
-
-option java_multiple_files = true;
-package org.apache.custos.credential.store.service;
-option go_package = "./pb";
-
-enum Type {
-    CUSTOS = 0;
-    IAM = 1;
-    CILOGON = 2;
-    INDIVIDUAL = 3;
-    AGENT_CLIENT = 4;
-    AGENT = 5;
-}
-
-message CredentialMetadata {
-    int64 owner_id = 1;
-    string id = 2;
-    string secret = 3;
-    int64 client_secret_expired_at = 4;
-    int64 client_id_issued_at = 5;
-    Type type = 6;
-    bool super_tenant = 7;
-    bool super_admin = 8;
-    string internal_sec = 11;
-}
-
-message GetCredentialRequest {
-    int64 ownerId = 1;
-    string id = 2;
-    Type type = 3;
-}
-
-message GetAllCredentialsRequest {
-    int64 ownerId = 1;
-}
-
-message GetAllCredentialsResponse {
-    repeated CredentialMetadata secret_list = 1;
-    string requester_user_email = 2;
-    string requester_username = 3;
-}
-
-message OperationStatus {
-    bool state = 1;
-}
-
-message DeleteCredentialRequest {
-    int64 owner_id = 1;
-    Type type = 2;
-}
-
-message GetOperationsMetadataRequest {
-    int64 trace_id = 1;
-}
-
-message OperationMetadata {
-    string event = 1;
-    string status = 2;
-    string time_stamp = 3;
-    string performed_by = 4;
-}
-message GetOperationsMetadataResponse {
-    repeated OperationMetadata metadata = 1;
-}
-
-message GetNewCustosCredentialRequest {
-    int64 owner_id = 1;
-    string performed_by = 2;
-}
-
-message GetNewCustosCredentialResponse {
-    string client_id = 1;
-    string client_secret = 2;
-}
-
-message TokenRequest {
-    string token = 1;
-    string parent_client_id = 2;
-}
-
-message GetOwnerIdResponse {
-    int64 owner_id = 2;
-}
-
-message Credentials {
-    string iam_client_id = 1;
-    string iam_client_secret = 2;
-    string ci_logon_client_id = 3;
-    string ci_logon_client_secret = 4;
-    string custos_client_id = 5;
-    string custos_client_secret = 6;
-    double custos_client_id_issued_at = 7;
-    double custos_client_secret_expired_at = 8;
-}
-
-
-
-service CredentialStoreService {
-    rpc putCredential (CredentialMetadata) returns (OperationStatus);
-    rpc deleteCredential (DeleteCredentialRequest) returns (OperationStatus);
-    rpc getCredential (GetCredentialRequest) returns (CredentialMetadata);
-    rpc getAllCredentials (GetAllCredentialsRequest) returns (GetAllCredentialsResponse);
-    rpc getOperationMetadata (GetOperationsMetadataRequest) returns (GetOperationsMetadataResponse);
-    rpc getNewCustosCredential (GetNewCustosCredentialRequest) returns (CredentialMetadata);
-    rpc getOwnerIdFromToken (TokenRequest) returns (GetOwnerIdResponse);
-    rpc getCustosCredentialFromToken (TokenRequest) returns (CredentialMetadata);
-    rpc getCustosCredentialFromClientId (GetCredentialRequest) returns (CredentialMetadata);
-    rpc getAllCredentialsFromToken (TokenRequest) returns (GetAllCredentialsResponse);
-    rpc getMasterCredentials (GetCredentialRequest) returns (GetAllCredentialsResponse);
-    rpc getAllCredentialsFromJWTToken (TokenRequest) returns (GetAllCredentialsResponse);
-    rpc getBasicCredentials (TokenRequest) returns (Credentials);
-
-
-    rpc createAgentCredential (CredentialMetadata) returns (CredentialMetadata);
-    rpc getAgentCredential (GetCredentialRequest) returns (CredentialMetadata);
-    rpc deleteAgentCredential (CredentialMetadata) returns (OperationStatus);
-    rpc getCredentialByAgentBasicAuth (TokenRequest) returns (GetAllCredentialsResponse);
-    rpc getCredentialByAgentJWTToken (TokenRequest) returns (GetAllCredentialsResponse);
-    rpc validateAgentJWTToken(TokenRequest) returns (OperationStatus);
-
-
-}
\ No newline at end of file
diff --git a/custos-core-services/custos-logging/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/LoggingService.proto b/custos-core-services/custos-logging/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/LoggingService.proto
deleted file mode 100644
index 7ab3fa59..00000000
--- a/custos-core-services/custos-logging/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/LoggingService.proto
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-syntax = "proto3";
-
-option java_multiple_files = true;
-package org.apache.custos.logging.service;
-
-import "google/protobuf/empty.proto";
-
-option go_package = "./pb";
-
-
-message LogEvent {
-    int64 created_time = 1;
-    string service_name = 2;
-    string event_type = 3;
-    string username = 4;
-    string client_id = 5;
-    int64 tenant_id = 6;
-    string external_ip = 7;
-}
-
-message Status {
-    bool status = 1;
-}
-
-message LogEventRequest {
-    int64 tenant_id = 1;
-    int64 start_time = 2;
-    int64 end_time = 3;
-    string client_id = 4;
-    string username = 5;
-    string remote_ip = 6;
-    string service_name = 7;
-    string event_type = 8;
-    int32 offset = 9;
-    int32 limit = 10;
-}
-
-message LogEvents {
-    repeated LogEvent events = 1;
-}
-
-message LoggingConfigurationRequest {
-    int64 tenant_id = 1;
-    string client_id = 2;
-}
-
-
-service LoggingService {
-
-    rpc addLogEvent(LogEvent) returns (Status);
-
-    rpc getLogEvents(LogEventRequest) returns (LogEvents);
-
-    rpc isLogEnabled(LoggingConfigurationRequest) returns(Status);
-
-    rpc enable(LoggingConfigurationRequest) returns (Status);
-
-}
\ No newline at end of file
diff --git a/custos-core-services/custos-messaging-core-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/EmailService.proto b/custos-core-services/custos-messaging-core-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/EmailService.proto
deleted file mode 100644
index e645edaf..00000000
--- a/custos-core-services/custos-messaging-core-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/EmailService.proto
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-syntax = "proto3";
-
-option java_multiple_files = true;
-package org.apache.custos.messaging.email.service;
-
-import "google/protobuf/empty.proto";
-
-option go_package = "./pb";
-
-enum CustosEvent {
-    UNKNOWN = 0;
-    NEW_USER_SIGNUP = 1;
-    GROUP_MEMBERSHIP_CHANGE = 2;
-}
-
-message Email {
-    string sender_email = 3;
-    repeated string receiver_email = 4;
-    CustosEvent custos_event = 5;
-    map<string, string> parameters = 6;
-}
-
-message EmailTemplate {
-    int64 template_id = 1;
-    CustosEvent custos_event = 2;
-    string subject = 3;
-    repeated string body_params = 4;
-    repeated string receiving_users = 5;
-    repeated string receiving_groups = 6;
-    string body = 7;
-}
-
-message EmailEnablingRequest {
-    int64 tenant_id = 1;
-    string client_id = 2;
-    EmailTemplate email_template = 3;
-}
-
-message EmailDisablingRequest {
-    int64 tenant_id = 1;
-    string client_id = 2;
-    EmailTemplate email_template = 3;
-}
-
-message Status {
-    bool status = 1;
-}
-
-
-message EmailMessageSendingRequest {
-    int64 tenant_id = 1;
-    string client_id = 2;
-    Email message = 3;
-}
-
-message FetchEmailTemplatesRequest {
-    int64 tenant_id = 1;
-    string client_id = 2;
-}
-
-message FetchEmailTemplatesResponse {
-   repeated EmailTemplate templates = 1;
-}
-
-message FetchEmailFriendlyEvents {
-    int64 tenant_id = 1;
-    string client_id = 2;
-}
-
-
-message CustosEmailEvent {
-    CustosEvent event = 1;
-    repeated string body_params = 2;
-}
-
-message FetchEmailFriendlyEventsResponse {
-    repeated CustosEmailEvent events = 1;
-}
-
-
-service EmailService {
-
-    rpc send (EmailMessageSendingRequest) returns (Status);
-
-    rpc enable (EmailEnablingRequest) returns (EmailTemplate);
-
-    rpc disable (EmailDisablingRequest) returns (Status);
-
-    rpc getTemplates (FetchEmailTemplatesRequest) returns (FetchEmailTemplatesResponse);
-
-    rpc getEmailFriendlyEvents(FetchEmailFriendlyEvents) returns(FetchEmailFriendlyEventsResponse);
-}
\ No newline at end of file
diff --git a/custos-core-services/custos-messaging-core-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/MessagingService.proto b/custos-core-services/custos-messaging-core-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/MessagingService.proto
deleted file mode 100644
index 52c26979..00000000
--- a/custos-core-services/custos-messaging-core-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/MessagingService.proto
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-syntax = "proto3";
-
-option java_multiple_files = true;
-package org.apache.custos.messaging.service;
-
-import "google/protobuf/empty.proto";
-
-
-option go_package = "./pb";
-
-
-message Message {
-    int64 created_time = 1;
-    string service_name = 2;
-    string event_type = 3;
-    string username = 4;
-    string client_id = 5;
-    int64 tenant_id = 6;
-    map<string, string> properties = 7;
-    string message_id = 8;
-}
-
-message MessageEnablingRequest {
-    int64 tenant_id = 1;
-    string client_id = 2;
-}
-
-message Status {
-    bool status = 1;
-}
-
-message MessageEnablingResponse {
-    string topic = 1;
-}
-
-
-service MessagingService {
-
-    rpc publish(Message) returns(Status);
-
-    rpc enable(MessageEnablingRequest) returns(MessageEnablingResponse);
-
-}
\ No newline at end of file
diff --git a/custos-core-services/federated-authentication-core-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/FederatedAuthenticationService.proto b/custos-core-services/federated-authentication-core-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/FederatedAuthenticationService.proto
deleted file mode 100644
index 7da3d0cc..00000000
--- a/custos-core-services/federated-authentication-core-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/FederatedAuthenticationService.proto
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-syntax = "proto3";
-
-option java_multiple_files = true;
-package org.apache.custos.federated.authentication.service;
-import "google/protobuf/struct.proto";
-option go_package = "./pb";
-
-enum InstitutionCacheType {
-    WHITELIST = 0;
-    BACKLIST = 1;
-}
-
-
-message ClientMetadata {
-    int64 tenant_id = 1;
-    string tenant_name = 2;
-    repeated string scope = 3;
-    string tenant_uRI = 4;
-    repeated string contacts = 5;
-    string comment = 6;
-    repeated string redirect_uRIs = 7;
-    string client_id = 8;
-    string performed_by = 9;
-}
-
-
-message RegisterClientResponse {
-    string client_id = 1;
-    string client_secret = 2;
-    int64 client_id_issued_at = 3;
-    int64 client_secret_expires_at = 4;
-    string client_registration_uri = 5;
-}
-
-
-message GetClientRequest {
-    int64 tenant_id= 1;
-    string client_id = 2;
-}
-
-message GetClientResponse {
-    string client_id = 1;
-    string client_name = 2;
-    repeated string redirect_uRIs = 3;
-    repeated string grant_types = 4;
-    repeated string scope = 5;
-    int64 client_id_issued_at = 6;
-    string comment = 7;
-    string client_secret = 8;
-    int64 client_secret_expires_at = 9;
-    string client_registration_uri = 10;
-}
-
-message DeleteClientRequest {
-    int64 tenant_id = 1;
-    string client_id = 2;
-    string performed_by = 3;
-}
-
-message Empty {
-
-}
-
-message GetOperationsMetadataRequest {
-    int64 trace_id = 1;
-}
-
-message OperationMetadata {
-    string event = 1;
-    string status = 2;
-    string time_stamp = 3;
-    string performed_by = 4;
-}
-message GetOperationsMetadataResponse {
-    repeated OperationMetadata metadata = 1;
-}
-
-
-message CacheManipulationRequest {
-    int64 tenant_id = 1;
-    repeated string institution_ids = 2;
-    InstitutionCacheType type = 3;
-    string performedBy = 4;
-}
-
-message Status {
-    bool status = 1;
-}
-
-message InstitutionOperationResponse {
-
-}
-
-message Institution {
-    string entity_id = 1;
-    string organization_name = 2;
-    string display_name = 3;
-    bool rand_s = 4;
-}
-
-message GetInstitutionsIdsAsResponse {
-   repeated string entity_ids = 1;
-}
-
-
-message GetInstitutionsResponse {
-    repeated Institution institutions = 2;
-}
-
-
-service FederatedAuthenticationService {
-    rpc addClient (ClientMetadata) returns (RegisterClientResponse);
-    rpc updateClient (ClientMetadata) returns (Empty);
-    rpc getClient (GetClientRequest) returns (GetClientResponse);
-    rpc deleteClient (DeleteClientRequest) returns (Empty);
-    rpc getOperationMetadata (GetOperationsMetadataRequest) returns (GetOperationsMetadataResponse);
-
-    rpc addToCache (CacheManipulationRequest) returns (Status);
-    rpc removeFromCache (CacheManipulationRequest) returns (Status);
-    rpc getFromCache (CacheManipulationRequest) returns (GetInstitutionsResponse);
-    rpc getInstitutions (CacheManipulationRequest) returns (GetInstitutionsResponse);
-
-}
\ No newline at end of file
diff --git a/custos-core-services/iam-admin-core-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/IamAdminService.proto b/custos-core-services/iam-admin-core-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/IamAdminService.proto
deleted file mode 100644
index 77fe2bb2..00000000
--- a/custos-core-services/iam-admin-core-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/IamAdminService.proto
+++ /dev/null
@@ -1,507 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-syntax = "proto3";
-
-option java_multiple_files = true;
-package org.apache.custos.iam.service;
-
-import "google/protobuf/empty.proto";
-option go_package = "./pb";
-
-enum FederatedIDPs {
-    CILOGON = 0;
-    FACEBOOK = 1;
-    GOOGLE = 2;
-    LINKEDIN = 3;
-    TWITTER = 4;
-    CUSTOM_OIDC = 5;
-}
-
-
-message SetUpTenantRequest {
-    int64 tenant_id = 1;
-    string tenant_name = 2;
-    string admin_username = 3;
-    string admin_firstname = 4;
-    string admin_lastname = 5;
-    string admin_email = 6;
-    string admin_password = 7;
-    string tenant_uRL = 8;
-    string requester_email = 9;
-    repeated string redirect_uRIs = 10;
-    string custos_client_id = 11;
-
-}
-
-message ConfigureFederateIDPRequest {
-    int64 tenant_id = 1;
-    FederatedIDPs type = 2;
-    string client_iD = 3;
-    string client_sec = 4;
-    map<string, string> config_map = 5;
-    string requester_email = 6;
-    string idp_id = 7;
-    string scope = 8;
-}
-
-
-message FederateIDPResponse {
-    bool status = 1;
-}
-
-message SetUpTenantResponse {
-    string client_id = 1;
-    string client_secret = 2;
-}
-
-message IsUsernameAvailableRequest {
-    int64 tenant_id = 1;
-    string access_token = 2;
-    string user_name = 3;
-
-}
-
-message CheckingResponse {
-    bool is_exist = 1;
-}
-
-
-message UserRepresentation {
-    string id = 1;
-    string username = 3;
-    string first_name = 4;
-    string last_name = 5;
-    string password = 6;
-    string email = 7;
-    bool temporary_password = 8;
-    repeated string realm_roles = 9;
-    repeated string client_roles = 10;
-    repeated UserAttribute attributes = 11;
-    string state = 12;
-    double creation_time = 13;
-    double last_login_at = 14;
-}
-
-
-message GroupRepresentation {
-    string name = 1;
-    string id = 2;
-    repeated string realm_roles = 3;
-    repeated string client_roles = 4;
-    repeated UserAttribute attributes = 5;
-    repeated UserRepresentation users = 6;
-    repeated GroupRepresentation sub_groups = 7;
-    string description = 8;
-    string ownerId = 9;
-}
-
-
-message RegisterUserRequest {
-    int64 tenant_id = 1;
-    string access_token = 2;
-    string client_id = 3;
-    string client_sec = 4;
-    UserRepresentation user = 5;
-    string performed_by = 6;
-}
-
-
-message RegisterUsersRequest {
-    repeated UserRepresentation users = 1;
-    int64 tenant_id = 2;
-    string access_token = 3;
-    string client_id = 4;
-    string performed_by = 5;
-}
-
-message RegisterUserResponse {
-    bool is_registered = 1;
-}
-
-message RegisterUsersResponse {
-    bool all_useres_registered = 1;
-    repeated UserRepresentation failed_users = 2;
-}
-
-
-message UserSearchMetadata {
-    string username = 1;
-    string first_name = 2;
-    string last_name = 3;
-    string email = 4;
-    string id = 5;
-}
-
-message FindUsersRequest {
-    UserSearchMetadata user = 3;
-    int32 offset = 4;
-    int32 limit = 5;
-    int64 tenant_id = 1;
-    string access_token = 2;
-    string client_id = 6;
-    string client_sec = 7;
-
-}
-
-message UserSearchRequest {
-    UserSearchMetadata user = 1;
-    int64 tenant_id = 2;
-    string access_token = 3;
-    string client_id = 4;
-    string client_sec = 5;
-    string performed_by = 6;
-}
-
-message FindUsersResponse {
-    repeated UserRepresentation users = 1;
-}
-
-message ResetUserPassword {
-    string username = 1;
-    string password = 2;
-    int64 tenant_id = 3;
-    string access_token = 4;
-    string client_id = 5;
-    string client_sec = 6;
-}
-
-
-message DeleteUserRolesRequest {
-    int64 tenant_id = 1;
-    string username = 2;
-    repeated string client_roles = 3;
-    repeated string roles = 4;
-    string access_token = 5;
-    string client_id = 6;
-    string performed_by = 7;
-    string id = 8;
-}
-
-message AddUserRolesRequest {
-    int64 tenant_id = 1;
-    repeated string usernames = 2;
-    repeated string roles = 3;
-    string access_token = 4;
-    string client_id = 5;
-    bool client_level = 6;
-    string performed_by = 7;
-    repeated string agents = 8;
-}
-
-message UpdateUserProfileRequest {
-    string access_token = 1;
-    int64 tenant_id = 2;
-    UserRepresentation user = 3;
-
-}
-
-message AddUserResponse {
-    string code = 1;
-}
-
-message GetOperationsMetadataRequest {
-    int64 trace_id = 1;
-}
-
-message OperationMetadata {
-    string event = 1;
-    string status = 2;
-    string time_stamp = 3;
-    string performed_by = 4;
-}
-message GetOperationsMetadataResponse {
-    repeated OperationMetadata metadata = 1;
-}
-
-message DeleteTenantRequest {
-    int64 tenant_id = 1;
-}
-
-message AddRolesRequest {
-    repeated RoleRepresentation roles = 1;
-    bool client_level = 2;
-    int64 tenant_id = 3;
-    string client_id = 4;
-}
-
-message GetRolesRequest {
-    bool client_level = 1;
-    int64 tenant_id = 2;
-    string client_id = 3;
-}
-
-message RoleRepresentation {
-    string name = 1;
-    string description = 2;
-    bool composite = 3;
-    string id = 4;
-}
-
-message DeleteRoleRequest {
-    bool client_level = 1;
-    int64 tenant_id = 2;
-    string client_id = 3;
-    RoleRepresentation role = 4;
-}
-
-message AllRoles {
-    repeated RoleRepresentation roles = 1;
-    string scope = 2;
-}
-
-message AddProtocolMapperRequest {
-    string name = 1;
-    string attribute_name = 2;
-    string claim_name = 3;
-    ClaimJSONTypes claim_type = 4;
-    int64 tenant_id = 6;
-    string client_id = 7;
-    MapperTypes mapper_type = 8;
-    bool add_to_id_token = 9;
-    bool add_to_access_token = 10;
-    bool add_to_user_info = 11;
-    bool multi_valued = 12;
-    bool aggregate_attribute_values = 13;
-}
-
-enum MapperTypes {
-    USER_ATTRIBUTE = 0;
-    USER_REALM_ROLE = 1;
-    USER_CLIENT_ROLE = 2;
-}
-
-enum ClaimJSONTypes {
-    STRING = 0;
-    LONG = 1;
-    INTEGER = 2;
-    BOOLEAN = 3;
-    JSON = 4;
-}
-
-enum ResourceTypes {
-    USER =0;
-    AGENT = 1;
-}
-
-message OperationStatus {
-    bool status = 1;
-}
-
-message AddUserAttributesRequest {
-    repeated UserAttribute attributes = 1;
-    repeated string users = 2;
-    int64 tenant_id = 3;
-    string client_id = 4;
-    string access_token = 5;
-    string performedBy = 6;
-    repeated string agents = 7;
-}
-
-message DeleteUserAttributeRequest {
-    repeated UserAttribute attributes = 1;
-    repeated string users = 2;
-    int64 tenant_id = 3;
-    string client_id = 4;
-    string access_token = 5;
-    string performedBy = 6;
-    repeated string agents = 7;
-}
-
-message UserAttribute {
-    string key = 1;
-    repeated string values = 2;
-}
-
-message EventPersistenceRequest {
-    int64 tenantId = 1;
-    bool admin_event = 2;
-    string event = 3;
-    bool enable = 4;
-    int64 persistence_time = 5;
-    string performedBy = 6;
-}
-
-
-message GroupsRequest {
-    int64 tenantId = 1;
-    string accessToken = 2;
-    string performedBy = 3;
-    string clientId = 4;
-    string clientSec = 5;
-    repeated GroupRepresentation groups = 6;
-}
-
-message GroupRequest {
-    int64 tenantId = 1;
-    string accessToken = 2;
-    string performedBy = 3;
-    string clientId = 4;
-    string clientSec = 5;
-    string id = 6;
-    GroupRepresentation group = 7;
-}
-
-message GroupsResponse {
-    repeated GroupRepresentation groups = 1;
-}
-
-message UserGroupMappingRequest {
-    int64 tenantId = 1;
-    string accessToken = 2;
-    string performedBy = 3;
-    string clientId = 4;
-    string clientSec = 5;
-    string username = 6;
-    string group_id = 7;
-    string membership_type = 8;
-}
-
-message AgentClientMetadata {
-    int64 tenantId = 1;
-    string tenantURL = 2;
-    repeated string redirectURIs = 3;
-    string clientName = 4;
-    int64 access_token_life_time = 5;
-    string performedBy = 6;
-    string access_token = 7;
-}
-
-message Agent {
-    string id = 1;
-    repeated string realm_roles = 2;
-    repeated UserAttribute attributes = 3;
-    bool isEnabled = 4;
-    double creation_time = 5;
-    double last_modified_at = 6;
-    repeated string client_roles = 7;
-}
-
-
-message GetAllResources {
-    int64 tenantId = 1;
-    string clientId = 2;
-    ResourceTypes resource_type = 3;
-}
-
-message GetAllResourcesResponse {
-    repeated Agent agents = 1;
-    repeated UserRepresentation users = 2;
-}
-
-message DeleteExternalIDPsRequest {
-    int64 tenant_id= 1;
-    string client_id = 2;
-    repeated string user_id=3;
-}
-
-message GetExternalIDPsRequest {
-    int64 tenant_id= 1;
-    string client_id = 2;
-    string user_id=3;
-}
-
-
-message ExternalIDPLink {
-    string provider_alias = 1;
-    string provider_user_id =2;
-    string provider_username = 3;
-}
-
-message GetExternalIDPsResponse {
-  repeated   ExternalIDPLink idp_links = 1;
-}
-
-message AddExternalIDPLinksRequest {
-   repeated ExternalIDPLink idp_links = 1;
-   int64 tenant_id= 2;
-   string client_id = 3;
-}
-
-service IamAdminService {
-
-    rpc setUPTenant (SetUpTenantRequest) returns (SetUpTenantResponse);
-    rpc updateTenant (SetUpTenantRequest) returns (SetUpTenantResponse);
-    rpc deleteTenant (DeleteTenantRequest) returns (google.protobuf.Empty);
-    rpc configureFederatedIDP (ConfigureFederateIDPRequest) returns (FederateIDPResponse);
-    rpc addRolesToTenant (AddRolesRequest) returns (AllRoles);
-    rpc addProtocolMapper (AddProtocolMapperRequest) returns (OperationStatus);
-    rpc getRolesOfTenant (GetRolesRequest) returns (AllRoles);
-    rpc deleteRole (DeleteRoleRequest) returns (OperationStatus);
-
-    rpc isUsernameAvailable (UserSearchRequest) returns (OperationStatus);
-    rpc registerUser (RegisterUserRequest) returns (RegisterUserResponse);
-    rpc enableUser (UserSearchRequest) returns (UserRepresentation);
-    rpc disableUser (UserSearchRequest) returns (UserRepresentation);
-    rpc isUserEnabled (UserSearchRequest) returns (OperationStatus);
-    rpc isUserExist (UserSearchRequest) returns (CheckingResponse);
-    rpc getUser (UserSearchRequest) returns (UserRepresentation);
-    rpc findUsers (FindUsersRequest) returns (FindUsersResponse);
-    rpc resetPassword (ResetUserPassword) returns (OperationStatus);
-    rpc grantAdminPrivilege (UserSearchRequest) returns (OperationStatus);
-    rpc removeAdminPrivilege (UserSearchRequest) returns (OperationStatus);
-    rpc deleteExternalIDPLinksOfUsers(DeleteExternalIDPsRequest) returns (OperationStatus);
-    rpc getExternalIDPLinksOfUsers(GetExternalIDPsRequest) returns (GetExternalIDPsResponse);
-    rpc addExternalIDPLinksOfUsers(AddExternalIDPLinksRequest) returns (OperationStatus);
-
-    rpc registerAndEnableUsers (RegisterUsersRequest) returns (RegisterUsersResponse);
-    rpc addUserAttributes (AddUserAttributesRequest) returns (OperationStatus);
-    rpc deleteUserAttributes (DeleteUserAttributeRequest) returns (OperationStatus);
-    rpc addRolesToUsers (AddUserRolesRequest) returns (OperationStatus);
-
-    rpc deleteUser (UserSearchRequest) returns (OperationStatus);
-
-    rpc deleteRolesFromUser (DeleteUserRolesRequest) returns (OperationStatus);
-
-    rpc updateUserProfile (UpdateUserProfileRequest) returns (OperationStatus);
-
-    rpc getOperationMetadata (GetOperationsMetadataRequest) returns (GetOperationsMetadataResponse);
-
-    rpc configureEventPersistence (EventPersistenceRequest) returns (OperationStatus);
-
-    rpc createGroups (GroupsRequest) returns (GroupsResponse);
-    rpc updateGroup (GroupRequest) returns (GroupRepresentation);
-    rpc deleteGroup (GroupRequest) returns (OperationStatus);
-    rpc findGroup (GroupRequest) returns (GroupRepresentation);
-    rpc getAllGroups (GroupRequest) returns (GroupsResponse);
-
-    rpc addUserToGroup (UserGroupMappingRequest) returns (OperationStatus);
-    rpc removeUserFromGroup (UserGroupMappingRequest) returns (OperationStatus);
-
-    rpc createAgentClient (AgentClientMetadata) returns (SetUpTenantResponse);
-    rpc configureAgentClient (AgentClientMetadata) returns (OperationStatus);
-
-
-    rpc isAgentNameAvailable (UserSearchRequest) returns (OperationStatus);
-    rpc registerAndEnableAgent (RegisterUserRequest) returns (RegisterUserResponse);
-    rpc deleteAgent (UserSearchRequest) returns (OperationStatus);
-    rpc getAgent (UserSearchRequest) returns (Agent);
-    rpc disableAgent (UserSearchRequest) returns (OperationStatus);
-    rpc enableAgent (UserSearchRequest) returns (OperationStatus);
-    rpc addAgentAttributes (AddUserAttributesRequest) returns (OperationStatus);
-    rpc deleteAgentAttributes (DeleteUserAttributeRequest) returns (OperationStatus);
-    rpc addRolesToAgent (AddUserRolesRequest) returns (OperationStatus);
-    rpc deleteAgentRoles (DeleteUserRolesRequest) returns (OperationStatus);
-
-
-    rpc getAllResources (GetAllResources) returns (GetAllResourcesResponse);
-
-
-}
\ No newline at end of file
diff --git a/custos-core-services/identity-core-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/IdentityService.proto b/custos-core-services/identity-core-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/IdentityService.proto
deleted file mode 100644
index a55a3a00..00000000
--- a/custos-core-services/identity-core-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/IdentityService.proto
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-syntax = "proto3";
-
-option java_multiple_files = true;
-package org.apache.custos.identity.service;
-import "google/protobuf/struct.proto";
-option go_package = "./pb";
-
-message AuthToken {
-    string access_token = 1;
-    repeated Claim claims = 2;
-}
-
-
-message Claim {
-    string key = 1;
-    string value = 2;
-}
-
-message User {
-    string sub = 1;
-    string full_name = 2;
-    string first_name = 3;
-    string last_name = 4;
-    string email_address = 5;
-    string username = 6;
-    string client_id = 7;
-}
-
-
-message GetTokenRequest {
-    int64 tenant_id = 1;
-    string client_id = 2;
-    string client_secret = 3;
-    string redirect_uri = 4;
-    string code = 6;
-    string username = 7;
-    string password = 8;
-    string refresh_token = 9;
-    string grant_type = 10;
-}
-
-message TokenResponse {
-    string access_token = 1;
-    double expires_in = 2;
-    double refresh_expires_in = 3;
-    string refresh_token = 4;
-    string token_type = 5;
-    string id_token = 6;
-    double not_before_policy = 7;
-    string session_state = 8;
-    string scope = 9;
-}
-
-
-message AuthenticationRequest {
-    string client_id = 1;
-    string client_secret = 2;
-    int64 tenant_id = 3;
-    string username = 4;
-    string password = 5;
-}
-
-message IsAuthenticatedResponse {
-    bool authenticated = 1;
-}
-
-message GetUserManagementSATokenRequest {
-    string client_id = 1;
-    string client_secret = 2;
-    int64 tenant_id = 3;
-}
-
-message GetAuthorizationEndpointRequest {
-    int64 tenant_id = 1;
-}
-
-message AuthorizationResponse {
-    string authorization_endpoint = 2;
-}
-
-message GetOIDCConfiguration {
-    string client_id = 1;
-    string client_secret = 2;
-    int64 tenant_id = 3;
-}
-
-message GetJWKSRequest {
-    string client_id = 1;
-    string client_secret = 2;
-    int64 tenant_id = 3;
-}
-
-message EndSessionRequest {
-    string client_id = 1;
-    string client_secret = 2;
-    int64 tenant_id = 3;
-    string refresh_token = 4;
-}
-
-message OperationStatus {
-    bool status = 1;
-}
-
-service IdentityService {
-    rpc authenticate (AuthenticationRequest) returns (AuthToken);
-    rpc isAuthenticated (AuthToken) returns (IsAuthenticatedResponse);
-    rpc getUser (AuthToken) returns (User);
-    rpc getUserManagementServiceAccountAccessToken (GetUserManagementSATokenRequest) returns (AuthToken);
-    rpc getToken (GetTokenRequest) returns (google.protobuf.Struct);
-    rpc getAuthorizeEndpoint (GetAuthorizationEndpointRequest) returns (AuthorizationResponse);
-    rpc getOIDCConfiguration (GetOIDCConfiguration) returns (google.protobuf.Struct);
-    rpc getTokenByPasswordGrantType (GetTokenRequest) returns (google.protobuf.Struct);
-    rpc getTokenByRefreshTokenGrantType (GetTokenRequest) returns (google.protobuf.Struct);
-    rpc getJWKS (GetJWKSRequest) returns (google.protobuf.Struct);
-    rpc endSession(EndSessionRequest) returns (OperationStatus);
-
-}
\ No newline at end of file
diff --git a/custos-core-services/resource-secret-core-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/ResourceSecretService.proto b/custos-core-services/resource-secret-core-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/ResourceSecretService.proto
deleted file mode 100644
index 88c66200..00000000
--- a/custos-core-services/resource-secret-core-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/ResourceSecretService.proto
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-syntax = "proto3";
-
-option java_multiple_files = true;
-package org.apache.custos.resource.secret.service;
-
-option go_package = "./pb";
-
-enum ResourceOwnerType {
-    TENANT_USER = 0;
-    CUSTOS = 1;
-    TENANT = 2;
-}
-
-enum ResourceType {
-    SERVER_CERTIFICATE = 0;
-    JWT_SIGNING_CERTIFICATE = 1;
-    VAULT_CREDENTIAL = 2;
-    VM = 3;
-    ACCOUNT = 4;
-    OTHER = 5;
-    SCP =6;
-    S3 =7;
-    BOX =8;
-    AZURE =9;
-    GCS = 10;
-    DROPBOX=11;
-    FTP=12;
-}
-
-enum ResourceSource {
-    KUBE = 0;
-    LOCAL = 1;
-    EXTERNAL = 2;
-    LETSENCRYPT = 3;
-}
-
-enum ResourceSecretType {
-    SSH = 0;
-    PASSWORD = 1;
-    X509_CERTIFICATE = 2;
-    RAW_DATA= 3;
-    KV=4;
-    CREDENTIAL_MAP=5;
-}
-
-message SecretMetadata {
-    ResourceOwnerType owner_type = 1;
-    ResourceType resource_type = 2;
-    ResourceSource source = 3;
-    string name = 4;
-    string value = 5;
-    ResourceSecretType type = 6;
-    int64 tenantId = 7;
-    string owner_id = 8;
-    int64 persisted_time = 9;
-    string token = 10;
-    string description = 11;
-    string client_id = 12;
-
-}
-
-
-
-
-
-message CertificateCredential {
-    SecretMetadata metadata = 1;
-    string x509_cert = 3;
-    string not_after = 4;
-    string private_key = 5;
-    int64 life_time = 6;
-    string not_before = 7;
-    bool use_shamirs_secret_sharing_with_encryption = 8;
-    int32 num_of_shares = 9;
-    int32 threshold = 10;
-    repeated bytes  private_key_shares = 11;
-}
-
-message PasswordCredential {
-    SecretMetadata metadata = 1;
-    string password = 3;
-    bool use_shamirs_secret_sharing_with_encryption = 4;
-    int32 num_of_shares = 5;
-    int32 threshold = 6;
-    repeated bytes  secret_shares = 7;
-    string userId = 8;
-}
-
-message SSHCredential {
-    SecretMetadata metadata = 1;
-    string passphrase = 3;
-    string public_key = 4;
-    string private_key = 5;
-    bool use_shamirs_secret_sharing_with_encryption = 6;
-    int32 num_of_shares = 7;
-    int32 threshold = 8;
-    repeated bytes  private_key_shares = 9;
-}
-
-
-message GetResourceCredentialByTokenRequest {
-    int64 tenantId = 1;
-    string token = 2;
-    string performed_by = 3;
-    string client_id = 4;
-    bool use_shamirs_secret_sharing_with_encryption = 5;
-    int32 num_of_shares = 6;
-    int32 threshold = 7;
-
-}
-
-message GetResourceCredentialSummariesRequest {
-    ResourceType type = 1;
-    repeated string accessible_tokens = 2;
-    int64 tenantId = 3;
-    string owner_id = 4;
-    bool all_types = 5;
-    string client_id =6;
-}
-
-message ResourceCredentialSummaries {
-    repeated SecretMetadata metadata = 1;
-}
-
-message AddResourceCredentialResponse {
-    string token = 1;
-}
-
-message ResourceCredentialOperationStatus {
-    bool status = 1;
-}
-
-
-message KVCredential {
-    string key = 1;
-    string value = 2;
-    SecretMetadata metadata = 3;
-    string token = 4;
-}
-
-
-
-
-message GetSecretRequest {
-    SecretMetadata metadata = 1;
-    string client_id =2;
-    int64 tenant_id = 3;
-    string client_sec = 4;
-}
-
-message CredentialMap {
-    map<string,string> credential_map = 1;
-    SecretMetadata metadata = 2;
-}
-
-
-
-service ResourceSecretService {
-    rpc getKVCredential (KVCredential) returns (KVCredential);
-    rpc setKVCredential(KVCredential)  returns (ResourceCredentialOperationStatus);
-    rpc updateKVCredential (KVCredential) returns (ResourceCredentialOperationStatus);
-    rpc deleteKVCredential (KVCredential) returns (ResourceCredentialOperationStatus);
-
-    rpc getCredentialMap (CredentialMap) returns (CredentialMap);
-    rpc setCredentialMap (CredentialMap) returns (AddResourceCredentialResponse);
-    rpc updateCredentialMap (CredentialMap) returns (ResourceCredentialOperationStatus);
-    rpc deleteCredentialMap (CredentialMap) returns (ResourceCredentialOperationStatus);
-
-    rpc getResourceCredentialSummary (GetResourceCredentialByTokenRequest) returns (SecretMetadata);
-    rpc getAllResourceCredentialSummaries (GetResourceCredentialSummariesRequest) returns (ResourceCredentialSummaries);
-    rpc addSSHCredential (SSHCredential) returns (AddResourceCredentialResponse);
-    rpc addPasswordCredential (PasswordCredential) returns (AddResourceCredentialResponse);
-    rpc addCertificateCredential (CertificateCredential) returns (AddResourceCredentialResponse);
-    rpc updateCertificateCredential (CertificateCredential) returns (ResourceCredentialOperationStatus);
-
-    rpc getSSHCredential (GetResourceCredentialByTokenRequest) returns (SSHCredential);
-    rpc getPasswordCredential (GetResourceCredentialByTokenRequest) returns (PasswordCredential);
-    rpc getCertificateCredential (GetResourceCredentialByTokenRequest) returns (CertificateCredential);
-
-    rpc deleteSSHCredential (GetResourceCredentialByTokenRequest) returns (ResourceCredentialOperationStatus);
-    rpc deletePWDCredential (GetResourceCredentialByTokenRequest) returns (ResourceCredentialOperationStatus);
-    rpc deleteCertificateCredential (GetResourceCredentialByTokenRequest) returns (ResourceCredentialOperationStatus);
-}
\ No newline at end of file
diff --git a/custos-core-services/sharing-core-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/SharingService.proto b/custos-core-services/sharing-core-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/SharingService.proto
deleted file mode 100644
index c11f6ac5..00000000
--- a/custos-core-services/sharing-core-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/SharingService.proto
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-syntax = "proto3";
-
-option java_multiple_files = true;
-package org.apache.custos.sharing.service;
-
-option go_package = "./pb";
-enum SearchCondition {
-    EQUAL = 0;
-    LIKE = 1;
-    GTE = 2;
-    LTE = 3;
-    NOT = 4;
-}
-
-enum EntitySearchField {
-    NAME = 0;
-    DESCRIPTION = 1;
-    ID = 2;
-    FULL_TEXT = 3;
-    OWNER_ID = 4;
-    CREATED_AT = 5;
-    LAST_MODIFIED_AT = 6;
-    ENTITY_TYPE_ID = 7;
-    PARENT_ID = 8;
-    SHARED_COUNT = 9;
-    PERMISSION_TYPE_ID = 10;
-}
-
-
-message EntityType {
-    string id = 1;
-    string name = 2;
-    string description = 3;
-    int64 created_at = 4;
-    int64 updated_at = 5;
-}
-
-message PermissionType {
-    string id = 1;
-    string name = 2;
-    string description = 3;
-    int64 created_at = 4;
-    int64 updated_at = 5;
-}
-
-message Entity {
-    string id = 1;
-    string type = 2;
-    string owner_id = 3;
-    string parent_id = 4;
-    string name = 5;
-    string description = 6;
-    bytes binary_data = 7;
-    string full_text = 8;
-    int64 original_creation_time = 9;
-    int64 created_at = 10;
-    int64 updated_at = 11;
-    int32 shared_count = 12;
-}
-
-message EntityRequest {
-    string client_id = 1;
-    int64 tenant_id = 2;
-    Entity entity = 3;
-    string client_sec = 4;
-}
-
-message EntityTypeRequest {
-    string client_id = 1;
-    int64 tenant_id = 2;
-    EntityType entity_type = 3;
-    string client_sec = 4;
-}
-
-
-message PermissionTypeRequest {
-    string client_id = 1;
-    int64 tenant_id = 2;
-    PermissionType permission_type = 3;
-    string client_sec = 4;
-}
-
-
-message SearchCriteria {
-    EntitySearchField search_field = 1;
-    string value = 2;
-    SearchCondition condition = 3;
-}
-
-message SearchRequest {
-    string client_id = 1;
-    int64 tenant_id = 2;
-    string owner_id = 3;
-    int32 offset = 4;
-    int32 limit = 5;
-    repeated SearchCriteria search_criteria = 6;
-    string client_sec = 7;
-    repeated string associating_ids = 8;
-}
-
-message PermissionRequest {
-    string client_id = 1;
-    int64 tenant_id = 2;
-    Entity entity = 3;
-    PermissionType permission_type = 4;
-    string client_sec = 5;
-}
-
-message SharingRequest {
-    string client_id = 1;
-    int64 tenant_id = 2;
-    Entity entity = 3;
-    PermissionType permission_type = 4;
-    repeated string owner_id = 5;
-    bool cascade = 6;
-    string client_sec = 7;
-    string shared_by = 8;
-}
-
-message SharesFilteringRequest {
-    string client_id = 1;
-    int64 tenant_id = 2;
-    repeated string owner_id = 5;
-    bool cascade = 6;
-    string client_sec = 7;
-}
-
-message Status {
-    bool status = 1;
-}
-
-message EntityTypes {
-    repeated EntityType types = 1;
-}
-
-message PermissionTypes {
-    repeated PermissionType types = 1;
-}
-
-message Entities {
-    repeated Entity entity_array = 1;
-}
-
-message SharedOwners {
-    repeated string owner_ids = 1;
-}
-
-message GetAllDirectSharingsResponse {
-    repeated SharingMetadata  shared_data = 1;
-}
-
-message GetAllSharingsResponse {
-    repeated SharingMetadata  shared_data = 1;
-}
-
-message SharingMetadata {
-    Entity entity = 1;
-    string owner_id = 2;
-    string owner_type = 3;
-    PermissionType permission = 4;
-    string shared_by = 5;
-}
-
-service SharingService {
-
-
-    rpc createEntityType (EntityTypeRequest) returns (Status);
-    rpc updateEntityType (EntityTypeRequest) returns (Status);
-    rpc deleteEntityType (EntityTypeRequest) returns (Status);
-    rpc getEntityType (EntityTypeRequest) returns (EntityType);
-    rpc getEntityTypes (SearchRequest) returns (EntityTypes);
-
-    rpc createPermissionType (PermissionTypeRequest) returns (Status);
-    rpc updatePermissionType (PermissionTypeRequest) returns (Status);
-    rpc deletePermissionType (PermissionTypeRequest) returns (Status);
-    rpc getPermissionType (PermissionTypeRequest) returns (PermissionType);
-    rpc getPermissionTypes (SearchRequest) returns (PermissionTypes);
-
-    rpc createEntity (EntityRequest) returns (Status);
-    rpc updateEntity (EntityRequest) returns (Status);
-    rpc isEntityExists (EntityRequest) returns (Status);
-    rpc getEntity (EntityRequest) returns (Entity);
-    rpc deleteEntity (EntityRequest) returns (Status);
-    rpc searchEntities (SearchRequest) returns (Entities);
-
-
-
-    rpc getListOfSharedUsers (SharingRequest) returns (SharedOwners);
-    rpc getListOfDirectlySharedUsers (SharingRequest) returns (SharedOwners);
-    rpc getListOfSharedGroups (SharingRequest) returns (SharedOwners);
-    rpc getListOfDirectlySharedGroups (SharingRequest) returns (SharedOwners);
-    rpc getAllDirectSharings (SharingRequest) returns (GetAllDirectSharingsResponse);
-    rpc getAllSharings (SharingRequest) returns (GetAllSharingsResponse);
-
-    rpc shareEntityWithUsers (SharingRequest) returns (Status);
-    rpc shareEntityWithGroups (SharingRequest) returns (Status);
-    rpc revokeEntitySharingFromUsers (SharingRequest) returns (Status);
-    rpc revokeEntitySharingFromGroups (SharingRequest) returns (Status);
-    rpc userHasAccess (SharingRequest) returns (Status);
-
-
-}
\ No newline at end of file
diff --git a/custos-core-services/tenant-profile-core-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/TenantProfileService.proto b/custos-core-services/tenant-profile-core-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/TenantProfileService.proto
deleted file mode 100644
index b84dbfe5..00000000
--- a/custos-core-services/tenant-profile-core-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/TenantProfileService.proto
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-syntax = "proto3";
-
-option java_multiple_files = true;
-package org.apache.custos.tenant.profile.service;
-option go_package = "./pb";
-
-message Tenant {
-    int64 tenant_id = 1;
-    string client_name = 2;
-    string requester_email = 4;
-    string admin_first_name = 5;
-    string admin_last_name = 6;
-    string admin_email = 7;
-    string admin_username = 8;
-    string admin_password = 9;
-    TenantStatus tenant_status = 10;
-    repeated string contacts = 11;
-    repeated string redirect_uris = 12;
-    string client_uri = 13;
-    string scope = 14;
-    string domain = 15;
-    string comment = 16;
-    string logo_uri = 17;
-    int64 parent_tenant_id = 18;
-    string application_type = 19;
-    string token_endpoint_auth_method = 20;
-    string jwks_uri = 21;
-    string example_extension_parameter = 22;
-    string tos_uri = 23;
-    string policy_uri = 24;
-    map<string, string> jwks = 25;
-    string software_id = 26;
-    string software_version = 27;
-    int64 refesh_token_lifetime = 28;
-    string client_id = 29;
-    string parent_client_id = 30;
-}
-
-enum TenantStatus {
-    UNKNOWN = 0;
-    REQUESTED = 1;
-    APPROVED = 2;
-    DENIED = 3;
-    CANCELLED = 4;
-    ACTIVE = 5;
-    DEACTIVATED = 6;
-}
-
-enum TenantType {
-    UNSPECIFIED = 0;
-    ADMIN = 1;
-}
-
-message TenantAttributeUpdateMetadata {
-    string updated_attribute = 1;
-    string updated_attributeValue = 2;
-    string updated_by = 3;
-    string updated_at = 4;
-}
-
-message TenantStatusUpdateMetadata {
-    TenantStatus updated_status = 1;
-    string updated_by = 2;
-    string updated_at = 3;
-}
-
-
-message AddTenantResponse {
-    int64 tenant_id = 1;
-}
-
-
-message UpdateTenantResponse {
-    Tenant tenant = 1;
-
-}
-
-message GetTenantRequest {
-    int64 tenant_id = 1;
-}
-
-message GetTenantResponse {
-    Tenant tenant = 1;
-}
-
-
-message GetAllTenantsResponse {
-    repeated Tenant tenant = 1;
-    int32 total_num_of_tenants =2;
-}
-
-message IsTenantExistRequest {
-    int64 tenant_id = 1;
-}
-
-message IsTenantExistResponse {
-    bool is_exist = 1;
-}
-
-message GetAllTenantsForUserRequest {
-    string requester_email = 1;
-}
-
-message GetAllTenantsForUserResponse {
-    repeated Tenant tenant = 1;
-}
-
-message UpdateStatusRequest {
-    string client_id = 1;
-    TenantStatus status = 2;
-    string updated_by = 3;
-    int64 tenant_id = 4;
-    bool super_tenant = 5;
-    string access_token = 6;
-}
-
-message UpdateStatusResponse {
-    int64 tenant_id = 1;
-    TenantStatus status = 2;
-}
-
-message GetAuditTrailRequest {
-    int64 tenant_id = 1;
-}
-
-message GetStatusUpdateAuditTrailResponse {
-    repeated TenantStatusUpdateMetadata metadata = 1;
-}
-
-message GetAttributeUpdateAuditTrailResponse {
-    repeated TenantAttributeUpdateMetadata metadata = 2;
-}
-
-message GetTenantsRequest {
- int32 offset = 1;
- int32 limit = 2;
- int64 parent_id = 3;
- TenantStatus status = 4;
- string requester_email = 5;
- string parent_client_id = 6;
- TenantType type= 7;
-}
-
-service TenantProfileService {
-    rpc addTenant (Tenant) returns (Tenant);
-    rpc updateTenant (Tenant) returns (Tenant);
-    rpc getTenant (GetTenantRequest) returns (GetTenantResponse);
-    rpc updateTenantStatus (UpdateStatusRequest) returns (UpdateStatusResponse);
-    rpc getAllTenants (GetTenantsRequest) returns (GetAllTenantsResponse);
-    rpc isTenantExist (IsTenantExistRequest) returns (IsTenantExistResponse);
-    rpc getAllTenantsForUser (GetAllTenantsForUserRequest) returns (GetAllTenantsForUserResponse);
-    rpc getTenantStatusUpdateAuditTrail (GetAuditTrailRequest) returns (GetStatusUpdateAuditTrailResponse);
-    rpc getTenantAttributeUpdateAuditTrail (GetAuditTrailRequest) returns (GetAttributeUpdateAuditTrailResponse);
-}
\ No newline at end of file
diff --git a/custos-core-services/user-profile-core-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/UserProfileService.proto b/custos-core-services/user-profile-core-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/UserProfileService.proto
deleted file mode 100644
index a7557848..00000000
--- a/custos-core-services/user-profile-core-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/UserProfileService.proto
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-syntax = "proto3";
-
-option java_multiple_files = true;
-package org.apache.custos.user.profile.service;
-option go_package = "./pb";
-
-enum UserStatus {
-    ACTIVE = 0;
-    CONFIRMED = 1;
-    APPROVED = 2;
-    DELETED = 3;
-    DUPLICATE = 4;
-    GRACE_PERIOD = 5;
-    INVITED = 6;
-    DENIED = 7;
-    PENDING = 8;
-    PENDING_APPROVAL = 9;
-    PENDING_CONFIRMATION = 10;
-    SUSPENDED = 11;
-    DECLINED = 12;
-    EXPIRED = 13;
-}
-
-enum DefaultGroupMembershipTypes {
-    OWNER = 0;
-    ADMIN = 1;
-    MEMBER = 2;
-}
-
-enum UserTypes {
-    END_USER = 0;
-    COMMUNITY = 1;
-}
-
-
-message UserProfile {
-    string username = 1;
-    string email = 2;
-    string first_name = 3;
-    string last_name = 4;
-    int64 created_at = 5;
-    UserStatus status = 6;
-    repeated UserAttribute attributes = 7;
-    repeated string client_roles = 8;
-    repeated string realm_roles = 9;
-    int64 last_modified_at = 10;
-    UserTypes type = 11;
-    string membership_type = 12;
-}
-
-message UserProfileRequest {
-    int64 tenantId = 1;
-    UserProfile profile = 2;
-    string performed_by = 3;
-    string client_id = 4;
-    int32 offset=5;
-    int32 limit=6;
-}
-
-
-message UserAttribute {
-    int64 id = 1;
-    string key = 2;
-    repeated string values = 3;
-}
-
-
-message GetAllUserProfilesResponse {
-    repeated UserProfile profiles = 1;
-}
-
-message GetUpdateAuditTrailRequest {
-    int64 tenantId = 1;
-    string username = 2;
-}
-
-message UserProfileAttributeUpdateMetadata {
-    string updated_attribute = 1;
-    string updated_attribute_value = 2;
-    string updated_by = 3;
-    string updated_at = 4;
-}
-
-message UserProfileStatusUpdateMetadata {
-    UserStatus updated_status = 1;
-    string updated_by = 2;
-    string updated_at = 3;
-}
-
-message GetUpdateAuditTrailResponse {
-    repeated UserProfileAttributeUpdateMetadata attribute_audit = 1;
-    repeated UserProfileStatusUpdateMetadata status_audit = 2;
-}
-
-message GroupRequest {
-    int64 tenant_id = 1;
-    Group group = 2;
-    string performed_by = 3;
-    string client_id = 4;
-    string membership_type = 5;
-    string id = 6;
-    string client_sec =7;
-
-}
-
-message GetAllGroupsResponse {
-    repeated Group groups = 1;
-}
-message Group {
-    string id = 1;
-    string name = 2;
-    repeated string realm_roles = 3;
-    repeated string client_roles = 4;
-    string parent_id = 5;
-    int64 created_time = 6;
-    int64 last_modified_time = 7;
-    repeated GroupAttribute attributes = 8;
-    string description = 9;
-    string owner_id = 10;
-}
-
-message GroupAttribute {
-    int64 id = 1;
-    string key = 2;
-    repeated string value = 3;
-}
-
-message GroupMembership {
-    int64 tenant_id = 1;
-    string group_id = 2;
-    string username = 3;
-    string type = 4;
-    string clientId = 5;
-    string clientSec = 6;
-}
-
-message GroupToGroupMembership {
-    int64 tenant_id = 1;
-    string parent_id = 2;
-    string child_id = 3;
-    string client_id = 4;
-}
-
-message Status {
-    bool status = 1;
-}
-
-message UserGroupMembershipTypeRequest {
-    string type = 1;
-    int64 tenant_id = 2;
-    string client_id = 3;
-}
-
-
-
-
-service UserProfileService {
-    rpc createUserProfile (UserProfileRequest) returns (UserProfile);
-    rpc updateUserProfile (UserProfileRequest) returns (UserProfile);
-    rpc getUserProfile (UserProfileRequest) returns (UserProfile);
-    rpc deleteUserProfile (UserProfileRequest) returns (UserProfile);
-    rpc getAllUserProfilesInTenant (UserProfileRequest) returns (GetAllUserProfilesResponse);
-    rpc findUserProfilesByAttributes (UserProfileRequest) returns (GetAllUserProfilesResponse);
-
-    rpc createGroup (GroupRequest) returns (Group);
-    rpc updateGroup (GroupRequest) returns (Group);
-    rpc deleteGroup (GroupRequest) returns (Group);
-    rpc getGroup (GroupRequest) returns (Group);
-    rpc getAllGroups (GroupRequest) returns (GetAllGroupsResponse);
-
-
-    rpc getUserProfileAuditTrails (GetUpdateAuditTrailRequest) returns (GetUpdateAuditTrailResponse);
-
-    rpc addUserToGroup (GroupMembership) returns (Status);
-    rpc removeUserFromGroup (GroupMembership) returns (Status);
-    rpc addChildGroupToParentGroup (GroupToGroupMembership) returns (Status);
-    rpc removeChildGroupFromParentGroup (GroupToGroupMembership) returns (Status);
-
-    rpc getAllGroupsOfUser (UserProfileRequest) returns (GetAllGroupsResponse);
-    rpc getAllParentGroupsOfGroup (GroupRequest) returns (GetAllGroupsResponse);
-
-    rpc addUserGroupMembershipType (UserGroupMembershipTypeRequest) returns (Status);
-    rpc removeUserGroupMembershipType (UserGroupMembershipTypeRequest) returns (Status);
-
-    rpc getAllChildUsers(GroupRequest) returns (GetAllUserProfilesResponse);
-    rpc getAllChildGroups(GroupRequest) returns (GetAllGroupsResponse);
-    rpc changeUserMembershipType (GroupMembership) returns (Status);
-    rpc hasAccess(GroupMembership) returns (Status);
-
-
-
-
-
-
-}
\ No newline at end of file
diff --git a/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/service/UserProfileService.java b/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/service/UserProfileService.java
index 4d1643f0..32af8bb9 100644
--- a/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/service/UserProfileService.java
+++ b/custos-core-services/user-profile-core-service/src/main/java/org/apache/custos/user/profile/service/UserProfileService.java
@@ -234,7 +234,7 @@ public class UserProfileService extends UserProfileServiceGrpc.UserProfileServic
             long tenantId = request.getTenantId();
             int limit = request.getLimit();
             int offset = request.getOffset();
-            
+
             List<UserProfile> profileList = new ArrayList<>();
 
             if (limit > 0) {
diff --git a/custos-integration-services/agent-management-service-parent/agent-management-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/AgentManagementService.proto b/custos-integration-services/agent-management-service-parent/agent-management-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/AgentManagementService.proto
deleted file mode 100644
index 12609e70..00000000
--- a/custos-integration-services/agent-management-service-parent/agent-management-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/AgentManagementService.proto
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-syntax = "proto3";
-
-option java_multiple_files = true;
-package org.apache.custos.agent.management.service;
-
-import "google/api/annotations.proto";
-import "google/rpc/error_details.proto";
-import "google/protobuf/empty.proto";
-import "IamAdminService.proto";
-
-option go_package = "./pb";
-
-
-message AgentSearchRequest {
-    int64 tenantId = 2;
-    string accessToken = 3;
-    string clientId = 4;
-    string clientSec = 5;
-    string performedBy = 6;
-    string id = 7;
-}
-
-message AgentRegistrationResponse {
-    string id = 1;
-    string secret = 2;
-}
-
-message SynchronizeAgentDBRequest {
-    int64 tenantId = 2;
-    string clientId = 4;
-}
-
-
-service AgentManagementService {
-
-    rpc enableAgents (org.apache.custos.iam.service.AgentClientMetadata) returns (org.apache.custos.iam.service.OperationStatus) {
-        option (google.api.http) = {
-           post: "/agent-management/v1.0.0/enable"
-         };
-    }
-    rpc configureAgentClient (org.apache.custos.iam.service.AgentClientMetadata) returns (org.apache.custos.iam.service.OperationStatus) {
-        option (google.api.http) = {
-           post: "/agent-management/v1.0.0/token/configuration"
-         };
-    }
-
-
-    rpc addRolesToClient (org.apache.custos.iam.service.AddRolesRequest) returns (org.apache.custos.iam.service.OperationStatus) {
-        option (google.api.http) = {
-           post: "/agent-management/v1.0.0/roles"
-         };
-    }
-
-    rpc registerAndEnableAgent (org.apache.custos.iam.service.RegisterUserRequest) returns (AgentRegistrationResponse) {
-        option (google.api.http) = {
-           post: "/agent-management/v1.0.0/agent"
-           body: "user"
-         };
-    }
-
-    rpc getAgent (AgentSearchRequest) returns (org.apache.custos.iam.service.Agent) {
-        option (google.api.http) = {
-           get: "/agent-management/v1.0.0/agent/{id}"
-         };
-    }
-
-    rpc deleteAgent (AgentSearchRequest) returns (org.apache.custos.iam.service.OperationStatus) {
-        option (google.api.http) = {
-           delete: "/agent-management/v1.0.0/agent/{id}"
-         };
-    }
-    rpc disableAgent (AgentSearchRequest) returns (org.apache.custos.iam.service.OperationStatus) {
-        option (google.api.http) = {
-           post: "/agent-management/v1.0.0/agent/deactivation/{id}"
-         };
-
-    }
-
-    rpc enableAgent (AgentSearchRequest) returns (org.apache.custos.iam.service.OperationStatus) {
-        option (google.api.http) = {
-           post: "/agent-management/v1.0.0/agent/activation/{id}"
-         };
-
-    }
-
-    rpc addAgentAttributes (org.apache.custos.iam.service.AddUserAttributesRequest) returns (org.apache.custos.iam.service.OperationStatus) {
-        option (google.api.http) = {
-           post: "/agent-management/v1.0.0/agent/attributes"
-         };
-    }
-    rpc deleteAgentAttributes (org.apache.custos.iam.service.DeleteUserAttributeRequest) returns (org.apache.custos.iam.service.OperationStatus) {
-        option (google.api.http) = {
-           delete: "/agent-management/v1.0.0/agent/attributes"
-         };
-    }
-    rpc addRolesToAgent (org.apache.custos.iam.service.AddUserRolesRequest) returns (org.apache.custos.iam.service.OperationStatus) {
-        option (google.api.http) = {
-           post: "/agent-management/v1.0.0/agent/roles"
-         };
-    }
-    rpc deleteRolesFromAgent (org.apache.custos.iam.service.DeleteUserRolesRequest) returns (org.apache.custos.iam.service.OperationStatus) {
-        option (google.api.http) = {
-           delete: "/agent-management/v1.0.0/agent/roles"
-         };
-    }
-
-    rpc addProtocolMapper (org.apache.custos.iam.service.AddProtocolMapperRequest) returns (org.apache.custos.iam.service.OperationStatus) {
-        option (google.api.http) = {
-           post: "/agent-management/v1.0.0/protocol/mapper"
-        };
-    }
-
-    rpc getAllAgents (org.apache.custos.iam.service.GetAllResources) returns (org.apache.custos.iam.service.GetAllResourcesResponse) {
-        option (google.api.http) = {
-           get: "/agent-management/v1.0.0/agents"
-        };
-    }
-
-     rpc synchronizeAgentDBs (SynchronizeAgentDBRequest) returns (org.apache.custos.iam.service.OperationStatus) {
-         option (google.api.http) = {
-           post: "/agent-management/v1.0.0/db/synchronize"
-        };
-      }
-
-
-}
-
-
diff --git a/custos-integration-services/group-management-service-parent/group-management-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/GroupManagementService.proto b/custos-integration-services/group-management-service-parent/group-management-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/GroupManagementService.proto
deleted file mode 100644
index df5d5bdf..00000000
--- a/custos-integration-services/group-management-service-parent/group-management-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/GroupManagementService.proto
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-syntax = "proto3";
-
-option java_multiple_files = true;
-package org.apache.custos.group.management.service;
-option go_package = "./pb";
-
-import "google/api/annotations.proto";
-import "UserProfileService.proto";
-import "IamAdminService.proto";
-
-
-service GroupManagementService {
-
-    rpc createKeycloakGroups (org.apache.custos.iam.service.GroupsRequest) returns (org.apache.custos.iam.service.GroupsResponse) {
-
-        option (google.api.http) = {
-           post: "/group-management/v1.0.0/keycloak/groups"
-         };
-    }
-
-
-    rpc updateKeycloakGroup (org.apache.custos.iam.service.GroupRequest) returns (org.apache.custos.iam.service.GroupRepresentation) {
-
-        option (google.api.http) = {
-           put: "/group-management/v1.0.0/keycloak/group/{id}"
-         };
-    }
-
-    rpc deleteKeycloakGroup (org.apache.custos.iam.service.GroupRequest) returns (org.apache.custos.iam.service.OperationStatus) {
-
-        option (google.api.http) = {
-           delete: "/group-management/v1.0.0/keycloak/group/{id}"
-         };
-    }
-
-    rpc findKeycloakGroup (org.apache.custos.iam.service.GroupRequest) returns (org.apache.custos.iam.service.GroupRepresentation) {
-
-        option (google.api.http) = {
-           get: "/group-management/v1.0.0/keycloak/group"
-         };
-    }
-
-
-    rpc getAllKeycloakGroups (org.apache.custos.iam.service.GroupRequest) returns (org.apache.custos.iam.service.GroupsResponse) {
-
-        option (google.api.http) = {
-           get: "/group-management/v1.0.0/keycloak/groups"
-         };
-    }
-
-    rpc addUserToKeycloakGroup (org.apache.custos.iam.service.UserGroupMappingRequest) returns (org.apache.custos.iam.service.OperationStatus) {
-
-        option (google.api.http) = {
-           post: "/group-management/v1.0.0/keycloak/user/group/membership"
-         };
-    }
-
-
-    rpc removeUserFromKeycloakGroup (org.apache.custos.iam.service.UserGroupMappingRequest) returns (org.apache.custos.iam.service.OperationStatus) {
-
-        option (google.api.http) = {
-           delete: "/group-management/v1.0.0/keycloak/user/group/membership"
-         };
-    }
-
-    rpc createGroup (org.apache.custos.user.profile.service.GroupRequest) returns (org.apache.custos.user.profile.service.Group) {
-
-        option (google.api.http) = {
-           post: "/group-management/v1.0.0/group"
-         };
-    }
-
-
-    rpc updateGroup (org.apache.custos.user.profile.service.GroupRequest) returns (org.apache.custos.user.profile.service.Group) {
-
-        option (google.api.http) = {
-           put: "/group-management/v1.0.0/group/{id}"
-         };
-    }
-
-    rpc deleteGroup (org.apache.custos.user.profile.service.GroupRequest) returns (org.apache.custos.user.profile.service.Status) {
-
-        option (google.api.http) = {
-           delete: "/group-management/v1.0.0/group/{id}"
-         };
-    }
-
-    rpc findGroup (org.apache.custos.user.profile.service.GroupRequest) returns (org.apache.custos.user.profile.service.Group) {
-
-        option (google.api.http) = {
-           get: "/group-management/v1.0.0/group"
-         };
-    }
-
-
-    rpc getAllGroups (org.apache.custos.user.profile.service.GroupRequest) returns (org.apache.custos.user.profile.service.GetAllGroupsResponse) {
-
-        option (google.api.http) = {
-           get: "/group-management/v1.0.0/groups"
-         };
-    }
-
-    rpc addUserToGroup (org.apache.custos.user.profile.service.GroupMembership) returns (org.apache.custos.user.profile.service.Status) {
-
-        option (google.api.http) = {
-           post: "/group-management/v1.0.0/user/group/membership"
-         };
-    }
-
-
-    rpc removeUserFromGroup (org.apache.custos.user.profile.service.GroupMembership) returns (org.apache.custos.user.profile.service.Status) {
-
-        option (google.api.http) = {
-           delete: "/group-management/v1.0.0/user/group/membership"
-         };
-    }
-
-
-    rpc addChildGroupToParentGroup (org.apache.custos.user.profile.service.GroupToGroupMembership) returns (org.apache.custos.user.profile.service.Status) {
-        option (google.api.http) = {
-           post: "/group-management/v1.0.0/group/membership"
-         };
-
-    }
-    rpc removeChildGroupFromParentGroup (org.apache.custos.user.profile.service.GroupToGroupMembership) returns (org.apache.custos.user.profile.service.Status) {
-
-        option (google.api.http) = {
-           delete: "/group-management/v1.0.0/group/membership"
-         };
-    }
-
-    rpc getAllGroupsOfUser (org.apache.custos.user.profile.service.UserProfileRequest) returns (org.apache.custos.user.profile.service.GetAllGroupsResponse) {
-
-        option (google.api.http) = {
-           get: "/group-management/v1.0.0/user/group/memberships"
-         };
-    }
-
-    rpc getAllParentGroupsOfGroup (org.apache.custos.user.profile.service.GroupRequest) returns (org.apache.custos.user.profile.service.GetAllGroupsResponse) {
-        option (google.api.http) = {
-           get: "/group-management/v1.0.0/groups/memberships"
-         };
-
-    }
-
-
-    rpc getAllChildUsers(org.apache.custos.user.profile.service.GroupRequest) returns (org.apache.custos.user.profile.service.GetAllUserProfilesResponse) {
-        option (google.api.http) = {
-           get: "/group-management/v1.0.0/user/group/memberships/child"
-         };
-
-    }
-    rpc getAllChildGroups(org.apache.custos.user.profile.service.GroupRequest) returns (org.apache.custos.user.profile.service.GetAllGroupsResponse) {
-        option (google.api.http) = {
-           get: "/group-management/v1.0.0/groups/memberships/child"
-         };
-
-    }
-    rpc changeUserMembershipType (org.apache.custos.user.profile.service.GroupMembership) returns (org.apache.custos.user.profile.service.Status) {
-        option (google.api.http) = {
-           put: "/group-management/v1.0.0/user/group/membership"
-         };
-
-    }
-    rpc hasAccess(org.apache.custos.user.profile.service.GroupMembership) returns (org.apache.custos.user.profile.service.Status) {
-        option (google.api.http) = {
-           get: "/group-management/v1.0.0/user/group/access"
-         };
-
-    }
-
-    rpc addGroupMembershipType(org.apache.custos.user.profile.service.UserGroupMembershipTypeRequest) returns (org.apache.custos.user.profile.service.Status) {
-        option (google.api.http) = {
-           post: "/group-management/v1.0.0/user/group/membership/type"
-         };
-
-    }
-
-    rpc removeUserGroupMembershipType(org.apache.custos.user.profile.service.UserGroupMembershipTypeRequest) returns (org.apache.custos.user.profile.service.Status) {
-        option (google.api.http) = {
-           delete: "/group-management/v1.0.0/user/group/membership/type"
-         };
-
-    }
-
-
-}
-
-
-
-
diff --git a/custos-integration-services/identity-management-service-parent/identity-management-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/IdentityManagementService.proto b/custos-integration-services/identity-management-service-parent/identity-management-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/IdentityManagementService.proto
deleted file mode 100644
index 47e2453a..00000000
--- a/custos-integration-services/identity-management-service-parent/identity-management-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/IdentityManagementService.proto
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-syntax = "proto3";
-
-option java_multiple_files = true;
-package org.apache.custos.identity.management.service;
-option go_package = "./pb";
-
-import "google/api/annotations.proto";
-import "IdentityService.proto";
-import "google/protobuf/struct.proto";
-import "google/protobuf/any.proto";
-import "CredentialStoreService.proto";
-
-
-
-message AuthorizationRequest {
-    int64 tenant_id = 1;
-    string client_id = 2;
-    string client_secret = 3;
-    string redirect_uri = 4;
-    string response_type = 5;
-    string scope = 6;
-    string state = 7;
-}
-
-message AuthorizationResponse {
-    string loginURI = 1;
-}
-
-message GetCredentialsRequest {
-    string client_id = 1;
-    org.apache.custos.credential.store.service.Credentials credentials = 2;
-}
-
-
-message GetAgentTokenRequest {
-    int64 tenant_id = 1;
-    string agent_client_id = 2;
-    string agent_client_secret = 3;
-    string agentId = 4;
-    string agentPassword = 5;
-    string  client_id = 6;
-    string grant_type = 7;
-    string refresh_token = 8;
-}
-
-message EndSessionRequest {
-    string client_id = 1;
-    org.apache.custos.identity.service.EndSessionRequest body = 2;
-}
-
-
-
-
-service IdentityManagementService {
-
-    rpc authenticate (org.apache.custos.identity.service.AuthenticationRequest) returns (org.apache.custos.identity.service.AuthToken) {
-        option (google.api.http) = {
-           post: "/identity-management/v1.0.0/authenticate"
-         };
-    }
-
-    rpc isAuthenticated (org.apache.custos.identity.service.AuthToken) returns (org.apache.custos.identity.service.IsAuthenticatedResponse) {
-        option (google.api.http) = {
-           post: "/identity-management/v1.0.0/authenticate/status"
-         };
-    }
-
-    rpc getUser (org.apache.custos.identity.service.AuthToken) returns (org.apache.custos.identity.service.User) {
-
-        option (google.api.http) = {
-           get: "/identity-management/v1.0.0/user"
-         };
-
-
-    }
-    rpc getUserManagementServiceAccountAccessToken (org.apache.custos.identity.service.GetUserManagementSATokenRequest) returns (org.apache.custos.identity.service.AuthToken) {
-        option (google.api.http) = {
-           get: "/identity-management/v1.0.0/account/token"
-         };
-
-    }
-
-    rpc endUserSession(EndSessionRequest) returns (org.apache.custos.identity.service.OperationStatus) {
-        option (google.api.http) = {
-           post: "/identity-management/v1.0.0/user/logout"
-           body: "body"
-         };
-    }
-
-    rpc authorize (AuthorizationRequest) returns (AuthorizationResponse) {
-        option (google.api.http) = {
-           get: "/identity-management/v1.0.0/authorize"
-         };
-    }
-
-
-    rpc token (org.apache.custos.identity.service.GetTokenRequest) returns (google.protobuf.Struct) {
-        option (google.api.http) = {
-           post: "/identity-management/v1.0.0/token"
-         };
-    }
-
-    rpc getCredentials (GetCredentialsRequest) returns (org.apache.custos.credential.store.service.Credentials) {
-        option (google.api.http) = {
-           get: "/identity-management/v1.0.0/credentials"
-        };
-    }
-
-
-
-    rpc getOIDCConfiguration(org.apache.custos.identity.service.GetOIDCConfiguration) returns (google.protobuf.Struct) {
-        option (google.api.http) = {
-           get: "/identity-management/v1.0.0/.well-known/openid-configuration"
-         };
-    }
-
-
-    rpc getAgentToken(GetAgentTokenRequest) returns (google.protobuf.Struct) {
-        option (google.api.http) = {
-           post: "/identity-management/v1.0.0/agent/token/{client_id}"
-         };
-    }
-
-    rpc endAgentSession(EndSessionRequest) returns (org.apache.custos.identity.service.OperationStatus) {
-        option (google.api.http) = {
-           post: "/identity-management/v1.0.0/agent/logout/{client_id}"
-           body: "body"
-         };
-    }
-
-    rpc isAgentAuthenticated(org.apache.custos.identity.service.AuthToken) returns (org.apache.custos.identity.service.IsAuthenticatedResponse) {
-        option (google.api.http) = {
-           post: "/identity-management/v1.0.0/agent/authentication/status"
-         };
-    }
-}
\ No newline at end of file
diff --git a/custos-integration-services/log-management-service-parent/log-management-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/LogManagementService.proto b/custos-integration-services/log-management-service-parent/log-management-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/LogManagementService.proto
deleted file mode 100644
index 3b1c7729..00000000
--- a/custos-integration-services/log-management-service-parent/log-management-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/LogManagementService.proto
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-syntax = "proto3";
-
-option java_multiple_files = true;
-package org.apache.custos.log.management.service;
-
-import "google/api/annotations.proto";
-import "google/protobuf/empty.proto";
-import "google/protobuf/struct.proto";
-import "LoggingService.proto";
-
-option go_package = "./pb";
-
-service LogManagementService {
-
-    rpc getLogEvents(org.apache.custos.logging.service.LogEventRequest) returns (org.apache.custos.logging.service.LogEvents) {
-        option (google.api.http) = {
-           get: "/log-management/v1.0.0/logs"
-         };
-    }
-
-    rpc isLogEnabled(org.apache.custos.logging.service.LoggingConfigurationRequest) returns(org.apache.custos.logging.service.Status) {
-        option (google.api.http) = {
-           get: "/log-management/v1.0.0/status"
-         };
-    }
-
-    rpc enable(org.apache.custos.logging.service.LoggingConfigurationRequest) returns (org.apache.custos.logging.service.Status) {
-        option (google.api.http) = {
-           post: "/log-management/v1.0.0/status"
-         };
-    }
-
-}
\ No newline at end of file
diff --git a/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/ResourceSecretManagementService.proto b/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/ResourceSecretManagementService.proto
deleted file mode 100644
index f46ad297..00000000
--- a/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/ResourceSecretManagementService.proto
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-syntax = "proto3";
-
-option java_multiple_files = true;
-package org.apache.custos.resource.secret.management.service;
-option go_package = "./pb";
-
-import "google/api/annotations.proto";
-import "google/protobuf/empty.proto";
-import "google/protobuf/struct.proto";
-import "ResourceSecretService.proto";
-import "IdentityService.proto";
-
-
-service ResourceSecretManagementService {
-
-    rpc getSecret (org.apache.custos.resource.secret.service.GetSecretRequest) returns (org.apache.custos.resource.secret.service.SecretMetadata) {
-        option (google.api.http) = {
-           get: "/resource-secret-management/v1.0.0/secret"
-         };
-    }
-
-    rpc getKVCredential (org.apache.custos.resource.secret.service.KVCredential) returns (org.apache.custos.resource.secret.service.KVCredential) {
-        option (google.api.http) = {
-           get: "/resource-secret-management/v1.0.0/secret/kv"
-         };
-    }
-    rpc addKVCredential (org.apache.custos.resource.secret.service.KVCredential) returns (org.apache.custos.resource.secret.service.ResourceCredentialOperationStatus) {
-        option (google.api.http) = {
-           post: "/resource-secret-management/v1.0.0/secret/kv"
-         };
-    }
-    rpc updateKVCredential (org.apache.custos.resource.secret.service.KVCredential) returns (org.apache.custos.resource.secret.service.ResourceCredentialOperationStatus) {
-        option (google.api.http) = {
-           put: "/resource-secret-management/v1.0.0/secret/kv"
-         };
-    }
-    rpc deleteKVCredential (org.apache.custos.resource.secret.service.KVCredential) returns (org.apache.custos.resource.secret.service.ResourceCredentialOperationStatus) {
-        option (google.api.http) = {
-           delete: "/resource-secret-management/v1.0.0/secret/kv"
-         };
-    }
-
-    rpc getJWKS (org.apache.custos.identity.service.GetJWKSRequest) returns (google.protobuf.Struct) {
-        option (google.api.http) = {
-           get: "/resource-secret-management/v1.0.0/openid-connect/certs"
-         };
-    }
-
-    rpc getResourceCredentialSummary (org.apache.custos.resource.secret.service.GetResourceCredentialByTokenRequest) returns (org.apache.custos.resource.secret.service.SecretMetadata) {
-        option (google.api.http) = {
-           get: "/resource-secret-management/v1.0.0/secret/summary"
-         };
-    }
-    rpc getAllResourceCredentialSummaries (org.apache.custos.resource.secret.service.GetResourceCredentialSummariesRequest) returns (org.apache.custos.resource.secret.service.ResourceCredentialSummaries) {
-        option (google.api.http) = {
-           get: "/resource-secret-management/v1.0.0/secret/summaries"
-         };
-    }
-    rpc addSSHCredential (org.apache.custos.resource.secret.service.SSHCredential) returns (org.apache.custos.resource.secret.service.AddResourceCredentialResponse) {
-        option (google.api.http) = {
-           post: "/resource-secret-management/v1.0.0/secret/ssh"
-         };
-    }
-    rpc addPasswordCredential (org.apache.custos.resource.secret.service.PasswordCredential) returns (org.apache.custos.resource.secret.service.AddResourceCredentialResponse) {
-        option (google.api.http) = {
-           post: "/resource-secret-management/v1.0.0/secret/password"
-         };
-    }
-    rpc addCertificateCredential (org.apache.custos.resource.secret.service.CertificateCredential) returns (org.apache.custos.resource.secret.service.AddResourceCredentialResponse) {
-        option (google.api.http) = {
-           post: "/resource-secret-management/v1.0.0/secret/certificate"
-         };
-    }
-
-    rpc updateCertificateCredential (org.apache.custos.resource.secret.service.CertificateCredential) returns (org.apache.custos.resource.secret.service.ResourceCredentialOperationStatus) {
-        option (google.api.http) = {
-           put: "/resource-secret-management/v1.0.0/secret/certificate"
-         };
-    }
-
-    rpc getSSHCredential (org.apache.custos.resource.secret.service.GetResourceCredentialByTokenRequest) returns (org.apache.custos.resource.secret.service.SSHCredential) {
-        option (google.api.http) = {
-           get: "/resource-secret-management/v1.0.0/secret/ssh"
-         };
-    }
-    rpc getPasswordCredential (org.apache.custos.resource.secret.service.GetResourceCredentialByTokenRequest) returns (org.apache.custos.resource.secret.service.PasswordCredential) {
-        option (google.api.http) = {
-           get: "/resource-secret-management/v1.0.0/secret/password"
-         };
-    }
-    rpc getCertificateCredential (org.apache.custos.resource.secret.service.GetResourceCredentialByTokenRequest) returns (org.apache.custos.resource.secret.service.CertificateCredential) {
-        option (google.api.http) = {
-           get: "/resource-secret-management/v1.0.0/secret/certificate"
-         };
-    }
-
-    rpc deleteSSHCredential (org.apache.custos.resource.secret.service.GetResourceCredentialByTokenRequest) returns (org.apache.custos.resource.secret.service.ResourceCredentialOperationStatus) {
-        option (google.api.http) = {
-           delete: "/resource-secret-management/v1.0.0/secret/ssh"
-         };
-    }
-    rpc deletePWDCredential (org.apache.custos.resource.secret.service.GetResourceCredentialByTokenRequest) returns (org.apache.custos.resource.secret.service.ResourceCredentialOperationStatus) {
-        option (google.api.http) = {
-           delete: "/resource-secret-management/v1.0.0/secret/password"
-         };
-    }
-    rpc deleteCertificateCredential (org.apache.custos.resource.secret.service.GetResourceCredentialByTokenRequest) returns (org.apache.custos.resource.secret.service.ResourceCredentialOperationStatus) {
-        option (google.api.http) = {
-           delete: "/resource-secret-management/v1.0.0/secret/certificate"
-         };
-    }
-
-
-
-    rpc getCredentialMap (org.apache.custos.resource.secret.service.CredentialMap) returns (org.apache.custos.resource.secret.service.CredentialMap) {
-        option (google.api.http) = {
-           get: "/resource-secret-management/v1.0.0/secret/map"
-         };
-    }
-    rpc addCredentialMap (org.apache.custos.resource.secret.service.CredentialMap) returns (org.apache.custos.resource.secret.service.AddResourceCredentialResponse) {
-        option (google.api.http) = {
-           post: "/resource-secret-management/v1.0.0/secret/map"
-         };
-    }
-    rpc updateCredentialMap (org.apache.custos.resource.secret.service.CredentialMap) returns (org.apache.custos.resource.secret.service.ResourceCredentialOperationStatus) {
-        option (google.api.http) = {
-           put: "/resource-secret-management/v1.0.0/secret/map"
-         };
-    }
-    rpc deleteCredentialMap (org.apache.custos.resource.secret.service.CredentialMap) returns (org.apache.custos.resource.secret.service.ResourceCredentialOperationStatus) {
-        option (google.api.http) = {
-           delete: "/resource-secret-management/v1.0.0/secret/map"
-         };
-    }
-
-}
\ No newline at end of file
diff --git a/custos-integration-services/sharing-management-service-parent/sharing-management-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/SharingManagementService.proto b/custos-integration-services/sharing-management-service-parent/sharing-management-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/SharingManagementService.proto
deleted file mode 100644
index 961f1aae..00000000
--- a/custos-integration-services/sharing-management-service-parent/sharing-management-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/SharingManagementService.proto
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-syntax = "proto3";
-
-option java_multiple_files = true;
-package org.apache.custos.sharing.management.service;
-option go_package = "./pb";
-
-import "SharingService.proto";
-import "google/api/annotations.proto";
-
-
-service SharingManagementService {
-
-
-    rpc createEntityType (org.apache.custos.sharing.service.EntityTypeRequest) returns (org.apache.custos.sharing.service.Status) {
-        option (google.api.http) = {
-           post: "/sharing-management/v1.0.0/entity/type"
-        };
-
-    }
-    rpc updateEntityType (org.apache.custos.sharing.service.EntityTypeRequest) returns (org.apache.custos.sharing.service.Status) {
-        option (google.api.http) = {
-           put: "/sharing-management/v1.0.0/entity/type"
-        };
-
-    }
-    rpc deleteEntityType (org.apache.custos.sharing.service.EntityTypeRequest) returns (org.apache.custos.sharing.service.Status) {
-        option (google.api.http) = {
-           delete: "/sharing-management/v1.0.0/entity/type"
-        };
-
-    }
-    rpc getEntityType (org.apache.custos.sharing.service.EntityTypeRequest) returns (org.apache.custos.sharing.service.EntityType) {
-        option (google.api.http) = {
-           get: "/sharing-management/v1.0.0/entity/type"
-        };
-
-    }
-    rpc getEntityTypes (org.apache.custos.sharing.service.SearchRequest) returns (org.apache.custos.sharing.service.EntityTypes) {
-        option (google.api.http) = {
-           get: "/sharing-management/v1.0.0/entity/types"
-        };
-
-    }
-
-    rpc createPermissionType (org.apache.custos.sharing.service.PermissionTypeRequest) returns (org.apache.custos.sharing.service.Status) {
-        option (google.api.http) = {
-           post: "/sharing-management/v1.0.0/permission/type"
-        };
-
-    }
-    rpc updatePermissionType (org.apache.custos.sharing.service.PermissionTypeRequest) returns (org.apache.custos.sharing.service.Status) {
-        option (google.api.http) = {
-           put: "/sharing-management/v1.0.0/permission/type"
-        };
-
-    }
-    rpc deletePermissionType (org.apache.custos.sharing.service.PermissionTypeRequest) returns (org.apache.custos.sharing.service.Status) {
-        option (google.api.http) = {
-           delete: "/sharing-management/v1.0.0/permission/type"
-        };
-
-    }
-    rpc getPermissionType (org.apache.custos.sharing.service.PermissionTypeRequest) returns (org.apache.custos.sharing.service.PermissionType) {
-        option (google.api.http) = {
-           get: "/sharing-management/v1.0.0/permission/type"
-        };
-
-    }
-    rpc getPermissionTypes (org.apache.custos.sharing.service.SearchRequest) returns (org.apache.custos.sharing.service.PermissionTypes) {
-        option (google.api.http) = {
-           get: "/sharing-management/v1.0.0/permission/types"
-        };
-
-    }
-
-    rpc createEntity (org.apache.custos.sharing.service.EntityRequest) returns (org.apache.custos.sharing.service.Status) {
-        option (google.api.http) = {
-           post: "/sharing-management/v1.0.0/entity"
-        };
-
-    }
-    rpc updateEntity (org.apache.custos.sharing.service.EntityRequest) returns (org.apache.custos.sharing.service.Status) {
-        option (google.api.http) = {
-           put: "/sharing-management/v1.0.0/entity"
-        };
-
-    }
-    rpc isEntityExists (org.apache.custos.sharing.service.EntityRequest) returns (org.apache.custos.sharing.service.Status) {
-        option (google.api.http) = {
-           get: "/sharing-management/v1.0.0/entity/existence"
-        };
-
-    }
-    rpc getEntity (org.apache.custos.sharing.service.EntityRequest) returns (org.apache.custos.sharing.service.Entity) {
-        option (google.api.http) = {
-           get: "/sharing-management/v1.0.0/entity"
-        };
-
-    }
-    rpc deleteEntity (org.apache.custos.sharing.service.EntityRequest) returns (org.apache.custos.sharing.service.Status) {
-        option (google.api.http) = {
-           delete: "/sharing-management/v1.0.0/entity"
-        };
-
-    }
-    rpc searchEntities (org.apache.custos.sharing.service.SearchRequest) returns (org.apache.custos.sharing.service.Entities) {
-        option (google.api.http) = {
-           post: "/sharing-management/v1.0.0/entities"
-        };
-
-    }
-
-
-    rpc getListOfSharedUsers (org.apache.custos.sharing.service.SharingRequest) returns (org.apache.custos.sharing.service.SharedOwners) {
-        option (google.api.http) = {
-           get: "/sharing-management/v1.0.0/users/share"
-        };
-
-    }
-    rpc getListOfDirectlySharedUsers (org.apache.custos.sharing.service.SharingRequest) returns (org.apache.custos.sharing.service.SharedOwners) {
-        option (google.api.http) = {
-           get: "/sharing-management/v1.0.0/users/share/direct"
-        };
-
-    }
-    rpc getListOfSharedGroups (org.apache.custos.sharing.service.SharingRequest) returns (org.apache.custos.sharing.service.SharedOwners) {
-        option (google.api.http) = {
-           get: "/sharing-management/v1.0.0/groups/share"
-        };
-
-    }
-    rpc getListOfDirectlySharedGroups (org.apache.custos.sharing.service.SharingRequest) returns (org.apache.custos.sharing.service.SharedOwners) {
-        option (google.api.http) = {
-           get: "/sharing-management/v1.0.0/groups/share/direct"
-        };
-
-    }
-
-    rpc getAllDirectSharings (org.apache.custos.sharing.service.SharingRequest) returns (org.apache.custos.sharing.service.GetAllDirectSharingsResponse) {
-        option (google.api.http) = {
-           get: "/sharing-management/v1.0.0/share/direct"
-        };
-
-    }
-
-    rpc getAllSharings (org.apache.custos.sharing.service.SharingRequest) returns (org.apache.custos.sharing.service.GetAllSharingsResponse) {
-        option (google.api.http) = {
-           get: "/sharing-management/v1.0.0/share"
-        };
-
-    }
-
-    rpc shareEntityWithUsers (org.apache.custos.sharing.service.SharingRequest) returns (org.apache.custos.sharing.service.Status) {
-        option (google.api.http) = {
-           post: "/sharing-management/v1.0.0/users/share"
-        };
-
-    }
-    rpc shareEntityWithGroups (org.apache.custos.sharing.service.SharingRequest) returns (org.apache.custos.sharing.service.Status) {
-        option (google.api.http) = {
-           post: "/sharing-management/v1.0.0/groups/share"
-        };
-
-    }
-    rpc revokeEntitySharingFromUsers (org.apache.custos.sharing.service.SharingRequest) returns (org.apache.custos.sharing.service.Status) {
-        option (google.api.http) = {
-           delete: "/sharing-management/v1.0.0/users/share"
-        };
-
-    }
-    rpc revokeEntitySharingFromGroups (org.apache.custos.sharing.service.SharingRequest) returns (org.apache.custos.sharing.service.Status) {
-        option (google.api.http) = {
-           delete: "/sharing-management/v1.0.0/groups/share"
-        };
-
-    }
-    rpc userHasAccess (org.apache.custos.sharing.service.SharingRequest) returns (org.apache.custos.sharing.service.Status) {
-        option (google.api.http) = {
-           get: "/sharing-management/v1.0.0/entity/user/access"
-        };
-
-    }
-
-
-
-}
\ No newline at end of file
diff --git a/custos-integration-services/tenant-management-service-parent/tenant-management-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/TenantManagementService.proto b/custos-integration-services/tenant-management-service-parent/tenant-management-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/TenantManagementService.proto
deleted file mode 100644
index 35e3324b..00000000
--- a/custos-integration-services/tenant-management-service-parent/tenant-management-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/TenantManagementService.proto
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-syntax = "proto3";
-
-option java_multiple_files = true;
-package org.apache.custos.tenant.management.service;
-option go_package = "./pb";
-
-import "google/api/annotations.proto";
-import "TenantProfileService.proto";
-import "google/rpc/error_details.proto";
-import "google/protobuf/empty.proto";
-import "IamAdminService.proto";
-import "FederatedAuthenticationService.proto";
-import "MessagingService.proto";
-import "EmailService.proto";
-
-
-message CreateTenantResponse {
-    string client_id = 1;
-    string client_secret = 2;
-    bool is_activated = 3;
-    double client_id_issued_at = 4;
-    double client_secret_expires_at = 5;
-    string registration_client_uri = 6;
-    string token_endpoint_auth_method = 17;
-    string msg = 7;
-}
-
-message GetTenantResponse {
-    string client_id = 1;
-    string client_name = 2;
-    string requester_email = 3;
-    string admin_first_name = 4;
-    string admin_last_name = 5;
-    string admin_email = 6;
-    repeated string contacts = 7;
-    repeated string redirect_uris = 8;
-    repeated string grant_types = 9;
-    double client_id_issued_at = 10;
-    string client_uri = 11;
-    string scope = 12;
-    string domain = 13;
-    string comment = 14;
-    string logo_uri = 15;
-    string application_type = 16;
-    string jwks_uri = 17;
-    string example_extension_parameter = 18;
-    string tos_uri = 19;
-    string policy_uri = 20;
-    map<string, string> jwks = 21;
-    string software_id = 22;
-    string software_version = 23;
-    string admin_username = 24;
-}
-
-
-message GetTenantRequest {
-    string client_id = 1;
-    int64 tenant_id = 2;
-    org.apache.custos.tenant.profile.service.Tenant tenant = 4;
-    Credentials credentials = 5;
-}
-
-
-message Credentials {
-    string iam_client_id = 1;
-    string iam_client_secret = 2;
-    string ci_logon_client_id = 3;
-    string ci_logon_client_secret = 4;
-    string custos_client_id = 5;
-    string custos_client_secret = 6;
-    double custos_client_id_issued_at = 7;
-    double custos_client_secret_expired_at = 8;
-}
-
-message UpdateTenantRequest {
-    string client_id = 1;
-    int64 tenant_id = 2;
-    Credentials credentials = 3;
-    org.apache.custos.tenant.profile.service.Tenant body = 4;
-}
-
-
-message DeleteTenantRequest {
-    string client_id = 1;
-    int64 tenant_id = 2;
-    Credentials credentials = 3;
-    org.apache.custos.tenant.profile.service.Tenant body = 4;
-}
-
-
-message GetCredentialsRequest {
-    int64 tenant_id = 1;
-}
-
-message GetCredentialsResponse {
-    string iam_client_id = 1;
-    string iam_client_secret = 2;
-    string ci_logon_client_id = 3;
-    string ci_logon_client_secret = 4;
-}
-
-
-message TenantValidationRequest {
-    string client_id = 1;
-    string client_sec = 2;
-
-}
-
-service TenantManagementService {
-
-    rpc createTenant (org.apache.custos.tenant.profile.service.Tenant) returns (CreateTenantResponse) {
-        option (google.api.http) = {
-           post: "/tenant-management/v1.0.0/oauth2/tenant"
-         };
-    }
-
-    rpc getTenant (GetTenantRequest) returns (org.apache.custos.tenant.profile.service.Tenant) {
-        option (google.api.http) = {
-           get: "/tenant-management/v1.0.0/oauth2/tenant"
-        };
-    }
-
-    rpc updateTenant (UpdateTenantRequest) returns (org.apache.custos.tenant.profile.service.Tenant) {
-        option (google.api.http) = {
-           put: "/tenant-management/v1.0.0/oauth2/tenant"
-           body: "body"
-        };
-    }
-
-
-    rpc deleteTenant (DeleteTenantRequest) returns (google.protobuf.Empty) {
-        option (google.api.http) = {
-           delete: "/tenant-management/v1.0.0/oauth2/tenant"
-        };
-    }
-
-    rpc validateTenant (TenantValidationRequest) returns (org.apache.custos.iam.service.OperationStatus) {
-        option (google.api.http) = {
-           post: "/tenant-management/v1.0.0/tenant/credentials/status"
-        };
-    }
-
-    rpc addTenantRoles (org.apache.custos.iam.service.AddRolesRequest) returns (org.apache.custos.iam.service.AllRoles) {
-        option (google.api.http) = {
-           post: "/tenant-management/v1.0.0/roles"
-        };
-    }
-
-    rpc getTenantRoles (org.apache.custos.iam.service.GetRolesRequest) returns (org.apache.custos.iam.service.AllRoles) {
-        option (google.api.http) = {
-           get: "/tenant-management/v1.0.0/roles"
-        };
-    }
-
-    rpc deleteRole (org.apache.custos.iam.service.DeleteRoleRequest) returns (org.apache.custos.iam.service.OperationStatus) {
-        option (google.api.http) = {
-           delete: "/tenant-management/v1.0.0/role"
-        };
-    }
-
-    rpc addProtocolMapper (org.apache.custos.iam.service.AddProtocolMapperRequest) returns (org.apache.custos.iam.service.OperationStatus) {
-        option (google.api.http) = {
-           post: "/tenant-management/v1.0.0/protocol/mapper"
-        };
-    }
-
-    rpc configureEventPersistence (org.apache.custos.iam.service.EventPersistenceRequest) returns (org.apache.custos.iam.service.OperationStatus) {
-        option (google.api.http) = {
-           post: "/tenant-management/v1.0.0/events"
-        };
-    }
-
-    rpc enableMessaging(org.apache.custos.messaging.service.MessageEnablingRequest) returns (org.apache.custos.messaging.service.MessageEnablingResponse) {
-        option (google.api.http) = {
-           post: "/tenant-management/v1.0.0/messaging"
-        };
-    }
-
-
-    rpc updateTenantStatus (org.apache.custos.tenant.profile.service.UpdateStatusRequest) returns (org.apache.custos.tenant.profile.service.UpdateStatusResponse) {
-        option (google.api.http) = {
-           post: "/tenant-management/v1.0.0/status"
-        };
-    }
-
-    rpc getAllTenants (org.apache.custos.tenant.profile.service.GetTenantsRequest) returns (org.apache.custos.tenant.profile.service.GetAllTenantsResponse) {
-        option (google.api.http) = {
-           get: "/tenant-management/v1.0.0/tenants"
-        };
-    }
-
-    rpc getChildTenants (org.apache.custos.tenant.profile.service.GetTenantsRequest) returns (org.apache.custos.tenant.profile.service.GetAllTenantsResponse) {
-        option (google.api.http) = {
-           get: "/tenant-management/v1.0.0/child/tenants"
-        };
-    }
-
-    rpc getAllTenantsForUser (org.apache.custos.tenant.profile.service.GetAllTenantsForUserRequest) returns (org.apache.custos.tenant.profile.service.GetAllTenantsForUserResponse) {
-        option (google.api.http) = {
-           get: "/tenant-management/v1.0.0/tenants/{requesterEmail}"
-        };
-    }
-    rpc getTenantStatusUpdateAuditTrail (org.apache.custos.tenant.profile.service.GetAuditTrailRequest) returns (org.apache.custos.tenant.profile.service.GetStatusUpdateAuditTrailResponse) {
-        option (google.api.http) = {
-           get: "/tenant-management/v1.0.0/audit/status/{tenantId}"
-        };
-    }
-    rpc getTenantAttributeUpdateAuditTrail (org.apache.custos.tenant.profile.service.GetAuditTrailRequest) returns (org.apache.custos.tenant.profile.service.GetAttributeUpdateAuditTrailResponse) {
-        option (google.api.http) = {
-           get: "/tenant-management/v1.0.0/audit/attributes/{tenantId}"
-        };
-    }
-
-
-    rpc addToCache (org.apache.custos.federated.authentication.service.CacheManipulationRequest) returns (org.apache.custos.federated.authentication.service.Status) {
-        option (google.api.http) = {
-           post: "/tenant-management/v1.0.0/cache/institutions/CILogon"
-        };
-
-    }
-    rpc removeFromCache (org.apache.custos.federated.authentication.service.CacheManipulationRequest) returns (org.apache.custos.federated.authentication.service.Status) {
-        option (google.api.http) = {
-           delete: "/tenant-management/v1.0.0/cache/institutions/CILogon"
-        };
-
-    }
-    rpc getFromCache (org.apache.custos.federated.authentication.service.CacheManipulationRequest) returns (org.apache.custos.federated.authentication.service.GetInstitutionsResponse) {
-        option (google.api.http) = {
-           get: "/tenant-management/v1.0.0/cache/institutions/CILogon"
-        };
-
-    }
-    rpc getInstitutions (org.apache.custos.federated.authentication.service.CacheManipulationRequest) returns (org.apache.custos.federated.authentication.service.GetInstitutionsResponse) {
-        option (google.api.http) = {
-           get: "/tenant-management/v1.0.0/institutions/CILogon"
-        };
-    }
-
-
-    rpc enableEmail(org.apache.custos.messaging.email.service.EmailEnablingRequest) returns (org.apache.custos.messaging.email.service.EmailTemplate) {
-        option (google.api.http) = {
-           post: "/tenant-management/v1.0.0/email/activation"
-        };
-    }
-
-    rpc disableEmail(org.apache.custos.messaging.email.service.EmailDisablingRequest) returns (org.apache.custos.messaging.email.service.Status) {
-        option (google.api.http) = {
-           post: "/tenant-management/v1.0.0/email/deactivation"
-        };
-    }
-
-    rpc getEmailTemplates(org.apache.custos.messaging.email.service.FetchEmailTemplatesRequest) returns (org.apache.custos.messaging.email.service.FetchEmailTemplatesResponse) {
-        option (google.api.http) = {
-           get: "/tenant-management/v1.0.0/email/templates"
-        };
-    }
-
-    rpc getEmailFriendlyEvents(org.apache.custos.messaging.email.service.FetchEmailFriendlyEvents) returns (org.apache.custos.messaging.email.service.FetchEmailFriendlyEventsResponse) {
-        option (google.api.http) = {
-           get: "/tenant-management/v1.0.0/email/events"
-        };
-    }
-
-
-}
\ No newline at end of file
diff --git a/custos-integration-services/user-management-service-parent/user-management-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/UserManagementService.proto b/custos-integration-services/user-management-service-parent/user-management-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/UserManagementService.proto
deleted file mode 100644
index 6bbf423c..00000000
--- a/custos-integration-services/user-management-service-parent/user-management-service/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos/UserManagementService.proto
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-syntax = "proto3";
-
-option java_multiple_files = true;
-package org.apache.custos.user.management.service;
-option go_package = "./pb";
-import "google/api/annotations.proto";
-import "UserProfileService.proto";
-import "IamAdminService.proto";
-
-
-message UserProfileRequest {
-    org.apache.custos.user.profile.service.UserProfile user_profile = 1;
-    string client_id = 2;
-    int64 tenant_id = 3;
-    string access_token = 4;
-    string client_secret = 5;
-    string performed_by = 6;
-    int32 limit = 7;
-    int32 offset=8;
-}
-
-message GetUserRequest {
-    string username = 1;
-    org.apache.custos.iam.service.UserSearchRequest user_search_request = 2;
-}
-
-message GetUsersRequest {
-    int64 tenant_id = 1;
-    string email = 2;
-    string username = 3;
-    int32 offset = 4;
-    int32 limit = 5;
-    string search = 6;
-    string iam_client_id = 7;
-    string iam_client_secret = 8;
-}
-
-message ResetPassword {
-    int64 tenant_id = 1;
-    string access_token = 2;
-    string username = 3;
-    string password = 4;
-    string iam_client_id = 5;
-    string iam_client_secret = 6;
-}
-
-message ResetPasswordRequest {
-    ResetPassword password_metadata = 1;
-}
-
-message LinkUserProfileRequest {
-    string current_username = 1;
-    string previous_username = 2;
-    repeated string linking_attributes = 3;
-    int64 tenantId = 4;
-    string iam_client_id = 5;
-    string iam_client_secret = 6;
-    string access_token = 7;
-    string performed_by = 8;
-}
-
-message SynchronizeUserDBRequest {
-    int64 tenant_id = 2;
-    string client_id = 4;
-}
-
-service UserManagementService {
-
-    rpc registerUser (org.apache.custos.iam.service.RegisterUserRequest) returns (org.apache.custos.iam.service.RegisterUserResponse) {
-        option (google.api.http) = {
-           post: "/user-management/v1.0.0/user"
-           body: "user"
-         };
-    }
-
-    rpc registerAndEnableUsers (org.apache.custos.iam.service.RegisterUsersRequest) returns (org.apache.custos.iam.service.RegisterUsersResponse) {
-        option (google.api.http) = {
-           post: "/user-management/v1.0.0/users"
-           body: "users"
-         };
-    }
-
-    rpc addUserAttributes (org.apache.custos.iam.service.AddUserAttributesRequest) returns (org.apache.custos.iam.service.OperationStatus) {
-        option (google.api.http) = {
-           post: "/user-management/v1.0.0/attributes"
-         };
-    }
-
-    rpc deleteUserAttributes (org.apache.custos.iam.service.DeleteUserAttributeRequest) returns (org.apache.custos.iam.service.OperationStatus) {
-        option (google.api.http) = {
-           delete: "/user-management/v1.0.0/attributes"
-         };
-    }
-
-    rpc enableUser (org.apache.custos.iam.service.UserSearchRequest) returns (org.apache.custos.iam.service.UserRepresentation) {
-        option (google.api.http) = {
-           post: "/user-management/v1.0.0/user/activation"
-           body: "user"
-         };
-    }
-
-    rpc disableUser (org.apache.custos.iam.service.UserSearchRequest) returns (org.apache.custos.iam.service.UserRepresentation) {
-        option (google.api.http) = {
-           post: "/user-management/v1.0.0/user/deactivation"
-           body: "user"
-         };
-    }
-
-    rpc grantAdminPrivileges (org.apache.custos.iam.service.UserSearchRequest) returns (org.apache.custos.iam.service.OperationStatus) {
-        option (google.api.http) = {
-           post: "/user-management/v1.0.0/user/admin"
-           body: "user"
-         };
-    }
-
-    rpc removeAdminPrivileges (org.apache.custos.iam.service.UserSearchRequest) returns (org.apache.custos.iam.service.OperationStatus) {
-        option (google.api.http) = {
-           delete: "/user-management/v1.0.0/user/admin"
-           body: "user"
-         };
-    }
-
-
-    rpc deleteExternalIDPsOfUsers (org.apache.custos.iam.service.DeleteExternalIDPsRequest) returns (org.apache.custos.iam.service.OperationStatus) {
-        option (google.api.http) = {
-           delete: "/user-management/v1.0.0/users/federatedIDPs"
-         };
-    }
-
-    rpc addExternalIDPsOfUsers (org.apache.custos.iam.service.AddExternalIDPLinksRequest) returns (org.apache.custos.iam.service.OperationStatus) {
-        option (google.api.http) = {
-           post: "/user-management/v1.0.0/users/federatedIDPs"
-         };
-    }
-
-
-    rpc getExternalIDPsOfUsers (org.apache.custos.iam.service.GetExternalIDPsRequest) returns (org.apache.custos.iam.service.GetExternalIDPsResponse) {
-        option (google.api.http) = {
-           get: "/user-management/v1.0.0/users/federatedIDPs"
-         };
-    }
-
-    rpc addRolesToUsers (org.apache.custos.iam.service.AddUserRolesRequest) returns (org.apache.custos.iam.service.OperationStatus) {
-        option (google.api.http) = {
-           post: "/user-management/v1.0.0/users/roles"
-         };
-    }
-
-    rpc isUserEnabled (org.apache.custos.iam.service.UserSearchRequest) returns (org.apache.custos.iam.service.OperationStatus) {
-        option (google.api.http) = {
-           get: "/user-management/v1.0.0/user/activation/status"
-         };
-
-    }
-
-    rpc isUsernameAvailable (org.apache.custos.iam.service.UserSearchRequest) returns (org.apache.custos.iam.service.OperationStatus) {
-        option (google.api.http) = {
-           get: "/user-management/v1.0.0/user/availability"
-         };
-    }
-
-
-    rpc getUser (org.apache.custos.iam.service.UserSearchRequest) returns (org.apache.custos.iam.service.UserRepresentation) {
-        option (google.api.http) = {
-           get: "/user-management/v1.0.0/user"
-         };
-
-    }
-
-    rpc findUsers (org.apache.custos.iam.service.FindUsersRequest) returns (org.apache.custos.iam.service.FindUsersResponse) {
-        option (google.api.http) = {
-           get: "/user-management/v1.0.0/users"
-         };
-
-    }
-
-    rpc resetPassword (org.apache.custos.iam.service.ResetUserPassword) returns (org.apache.custos.iam.service.OperationStatus) {
-        option (google.api.http) = {
-           put: "/user-management/v1.0.0/user/password"
-         };
-
-    }
-
-
-    rpc deleteUser (org.apache.custos.iam.service.UserSearchRequest) returns (org.apache.custos.iam.service.OperationStatus) {
-        option (google.api.http) = {
-           delete: "/user-management/v1.0.0/user"
-           body: "user"
-         };
-
-    }
-
-
-    rpc deleteUserRoles (org.apache.custos.iam.service.DeleteUserRolesRequest) returns (org.apache.custos.iam.service.OperationStatus) {
-        option (google.api.http) = {
-           delete: "/user-management/v1.0.0/user/roles"
-         };
-    }
-
-
-    rpc updateUserProfile (UserProfileRequest) returns (org.apache.custos.user.profile.service.UserProfile) {
-
-        option (google.api.http) = {
-           put: "/user-management/v1.0.0/user/profile"
-           body: "user_profile"
-         };
-    }
-
-    rpc getUserProfile (UserProfileRequest) returns (org.apache.custos.user.profile.service.UserProfile) {
-
-        option (google.api.http) = {
-           get: "/user-management/v1.0.0/user/profile"
-         };
-    }
-    rpc deleteUserProfile (UserProfileRequest) returns (org.apache.custos.user.profile.service.UserProfile) {
-
-        option (google.api.http) = {
-           delete: "/user-management/v1.0.0/user/profile"
-         };
-
-    }
-    rpc getAllUserProfilesInTenant (UserProfileRequest) returns (org.apache.custos.user.profile.service.GetAllUserProfilesResponse) {
-
-        option (google.api.http) = {
-           get: "/user-management/v1.0.0/users/profile"
-         };
-
-
-    }
-
-    rpc linkUserProfile (LinkUserProfileRequest) returns (org.apache.custos.iam.service.OperationStatus) {
-
-        option (google.api.http) = {
-           post: "/user-management/v1.0.0/user/profile/mapper"
-         };
-
-
-    }
-
-
-    rpc getUserProfileAuditTrails (org.apache.custos.user.profile.service.GetUpdateAuditTrailRequest) returns (org.apache.custos.user.profile.service.GetUpdateAuditTrailResponse) {
-
-        option (google.api.http) = {
-           get: "/user-management/v1.0.0/user/profile/audit"
-         };
-
-    }
-
-    rpc synchronizeUserDBs (SynchronizeUserDBRequest) returns (org.apache.custos.iam.service.OperationStatus) {
-        option (google.api.http) = {
-           post: "/user-management/v1.0.0/db/synchronize"
-        };
-    }
-
-}
-
-
-
-
diff --git a/pom.xml b/pom.xml
index 7ffdbf4e..8ef92911 100644
--- a/pom.xml
+++ b/pom.xml
@@ -299,35 +299,35 @@
                             <release>${java.version}</release>
                         </configuration>
                     </plugin>
-                    <plugin>
-                        <artifactId>maven-resources-plugin</artifactId>
-                        <version>3.0.2</version>
-                        <executions>
-                            <execution>
-                                <id>copy-resources</id>
-                                <!-- here the phase you need -->
-                                <phase>install</phase>
-                                <goals>
-                                    <goal>copy-resources</goal>
-                                </goals>
-                                <configuration>
-                                    <outputDirectory>
-                                        ${project.basedir}/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos
-                                    </outputDirectory>   <!-- output directory -->
-                                    <resources>
-                                        <resource>
-                                            <directory>${basedir}/src/main/proto
-                                            </directory>         <!-- source directory -->
-                                            <includes>
-                                                <include>**/*.proto</include>
-                                            </includes>
-                                            <filtering>true</filtering>
-                                        </resource>
-                                    </resources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
+<!--                    <plugin>-->
+<!--                        <artifactId>maven-resources-plugin</artifactId>-->
+<!--                        <version>3.0.2</version>-->
+<!--                        <executions>-->
+<!--                            <execution>-->
+<!--                                <id>copy-resources</id>-->
+<!--                                &lt;!&ndash; here the phase you need &ndash;&gt;-->
+<!--                                <phase>install</phase>-->
+<!--                                <goals>-->
+<!--                                    <goal>copy-resources</goal>-->
+<!--                                </goals>-->
+<!--                                <configuration>-->
+<!--                                    <outputDirectory>-->
+<!--                                        ${project.basedir}/custos-integration-services/custos-integration-services-swagger/src/main/resources/protos-->
+<!--                                    </outputDirectory>   &lt;!&ndash; output directory &ndash;&gt;-->
+<!--                                    <resources>-->
+<!--                                        <resource>-->
+<!--                                            <directory>${basedir}/src/main/proto-->
+<!--                                            </directory>         &lt;!&ndash; source directory &ndash;&gt;-->
+<!--                                            <includes>-->
+<!--                                                <include>**/*.proto</include>-->
+<!--                                            </includes>-->
+<!--                                            <filtering>true</filtering>-->
+<!--                                        </resource>-->
+<!--                                    </resources>-->
+<!--                                </configuration>-->
+<!--                            </execution>-->
+<!--                        </executions>-->
+<!--                    </plugin>-->
                     <plugin>
                         <groupId>org.xolstice.maven.plugins</groupId>
                         <artifactId>protobuf-maven-plugin</artifactId>