From 5278da86b25a7104ac68d86610a3f4b9413e62ea Mon Sep 17 00:00:00 2001 From: Chi Fujii Date: Tue, 5 Mar 2024 16:05:01 +0900 Subject: [PATCH] renaming --- cmd/envtool/envtool.go | 26 ++++++++++--------- cmd/envtool/envtool_test.go | 6 ++--- ...stem_users.json => test_system_users.json} | 0 cmd/envtool/{user.json => test_user.json} | 0 4 files changed, 17 insertions(+), 15 deletions(-) rename cmd/envtool/{system_users.json => test_system_users.json} (100%) rename cmd/envtool/{user.json => test_user.json} (100%) diff --git a/cmd/envtool/envtool.go b/cmd/envtool/envtool.go index 06e626d24990..cb38f2afecfc 100644 --- a/cmd/envtool/envtool.go +++ b/cmd/envtool/envtool.go @@ -54,11 +54,11 @@ var ( //go:embed error.tmpl errorTemplateB []byte - //go:embed user.json - user string + //go:embed test_user.json + testUser string - //go:embed system_users.json - systemUsers string + //go:embed test_system_users.json + testSystemUsers string // Parsed error template. errorTemplate = template.Must(template.New("error").Option("missingkey=error").Parse(string(errorTemplateB))) @@ -153,12 +153,12 @@ func setupPostgres(ctx context.Context, logger *zap.SugaredLogger) error { return err } - err = setupUser(ctx, logger, "postgres://username@127.0.0.1:5432/ferretdb") + err = setupUserInPostgres(ctx, logger, "postgres://username@127.0.0.1:5432/ferretdb") if err != nil { return err } - return setupUser(ctx, logger, "postgres://username@127.0.0.1:5432/template1") + return setupUserInPostgres(ctx, logger, "postgres://username@127.0.0.1:5432/template1") } // setupPostgresSecured configures `postgres_secured` container. @@ -174,12 +174,12 @@ func setupPostgresSecured(ctx context.Context, logger *zap.SugaredLogger) error return err } - err = setupUser(ctx, logger, "postgres://username:password@127.0.0.1:5433/ferretdb") + err = setupUserInPostgres(ctx, logger, "postgres://username:password@127.0.0.1:5433/ferretdb") if err != nil { return err } - return setupUser(ctx, logger, "postgres://username:password@127.0.0.1:5433/template1") + return setupUserInPostgres(ctx, logger, "postgres://username:password@127.0.0.1:5433/template1") } // setupMySQL configures `mysql` container. @@ -255,14 +255,14 @@ func setupMongodb(ctx context.Context, logger *zap.SugaredLogger) error { return ctx.Err() } -// setupUser creates a user with username/password credential in admin database +// setupUserInPostgres creates a user with username/password credential in admin database // with supported mechanisms. // It creates admin database (PostgreSQL admin schema), if it does not exist. // It also creates system.users collection, if it does not exist. // // Without this, once the first user is created, the authentication fails // as username/password does not exist in admin.system.users collection. -func setupUser(ctx context.Context, logger *zap.SugaredLogger, uri string) error { +func setupUserInPostgres(ctx context.Context, logger *zap.SugaredLogger, uri string) error { sp, err := state.NewProvider("") if err != nil { return err @@ -326,13 +326,15 @@ func setupUser(ctx context.Context, logger *zap.SugaredLogger, uri string) error } q = `INSERT INTO admin._ferretdb_database_metadata (_jsonb) VALUES ($1)` - if _, err = dbPool.Exec(ctx, q, systemUsers); err != nil { + if _, err = dbPool.Exec(ctx, q, testSystemUsers); err != nil { return err } } q = `INSERT INTO admin.system_users_aff2f7ce (_jsonb) VALUES ($1)` - if _, err = dbPool.Exec(ctx, q, user); err != nil && (!errors.As(err, &pgErr) || pgErr.Code != pgerrcode.UniqueViolation) { + + _, err = dbPool.Exec(ctx, q, testUser) + if err != nil && (!errors.As(err, &pgErr) || pgErr.Code != pgerrcode.UniqueViolation) { return err } diff --git a/cmd/envtool/envtool_test.go b/cmd/envtool/envtool_test.go index 96b2706e834f..5a2d4fea168e 100644 --- a/cmd/envtool/envtool_test.go +++ b/cmd/envtool/envtool_test.go @@ -99,7 +99,7 @@ func TestPackageVersion(t *testing.T) { assert.Equal(t, "1.0.0", output.String()) } -func TestSetupPostgresUser(t *testing.T) { +func TestSetupUserInPostgres(t *testing.T) { if testing.Short() { t.Skip("skipping in -short mode") } @@ -141,10 +141,10 @@ func TestSetupPostgresUser(t *testing.T) { uri := fmt.Sprintf("postgres://username@127.0.0.1:5432/%s", dbName) - err = setupUser(ctx, l.Sugar(), uri) + err = setupUserInPostgres(ctx, l.Sugar(), uri) require.NoError(t, err) // if the user already exists, it should not fail - err = setupUser(ctx, l.Sugar(), uri) + err = setupUserInPostgres(ctx, l.Sugar(), uri) require.NoError(t, err) } diff --git a/cmd/envtool/system_users.json b/cmd/envtool/test_system_users.json similarity index 100% rename from cmd/envtool/system_users.json rename to cmd/envtool/test_system_users.json diff --git a/cmd/envtool/user.json b/cmd/envtool/test_user.json similarity index 100% rename from cmd/envtool/user.json rename to cmd/envtool/test_user.json