Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Go enforcer #2670

Merged
merged 2 commits into from
Jan 2, 2025
Merged

Go enforcer #2670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8f66c3
move server models to common go libs
Dec 20, 2024
1d74110
Add notification handler
Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 25 additions & 22 deletions common-controller/internal/controlplane/artifact_deployer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,32 +16,35 @@
*/
package controlplane

import "github.com/wso2/apk/common-controller/internal/server"
import (
"github.com/wso2/apk/common-go-libs/pkg/server/model"
)


// ArtifactDeployer is an interface that defines the methods that should be implemented by an artifact deployer
type ArtifactDeployer interface {
DeployApplication(application server.Application) error
UpdateApplication(application server.Application) error
DeploySubscription(subscription server.Subscription) error
UpdateSubscription(subscription server.Subscription) error
DeployApplicationMappings(applicationMapping server.ApplicationMapping) error
UpdateApplicationMappings(applicationMapping server.ApplicationMapping) error
DeployKeyMappings(keyMapping server.ApplicationKeyMapping) error
UpdateKeyMappings(keyMapping server.ApplicationKeyMapping) error
GetApplication(applicationID string) (server.Application, error)
GetSubscription(subscriptionID string) (server.Subscription, error)
GetApplicationMappings(applicationID string) (server.ApplicationMapping, error)
GetKeyMappings(applicationID string) (server.ApplicationKeyMapping, error)
GetAllApplications() (server.ApplicationList, error)
GetAllSubscriptions() (server.SubscriptionList, error)
GetAllApplicationMappings() (server.ApplicationMappingList, error)
GetAllKeyMappings() (server.ApplicationKeyMappingList, error)
DeployApplication(application model.Application) error
UpdateApplication(application model.Application) error
DeploySubscription(subscription model.Subscription) error
UpdateSubscription(subscription model.Subscription) error
DeployApplicationMappings(applicationMapping model.ApplicationMapping) error
UpdateApplicationMappings(applicationMapping model.ApplicationMapping) error
DeployKeyMappings(keyMapping model.ApplicationKeyMapping) error
UpdateKeyMappings(keyMapping model.ApplicationKeyMapping) error
GetApplication(applicationID string) (model.Application, error)
GetSubscription(subscriptionID string) (model.Subscription, error)
GetApplicationMappings(applicationID string) (model.ApplicationMapping, error)
GetKeyMappings(applicationID string) (model.ApplicationKeyMapping, error)
GetAllApplications() (model.ApplicationList, error)
GetAllSubscriptions() (model.SubscriptionList, error)
GetAllApplicationMappings() (model.ApplicationMappingList, error)
GetAllKeyMappings() (model.ApplicationKeyMappingList, error)
DeleteApplication(applicationID string) error
DeleteSubscription(subscriptionID string) error
DeleteApplicationMappings(applicationID string) error
DeleteKeyMappings(keyMapping server.ApplicationKeyMapping) error
DeployAllApplications(applications server.ApplicationList) error
DeployAllSubscriptions(subscriptions server.SubscriptionList) error
DeployAllApplicationMappings(applicationMappings server.ApplicationMappingList) error
DeployAllKeyMappings(keyMappings server.ApplicationKeyMappingList) error
DeleteKeyMappings(keyMapping model.ApplicationKeyMapping) error
DeployAllApplications(applications model.ApplicationList) error
DeployAllSubscriptions(subscriptions model.SubscriptionList) error
DeployAllApplicationMappings(applicationMappings model.ApplicationMappingList) error
DeployAllKeyMappings(keyMappings model.ApplicationKeyMappingList) error
}
56 changes: 28 additions & 28 deletions common-controller/internal/controlplane/controlplane_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
grpc_retry "github.com/grpc-ecosystem/go-grpc-middleware/retry"
"github.com/wso2/apk/common-controller/internal/config"
"github.com/wso2/apk/common-controller/internal/loggers"
"github.com/wso2/apk/common-controller/internal/server"
"github.com/wso2/apk/common-go-libs/pkg/server/model"
"github.com/wso2/apk/common-controller/internal/utils"
"github.com/wso2/apk/common-go-libs/constants"
apkmgt "github.com/wso2/apk/common-go-libs/pkg/discovery/api/wso2/discovery/service/apkmgt"
Expand Down Expand Up @@ -172,7 +172,7 @@ func (controlPlaneGrpcClient *Agent) handleEvents(event *subscription.Event) {
} else if event.Type == constants.ApplicationCreated {
loggers.LoggerAPKOperator.Infof("Received APPLICATION_CREATED event.")
if event.Application != nil {
application := server.Application{UUID: event.Application.Uuid,
application := model.Application{UUID: event.Application.Uuid,
Name: event.Application.Name,
Owner: event.Application.Owner,
OrganizationID: event.Application.Organization,
Expand All @@ -184,7 +184,7 @@ func (controlPlaneGrpcClient *Agent) handleEvents(event *subscription.Event) {
}
} else if event.Type == constants.ApplicationUpdated {
if event.Application != nil {
application := server.Application{UUID: event.Application.Uuid,
application := model.Application{UUID: event.Application.Uuid,
Name: event.Application.Name,
Owner: event.Application.Owner,
OrganizationID: event.Application.Organization,
Expand All @@ -195,7 +195,7 @@ func (controlPlaneGrpcClient *Agent) handleEvents(event *subscription.Event) {
}
} else if event.Type == constants.ApplicationDeleted {
if event.Application != nil {
application := server.Application{UUID: event.Application.Uuid,
application := model.Application{UUID: event.Application.Uuid,
Name: event.Application.Name,
Owner: event.Application.Owner,
OrganizationID: event.Application.Organization,
Expand All @@ -207,10 +207,10 @@ func (controlPlaneGrpcClient *Agent) handleEvents(event *subscription.Event) {
} else if event.Type == constants.SubscriptionCreated {
loggers.LoggerAPKOperator.Infof("Received SUBSCRIPTION_CREATED event.")
if event.Subscription != nil {
subscription := server.Subscription{UUID: event.Subscription.Uuid,
subscription := model.Subscription{UUID: event.Subscription.Uuid,
Organization: event.Subscription.Organization,
SubStatus: event.Subscription.SubStatus,
SubscribedAPI: &server.SubscribedAPI{Name: event.Subscription.SubscribedApi.Name, Version: event.Subscription.SubscribedApi.Version},
SubscribedAPI: &model.SubscribedAPI{Name: event.Subscription.SubscribedApi.Name, Version: event.Subscription.SubscribedApi.Version},
RatelimitTier: event.Subscription.RatelimitTier,
}
loggers.LoggerAPKOperator.Infof("Received Subscription %s", subscription.UUID)
Expand All @@ -219,10 +219,10 @@ func (controlPlaneGrpcClient *Agent) handleEvents(event *subscription.Event) {
} else if event.Type == constants.SubscriptionUpdated {
loggers.LoggerAPKOperator.Infof("Received SUBSCRIPTION_UPDATED event.")
if event.Subscription != nil {
subscription := server.Subscription{UUID: event.Subscription.Uuid,
subscription := model.Subscription{UUID: event.Subscription.Uuid,
Organization: event.Subscription.Organization,
SubStatus: event.Subscription.SubStatus,
SubscribedAPI: &server.SubscribedAPI{Name: event.Subscription.SubscribedApi.Name, Version: event.Subscription.SubscribedApi.Version},
SubscribedAPI: &model.SubscribedAPI{Name: event.Subscription.SubscribedApi.Name, Version: event.Subscription.SubscribedApi.Version},
RatelimitTier: event.Subscription.RatelimitTier,
}
loggers.LoggerAPKOperator.Infof("Received Subscription %s", subscription.UUID)
Expand All @@ -231,18 +231,18 @@ func (controlPlaneGrpcClient *Agent) handleEvents(event *subscription.Event) {
} else if event.Type == constants.SubscriptionDeleted {
loggers.LoggerAPKOperator.Infof("Received SUBSCRIPTION_DELETED event.")
if event.Subscription != nil {
subscription := server.Subscription{UUID: event.Subscription.Uuid,
subscription := model.Subscription{UUID: event.Subscription.Uuid,
Organization: event.Subscription.Organization,
SubStatus: event.Subscription.SubStatus,
SubscribedAPI: &server.SubscribedAPI{Name: event.Subscription.SubscribedApi.Name, Version: event.Subscription.SubscribedApi.Version},
SubscribedAPI: &model.SubscribedAPI{Name: event.Subscription.SubscribedApi.Name, Version: event.Subscription.SubscribedApi.Version},
}
loggers.LoggerAPKOperator.Infof("Received Subscription %s", subscription.UUID)
controlPlaneGrpcClient.artifactDeployer.DeleteSubscription(subscription.UUID)
}
} else if event.Type == constants.ApplicationKeyMappingCreated {
loggers.LoggerAPKOperator.Infof("Received APPLICATION_KEY_MAPPING_CREATED event.")
if event.ApplicationKeyMapping != nil {
applicationKeyMapping := server.ApplicationKeyMapping{ApplicationUUID: event.ApplicationKeyMapping.ApplicationUUID,
applicationKeyMapping := model.ApplicationKeyMapping{ApplicationUUID: event.ApplicationKeyMapping.ApplicationUUID,
SecurityScheme: event.ApplicationKeyMapping.SecurityScheme,
ApplicationIdentifier: event.ApplicationKeyMapping.ApplicationIdentifier,
KeyType: event.ApplicationKeyMapping.KeyType,
Expand All @@ -255,7 +255,7 @@ func (controlPlaneGrpcClient *Agent) handleEvents(event *subscription.Event) {
} else if event.Type == constants.ApplicationKeyMappingDeleted {
loggers.LoggerAPKOperator.Infof("Received APPLICATION_KEY_MAPPING_DELETED event.")
if event.ApplicationKeyMapping != nil {
applicationKeyMapping := server.ApplicationKeyMapping{ApplicationUUID: event.ApplicationKeyMapping.ApplicationUUID,
applicationKeyMapping := model.ApplicationKeyMapping{ApplicationUUID: event.ApplicationKeyMapping.ApplicationUUID,
SecurityScheme: event.ApplicationKeyMapping.SecurityScheme,
ApplicationIdentifier: event.ApplicationKeyMapping.ApplicationIdentifier,
KeyType: event.ApplicationKeyMapping.KeyType,
Expand All @@ -268,7 +268,7 @@ func (controlPlaneGrpcClient *Agent) handleEvents(event *subscription.Event) {
} else if event.Type == constants.ApplicationMappingCreated {
loggers.LoggerAPKOperator.Infof("Received APPLICATION_MAPPING_CREATED event.")
if event.ApplicationMapping != nil {
applicationMapping := server.ApplicationMapping{UUID: event.ApplicationMapping.Uuid,
applicationMapping := model.ApplicationMapping{UUID: event.ApplicationMapping.Uuid,
ApplicationRef: event.ApplicationMapping.ApplicationRef,
SubscriptionRef: event.ApplicationMapping.SubscriptionRef,
OrganizationID: event.ApplicationMapping.Organization,
Expand All @@ -279,7 +279,7 @@ func (controlPlaneGrpcClient *Agent) handleEvents(event *subscription.Event) {
} else if event.Type == constants.ApplicationMappingDeleted {
loggers.LoggerAPKOperator.Infof("Received APPLICATION_MAPPING_DELETED event.")
if event.ApplicationMapping != nil {
applicationMapping := server.ApplicationMapping{UUID: event.ApplicationMapping.Uuid,
applicationMapping := model.ApplicationMapping{UUID: event.ApplicationMapping.Uuid,
ApplicationRef: event.ApplicationMapping.ApplicationRef,
SubscriptionRef: event.ApplicationMapping.SubscriptionRef,
OrganizationID: event.ApplicationMapping.Organization,
Expand All @@ -290,7 +290,7 @@ func (controlPlaneGrpcClient *Agent) handleEvents(event *subscription.Event) {
} else if event.Type == constants.ApplicationMappingUpdated {
loggers.LoggerAPKOperator.Infof("Received APPLICATION_MAPPING_UPDATED event.")
if event.ApplicationMapping != nil {
applicationMapping := server.ApplicationMapping{UUID: event.ApplicationMapping.Uuid,
applicationMapping := model.ApplicationMapping{UUID: event.ApplicationMapping.Uuid,
ApplicationRef: event.ApplicationMapping.ApplicationRef,
SubscriptionRef: event.ApplicationMapping.SubscriptionRef,
OrganizationID: event.ApplicationMapping.Organization,
Expand All @@ -301,7 +301,7 @@ func (controlPlaneGrpcClient *Agent) handleEvents(event *subscription.Event) {
} else if event.Type == constants.ApplicationKeyMappingUpdated {
loggers.LoggerAPKOperator.Infof("Received APPLICATION_KEY_MAPPING_UPDATED event.")
if event.ApplicationKeyMapping != nil {
applicationKeyMapping := server.ApplicationKeyMapping{ApplicationUUID: event.ApplicationKeyMapping.ApplicationUUID,
applicationKeyMapping := model.ApplicationKeyMapping{ApplicationUUID: event.ApplicationKeyMapping.ApplicationUUID,
SecurityScheme: event.ApplicationKeyMapping.SecurityScheme,
ApplicationIdentifier: event.ApplicationKeyMapping.ApplicationIdentifier,
KeyType: event.ApplicationKeyMapping.KeyType,
Expand Down Expand Up @@ -470,37 +470,37 @@ func (controlPlaneGrpcClient *Agent) retrieveDataFromResponseChannel(response re
}
}
}
func marshalMultipleSubscriptions(subList *SubscriptionList) server.SubscriptionList {
subscriptionList := server.SubscriptionList{List: []server.Subscription{}}
func marshalMultipleSubscriptions(subList *SubscriptionList) model.SubscriptionList {
subscriptionList := model.SubscriptionList{List: []model.Subscription{}}
for _, subscription := range subList.List {
loggers.LoggerAPI.Debugf("Subscription: %v", subscription)
subscriptionList.List = append(subscriptionList.List, server.Subscription{UUID: subscription.UUID, Organization: subscription.Organization, SubStatus: subscription.SubStatus, SubscribedAPI: &server.SubscribedAPI{Name: subscription.SubscribedAPI.Name, Version: subscription.SubscribedAPI.Version}})
subscriptionList.List = append(subscriptionList.List, model.Subscription{UUID: subscription.UUID, Organization: subscription.Organization, SubStatus: subscription.SubStatus, SubscribedAPI: &model.SubscribedAPI{Name: subscription.SubscribedAPI.Name, Version: subscription.SubscribedAPI.Version}})
}
return subscriptionList
}
func marshalMultipleApplications(appList *ApplicationList) server.ApplicationList {
applicationList := server.ApplicationList{List: []server.Application{}}
func marshalMultipleApplications(appList *ApplicationList) model.ApplicationList {
applicationList := model.ApplicationList{List: []model.Application{}}
for _, application := range appList.List {
loggers.LoggerAPI.Debugf("Application: %v", application)
applicationList.List = append(applicationList.List, server.Application{UUID: application.UUID, Name: application.Name, Owner: application.Owner, OrganizationID: application.Organization, Attributes: application.Attributes})
applicationList.List = append(applicationList.List, model.Application{UUID: application.UUID, Name: application.Name, Owner: application.Owner, OrganizationID: application.Organization, Attributes: application.Attributes})
}
return applicationList
}
func marshalMultipleApplicationKeyMappings(appList *ApplicationList) server.ApplicationKeyMappingList {
applicationKeyMappingList := server.ApplicationKeyMappingList{List: []server.ApplicationKeyMapping{}}
func marshalMultipleApplicationKeyMappings(appList *ApplicationList) model.ApplicationKeyMappingList {
applicationKeyMappingList := model.ApplicationKeyMappingList{List: []model.ApplicationKeyMapping{}}
for _, application := range appList.List {
loggers.LoggerAPI.Debugf("Application: %v", application)
for _, securityScheme := range application.SecuritySchemes {
applicationKeyMappingList.List = append(applicationKeyMappingList.List, server.ApplicationKeyMapping{ApplicationUUID: application.UUID, SecurityScheme: securityScheme.SecurityScheme, ApplicationIdentifier: securityScheme.ApplicationIdentifier, KeyType: securityScheme.KeyType, EnvID: securityScheme.EnvID, OrganizationID: application.Organization})
applicationKeyMappingList.List = append(applicationKeyMappingList.List, model.ApplicationKeyMapping{ApplicationUUID: application.UUID, SecurityScheme: securityScheme.SecurityScheme, ApplicationIdentifier: securityScheme.ApplicationIdentifier, KeyType: securityScheme.KeyType, EnvID: securityScheme.EnvID, OrganizationID: application.Organization})
}
}
return applicationKeyMappingList
}
func marshalMultipleApplicationMappings(appMappingList *ApplicationMappingList) server.ApplicationMappingList {
applicationMappingList := server.ApplicationMappingList{List: []server.ApplicationMapping{}}
func marshalMultipleApplicationMappings(appMappingList *ApplicationMappingList) model.ApplicationMappingList {
applicationMappingList := model.ApplicationMappingList{List: []model.ApplicationMapping{}}
for _, applicationMapping := range appMappingList.List {
loggers.LoggerAPI.Debugf("ApplicationMapping: %v", applicationMapping)
applicationMappingList.List = append(applicationMappingList.List, server.ApplicationMapping{UUID: applicationMapping.UUID, ApplicationRef: applicationMapping.ApplicationRef, SubscriptionRef: applicationMapping.SubscriptionRef, OrganizationID: applicationMapping.Organization})
applicationMappingList.List = append(applicationMappingList.List, model.ApplicationMapping{UUID: applicationMapping.UUID, ApplicationRef: applicationMapping.ApplicationRef, SubscriptionRef: applicationMapping.SubscriptionRef, OrganizationID: applicationMapping.Organization})
}
return applicationMappingList
}
Loading
Loading