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

Jump to bottom

Support multiple different APIs from the same service in a call chain #37

Merged
merged 1 commit into from
Aug 2, 2024
Merged

Support multiple different APIs from the same service in a call chain #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions service/servicemessagehandler/servicemessagehandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ func (rd *ServiceMessageHandler) sendMessage(ctx context.Context, serviceName st
return nil
}

func (rd *ServiceMessageHandler) DispatchTraTVerificationRule(ctx context.Context, serviceName string, namespace string, verificationEndpointRule *v1alpha1.TraTVerificationRule, versionNumber int64) error {
jsonData, err := json.Marshal(verificationEndpointRule)
func (rd *ServiceMessageHandler) DispatchTraTVerificationRule(ctx context.Context, serviceName string, namespace string, serviceTraTVerificationRules *v1alpha1.ServiceTraTVerificationRules, versionNumber int64) error {
jsonData, err := json.Marshal(serviceTraTVerificationRules)
if err != nil {
return fmt.Errorf("error marshaling verification trat rule: %w", err)
}
Expand Down
4 changes: 2 additions & 2 deletions service/tratteriacontroller/controller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,14 +371,14 @@ func (c *Controller) GetActiveVerificationRules(serviceName string, namespace st
return nil, 0, err
}

traTVerificationRules, err := c.GetActiveTraTsVerificationRules(serviceName, namespace)
traTsVerificationRules, err := c.GetActiveTraTsVerificationRules(serviceName, namespace)
if err != nil {
return nil, 0, err
}

return &tratteria1alpha1.VerificationRules{
TratteriaConfigVerificationRule: tratteriaConfigVerificationRule,
TraTsVerificationRules: traTVerificationRules,
TraTsVerificationRules: traTsVerificationRules,
},
activeRuleVersionNumber,
nil
Expand Down
55 changes: 31 additions & 24 deletions service/tratteriacontroller/controller/tratcontroller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
)

func (c *Controller) handleTraTUpsert(ctx context.Context, newTraT *tratteria1alpha1.TraT, versionNumber int64) error {
verificationEndpointRules, err := newTraT.GetTraTVerificationRules()
servicestraTVerificationRules, err := newTraT.GetTraTVerificationRules()
if err != nil {
messagedErr := fmt.Errorf("error retrieving verification rules from %s trat: %w", newTraT.Name, err)

Expand All @@ -28,8 +28,8 @@ func (c *Controller) handleTraTUpsert(ctx context.Context, newTraT *tratteria1al
}

// TODO: Implement parallel dispatching of rules using goroutines
for service, serviceVerificationRule := range verificationEndpointRules {
err := c.serviceMessageHandler.DispatchTraTVerificationRule(ctx, service, newTraT.Namespace, serviceVerificationRule, versionNumber)
for service, serviceTraTVerificationRules := range servicestraTVerificationRules {
err := c.serviceMessageHandler.DispatchTraTVerificationRule(ctx, service, newTraT.Namespace, serviceTraTVerificationRules, versionNumber)
if err != nil {
messagedErr := fmt.Errorf("error dispatching %s trat verification rule to %s service: %w", newTraT.Name, service, err)

Expand Down Expand Up @@ -83,16 +83,21 @@ func (c *Controller) handleTraTUpsert(ctx context.Context, newTraT *tratteria1al
func (c *Controller) handleTraTUpdation(ctx context.Context, newTraT *tratteria1alpha1.TraT, oldTraT *tratteria1alpha1.TraT, versionNumber int64) error {
// First, handle any service removals from the TraT
newServices := make(map[string]bool)
for _, serviceSpec := range newTraT.Spec.Services {
newServices[serviceSpec.Name] = true
for _, newServiceSpec := range newTraT.Spec.Services {
newServices[newServiceSpec.Name] = true
}

oldServices := make(map[string]bool)
for _, oldServiceSpec := range oldTraT.Spec.Services {
if !newServices[oldServiceSpec.Name] {
oldServices[oldServiceSpec.Name] = true
}

for oldService := range oldServices {
if !newServices[oldService] {
// Service was removed, so remove the TraT from it
err := c.serviceMessageHandler.DeleteTraT(ctx, oldServiceSpec.Name, oldTraT.Namespace, oldTraT.Name, versionNumber)
err := c.serviceMessageHandler.DeleteTraT(ctx, oldService, oldTraT.Namespace, oldTraT.Name, versionNumber)
if err != nil {
messagedErr := fmt.Errorf("error deleting %s trat from %s service: %w", oldTraT.Name, oldServiceSpec.Name, err)
messagedErr := fmt.Errorf("error deleting %s trat from %s service: %w", oldTraT.Name, oldService, err)

c.recorder.Event(newTraT, corev1.EventTypeWarning, "error", messagedErr.Error())

Expand All @@ -110,23 +115,24 @@ func (c *Controller) handleTraTUpdation(ctx context.Context, newTraT *tratteria1
}

func (c *Controller) handleTraTDeletion(ctx context.Context, oldTraT *tratteria1alpha1.TraT, versionNumber int64) error {
// TODO: Implement parallel requests using goroutines
services := make(map[string]bool)

for _, serviceSpec := range oldTraT.Spec.Services {
err := c.serviceMessageHandler.DeleteTraT(ctx, serviceSpec.Name, oldTraT.Namespace, oldTraT.Name, versionNumber)
services[serviceSpec.Name] = true
}

services[common.TRATTERIA_SERVICE_NAME] = true

// TODO: Implement parallel requests using goroutines
for service := range services {
err := c.serviceMessageHandler.DeleteTraT(ctx, service, oldTraT.Namespace, oldTraT.Name, versionNumber)
if err != nil {
messagedErr := fmt.Errorf("error deleting %s trat from %s service: %w", oldTraT.Name, serviceSpec.Name, err)
messagedErr := fmt.Errorf("error deleting %s trat from %s service: %w", oldTraT.Name, service, err)

return messagedErr
}
}

err := c.serviceMessageHandler.DeleteTraT(ctx, common.TRATTERIA_SERVICE_NAME, oldTraT.Namespace, oldTraT.Name, versionNumber)
if err != nil {
messagedErr := fmt.Errorf("error deleting %s trat from %s service: %w", oldTraT.Name, common.TRATTERIA_SERVICE_NAME, err)

return messagedErr
}

return nil
}

Expand Down Expand Up @@ -161,27 +167,28 @@ func (c *Controller) updateSuccessTratStatus(ctx context.Context, trat *tratteri
return updateErr
}

func (c *Controller) GetActiveTraTsVerificationRules(serviceName string, namespace string) (map[string]*tratteria1alpha1.TraTVerificationRule, error) {
func (c *Controller) GetActiveTraTsVerificationRules(serviceName string, namespace string) (map[string]*tratteria1alpha1.ServiceTraTVerificationRules, error) {
traTs, err := c.traTsLister.TraTs(namespace).List(labels.Everything())
if err != nil {
c.logger.Error("Failed to list TraTs in namespace.", zap.String("namespace", namespace), zap.Error(err))

return nil, err
}

traTsVerificationRules := make(map[string]*tratteria1alpha1.TraTVerificationRule)
serviceTraTsVerificationRules := make(map[string]*tratteria1alpha1.ServiceTraTVerificationRules)

for _, traT := range traTs {
traTVerificationRule, err := traT.GetTraTVerificationRules()
traTVerificationRules, err := traT.GetTraTVerificationRules()
if err != nil {
return nil, err
}
if serviceTraTVerificationRule := traTVerificationRule[serviceName]; serviceTraTVerificationRule != nil {
traTsVerificationRules[traT.Name] = serviceTraTVerificationRule

if serviceTraTVerificationRules := traTVerificationRules[serviceName]; serviceTraTVerificationRules != nil {
serviceTraTsVerificationRules[traT.Name] = serviceTraTVerificationRules
}
}

return traTsVerificationRules, nil
return serviceTraTsVerificationRules, nil
}

func (c *Controller) GetActiveTraTsGenerationRules(namespace string) (map[string]*tratteria1alpha1.TraTGenerationRule, error) {
Expand Down
41 changes: 26 additions & 15 deletions service/tratteriacontroller/pkg/apis/tratteria/v1alpha1/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,11 @@ type TraTVerificationRule struct {
AzdMapping AzdMapping `json:"azdmapping,omitempty"`
}

type ServiceTraTVerificationRules struct {
TraTName string
TraTVerificationRules []*TraTVerificationRule
}

type TraTGenerationRule struct {
TraTName string `json:"traTName"`
Endpoint string `json:"endpoint"`
Expand All @@ -76,10 +81,10 @@ type TraTGenerationRule struct {
AzdMapping AzdMapping `json:"azdmapping,omitempty"`
}

func (traT *TraT) GetTraTVerificationRules() (map[string]*TraTVerificationRule, error) {
verificationRules := make(map[string]*TraTVerificationRule)

// TODO: do basic check and return err if failed
// constructs TraT verification for each service present in the call chain
// a single service can have multiple different APIs present in the call chain, so it return the map of list of TraTVerificationRule
func (traT *TraT) GetTraTVerificationRules() (map[string]*ServiceTraTVerificationRules, error) {
servicesTraTVerificationRules := make(map[string]*ServiceTraTVerificationRules)

for _, serviceSpec := range traT.Spec.Services {
endpoint := traT.Spec.Endpoint
Expand All @@ -98,25 +103,31 @@ func (traT *TraT) GetTraTVerificationRules() (map[string]*TraTVerificationRule,
azdMapping = serviceSpec.AzdMapping
}

verificationRules[serviceSpec.Name] = &TraTVerificationRule{
TraTName: traT.Name,
Endpoint: endpoint,
Method: method,
Purp: traT.Spec.Purp,
AzdMapping: azdMapping,
if servicesTraTVerificationRules[serviceSpec.Name] == nil {
servicesTraTVerificationRules[serviceSpec.Name] = &ServiceTraTVerificationRules{
TraTName: traT.Name,
}
}

servicesTraTVerificationRules[serviceSpec.Name].TraTVerificationRules = append(
servicesTraTVerificationRules[serviceSpec.Name].TraTVerificationRules,
&TraTVerificationRule{
TraTName: traT.Name,
Endpoint: endpoint,
Method: method,
Purp: traT.Spec.Purp,
AzdMapping: azdMapping,
})
}

if len(verificationRules) == 0 {
if len(servicesTraTVerificationRules) == 0 {
return nil, fmt.Errorf("%w: verification rules for %s trat", tconfigderrors.ErrNotFound, traT.Name)
}

return verificationRules, nil
return servicesTraTVerificationRules, nil
}

func (traT *TraT) GetTraTGenerationRule() (*TraTGenerationRule, error) {
// TODO: do basic check and return err if failed

return &TraTGenerationRule{
TraTName: traT.Name,
Expand Down Expand Up @@ -218,8 +229,8 @@ func (tratteriaConfig *TratteriaConfig) GetTratteriaConfigGenerationRule() (*Tra
}

type VerificationRules struct {
TratteriaConfigVerificationRule *TratteriaConfigVerificationRule `json:"tratteriaConfigVerificationRule"`
TraTsVerificationRules map[string]*TraTVerificationRule `json:"traTsVerificationRules"`
TratteriaConfigVerificationRule *TratteriaConfigVerificationRule `json:"tratteriaConfigVerificationRule"`
TraTsVerificationRules map[string]*ServiceTraTVerificationRules `json:"traTsVerificationRules"`
}

func (verificationRules *VerificationRules) ComputeStableHash() (string, error) {
Expand Down
33 changes: 30 additions & 3 deletions service/tratteriacontroller/pkg/apis/tratteria/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading