refactor: cleanup of aiven credential types

integration_tests/aiven_credentials.lua

@@ -381,28 +381,40 @@ Helper.SQLExec(string.format([[
 	INSERT INTO activity_log_entries (actor, action, resource_type, resource_name, team_slug, environment, data, created_at)
 	VALUES
 		('%s', 'CREDENTIALS_CREATED', 'OPENSEARCH', 'my-instance', '%s', 'dev', '{"permission":"READ","ttl":"1d"}', NOW() - INTERVAL '2 minutes'),
-		('%s', 'CREDENTIALS_CREATED', 'VALKEY', 'my-valkey', '%s', 'dev', '{"ttl":"7d"}', NOW() - INTERVAL '1 minute')
-]], user:email(), team:slug(), user:email(), team:slug()))
+		('%s', 'CREDENTIALS_CREATED', 'VALKEY', 'my-valkey', '%s', 'dev', '{"ttl":"7d"}', NOW() - INTERVAL '1 minute'),
+		('%s', 'CREDENTIALS_CREATED', 'KAFKA_TOPIC', 'dev', '%s', 'dev', '{"ttl":"7d"}', NOW() - INTERVAL '5 minute')
+]], user:email(), team:slug(), user:email(), team:slug(), user:email(), team:slug()))
 
 Test.gql("Activity log returns credentials entries without panic", function(t)
 	t.addHeader("x-user-email", user:email())
 	t.query(string.format([[
 		{
 		  team(slug: "%s") {
-		    activityLog(first: 10, filter: { activityTypes: [CREDENTIALS_CREATED] }) {
+		    activityLog(first: 10, filter: { activityTypes: [VALKEY_CREDENTIALS_CREATED, OPENSEARCH_CREDENTIALS_CREATED, KAFKA_CREDENTIALS_CREATED] }) {
 		      nodes {
 		        __typename
 		        message
 		        actor
 		        resourceType
 		        resourceName
 		        environmentName
-		        ... on CredentialsActivityLogEntry {
+		        ... on ValkeyCredentialsCreatedActivityLogEntry {
 		          data {
 		            permission
 		            ttl
 		          }
 		        }
+		        ... on OpenSearchCredentialsCreatedActivityLogEntry {
+		          data {
+		            permission
+		            ttl
+		          }
+		        }
+		        ... on KafkaCredentialsCreatedActivityLogEntry {
+		          data {
+                ttl
+		          }
+		        }
 		      }
 		    }
 		  }
@@ -415,8 +427,8 @@ Test.gql("Activity log returns credentials entries without panic", function(t)
 				activityLog = {
 					nodes = {
 						{
-							__typename = "CredentialsActivityLogEntry",
-							message = "Created VALKEY credentials for my-valkey (TTL: 7d)",
+							__typename = "ValkeyCredentialsCreatedActivityLogEntry",
+							message = "Created credentials for \"my-valkey\" (TTL: 7d)",
 							actor = user:email(),
 							resourceType = "VALKEY",
 							resourceName = "my-valkey",
@@ -427,8 +439,8 @@ Test.gql("Activity log returns credentials entries without panic", function(t)
 							},
 						},
 						{
-							__typename = "CredentialsActivityLogEntry",
-							message = "Created OPENSEARCH credentials for my-instance with READ permission (TTL: 1d)",
+							__typename = "OpenSearchCredentialsCreatedActivityLogEntry",
+							message = "Created credentials for \"my-instance\" with \"read\" permission (TTL: 1d)",
 							actor = user:email(),
 							resourceType = "OPENSEARCH",
 							resourceName = "my-instance",
@@ -438,6 +450,17 @@ Test.gql("Activity log returns credentials entries without panic", function(t)
 								ttl = "1d",
 							},
 						},
+						{
+							__typename = "KafkaCredentialsCreatedActivityLogEntry",
+							message = "Created credentials for \"dev\" (TTL: 7d)",
+							actor = user:email(),
+							resourceType = "KAFKA_TOPIC",
+							resourceName = "dev",
+							environmentName = "dev",
+							data = {
+								ttl = "7d",
+							},
+						},
 					},
 				},
 			},

internal/activitylog/model.go

@@ -20,11 +20,12 @@ type (
 )
 
 const (
-	ActivityLogEntryActionAdded   ActivityLogEntryAction = "ADDED"
-	ActivityLogEntryActionCreated ActivityLogEntryAction = "CREATED"
-	ActivityLogEntryActionDeleted ActivityLogEntryAction = "DELETED"
-	ActivityLogEntryActionRemoved ActivityLogEntryAction = "REMOVED"
-	ActivityLogEntryActionUpdated ActivityLogEntryAction = "UPDATED"
+	ActivityLogEntryActionAdded              ActivityLogEntryAction = "ADDED"
+	ActivityLogEntryActionCreated            ActivityLogEntryAction = "CREATED"
+	ActivityLogEntryActionDeleted            ActivityLogEntryAction = "DELETED"
+	ActivityLogEntryActionRemoved            ActivityLogEntryAction = "REMOVED"
+	ActivityLogEntryActionUpdated            ActivityLogEntryAction = "UPDATED"
+	ActivityLogEntryActionCredentialsCreated ActivityLogEntryAction = "CREDENTIALS_CREATED"
 )
 
 type ActivityLogEntry interface {

internal/cmd/api/http.go

@@ -343,14 +343,14 @@ func ConfigureGraph(
 		ctx = bigquery.NewLoaderContext(ctx, watchers.BqWatcher)
 		ctx = bucket.NewLoaderContext(ctx, watchers.BucketWatcher)
 		ctx = job.NewLoaderContext(ctx, watchers.JobWatcher, watchers.RunWatcher)
-		ctx = kafkatopic.NewLoaderContext(ctx, watchers.KafkaTopicWatcher)
+		ctx = kafkatopic.NewLoaderContext(ctx, watchers.KafkaTopicWatcher, log)
 		ctx = workload.NewLoaderContext(ctx, watchers.PodWatcher)
 		ctx = secret.NewLoaderContext(ctx, watchers.SecretWatcher, secretClientCreator, dynamicClients, clusters, log)
 		ctx = config.NewLoaderContext(ctx, watchers.ConfigWatcher, log)
 		ctx = instancegroup.NewLoaderContext(ctx, watchers.ReplicaSetWatcher, watchers.PodWatcher, watchers.AppWatcher, dynamicClients, log)
 		ctx = aiven.NewLoaderContext(ctx, aivenProjects)
 		ctx = opensearch.NewLoaderContext(ctx, tenantName, watchers.OpenSearchWatcher, aivenClient, log)
-		ctx = valkey.NewLoaderContext(ctx, tenantName, watchers.ValkeyWatcher, aivenClient)
+		ctx = valkey.NewLoaderContext(ctx, tenantName, watchers.ValkeyWatcher, aivenClient, log)
 		ctx = price.NewLoaderContext(ctx, priceRetriever, log)
 		ctx = utilization.NewLoaderContext(ctx, prometheusClient, log)
 		ctx = alerts.NewLoaderContext(ctx, prometheusClient, log)