Allow Eval without variants (#145)

* WIP: allow rules without variants; fix modal css issues; smaller assets

* Add *_vfsdata.go to gitignore

* Add back vfsdata assets for now

* Upgrade go; move config to own package

* Fix configs in dockerfiles

* Update CHANGELOG

CHANGELOG.md

@@ -3,6 +3,12 @@
 This format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+
+### Added
+
+* Support evaluating flags without variants: [https://github.com/markphelps/flipt/issues/138](https://github.com/markphelps/flipt/issues/138)
+
 ## [v0.8.0](https://github.com/markphelps/flipt/releases/tag/v0.8.0) - 2019-09-15
 
 ### Added

Dockerfile

@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.12
+ARG GO_VERSION=1.13.1
 
 FROM golang:$GO_VERSION-alpine AS build
 
@@ -34,7 +34,8 @@ RUN mkdir -p /etc/flipt && \
     mkdir -p /var/opt/flipt
 
 COPY --from=build /go/bin/flipt /
-COPY config /etc/flipt/config
+COPY config/migrations/ /etc/flipt/config/migrations/
+COPY config/*.yml /etc/flipt/config/
 
 EXPOSE 8080
 EXPOSE 9000

cmd/flipt/main.go

@@ -3,6 +3,7 @@ package main
 import (
 	"context"
 	"crypto/tls"
+	"encoding/json"
 	"fmt"
 	"net"
 	"net/http"
@@ -30,6 +31,7 @@ import (
 	"github.com/golang-migrate/migrate/database/postgres"
 	"github.com/golang-migrate/migrate/database/sqlite3"
 	grpc_gateway "github.com/grpc-ecosystem/grpc-gateway/runtime"
+	"github.com/markphelps/flipt/config"
 	pb "github.com/markphelps/flipt/rpc"
 	"github.com/markphelps/flipt/server"
 	"github.com/markphelps/flipt/storage"
@@ -67,7 +69,7 @@ const (
 
 var (
 	logger = logrus.New()
-	cfg    *config
+	cfg    *config.Config
 
 	cfgPath      string
 	printVersion bool
@@ -119,7 +121,7 @@ func printVersionHeader() {
 func runMigrations() error {
 	var err error
 
-	cfg, err = configure(cfgPath)
+	cfg, err = config.Load(cfgPath)
 	if err != nil {
 		return err
 	}
@@ -177,7 +179,7 @@ func execute() error {
 
 	var err error
 
-	cfg, err = configure(cfgPath)
+	cfg, err = config.Load(cfgPath)
 	if err != nil {
 		return errors.Wrap(err, "loading configuration")
 	}
@@ -301,7 +303,7 @@ func execute() error {
 			grpc_recovery.UnaryServerInterceptor(),
 		))
 
-		if cfg.Server.Protocol == HTTPS {
+		if cfg.Server.Protocol == config.HTTPS {
 			creds, err := credentials.NewServerTLSFromFile(cfg.Server.CertFile, cfg.Server.CertKey)
 			if err != nil {
 				return errors.Wrap(err, "loading TLS credentials")
@@ -327,15 +329,15 @@ func execute() error {
 		)
 
 		switch cfg.Server.Protocol {
-		case HTTPS:
+		case config.HTTPS:
 			creds, err := credentials.NewClientTLSFromFile(cfg.Server.CertFile, "")
 			if err != nil {
 				return errors.Wrap(err, "loading TLS credentials")
 			}
 
 			opts = append(opts, grpc.WithTransportCredentials(creds))
 			httpPort = cfg.Server.HTTPSPort
-		case HTTP:
+		case config.HTTP:
 			opts = append(opts, grpc.WithInsecure())
 			httpPort = cfg.Server.HTTPPort
 		}
@@ -400,7 +402,7 @@ func execute() error {
 			logger.Infof("ui available at: %s://%s:%d", cfg.Server.Protocol, cfg.Server.Host, httpPort)
 		}
 
-		if cfg.Server.Protocol == HTTPS {
+		if cfg.Server.Protocol == config.HTTPS {
 			httpServer.TLSConfig = &tls.Config{
 				MinVersion:               tls.VersionTLS12,
 				PreferServerCipherSuites: true,
@@ -458,3 +460,25 @@ func execute() error {
 
 	return g.Wait()
 }
+
+type info struct {
+	Version   string `json:"version,omitempty"`
+	Commit    string `json:"commit,omitempty"`
+	BuildDate string `json:"buildDate,omitempty"`
+	GoVersion string `json:"goVersion,omitempty"`
+}
+
+func (i info) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	out, err := json.Marshal(i)
+	if err != nil {
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	if _, err = w.Write(out); err != nil {
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	w.WriteHeader(http.StatusOK)
+}

cmd/flipt/config.go → config/config.go

@@ -1,4 +1,4 @@
-package main
+package config
 
 import (
 	"encoding/json"
@@ -11,7 +11,7 @@ import (
 	"github.com/spf13/viper"
 )
 
-type config struct {
+type Config struct {
 	LogLevel string         `json:"logLevel,omitempty"`
 	UI       uiConfig       `json:"ui,omitempty"`
 	Cors     corsConfig     `json:"cors,omitempty"`
@@ -76,8 +76,8 @@ type databaseConfig struct {
 	URL            string `json:"url,omitempty"`
 }
 
-func defaultConfig() *config {
-	return &config{
+func Default() *Config {
+	return &Config{
 		LogLevel: "INFO",
 
 		UI: uiConfig{
@@ -140,7 +140,7 @@ const (
 	cfgDBMigrationsPath = "db.migrations.path"
 )
 
-func configure(path string) (*config, error) {
+func Load(path string) (*Config, error) {
 	viper.SetEnvPrefix("FLIPT")
 	viper.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))
 	viper.AutomaticEnv()
@@ -151,7 +151,7 @@ func configure(path string) (*config, error) {
 		return nil, errors.Wrap(err, "loading config")
 	}
 
-	cfg := defaultConfig()
+	cfg := Default()
 
 	// Logging
 	if viper.IsSet(cfgLogLevel) {
@@ -213,13 +213,13 @@ func configure(path string) (*config, error) {
 	}
 
 	if err := cfg.validate(); err != nil {
-		return &config{}, err
+		return &Config{}, err
 	}
 
 	return cfg, nil
 }
 
-func (c *config) validate() error {
+func (c *Config) validate() error {
 	if c.Server.Protocol == HTTPS {
 		if c.Server.CertFile == "" {
 			return errors.New("cert_file cannot be empty when using HTTPS")
@@ -238,40 +238,14 @@ func (c *config) validate() error {
 	return nil
 }
 
-func (c *config) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+func (c *Config) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	out, err := json.Marshal(c)
 	if err != nil {
-		logger.WithError(err).Error("getting config")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
 
 	if _, err = w.Write(out); err != nil {
-		logger.WithError(err).Error("writing response")
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
-	w.WriteHeader(http.StatusOK)
-}
-
-type info struct {
-	Version   string `json:"version,omitempty"`
-	Commit    string `json:"commit,omitempty"`
-	BuildDate string `json:"buildDate,omitempty"`
-	GoVersion string `json:"goVersion,omitempty"`
-}
-
-func (i info) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	out, err := json.Marshal(i)
-	if err != nil {
-		logger.WithError(err).Error("getting metadata")
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
-	if _, err = w.Write(out); err != nil {
-		logger.WithError(err).Error("writing response")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}

cmd/flipt/config_test.go → config/config_test.go

@@ -1,4 +1,4 @@
-package main
+package config
 
 import (
 	"io/ioutil"
@@ -10,22 +10,22 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestConfigure(t *testing.T) {
+func TestLoad(t *testing.T) {
 	tests := []struct {
 		name     string
 		path     string
 		wantErr  bool
-		expected *config
+		expected *Config
 	}{
 		{
 			name:     "defaults",
 			path:     "./testdata/config/default.yml",
-			expected: defaultConfig(),
+			expected: Default(),
 		},
 		{
 			name: "configured",
 			path: "./testdata/config/advanced.yml",
-			expected: &config{
+			expected: &Config{
 				LogLevel: "WARN",
 				UI: uiConfig{
 					Enabled: false,
@@ -65,7 +65,7 @@ func TestConfigure(t *testing.T) {
 		)
 
 		t.Run(tt.name, func(t *testing.T) {
-			cfg, err := configure(path)
+			cfg, err := Load(path)
 
 			if wantErr {
 				require.Error(t, err)
@@ -83,13 +83,13 @@ func TestConfigure(t *testing.T) {
 func TestValidate(t *testing.T) {
 	tests := []struct {
 		name       string
-		cfg        *config
+		cfg        *Config
 		wantErr    bool
 		wantErrMsg string
 	}{
 		{
 			name: "https: valid",
-			cfg: &config{
+			cfg: &Config{
 				Server: serverConfig{
 					Protocol: HTTPS,
 					CertFile: "./testdata/config/ssl_cert.pem",
@@ -99,7 +99,7 @@ func TestValidate(t *testing.T) {
 		},
 		{
 			name: "http: valid",
-			cfg: &config{
+			cfg: &Config{
 				Server: serverConfig{
 					Protocol: HTTP,
 					CertFile: "foo.pem",
@@ -109,7 +109,7 @@ func TestValidate(t *testing.T) {
 		},
 		{
 			name: "https: empty cert_file path",
-			cfg: &config{
+			cfg: &Config{
 				Server: serverConfig{
 					Protocol: HTTPS,
 					CertFile: "",
@@ -121,7 +121,7 @@ func TestValidate(t *testing.T) {
 		},
 		{
 			name: "https: empty key_file path",
-			cfg: &config{
+			cfg: &Config{
 				Server: serverConfig{
 					Protocol: HTTPS,
 					CertFile: "./testdata/config/ssl_cert.pem",
@@ -133,7 +133,7 @@ func TestValidate(t *testing.T) {
 		},
 		{
 			name: "https: missing cert_file",
-			cfg: &config{
+			cfg: &Config{
 				Server: serverConfig{
 					Protocol: HTTPS,
 					CertFile: "foo.pem",
@@ -145,7 +145,7 @@ func TestValidate(t *testing.T) {
 		},
 		{
 			name: "https: missing key_file",
-			cfg: &config{
+			cfg: &Config{
 				Server: serverConfig{
 					Protocol: HTTPS,
 					CertFile: "./testdata/config/ssl_cert.pem",
@@ -178,9 +178,9 @@ func TestValidate(t *testing.T) {
 	}
 }
 
-func TestConfigServeHTTP(t *testing.T) {
+func TestServeHTTP(t *testing.T) {
 	var (
-		cfg = defaultConfig()
+		cfg = Default()
 		req = httptest.NewRequest("GET", "http://example.com/foo", nil)
 		w   = httptest.NewRecorder()
 	)
@@ -195,26 +195,3 @@ func TestConfigServeHTTP(t *testing.T) {
 	assert.Equal(t, http.StatusOK, resp.StatusCode)
 	assert.NotEmpty(t, body)
 }
-
-func TestInfoServeHTTP(t *testing.T) {
-	var (
-		i = info{
-			Version:   "1.0.0",
-			Commit:    "12345",
-			BuildDate: "2019-09-01",
-			GoVersion: "1.12.9",
-		}
-		req = httptest.NewRequest("GET", "http://example.com/foo", nil)
-		w   = httptest.NewRecorder()
-	)
-
-	i.ServeHTTP(w, req)
-
-	resp := w.Result()
-	defer resp.Body.Close()
-
-	body, _ := ioutil.ReadAll(resp.Body)
-
-	assert.Equal(t, http.StatusOK, resp.StatusCode)
-	assert.NotEmpty(t, body)
-}

dev/centos/setup.sh

@@ -3,7 +3,7 @@ set -euxo pipefail
 
 NODE_VERSION='12.4.0'
 YARN_VERSION='1.16.0'
-GO_VERSION='1.12.5'
+GO_VERSION='1.13.1'
 PROTOC_VERSION='3.6.1'
 
 echo '=== Installing necessary system libraries to build'

dev/ubuntu/setup.sh

@@ -3,7 +3,7 @@ set -euxo pipefail
 
 NODE_VERSION='12.4.0'
 YARN_VERSION='1.16.0'
-GO_VERSION='1.12.5'
+GO_VERSION='1.13.1'
 PROTOC_VERSION='3.6.1'
 
 echo '=== Installing necessary system libraries to build'