Rename 'primary' to 'pgsql

Author: marcleblanc2

cmd/src/snapshot_databases.go

@@ -19,13 +19,13 @@ func init() {
 Note that these commands are intended for use as reference - you may need to adjust the commands for your deployment.
 
 USAGE
-	src [-v] snapshot databases [--targets=<docker|k8s|"targets.yaml">] [--run] <pg_dump|docker|kubectl> 
+	src [-v] snapshot databases [--targets=<docker|k8s|"targets.yaml">] [--run] <pg_dump|docker|kubectl>
 
 TARGETS FILES
 	Predefined targets are available based on default Sourcegraph configurations ('docker', 'k8s').
 	Custom targets configuration can be provided in YAML format with '--targets=target.yaml', e.g.
 
-		primary:
+		pgsql:
 			target: ...   # the DSN of the database deployment, e.g. in docker, the name of the database container
 			dbname: ...   # name of database
 			username: ... # username for database access
@@ -109,7 +109,7 @@ TARGETS FILES
 // predefinedDatabaseDumpTargets is based on default Sourcegraph configurations.
 var predefinedDatabaseDumpTargets = map[string]pgdump.Targets{
 	"local": {
-		Primary: pgdump.Target{
+		Pgsql: pgdump.Target{
 			DBName:   "sg",
 			Username: "sg",
 			Password: "sg",
@@ -126,7 +126,7 @@ var predefinedDatabaseDumpTargets = map[string]pgdump.Targets{
 		},
 	},
 	"docker": { // based on deploy-sourcegraph-managed
-		Primary: pgdump.Target{
+		Pgsql: pgdump.Target{
 			Target:   "pgsql",
 			DBName:   "sg",
 			Username: "sg",
@@ -146,7 +146,7 @@ var predefinedDatabaseDumpTargets = map[string]pgdump.Targets{
 		},
 	},
 	"k8s": { // based on deploy-sourcegraph-helm
-		Primary: pgdump.Target{
+		Pgsql: pgdump.Target{
 			Target:   "statefulset/pgsql",
 			DBName:   "sg",
 			Username: "sg",

cmd/src/snapshot_restore.go

@@ -25,7 +25,7 @@ TARGETS FILES
 	Predefined targets are available based on default Sourcegraph configurations ('docker', 'k8s').
 	Custom targets configuration can be provided in YAML format with '--targets=target.yaml', e.g.
 
-		primary:
+		pgsql:
 			target: ...   # the DSN of the database deployment, e.g. in docker, the name of the database container
 			dbname: ...   # name of database
 			username: ... # username for database access

internal/pgdump/pgdump.go

@@ -9,7 +9,7 @@ import (
 
 // Targets represents configuration for each of Sourcegraph's databases.
 type Targets struct {
-	Primary      Target `yaml:"primary"`
+	Pgsql        Target `yaml:"pgsql"`
 	CodeIntel    Target `yaml:"codeintel"`
 	CodeInsights Target `yaml:"codeinsights"`
 }
@@ -59,8 +59,8 @@ type Output struct {
 // path. It can be provided a zero-value Targets to just generate the output paths.
 func Outputs(dir string, targets Targets) []Output {
 	return []Output{{
-		Output: filepath.Join(dir, "primary.sql"),
-		Target: targets.Primary,
+		Output: filepath.Join(dir, "pgsql.sql"),
+		Target: targets.Pgsql,
 	}, {
 		Output: filepath.Join(dir, "codeintel.sql"),
 		Target: targets.CodeIntel,