fix: apply CodeRabbit auto-fixes

Fixed 2 file(s) based on 2 unresolved review comments.

Co-authored-by: CodeRabbit <noreply@coderabbit.ai>

commit: c69eeb8fc7d3fdcc4d68b85f5cf9d8b7611a96f7
author: coderabbitai[bot] · 5mo ago · 2026-04-26 07:04 UTC
committer: GitHub · 5mo ago · 2026-04-26 07:04 UTC
parent: a40ece3
signature: GPG UnverifiedB5690EEEBB952194 The key is unknown

2 files · +24 -11

M internal/app/migrate_env.go +23 -11


@@ -94,7 +94,7 @@ func migrateEnvFile(envDir, name string, passStore *domainsecrets.PassStore, log
94	94
95	95		if err := os.Remove(filePath); err != nil {
96	96		// Check if the stored secrets match what we just wrote
97		-	storedSecrets, getErr := passStore.Get(domainName)
	97	+	storedSecrets, getErr := passStore.GetAll(domainName)
98	98		if getErr == nil && secretsMatch(storedSecrets, secrets) {
99	99		// Migration was successful, removal failed but secrets are stored
100	100		log.Warn().

@@ -104,11 +104,17 @@ func migrateEnvFile(envDir, name string, passStore *domainsecrets.PassStore, log
104	104		return nil
105	105		}
106	106		// Attempt rollback: remove the pass entry we just wrote
107		-	if delErr := passStore.Delete(domainName); delErr != nil {
108		-	log.Error().
109		-	Err(delErr).
110		-	Str("domain", domainName).
111		-	Msg("failed to rollback pass entry after file removal failure")
	107	+	rollbackKeys, listErr := passStore.ListKeys(domainName)
	108	+	if listErr == nil {
	109	+	for _, key := range rollbackKeys {
	110	+	if delErr := passStore.Delete(domainName, key); delErr != nil {
	111	+	log.Error().
	112	+	Err(delErr).
	113	+	Str("domain", domainName).
	114	+	Str("key", key).
	115	+	Msg("failed to rollback pass entry after file removal failure")
	116	+	}
	117	+	}
112	118		}
113	119		return fmt.Errorf("failed to remove migrated env file %s: %w", filePath, err)
114	120		}

@@ -198,11 +204,17 @@ func migrateAttachmentEnvFile(envDir, name string, passStore *domainsecrets.Pass
198	204		return nil
199	205		}
200	206		// Attempt rollback: remove the pass entry we just wrote
201		-	if delErr := passStore.DeleteAttachment(containerName); delErr != nil {
202		-	log.Error().
203		-	Err(delErr).
204		-	Str("container", containerName).
205		-	Msg("failed to rollback pass entry after file removal failure")
	207	+	rollbackSecrets, listErr := passStore.GetAllAttachment(containerName)
	208	+	if listErr == nil {
	209	+	for key := range rollbackSecrets {
	210	+	if delErr := passStore.DeleteAttachment(containerName, key); delErr != nil {
	211	+	log.Error().
	212	+	Err(delErr).
	213	+	Str("container", containerName).
	214	+	Str("key", key).
	215	+	Msg("failed to rollback pass entry after file removal failure")
	216	+	}
	217	+	}
206	218		}
207	219		return fmt.Errorf("failed to remove migrated attachment env file %s: %w", filePath, err)
208	220		}

 	if err := os.Remove(filePath); err != nil {
 		// Check if the stored secrets match what we just wrote
-		storedSecrets, getErr := passStore.Get(domainName)
+		storedSecrets, getErr := passStore.GetAll(domainName)
 		if getErr == nil && secretsMatch(storedSecrets, secrets) {
 			// Migration was successful, removal failed but secrets are stored
 			log.Warn().
 			return nil
 		}
 		// Attempt rollback: remove the pass entry we just wrote
-		if delErr := passStore.Delete(domainName); delErr != nil {
+		rollbackKeys, listErr := passStore.ListKeys(domainName)
-			log.Error().
+		if listErr == nil {
-				Err(delErr).
+			for _, key := range rollbackKeys {
-				Str("domain", domainName).
+				if delErr := passStore.Delete(domainName, key); delErr != nil {
-				Msg("failed to rollback pass entry after file removal failure")
+					log.Error().
+						Err(delErr).
+						Str("domain", domainName).
+						Str("key", key).
+						Msg("failed to rollback pass entry after file removal failure")
+				}
+			}
 		}
 		return fmt.Errorf("failed to remove migrated env file %s: %w", filePath, err)
 	}
 			return nil
 		}
 		// Attempt rollback: remove the pass entry we just wrote
-		if delErr := passStore.DeleteAttachment(containerName); delErr != nil {
+		rollbackSecrets, listErr := passStore.GetAllAttachment(containerName)
-			log.Error().
+		if listErr == nil {
-				Err(delErr).
+			for key := range rollbackSecrets {
-				Str("container", containerName).
+				if delErr := passStore.DeleteAttachment(containerName, key); delErr != nil {
-				Msg("failed to rollback pass entry after file removal failure")
+					log.Error().
+						Err(delErr).
+						Str("container", containerName).
+						Str("key", key).
+						Msg("failed to rollback pass entry after file removal failure")
+				}
+			}
 		}
 		return fmt.Errorf("failed to remove migrated attachment env file %s: %w", filePath, err)
 	}

M internal/usecase/container/service.go +1 -0


@@ -1823,6 +1823,7 @@ func imageRegistryForPolicy(imageRef string) string {
1823	1823
1824	1824		func normalizeRegistry(registry string) string {
1825	1825		registry = strings.ToLower(strings.TrimSuffix(strings.TrimSpace(registry), "."))
	1826	+	registry = strings.TrimSuffix(registry, "/")
1826	1827		if strings.HasPrefix(registry, "[") {
1827	1828		if end := strings.Index(registry, "]"); end != -1 {
1828	1829		host := strings.Trim(registry[:end+1], "[]")


@@ -1823,6 +1823,7 @@ func imageRegistryForPolicy(imageRef string) string {
1823		1823
1824	func normalizeRegistry(registry string) string {	1824		func normalizeRegistry(registry string) string {
1825	registry = strings.ToLower(strings.TrimSuffix(strings.TrimSpace(registry), "."))	1825		registry = strings.ToLower(strings.TrimSuffix(strings.TrimSpace(registry), "."))
		1826	+	registry = strings.TrimSuffix(registry, "/")
1826	if strings.HasPrefix(registry, "[") {	1827		if strings.HasPrefix(registry, "[") {
1827	if end := strings.Index(registry, "]"); end != -1 {	1828		if end := strings.Index(registry, "]"); end != -1 {
1828	host := strings.Trim(registry[:end+1], "[]")	1829		host := strings.Trim(registry[:end+1], "[]")