clear cache

Author: hvn2k1

migration/mysql/20251028072327_update_last_used_at_api_key_table.sql

@@ -1 +1 @@
-ALTER TABLE api_key ADD COLUMN last_used_at bigint DEFAULT NULL;
+ALTER TABLE api_key ADD COLUMN last_used_at bigint DEFAULT 0;

migration/mysql/atlas.sum

@@ -1,4 +1,4 @@
-h1:3F5xjAgjZp5Vn131LnNB9/Hbz+eHAVqnv067kaFHy20=
+h1:jLGSNaAAAnRJ8v7ZLH7JHqjFe8HPv3wXCLetHRB/RXg=
 20240626022133_initialization.sql h1:reSmqMhqnsrdIdPU2ezv/PXSL0COlRFX4gQA4U3/wMo=
 20240708065726_update_audit_log_table.sql h1:fi8Xxw4WfSlHDyvq2Ni/8JUiZW8z/0qWWyWm6jFdUy8=
 20240815043128_update_auto_ops_rule_table.sql h1:IKSW9W/XO6SWAYl5WPLJSg6KdsfcZ3rfQhIrf7aOnYc=
@@ -32,4 +32,4 @@ h1:3F5xjAgjZp5Vn131LnNB9/Hbz+eHAVqnv067kaFHy20=
 20250411093510_update_audit_log_table.sql h1:KDbGMLbeKhtUc833pAvKOiw9JdM4rXSUVc34TOywvc8=
 20250618071930_create_team_table.sql h1:Gc0+XyVk0zM+wWdWfqtkox2WQEnzftNX3FR7qpEAioU=
 20250711131250_update_indexes.sql h1:ghjrhD9mDtCHaHL7HbiAkTjmRHp6EZ3eerVjb8cSZCA=
-20251028072327_update_last_used_at_api_key_table.sql h1:2zpDE4qFt4WSN5mmMGlrzOSPcQRoVMzq4twSzABsn2I=
+20251028072327_update_last_used_at_api_key_table.sql h1:cuC7b8RV6QPv2LKij2Ld1cqkH8tpQB85Y+J8fHbi+38=

pkg/account/api/api_key.go

@@ -793,12 +793,15 @@ func (s *AccountService) UpdateAPIKeyLastUsedAt(
 	}
 
 	err = s.mysqlClient.RunInTransactionV2(ctx, func(contextWithTx context.Context, _ mysql.Transaction) error {
-		apiKey, err := s.accountStorage.GetAPIKey(contextWithTx, req.ApiKeyId, req.EnvironmentId)
+		envAPIKey, err := s.accountStorage.GetEnvironmentAPIKey(contextWithTx, req.ApiKeyId)
 		if err != nil {
 			return err
 		}
+		apiKey := &domain.APIKey{
+			APIKey: envAPIKey.ApiKey,
+		}
 		apiKey.UsedAt(req.LastUsedAt)
-		return s.accountStorage.UpdateAPIKey(contextWithTx, apiKey, req.EnvironmentId)
+		return s.accountStorage.UpdateAPIKey(contextWithTx, apiKey, envAPIKey.Environment.Id)
 	})
 	if err != nil {
 		if errors.Is(err, v2as.ErrAPIKeyNotFound) {
@@ -815,7 +818,6 @@ func (s *AccountService) UpdateAPIKeyLastUsedAt(
 			"Failed to update api key last used at",
 			log.FieldsFromIncomingContext(ctx).AddFields(
 				zap.Error(err),
-				zap.String("environmentId", req.EnvironmentId),
 				zap.String("id", req.ApiKeyId),
 			)...,
 		)

pkg/api/api/save_api_key_last_used_at.go

@@ -52,9 +52,11 @@ func (s *grpcGatewayService) writeAPIKeyLastUsedAtCacheToDatabase(ctx context.Co
 }
 
 func (s *grpcGatewayService) writeAPIKeyLastUsedAt(ctx context.Context) {
+	keys := make([]string, 0)
 	s.apiKeyLastUsedInfoCacher.Range(func(key, value interface{}) bool {
 		apikey := key.(string)
 		lastUsedAt := value.(int64)
+		keys = append(keys, apikey)
 		envAPIKey, err := s.getEnvironmentAPIKey(ctx, apikey)
 		if err != nil {
 			s.logger.Error("failed to get environment API key", zap.Error(err),
@@ -75,9 +77,8 @@ func (s *grpcGatewayService) writeAPIKeyLastUsedAt(ctx context.Context) {
 		}
 
 		_, err = s.accountClient.UpdateAPIKeyLastUsedAt(ctx, &account.UpdateAPIKeyLastUsedAtRequest{
-			EnvironmentId: envAPIKey.Environment.Id,
-			ApiKeyId:      envAPIKey.ApiKey.Id,
-			LastUsedAt:    lastUsedAt,
+			ApiKeyId:   envAPIKey.ApiKey.Id,
+			LastUsedAt: lastUsedAt,
 		})
 		if err != nil {
 			s.logger.Error("failed to update API key last used at", zap.Error(err),
@@ -87,4 +88,6 @@ func (s *grpcGatewayService) writeAPIKeyLastUsedAt(ctx context.Context) {
 		}
 		return true
 	})
+
+	s.apiKeyLastUsedInfoCacher.Clear()
 }

proto/account/service.pb.go

@@ -343,8 +343,7 @@ message UpdateAPIKeyResponse {}
 
 message UpdateAPIKeyLastUsedAtRequest {
   string api_key_id = 1;
-  string environment_id = 2;
-  int64 last_used_at = 3;
+  int64 last_used_at = 2;
 }
 
 message UpdateAPIKeyLastUsedAtResponse {}

proto/account/service.proto

@@ -2099,11 +2099,6 @@
               },
               {
                 "id": 2,
-                "name": "environment_id",
-                "type": "string"
-              },
-              {
-                "id": 3,
                 "name": "last_used_at",
                 "type": "int64"
               }