Rename environment prefix/app name to fleetdb (#8)

Alva8756 · web-flow · commit cce197c3b921 · 2024-02-20T10:55:49.000-08:00
diff --git a/.github/workflows/lint-test.yml b/.github/workflows/lint-test.yml
@@ -36,8 +36,8 @@ jobs:
           args: --timeout=5m
 
       - name: Run go tests and generate coverage report
-        run: SERVERSERVICE_CRDB_URI="host=localhost port=26257 user=root sslmode=disable dbname=serverservice_test" go test -test.v -race -coverprofile=coverage.txt -covermode=atomic -tags testtools -p 1 ./...
-
+        run: FLEETDB_CRDB_URI="host=localhost port=26257 user=root sslmode=disable dbname=fleetdb_test" go test -race -coverprofile=coverage.txt -covermode=atomic -tags testtools -p 1 ./...
+        
       - name: Stop test database
         run: cockroach node drain --insecure --host=localhost:26257
 
diff --git a/Dockerfile.dev b/Dockerfile.dev
@@ -16,12 +16,12 @@ RUN go mod tidy
 # Build the binary.
 # -mod=readonly ensures immutable go.mod and go.sum in container builds.
 RUN export LDFLAG_LOCATION="go.infratographer.com/x/versionx" && \
-	CGO_ENABLED=0 GOOS=linux go build -mod=readonly -v -o fleetdb \
+    CGO_ENABLED=0 GOOS=linux go build -mod=readonly -v -o fleetdb \
 	-ldflags \
-		"-X ${LDFLAG_LOCATION}.appName=serverservice \
-		 -X ${LDFLAG_LOCATION}.commit=$(git rev-parse --short HEAD) \
-		 -X ${LDFLAG_LOCATION}.version=$(git describe --tags 2>/dev/null) \
-		 -X ${LDFLAG_LOCATION}.date=$(date -u '+%H:%M:%S-%Y-%m-%d')"
+            "-X ${LDFLAG_LOCATION}.appName=fleetdb \
+             -X ${LDFLAG_LOCATION}.commit=$(git rev-parse --short HEAD) \
+             -X ${LDFLAG_LOCATION}.version=$(git describe --tags 2>/dev/null) \
+             -X ${LDFLAG_LOCATION}.date=$(date -u '+%H:%M:%S-%Y-%m-%d')"
 
 # Use the official Alpine image for a lean production container.
 # https://hub.docker.com/_/alpine
diff --git a/Makefile b/Makefile
@@ -2,8 +2,8 @@ all: lint test
 PHONY: test coverage lint golint clean vendor local-dev-databases docker-up docker-down integration-test unit-test
 GOOS=linux
 DB_STRING=host=localhost port=26257 user=root sslmode=disable
-DEV_DB=${DB_STRING} dbname=serverservice
-TEST_DB=${DB_STRING} dbname=serverservice_test
+DEV_DB=${DB_STRING} dbname=fleetdb
+TEST_DB=${DB_STRING} dbname=fleetdb_test
 DOCKER_IMAGE := "ghcr.io/metal-toolbox/fleetdb"
 PROJECT_NAME := fleetdb
 REPO := "https://github.com/metal-toolbox/fleetdb.git"
@@ -14,7 +14,7 @@ test: | unit-test integration-test
 ## run integration tests
 integration-test: test-database
 	@echo Running integration tests...
-	@SERVERSERVICE_CRDB_URI="${TEST_DB}" go test -cover -tags testtools,integration -p 1 ./...
+	@FLEETDB_CRDB_URI="${TEST_DB}" go test -cover -tags testtools,integration -p 1 ./...
 
 ## run lint and unit tests
 unit-test: | lint
@@ -24,7 +24,7 @@ unit-test: | lint
 ## check test coverage
 coverage: | test-database
 	@echo Generating coverage report...
-	@SERVERSERVICE_CRDB_URI="${TEST_DB}" go test ./... -race -coverprofile=coverage.out -covermode=atomic -tags testtools -p 1
+	@FLEETDB_CRDB_URI="${TEST_DB}" go test ./... -race -coverprofile=coverage.out -covermode=atomic -tags testtools -p 1
 	@go tool cover -func=coverage.out
 	@go tool cover -html=coverage.out
 
@@ -60,16 +60,16 @@ docker-clean:
 
 ## setup devel database
 dev-database: | vendor
-	@cockroach sql --insecure -e "drop database if exists serverservice"
-	@cockroach sql --insecure -e "create database serverservice"
-	@SERVERSERVICE_CRDB_URI="${DEV_DB}" go run main.go migrate up
+	@cockroach sql --insecure -e "drop database if exists fleetdb"
+	@cockroach sql --insecure -e "create database fleetdb"
+	@FLEETDB_CRDB_URI="${DEV_DB}" go run main.go migrate up
 
 ## setup test database
 test-database: | vendor
-	@cockroach sql --insecure -e "drop database if exists serverservice_test"
-	@cockroach sql --insecure -e "create database serverservice_test"
-	@SERVERSERVICE_CRDB_URI="${TEST_DB}" go run main.go migrate up
-	@cockroach sql --insecure -e "use serverservice_test; ALTER TABLE attributes DROP CONSTRAINT check_server_id_server_component_id; ALTER TABLE versioned_attributes DROP CONSTRAINT check_server_id_server_component_id;"
+	@cockroach sql --insecure -e "drop database if exists fleetdb_test"
+	@cockroach sql --insecure -e "create database fleetdb_test"
+	@FLEETDB_CRDB_URI="${TEST_DB}" go run main.go migrate up
+	@cockroach sql --insecure -e "use fleetdb_test; ALTER TABLE attributes DROP CONSTRAINT check_server_id_server_component_id; ALTER TABLE versioned_attributes DROP CONSTRAINT check_server_id_server_component_id;"
 
 ## Build linux bin
 build-linux:
diff --git a/README.md b/README.md
@@ -54,7 +54,7 @@ sqlboiler crdb --add-soft-deletes
 Export the DB URI required for integration tests.
 
 ```bash
-export SERVERSERVICE_CRDB_URI="host=localhost port=26257 user=root sslmode=disable dbname=serverservice_test"
+export FLEETDB_CRDB_URI="host=localhost port=26257 user=root sslmode=disable dbname=fleetdb_test"
 ```
 
 Run test.
diff --git a/cmd/root.go b/cmd/root.go
@@ -18,7 +18,7 @@ import (
 )
 
 var (
-	appName = "serverservice"
+	appName = "fleetdb"
 	cfgFile string
 	logger  *zap.SugaredLogger
 )
@@ -69,7 +69,7 @@ func initConfig() {
 	}
 
 	viper.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))
