Merge pull request #218 from stlaz/version_remove

openshift-merge-robot · web-flow · commit 689fb46e116c · 2021-07-08T05:42:10.000-04:00
Bug 1980235: deprecate version
diff --git a/main.go b/main.go
@@ -109,7 +109,7 @@ func main() {
 	providerOpenShift.SetReviewCAs(openshiftCAs.Get().([]string))
 
 	if *showVersion {
-		fmt.Printf("oauth2_proxy v%s (built with %s)\n", VERSION, runtime.Version())
+		fmt.Printf("oauth2_proxy was built with %s\n", runtime.Version())
 		return
 	}
 
diff --git a/oauthproxy.go b/oauthproxy.go
@@ -473,15 +473,13 @@ func (p *OAuthProxy) SignInPage(rw http.ResponseWriter, req *http.Request, code
 		SignInMessage string
 		CustomLogin   bool
 		Redirect      string
-		Version       string
 		ProxyPrefix   string
 		Footer        template.HTML
 	}{
 		ProviderName:  p.provider.Data().ProviderName,
 		SignInMessage: p.SignInMessage,
 		CustomLogin:   p.displayCustomLoginForm(),
 		Redirect:      redirect_url,
-		Version:       VERSION,
 		ProxyPrefix:   p.ProxyPrefix,
 		Footer:        template.HTML(p.Footer),
 	}
diff --git a/templates.go b/templates.go
@@ -310,7 +310,7 @@ func getTemplates() *template.Template {
   <footer>
     {{ if eq .Footer "-" }}
     {{ else if eq .Footer ""}}
-      Secured with <a href="https://github.com/openshift/oauth-proxy#oauth2_proxy">OpenShift oauth-proxy</a> version {{.Version}}
+      Secured with <a href="https://github.com/openshift/oauth-proxy#oauth2_proxy">OpenShift oauth-proxy</a>
     {{ else }}
       {{.Footer}}
     {{ end }}
diff --git a/version.go b/version.go

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ func main() {`
`109`	`109`	`providerOpenShift.SetReviewCAs(openshiftCAs.Get().([]string))`
`110`	`110`
`111`	`111`	`if *showVersion {`
`112`		`- fmt.Printf("oauth2_proxy v%s (built with %s)\n", VERSION, runtime.Version())`
	`112`	`+ fmt.Printf("oauth2_proxy was built with %s\n", runtime.Version())`
`113`	`113`	`return`
`114`	`114`	`}`
`115`	`115`