Display version from git tag

ystv · Jul 21, 2021 · 7ba22f0 · 7ba22f0
1 parent a449d93
commit 7ba22f0
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 8 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -38,7 +38,7 @@ pipeline {
                                 sh '''ssh -tt deploy@web << EOF
                                     docker pull $REGISTRY_ENDPOINT/ystv/web-auth:$BUILD_ID
                                     docker rm -f ystv-web-auth || true
-                                    docker run -d -p 1335:8080 --env-file /data/webs/web-auth/env --name ystv-web-auth $REGISTRY_ENDPOINT/ystv/web-auth:$BUILD_ID
+                                    docker run -d -p 1335:8080 --env-file /data/webs/web-auth/env -e WAUTH_VERSION=$TAG_NAME --name ystv-web-auth $REGISTRY_ENDPOINT/ystv/web-auth:$BUILD_ID
                                     docker image prune -a -f --filter "label=site=auth"
                                 EOF'''
                             }
@@ -66,7 +66,7 @@ pipeline {
                                 echo err.getMessage()
                             }
                         }
-                        sh 'docker run -d -p 1335:8080 --env-file $APP_ENV --name ystv-web-auth $REGISTRY_ENDPOINT/ystv/web-auth:$BUILD_ID' // Deploying site
+                        sh 'docker run -d -p 1335:8080 --env-file $APP_ENV -e WAUTH_VERSION=$TAG_NAME --name ystv-web-auth $REGISTRY_ENDPOINT/ystv/web-auth:$BUILD_ID' // Deploying site
                         sh 'docker image prune -a -f --filter "label=site=auth"' // remove old image
                     }
                 }

diff --git a/main.go b/main.go
@@ -31,8 +31,14 @@ func main() {
 		log.Fatalf("template files failed: %+v", err)
 	}
 
+	version := os.Getenv("WAUTH_VERSION")
+	if version == "" {
+		version = "unknown"
+	}
+
 	// Generate config
 	conf := views.Config{
+		Version:        version,
 		DatabaseURL:    os.Getenv("WAUTH_DATABASE_URL"),
 		DomainName:     os.Getenv("WAUTH_DOMAIN_NAME"),
 		LogoutEndpoint: os.Getenv("WAUTH_LOGOUT_ENDPOINT"),

diff --git a/views/internal.go b/views/internal.go
@@ -59,7 +59,7 @@ func (v *Views) InternalFunc(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
 	}
-	c := getData(session)
+	c := v.getData(session)
 	lastLogin := time.Now()
 	if c.User.LastLogin.Valid {
 		lastLogin = c.User.LastLogin.Time

diff --git a/views/login.go b/views/login.go
@@ -55,7 +55,7 @@ func (v *Views) LoginFunc(w http.ResponseWriter, r *http.Request) {
 	switch r.Method {
 	case "GET":
 		// Data for our HTML template
-		context := getData(session)
+		context := v.getData(session)
 
 		// Check if there is a callback request
 		callbackURL, err := url.Parse(r.URL.Query().Get("callback"))
@@ -95,7 +95,7 @@ func (v *Views) LoginFunc(w http.ResponseWriter, r *http.Request) {
 				http.Error(w, err.Error(), http.StatusInternalServerError)
 				return
 			}
-			ctx := getData(session)
+			ctx := v.getData(session)
 			ctx.Callback = callback
 			ctx.Message = "Invalid username or password"
 			ctx.MsgType = "is-danger"

diff --git a/views/views.go b/views/views.go
@@ -25,6 +25,7 @@ import (
 type (
 	// Config the global web-auth configuration
 	Config struct {
+		Version        string
 		DatabaseURL    string
 		DomainName     string
 		LogoutEndpoint string
@@ -147,7 +148,7 @@ func (v Views) IndexFunc(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	// Data for our HTML template
-	context := getData(session)
+	context := v.getData(session)
 
 	// Check if there is a callback request
 	callbackURL, err := url.Parse(r.URL.Query().Get("callback"))
@@ -173,14 +174,14 @@ type Context struct {
 	User     types.User
 }
 
-func getData(s *sessions.Session) *Context {
+func (v Views) getData(s *sessions.Session) *Context {
 	val := s.Values["user"]
 	u := types.User{}
 	u, ok := val.(types.User)
 	if !ok {
 		u = types.User{Authenticated: false}
 	}
-	c := Context{Version: "0.4.12",
+	c := Context{Version: v.conf.Version,
 		Callback: "/internal",
 		User:     u,
 	}