-	viper.SetEnvPrefix("serverservice")
+	viper.SetEnvPrefix("fleetdb")
 	viper.AutomaticEnv() // read in environment variables that match
 
 	// If a config file is found, read it in.
diff --git a/internal/dbtools/testtools.go b/internal/dbtools/testtools.go
@@ -27,7 +27,7 @@ import (
 )
 
 // TestDBURI is the URI for the test database
-var TestDBURI = os.Getenv("SERVERSERVICE_CRDB_URI")
+var TestDBURI = os.Getenv("FLEETDB_CRDB_URI")
 var testDB *sqlx.DB
 var testKeeper *secrets.Keeper
 
diff --git a/quickstart-dev.yml b/quickstart-dev.yml
@@ -1,12 +1,12 @@
 version: "3.9"
 
 services:
-  serverservice:
+  fleetdb:
     build:
       context: .
       dockerfile: Dockerfile.dev
 
-  serverservice-migrate:
+  fleetdb-migrate:
     build:
       context: .
       dockerfile: Dockerfile.dev
diff --git a/quickstart-tracing.yml b/quickstart-tracing.yml
@@ -1,14 +1,14 @@
 version: '3.7'
 
 services:
-  serverservice:
+  fleetdb:
     depends_on:
       - jaeger
     environment:
