15104611350

Committed 19 May 2025 04:53AM UTC coverage: 60.212% (-0.03%) from 60.242%

Build # 15104611350

Build Type

push

github

Committed by

web-flow

Commit Message

fix: convert timeout fields to string (#3582)

fix: timeout must be typed as string

Run Details

0 of 4 new or added lines in 1 file covered. (0.0%)

4 existing lines in 2 files now uncovered.

9024 of 14987 relevant lines covered (60.21%)

509.34 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

0.0

/internal/postgresConfig/update/update.go

package update

import (
        "bytes"
        "context"
        "encoding/json"
        "fmt"
        "strconv"
        "strings"

        "github.com/go-errors/errors"
        "github.com/spf13/afero"
        "github.com/supabase/cli/internal/postgresConfig/get"
        "github.com/supabase/cli/internal/utils"
)

func Run(ctx context.Context, projectRef string, values []string, replaceOverrides, noRestart bool, fsys afero.Fs) error {
        // 1. Prepare config overrides
        newConfigOverrides := make(map[string]string)
        for _, config := range values {
                splits := strings.Split(config, "=")
                if len(splits) != 2 {
                        return errors.Errorf("expected config value in key:value format, received: '%s'", config)
                }
                newConfigOverrides[splits[0]] = splits[1]
        }
        // 2. If not in replace mode, retrieve current overrides
        finalOverrides := make(map[string]interface{})
        {
                if !replaceOverrides {
                        config, err := get.GetCurrentPostgresConfig(ctx, projectRef)
                        if err != nil {
                                return err
                        }
                        finalOverrides = config
                }
        }
        // 3. Create the list of final overrides
        {
                for k, v := range newConfigOverrides {
                        // this is hacky - if we're able to convert the value to an integer, we do so
                        // if we start supporting config fields with e.g. floating pt overrides this'll need to be updated
                        if vInt, err := strconv.Atoi(v); err == nil {
                                finalOverrides[k] = vInt
                        } else if vBool, err := strconv.ParseBool(v); err == nil {
                                finalOverrides[k] = vBool
                        } else {
                                finalOverrides[k] = v
                        }
                }
        }
        // 4. update config overrides and print out final result
        {
                if noRestart {
                        finalOverrides["restart_database"] = false
                }
                // statement_timeout and wal_sender_timeout must be typed as string
                for k, v := range finalOverrides {
                        if _, ok := v.(string); strings.HasSuffix(k, "_timeout") && !ok {
                                finalOverrides[k] = fmt.Sprintf("%v", v)
                        }
                }
                bts, err := json.Marshal(finalOverrides)
                if err != nil {
                        return errors.Errorf("failed to serialize config overrides: %w", err)
                }
                resp, err := utils.GetSupabase().V1UpdatePostgresConfigWithBodyWithResponse(ctx, projectRef, "application/json", bytes.NewReader(bts))
                if err != nil {
                        return errors.Errorf("failed to update config overrides: %w", err)
                }
                if resp.JSON200 == nil {
                        if resp.StatusCode() == 400 {
                                return errors.Errorf("failed to update config overrides: %s (%s). This usually indicates that an unsupported or invalid config override was attempted. Please refer to https://supabase.com/docs/guides/platform/custom-postgres-config", resp.Status(), string(resp.Body))
                        }
                        return errors.Errorf("failed to update config overrides: %s (%s)", resp.Status(), string(resp.Body))
                }
        }
        return get.Run(ctx, projectRef, fsys)
}

1	package update
2
3	import (
4	"bytes"
5	"context"
6	"encoding/json"
7	"fmt"
8	"strconv"
9	"strings"
10
11	"github.com/go-errors/errors"
12	"github.com/spf13/afero"
13	"github.com/supabase/cli/internal/postgresConfig/get"
14	"github.com/supabase/cli/internal/utils"
15	)
16
17	func Run(ctx context.Context, projectRef string, values []string, replaceOverrides, noRestart bool, fsys afero.Fs) error {	×
18	// 1. Prepare config overrides	×
19	newConfigOverrides := make(map[string]string)	×
20	for _, config := range values {	×
21	splits := strings.Split(config, "=")	×
22	if len(splits) != 2 {	×
23	return errors.Errorf("expected config value in key:value format, received: '%s'", config)	×
24	}	×
25	newConfigOverrides[splits[0]] = splits[1]	×
26	}
27	// 2. If not in replace mode, retrieve current overrides
28	finalOverrides := make(map[string]interface{})	×
29	{	×
30	if !replaceOverrides {	×
31	config, err := get.GetCurrentPostgresConfig(ctx, projectRef)	×
32	if err != nil {	×
33	return err	×
34	}	×
35	finalOverrides = config	×
36	}
37	}
38	// 3. Create the list of final overrides
39	{	×
40	for k, v := range newConfigOverrides {	×
41	// this is hacky - if we're able to convert the value to an integer, we do so	×
42	// if we start supporting config fields with e.g. floating pt overrides this'll need to be updated	×
43	if vInt, err := strconv.Atoi(v); err == nil {	×
44	finalOverrides[k] = vInt	×
45	} else if vBool, err := strconv.ParseBool(v); err == nil {	×
46	finalOverrides[k] = vBool	×
47	} else {	×
48	finalOverrides[k] = v	×
49	}	×
50	}
51	}
52	// 4. update config overrides and print out final result
53	{	×
54	if noRestart {	×
55	finalOverrides["restart_database"] = false	×
56	}	×
57	// statement_timeout and wal_sender_timeout must be typed as string
NEW 58	for k, v := range finalOverrides {	×
NEW 59	if _, ok := v.(string); strings.HasSuffix(k, "_timeout") && !ok {	×
NEW 60	finalOverrides[k] = fmt.Sprintf("%v", v)	×
NEW 61	}	×
62	}
63	bts, err := json.Marshal(finalOverrides)	×
64	if err != nil {	×
65	return errors.Errorf("failed to serialize config overrides: %w", err)	×
66	}	×
67	resp, err := utils.GetSupabase().V1UpdatePostgresConfigWithBodyWithResponse(ctx, projectRef, "application/json", bytes.NewReader(bts))	×
68	if err != nil {	×
69	return errors.Errorf("failed to update config overrides: %w", err)	×
70	}	×
71	if resp.JSON200 == nil {	×
72	if resp.StatusCode() == 400 {	×
73	return errors.Errorf("failed to update config overrides: %s (%s). This usually indicates that an unsupported or invalid config override was attempted. Please refer to https://supabase.com/docs/guides/platform/custom-postgres-config", resp.Status(), string(resp.Body))	×
74	}	×
75	return errors.Errorf("failed to update config overrides: %s (%s)", resp.Status(), string(resp.Body))	×
76	}
77	}
78	return get.Run(ctx, projectRef, fsys)	×
79	}

supabase / cli / 15104611350

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous