fix(test): use storedContainerName when verifying attachment migration

extractContainerNameFromAttachmentFile preserves the 'gordon-' prefix
from the filename, but the test was calling GetAllAttachment with the
bare containerName (without prefix), so the lookup returned empty.
Fix by deriving storedContainerName from the filename, matching what
migrateAttachmentEnvFile actually stores in pass.

commit: a00b616404aeedad96c3b8585752a7d193a35f4e
author: brice · 7mo ago · 2026-03-01 11:17 UTC
parent: 2c769c5
signature: unsigned

1 file · +6 -3

M internal/app/migrate_env_test.go +6 -3


@@ -110,11 +110,14 @@ func TestMigrateAttachmentEnvFile(t *testing.T) {
110	110		require.NoError(t, err)
111	111
112	112		containerName := fmt.Sprintf("gitea-postgres-%d", time.Now().UnixNano())
	113	+	envFileName := "gordon-" + containerName + ".env"
	114	+	// extractContainerNameFromAttachmentFile strips the .env suffix, so the
	115	+	// stored name includes the "gordon-" prefix from the filename.
	116	+	storedContainerName := extractContainerNameFromAttachmentFile(envFileName)
113	117		keys := []string{"POSTGRES_USER", "POSTGRES_PASSWORD"}
114		-	defer cleanupPassAttachment(t, containerName, keys)
	118	+	defer cleanupPassAttachment(t, storedContainerName, keys)
115	119
116	120		envContent := "POSTGRES_USER=gitea\nPOSTGRES_PASSWORD=secret123\n"
117		-	envFileName := "gordon-" + containerName + ".env"
118	121		envFilePath := filepath.Join(tmpDir, envFileName)
119	122		err = os.WriteFile(envFilePath, []byte(envContent), 0600)
120	123		require.NoError(t, err)

@@ -129,7 +132,7 @@ func TestMigrateAttachmentEnvFile(t *testing.T) {
129	132		_, err = os.Stat(migratedPath)
130	133		assert.NoError(t, err, ".env.migrated file should exist")
131	134
132		-	values, err := store.GetAllAttachment(containerName)
	135	+	values, err := store.GetAllAttachment(storedContainerName)
133	136		require.NoError(t, err)
134	137		assert.Equal(t, "gitea", values["POSTGRES_USER"])
135	138		assert.Equal(t, "secret123", values["POSTGRES_PASSWORD"])

 	require.NoError(t, err)
 	containerName := fmt.Sprintf("gitea-postgres-%d", time.Now().UnixNano())
+	envFileName := "gordon-" + containerName + ".env"
+	// extractContainerNameFromAttachmentFile strips the .env suffix, so the
+	// stored name includes the "gordon-" prefix from the filename.
+	storedContainerName := extractContainerNameFromAttachmentFile(envFileName)
 	keys := []string{"POSTGRES_USER", "POSTGRES_PASSWORD"}
-	defer cleanupPassAttachment(t, containerName, keys)
+	defer cleanupPassAttachment(t, storedContainerName, keys)
 	envContent := "POSTGRES_USER=gitea\nPOSTGRES_PASSWORD=secret123\n"
-	envFileName := "gordon-" + containerName + ".env"
 	envFilePath := filepath.Join(tmpDir, envFileName)
 	err = os.WriteFile(envFilePath, []byte(envContent), 0600)
 	require.NoError(t, err)
 	_, err = os.Stat(migratedPath)
 	assert.NoError(t, err, ".env.migrated file should exist")
-	values, err := store.GetAllAttachment(containerName)
+	values, err := store.GetAllAttachment(storedContainerName)
 	require.NoError(t, err)
 	assert.Equal(t, "gitea", values["POSTGRES_USER"])
 	assert.Equal(t, "secret123", values["POSTGRES_PASSWORD"])