-      - SERVERSERVICE_TRACING_ENABLED=true
-      - SERVERSERVICE_TRACING_ENVIRONMENT=dev-dockercompose
-      - SERVERSERVICE_TRACING_PROVIDER=jaeger
-      - SERVERSERVICE_TRACING_JAEGER_ENDPOINT=http://jaeger:14268/api/traces
+      - FLEETDB_TRACING_ENABLED=true
+      - FLEETDB_TRACING_ENVIRONMENT=dev-dockercompose
+      - FLEETDB_TRACING_PROVIDER=jaeger
+      - FLEETDB_TRACING_JAEGER_ENDPOINT=http://jaeger:14268/api/traces
 
   jaeger:
     image: jaegertracing/all-in-one:1.48.0
diff --git a/quickstart.yml b/quickstart.yml
@@ -1,29 +1,29 @@
 version: "3.9"
 
 services:
-  serverservice:
+  fleetdb:
     image: ghcr.io/metal-toolbox/fleetdb:latest
     depends_on:
       - crdb
-      - serverservice-migrate
+      - fleetdb-migrate
     environment:
-      - SERVERSERVICE_OIDC_ENABLED=false
-      - SERVERSERVICE_CRDB_URI=postgresql://root@crdb:26257/defaultdb?sslmode=disable
-      - SERVERSERVICE_DB_ENCRYPTION_DRIVER=base64key://smGbjm71Nxd1Ig5FS0wj9SlbzAIrnolCz9bQQ6uAhl4=
+      - FLEETDB_OIDC_ENABLED=false
+      - FLEETDB_CRDB_URI=postgresql://root@crdb:26257/defaultdb?sslmode=disable
+      - FLEETDB_DB_ENCRYPTION_DRIVER=base64key://smGbjm71Nxd1Ig5FS0wj9SlbzAIrnolCz9bQQ6uAhl4=
     ports:
       - "8000:8000"
     restart: unless-stopped
     networks:
       - hollow
 
-  serverservice-migrate:
+  fleetdb-migrate:
     image: ghcr.io/metal-toolbox/fleetdb:latest
     command:
       migrate up
     depends_on:
       - crdb
     environment:
-      - SERVERSERVICE_CRDB_URI=postgresql://root@crdb:26257/defaultdb?sslmode=disable
+      - FLEETDB_CRDB_URI=postgresql://root@crdb:26257/defaultdb?sslmode=disable
     restart: on-failure
     networks:
       - hollow
diff --git a/sqlboiler.toml b/sqlboiler.toml
@@ -3,7 +3,7 @@ pkgname = "models"
 output = "internal/models"
 
 [crdb]
-dbname = "serverservice_test"
+dbname = "fleetdb_test"
 host = "localhost"
 port = 26257
 user = "root"

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ import (`
`18`	`18`	`)`
`19`	`19`
`20`	`20`	`var (`
`21`		`- appName = "serverservice"`
	`21`	`+ appName = "fleetdb"`
`22`	`22`	`cfgFile string`
`23`	`23`	`logger *zap.SugaredLogger`
`24`	`24`	`)`
`@@ -69,7 +69,7 @@ func initConfig() {`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`viper.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))`
`72`		`- viper.SetEnvPrefix("serverservice")`
	`72`	`+ viper.SetEnvPrefix("fleetdb")`
`73`	`73`	`viper.AutomaticEnv() // read in environment variables that match`
`74`	`74`
`75`	`75`	`// If a config file is found, read it in.`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ import (`
`27`	`27`	`)`
`28`	`28`
`29`	`29`	`// TestDBURI is the URI for the test database`
`30`		`-var TestDBURI = os.Getenv("SERVERSERVICE_CRDB_URI")`
	`30`	`+var TestDBURI = os.Getenv("FLEETDB_CRDB_URI")`
`31`	`31`	`var testDB *sqlx.DB`
`32`	`32`	`var testKeeper *secrets.Keeper`
`33`	`33`