From 6cb386576ad837da995e556eaadc44631fe23b1c Mon Sep 17 00:00:00 2001 From: kchiranjewee63 Date: Wed, 29 Jan 2025 17:11:50 -0500 Subject: [PATCH] Name update chore --- service/common/common.go | 2 +- .../servicemessagehandler/servicemessagehandler.go | 4 ++-- .../tokenetescontroller/controller/controller.go | 12 ++++++------ .../controller/tratcontroller.go | 2 +- service/websocketserver/clientmanager.go | 14 +++++++------- service/websocketserver/setup.go | 4 ++-- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/service/common/common.go b/service/common/common.go index e9beb62..395befd 100644 --- a/service/common/common.go +++ b/service/common/common.go @@ -1,5 +1,5 @@ package common const ( - TRATTERIA_SERVICE_NAME = "tokenetes" + TOKENETES_SERVICE_NAME = "tokenetes" ) diff --git a/service/servicemessagehandler/servicemessagehandler.go b/service/servicemessagehandler/servicemessagehandler.go index b94b3de..958d7a4 100644 --- a/service/servicemessagehandler/servicemessagehandler.go +++ b/service/servicemessagehandler/servicemessagehandler.go @@ -121,7 +121,7 @@ func (smh *ServiceMessageHandler) DispatchTraTGenerationRule(ctx context.Context return fmt.Errorf("error marshaling generation trat rule: %w", err) } - err = smh.sendMessage(ctx, common.TRATTERIA_SERVICE_NAME, namespace, websocketserver.MessageTypeTraTGenerationRuleUpsertRequest, jsonData, verisionNumber) + err = smh.sendMessage(ctx, common.TOKENETES_SERVICE_NAME, namespace, websocketserver.MessageTypeTraTGenerationRuleUpsertRequest, jsonData, verisionNumber) if err != nil { return fmt.Errorf("error dispatching generation trat rule to tokenetes: %w", err) } @@ -135,7 +135,7 @@ func (smh *ServiceMessageHandler) DispatchTokenetesConfigGenerationRule(ctx cont return fmt.Errorf("error marshaling generation tokenetes config rule: %w", err) } - err = smh.sendMessage(ctx, common.TRATTERIA_SERVICE_NAME, namespace, websocketserver.MessageTypeTokenetesConfigGenerationRuleUpsertRequest, jsonData, versionNumber) + err = smh.sendMessage(ctx, common.TOKENETES_SERVICE_NAME, namespace, websocketserver.MessageTypeTokenetesConfigGenerationRuleUpsertRequest, jsonData, versionNumber) if err != nil { return fmt.Errorf("error dispatching generation tokenetes config rule to tokenetes: %w", err) } diff --git a/service/tokenetescontroller/controller/controller.go b/service/tokenetescontroller/controller/controller.go index 70a5cb8..b38c3ee 100644 --- a/service/tokenetescontroller/controller/controller.go +++ b/service/tokenetescontroller/controller/controller.go @@ -506,16 +506,16 @@ func (c *Controller) GetActiveGenerationRules(namespace string) (*tokenetes1alph } func (c *Controller) GetActiveGenerationRulesHash(namespace string) (string, int64, error) { - err := c.RecomputeRulesHashesIfNotLatest(common.TRATTERIA_SERVICE_NAME, namespace) + err := c.RecomputeRulesHashesIfNotLatest(common.TOKENETES_SERVICE_NAME, namespace) if err != nil { return "", 0, err } - c.allRulesHashes.namespacesRulesHashes[namespace].servicesRulesHashes[common.TRATTERIA_SERVICE_NAME].mu.RLock() - defer c.allRulesHashes.namespacesRulesHashes[namespace].servicesRulesHashes[common.TRATTERIA_SERVICE_NAME].mu.RUnlock() + c.allRulesHashes.namespacesRulesHashes[namespace].servicesRulesHashes[common.TOKENETES_SERVICE_NAME].mu.RLock() + defer c.allRulesHashes.namespacesRulesHashes[namespace].servicesRulesHashes[common.TOKENETES_SERVICE_NAME].mu.RUnlock() - return c.allRulesHashes.namespacesRulesHashes[namespace].servicesRulesHashes[common.TRATTERIA_SERVICE_NAME].hash, - c.allRulesHashes.namespacesRulesHashes[namespace].servicesRulesHashes[common.TRATTERIA_SERVICE_NAME].ruleVersionNumber, + return c.allRulesHashes.namespacesRulesHashes[namespace].servicesRulesHashes[common.TOKENETES_SERVICE_NAME].hash, + c.allRulesHashes.namespacesRulesHashes[namespace].servicesRulesHashes[common.TOKENETES_SERVICE_NAME].ruleVersionNumber, nil } @@ -559,7 +559,7 @@ func (c *Controller) RecomputeRulesHashesIfNotLatest(serviceName string, namespa // The computed hash is guaranteed to incorporate changes at least up to and including this rule version number ruleVersionNumber := atomic.LoadInt64(&c.ruleVersionNumber) - if serviceName == common.TRATTERIA_SERVICE_NAME { + if serviceName == common.TOKENETES_SERVICE_NAME { activeGenerationRules, _, err := c.GetActiveGenerationRules(namespace) if err != nil { return err diff --git a/service/tokenetescontroller/controller/tratcontroller.go b/service/tokenetescontroller/controller/tratcontroller.go index a27e79a..b365ed3 100644 --- a/service/tokenetescontroller/controller/tratcontroller.go +++ b/service/tokenetescontroller/controller/tratcontroller.go @@ -121,7 +121,7 @@ func (c *Controller) handleTraTDeletion(ctx context.Context, oldTraT *tokenetes1 services[serviceSpec.Name] = true } - services[common.TRATTERIA_SERVICE_NAME] = true + services[common.TOKENETES_SERVICE_NAME] = true // TODO: Implement parallel requests using goroutines for service := range services { diff --git a/service/websocketserver/clientmanager.go b/service/websocketserver/clientmanager.go index cf19b7c..f88c089 100644 --- a/service/websocketserver/clientmanager.go +++ b/service/websocketserver/clientmanager.go @@ -67,10 +67,10 @@ const ( MessageTypeTraTVerificationRuleUpsertResponse MessageType = "TRAT_VERIFICATION_RULE_UPSERT_RESPONSE" MessageTypeTraTGenerationRuleUpsertRequest MessageType = "TRAT_GENERATION_RULE_UPSERT_REQUEST" MessageTypeTraTGenerationRuleUpsertResponse MessageType = "TRAT_GENERATION_RULE_UPSERT_RESPONSE" - MessageTypeTokenetesConfigVerificationRuleUpsertRequest MessageType = "TRATTERIA_CONFIG_VERIFICATION_RULE_UPSERT_REQUEST" - MessageTypeTokenetesConfigVerificationRuleUpsertResponse MessageType = "TRATTERIA_CONFIG_VERIFICATION_RULE_UPSERT_RESPONSE" - MessageTypeTokenetesConfigGenerationRuleUpsertRequest MessageType = "TRATTERIA_CONFIG_GENERATION_RULE_UPSERT_REQUEST" - MessageTypeTokenetesConfigGenerationRuleUpsertResponse MessageType = "TRATTERIA_CONFIG_GENERATION_RULE_UPSERT_RESPONSE" + MessageTypeTokenetesConfigVerificationRuleUpsertRequest MessageType = "TOKENETES_CONFIG_VERIFICATION_RULE_UPSERT_REQUEST" + MessageTypeTokenetesConfigVerificationRuleUpsertResponse MessageType = "TOKENETES_CONFIG_VERIFICATION_RULE_UPSERT_RESPONSE" + MessageTypeTokenetesConfigGenerationRuleUpsertRequest MessageType = "TOKENETES_CONFIG_GENERATION_RULE_UPSERT_REQUEST" + MessageTypeTokenetesConfigGenerationRuleUpsertResponse MessageType = "TOKENETES_CONFIG_GENERATION_RULE_UPSERT_RESPONSE" MessageTypeRuleReconciliationRequest MessageType = "RULE_RECONCILIATION_REQUEST" MessageTypeRuleReconciliationResponse MessageType = "RULE_RECONCILIATION_RESPONSE" MessageTypeTraTDeletionRequest MessageType = "TRAT_DELETION_REQUEST" @@ -184,7 +184,7 @@ func (cm *ClientManager) compareAndReconcileRule(appData string) { var activeRuleVersionNumber int64 - if cm.Service == common.TRATTERIA_SERVICE_NAME { + if cm.Service == common.TOKENETES_SERVICE_NAME { lateshHash, activeRuleVersionNumber, _ = cm.Server.ruleRetriever.GetActiveGenerationRulesHash(cm.Namespace) } else { lateshHash, activeRuleVersionNumber, _ = cm.Server.ruleRetriever.GetActiveVerificationRulesHash(cm.Service, cm.Namespace) @@ -215,7 +215,7 @@ func (cm *ClientManager) reconcileRules() error { allActiveRulesPayload := &AllActiveRulesPayload{} - if cm.Service == common.TRATTERIA_SERVICE_NAME { + if cm.Service == common.TOKENETES_SERVICE_NAME { completeGenerationRules, activeRuleVersionNumber, err = cm.Server.ruleRetriever.GetActiveGenerationRules(cm.Namespace) if err != nil { cm.Server.Logger.Error("Error getting all active generation rules from controller", zap.Error(err)) @@ -342,7 +342,7 @@ func (cm *ClientManager) handleRequest(message []byte) { } func (cm *ClientManager) handleGetJWKSRequest(request Request) { - tokenetesInstances := cm.Server.GetClientManagers(common.TRATTERIA_SERVICE_NAME, cm.Namespace) + tokenetesInstances := cm.Server.GetClientManagers(common.TOKENETES_SERVICE_NAME, cm.Namespace) if len(tokenetesInstances) == 0 { cm.Server.Logger.Warn("No active tokenetes instances found", zap.String("namespace", cm.Namespace)) cm.sendErrorResponse(request.ID, MessageTypeGetJWKSResponse, http.StatusNotFound, "No active tokenetes instances found") diff --git a/service/websocketserver/setup.go b/service/websocketserver/setup.go index 6844d62..04e4aac 100644 --- a/service/websocketserver/setup.go +++ b/service/websocketserver/setup.go @@ -169,7 +169,7 @@ func (wss *WebSocketServer) handleWebSocket(w http.ResponseWriter, r *http.Reque initialRulesPayload := &AllActiveRulesPayload{} - if serviceName == common.TRATTERIA_SERVICE_NAME { + if serviceName == common.TOKENETES_SERVICE_NAME { activeGenerationRules, activeRuleVersionNumber, err = wss.ruleRetriever.GetActiveGenerationRules(namespace) if err != nil { wss.Logger.Error("Error getting initial generation rules from controller", zap.Error(err)) @@ -274,7 +274,7 @@ func (wss *WebSocketServer) GetTokenetesAgentServices(namespace string) []string var tokenetesAgentsServices []string for service := range wss.ClientManagers { - if service != common.TRATTERIA_SERVICE_NAME { + if service != common.TOKENETES_SERVICE_NAME { tokenetesAgentsServices = append(tokenetesAgentsServices, service) } }