fix: environment is not found error during operation of apikey-cacher (…

…#458)
bucketeer-io · Jul 7, 2023 · 9414dc8 · 9414dc8
1 parent 119308f
commit 9414dc8
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/pkg/account/apikeycacher/apikeycacher.go b/pkg/account/apikeycacher/apikeycacher.go
@@ -238,14 +238,17 @@ func (c *EnvAPIKeyCacher) handleAPIKeyEvent(msg *puller.Message, event *domainev
 		c.logger.Warn("Message contains an empty apiKeyID", zap.Any("event", event))
 		return
 	}
-	envResp, err := c.environmentClient.GetEnvironment(c.ctx, &environmentproto.GetEnvironmentRequest{
-		Id: event.EnvironmentNamespace,
-	})
+	envResp, err := c.environmentClient.GetEnvironmentByNamespace(
+		c.ctx,
+		&environmentproto.GetEnvironmentByNamespaceRequest{
+			Namespace: event.EnvironmentNamespace,
+		},
+	)
 	if err != nil {
 		if code := status.Code(err); code == grpccodes.NotFound {
 			msg.Ack()
 			handledCounter.WithLabelValues(codes.BadMessage.String()).Inc()
-			c.logger.Error("The specified environmentNamespace ID does not exist",
+			c.logger.Error("The specified environmentNamespace does not exist",
 				zap.Error(err),
 				zap.String("apiKeyID", apiKeyID),
 				zap.String("environmentNamespace", event.EnvironmentNamespace),
@@ -329,14 +332,17 @@ func (c *EnvAPIKeyCacher) handleEnvironmentEvent(msg *puller.Message, event *dom
 		return
 	}
 	environmentNamespace := ede.Namespace
-	envResp, err := c.environmentClient.GetEnvironment(c.ctx, &environmentproto.GetEnvironmentRequest{
-		Id: event.EnvironmentNamespace,
-	})
+	envResp, err := c.environmentClient.GetEnvironmentByNamespace(
+		c.ctx,
+		&environmentproto.GetEnvironmentByNamespaceRequest{
+			Namespace: event.EnvironmentNamespace,
+		},
+	)
 	if err != nil {
 		if code := status.Code(err); code == grpccodes.NotFound {
 			msg.Ack()
 			handledCounter.WithLabelValues(codes.BadMessage.String()).Inc()
-			c.logger.Error("The specified environmentNamespace ID does not exist",
+			c.logger.Error("The specified environmentNamespace does not exist",
 				zap.Error(err),
 				zap.String("environmentNamespace", event.EnvironmentNamespace),
 				zap.Any("event", event),