From 74abc01ec694ff0ad3a2e4ecd03744bcdb9956c7 Mon Sep 17 00:00:00 2001
From: Kevin Midboe <kevin.midboe@gmail.com>
Date: Sat, 17 Dec 2022 15:55:51 +0100
Subject: [PATCH] Dockerfile creates volumes for secrets & logs

- Renamed logs folder to kebab-case
- All logger error variables renamed to err
---
 Dockerfile       |  8 ++++++++
 logger/logger.go | 14 +++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6d6f3f8..f1794c1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,6 +16,14 @@ EXPOSE 8000
 
 RUN apk add --no-cache ca-certificates
 
+RUN mkdir -p /etc/secrets
+VOLUME /etc/secrets
+
+RUN mkdir -p /var/log/planetposen-logs
+VOLUME /var/log/planetposen-logs
+
 COPY --from=builder /go/src/github.com/kevinmidboe/planetposen-images .
 
+ENV GOOGLE_APPLICATION_CREDENTIALS=/etc/secrets/sa-key.json
+
 CMD ["./main"]
\ No newline at end of file
diff --git a/logger/logger.go b/logger/logger.go
index 23ae7d5..e3d0185 100644
--- a/logger/logger.go
+++ b/logger/logger.go
@@ -22,7 +22,7 @@ func InitLogger() *ApplicationLogger {
 	var baseLogger = logrus.New()
 	var applicationLogger = &ApplicationLogger{baseLogger}
 
-	f, _ := os.OpenFile("/var/log/planetposen_logs/planetposen-images.log", os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666)
+	f, _ := os.OpenFile("/var/log/planetposen-logs/planetposen-images.log", os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666)
 
 	applicationLogger.SetOutput(f)
 	applicationLogger.Formatter = &logrus.JSONFormatter{
@@ -72,25 +72,25 @@ func (l *ApplicationLogger) UploadSuccessMessage(path string, url string) {
 	}).Info("Uploaded and available")
 }
 
-func (l *ApplicationLogger) Error(message string, error error) {
+func (l *ApplicationLogger) Error(message string, err error) {
 	l.WithFields(logrus.Fields{
 		"application": "planetposen-images",
-		"err":         error,
+		"err":         err,
 	}).Error(message)
 }
 
-func (l *ApplicationLogger) Fatal(error error) {
+func (l *ApplicationLogger) Fatal(err error) {
 	l.WithFields(logrus.Fields{
 		"application": "planetposen-images",
-		"err":         error,
+		"err":         err,
 	}).Fatal("Fatal application exception!")
 }
 
-func (l *ApplicationLogger) GoogleApiError(message string, error error) {
+func (l *ApplicationLogger) GoogleApiError(message string, err error) {
 	l.WithFields(logrus.Fields{
 		"application": "planetposen-images",
 		"go_package":  "cloud.google.com/go/storage",
-		"err":         error,
+		"err":         err,
 	}).Error(message)
 }