test: improve TestUserSecrets test

evgeniy-scherbina · evgeniy-scherbina · commit b40ec25ee563 · 2025-07-15T18:35:27.000Z
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -1248,6 +1248,7 @@ func New(options *Options) *API {
 					//GET    /api/v2/users/secrets/{secretID}/value   // Get secret value
 
 					r.Post("/", api.createUserSecret)
+					r.Get("/", api.listUserSecrets)
 				})
 				r.Route("/{user}", func(r chi.Router) {
 					r.Group(func(r chi.Router) {
diff --git a/coderd/user_secrets_test.go b/coderd/user_secrets_test.go
@@ -18,7 +18,7 @@ func TestUserSecrets(t *testing.T) {
 
 	ctx := testutil.Context(t, testutil.WaitShort)
 
-	db, ps := dbtestutil.NewDB(t, dbtestutil.WithDumpOnFailure())
+	db, ps := dbtestutil.NewDB(t)
 	client := coderdtest.New(t, &coderdtest.Options{
 		IncludeProvisionerDaemon: true,
 		Database:                 db,
@@ -45,7 +45,19 @@ func TestUserSecrets(t *testing.T) {
 	fmt.Printf("userSecretInJSON: %s\n", userSecretInJSON)
 
 	require.NotNil(t, userSecret.ID)
-	require.Equal(t, userSecret.UserID, templateAdmin.ID)
-	require.Equal(t, userSecret.Name, userSecretName)
-	require.Equal(t, userSecret.Description, userSecretDescription)
+	require.Equal(t, templateAdmin.ID, userSecret.UserID)
+	require.Equal(t, userSecretName, userSecret.Name)
+	require.Equal(t, userSecretDescription, userSecret.Description)
+
+	userSecretList, err := templateAdminClient.ListUserSecrets(ctx)
+	require.NoError(t, err)
+	require.Len(t, userSecretList.Secrets, 1)
+	userSecretListInJSON, err := json.Marshal(userSecretList)
+	require.NoError(t, err)
+	fmt.Printf("userSecretListInJSON: %s\n", userSecretListInJSON)
+
+	require.NotNil(t, userSecretList.Secrets[0].ID)
+	require.Equal(t, templateAdmin.ID, userSecretList.Secrets[0].UserID)
+	require.Equal(t, userSecretName, userSecretList.Secrets[0].Name)
+	require.Equal(t, userSecretDescription, userSecretList.Secrets[0].Description)
 }
diff --git a/codersdk/user_secrets.go b/codersdk/user_secrets.go
@@ -60,3 +60,21 @@ func (c *Client) CreateUserSecret(ctx context.Context, req CreateUserSecretReque
 	var userSecret UserSecret
 	return userSecret, json.NewDecoder(res.Body).Decode(&userSecret)
 }
+
+func (c *Client) ListUserSecrets(ctx context.Context) (ListUserSecretsResponse, error) {
+	res, err := c.Request(ctx, http.MethodGet,
+		fmt.Sprintf("/api/v2/users/secrets"),
+		nil,
+	)
+	if err != nil {
+		return ListUserSecretsResponse{}, xerrors.Errorf("execute request: %w", err)
+	}
+	defer res.Body.Close()
+
+	if res.StatusCode != http.StatusOK {
+		return ListUserSecretsResponse{}, ReadBodyAsError(res)
+	}
+
+	var userSecrets ListUserSecretsResponse
+	return userSecrets, json.NewDecoder(res.Body).Decode(&userSecrets)
+}
