Show atlantis version in index page #57
Conversation
server/server.go
Outdated
| @@ -71,6 +72,7 @@ type Config struct { | |||
| SlackToken string `mapstructure:"slack-token"` | |||
| SSLCertFile string `mapstructure:"ssl-cert-file"` | |||
| SSLKeyFile string `mapstructure:"ssl-key-file"` | |||
| Version string `mapstructure:"version"` | |||
There was a problem hiding this comment.
It's kinda annoying right now but this struct is supposed to map to the config flags and the config file. That's what the mapstructure tags are for, so it can deserialize a yaml config file.
So given that, I don't think it makes sense to include Version here, because it's not something that a user is allowed to configure. What I think we should do:
- Rename this struct from
ConfigtoUserConfig - Rename the
FlagNamesstruct toConfigand add theVersionfield to that. - Instead of calling it
Version, let's useAtlantisVersionso it's clear it's not the terraform version or something else
server/server.go
Outdated
| s.IndexTemplate.Execute(w, results) // nolint: errcheck | ||
| s.IndexTemplate.Execute(w, IndexData { | ||
| Locks: lockResults, | ||
| Version: s.Version, |
| @@ -308,17 +311,20 @@ func (s *Server) Index(w http.ResponseWriter, _ *http.Request) { | |||
| return | |||
| } | |||
|
|
|||
| var results []LockIndexData | |||
| var lockResults []LockIndexData | |||
server/web_templates.go
Outdated
| @@ -24,6 +24,11 @@ type LockIndexData struct { | |||
| Time time.Time | |||
| } | |||
|
|
|||
| type IndexData struct { | |||
There was a problem hiding this comment.
Needs a comment, ex. // IndexData holds the data for rendering the index page
server/web_templates.go
Outdated
| @@ -24,6 +24,11 @@ type LockIndexData struct { | |||
| Time time.Time | |||
| } | |||
|
|
|||
| type IndexData struct { | |||
| Locks []LockIndexData | |||
| Version string | |||
server/web_templates.go
Outdated
| @@ -51,7 +56,7 @@ var indexTemplate = template.Must(template.New("index.html.tmpl").Parse(` | |||
| <div class="container"> | |||
| <section class="header"> | |||
| <a title="atlantis" href="/"><img src="/static/images/atlantis-icon.png"/></a> | |||
| <p class="title-heading">atlantis</p> | |||
| <p class="title-heading">atlantis {{ .Version }}</p> | |||
There was a problem hiding this comment.
I think this makes more sense to be in the bottom left of footer with the prefix v. I don't like having it in the title here because I think it gives the version too much prominence. If you don't want to mess with the CSS for a fixed footer that's totally fine, just LMK and I can merge your PR and then add that myself.
- Config to UserConfig - FlagNames to Config - Use AtlantisVersion to be clear
|
If you could add the version in the footer that would be awesome @lkysow |
Works towards #33