Просмотр исходного кода

add version field back to metadata

Alexander Belanger 4 лет назад
Родитель
Сommit
4cffbe014a
3 измененных файлов с 14 добавлено и 9 удалено
  1. 2 1
      .air.toml
  2. 2 0
      api/server/shared/config/config.go
  3. 10 8
      api/server/shared/config/metadata.go

+ 2 - 1
.air.toml

@@ -7,7 +7,8 @@ tmp_dir = "tmp"
 
 [build]
 # Just plain old shell command. You could use `make` as well.
-cmd = "go build -o ./tmp/app -tags ee ./cmd/app"
+cmd = "go build -o ./tmp/app -tags ee -ldflags=\"-X 'github.com/porter-dev/porter/api/server/shared/config.Version=dev-ee'\" ./cmd/app"
+
 # Binary file yields from `cmd`.
 bin = "tmp/app"
 # Customize binary.

+ 2 - 0
api/server/shared/config/config.go

@@ -17,6 +17,8 @@ import (
 	"gorm.io/gorm"
 )
 
+var Version string = "dev-ce"
+
 type Config struct {
 	// Logger for logging
 	Logger *logger.Logger

+ 10 - 8
api/server/shared/config/metadata.go

@@ -3,14 +3,15 @@ package config
 import "github.com/porter-dev/porter/api/server/shared/config/env"
 
 type Metadata struct {
-	Provisioning       bool `json:"provisioner"`
-	Github             bool `json:"github"`
-	BasicLogin         bool `json:"basic_login"`
-	GithubLogin        bool `json:"github_login"`
-	GoogleLogin        bool `json:"google_login"`
-	SlackNotifications bool `json:"slack_notifications"`
-	Email              bool `json:"email"`
-	Analytics          bool `json:"analytics"`
+	Provisioning       bool   `json:"provisioner"`
+	Github             bool   `json:"github"`
+	BasicLogin         bool   `json:"basic_login"`
+	GithubLogin        bool   `json:"github_login"`
+	GoogleLogin        bool   `json:"google_login"`
+	SlackNotifications bool   `json:"slack_notifications"`
+	Email              bool   `json:"email"`
+	Analytics          bool   `json:"analytics"`
+	Version            string `json:"version"`
 }
 
 func MetadataFromConf(sc *env.ServerConf) *Metadata {
@@ -24,6 +25,7 @@ func MetadataFromConf(sc *env.ServerConf) *Metadata {
 		SlackNotifications: sc.SlackClientID != "" && sc.SlackClientSecret != "",
 		Email:              sc.SendgridAPIKey != "",
 		Analytics:          sc.SegmentClientKey != "",
+		Version:            Version,
 	}
 }