Fix: tests

Author: aopoltorzhicky

config/config.go

@@ -40,7 +40,7 @@ type Contract struct {
 // Database
 type Database struct {
 	Path       string `yaml:"path"`
-	Kind       string `yaml:"kind" validate:"required,oneof=sqlite postgres mysql clickhouse"`
+	Kind       string `yaml:"kind" validate:"required,oneof=sqlite postgres mysql clickhouse elasticsearch"`
 	Host       string `yaml:"host" validate:"required_with=Port User Database"`
 	Port       int    `yaml:"port" validate:"required_with=Host User Database,gt=-1,lt=65535"`
 	User       string `yaml:"user" validate:"required_with=Host Port Database"`

config/consts.go

@@ -2,8 +2,9 @@ package config
 
 // Supported database kinds
 const (
-	DBKindSqlite     = "sqlite"
-	DBKindPostgres   = "postgres"
-	DBKindMysql      = "mysql"
-	DBKindClickhouse = "clickhouse"
+	DBKindSqlite        = "sqlite"
+	DBKindPostgres      = "postgres"
+	DBKindMysql         = "mysql"
+	DBKindClickhouse    = "clickhouse"
+	DBKindElasticSearch = "elasticsearch"
 )

hasura/api.go

@@ -130,7 +130,7 @@ func (api *API) AddSource(ctx context.Context, hasura *config.Hasura, cfg config
 			"name": hasura.Source,
 			"configuration": Configuration{
 				ConnectionInfo: ConnectionInfo{
-					DatabaseUrl:           fmt.Sprintf("postgresql://%s:%s@%s:%d/%s", cfg.User, cfg.Password, cfg.Host, cfg.Port, cfg.Database),
+					DatabaseUrl:           DatabaseUrl(fmt.Sprintf("postgresql://%s:%s@%s:%d/%s", cfg.User, cfg.Password, cfg.Host, cfg.Port, cfg.Database)),
 					UsePreparedStatements: true,
 					IsolationLevel:        "read-committed",
 				},

hasura/hasura.go

@@ -51,8 +51,7 @@ func Create(ctx context.Context, hasura *config.Hasura, cfg config.Database, vie
 
 	if hasura.AddSource {
 		log.Info().Msg("Adding source...")
-		err := api.AddSource(ctx, hasura, cfg)
-		if err != nil {
+		if err := api.AddSource(ctx, hasura, cfg); err != nil {
 			return err
 		}
 	}
@@ -69,24 +68,24 @@ func Create(ctx context.Context, hasura *config.Hasura, cfg config.Database, vie
 	}
 
 	// Find our source in the existing metadata
-	var selected_source *Source = nil
+	var selectedSource *Source = nil
 	for idx := range export.Sources {
 		if export.Sources[idx].Name == hasura.Source {
-			selected_source = &export.Sources[idx]
+			selectedSource = &export.Sources[idx]
 			break
 		}
 	}
-	if selected_source == nil {
+	if selectedSource == nil {
 		return errors.Errorf("Source '%s' not found on exported metadata", hasura.Source)
 	}
 
 	log.Info().Msg("Merging metadata...")
 	// Clear tables
 	// TODO: maybe instead replace tables by name.
-	selected_source.Tables = make([]Table, 0)
+	selectedSource.Tables = make([]Table, 0)
 	// Insert generated tables
 	for _, table := range metadata.Sources[0].Tables {
-		selected_source.Tables = append(selected_source.Tables, table)
+		selectedSource.Tables = append(selectedSource.Tables, table)
 	}
 
 	if err := createQueryCollections(&export); err != nil {

hasura/hasura_test.go

@@ -142,12 +142,13 @@ func TestGenerate(t *testing.T) {
 				hasura: config.Hasura{
 					EnableAggregations: true,
 					RowsLimit:          5,
+					Source:             "mysql",
 				},
 				models: []interface{}{
 					&testTable{}, &testTable2{}, &testTable3{}, &testTable4{},
 				},
 			},
-			want: `{"tables":[{"array_relationships":[],"object_relationships":[],"select_permissions":[{"permission":{"limit":5,"allow_aggregations":true,"columns":["field_1","field_2"],"filter":{}},"role":"user"}],"table":{"name":"test_table","schema":"public"}},{"array_relationships":[],"object_relationships":[],"select_permissions":[{"permission":{"limit":5,"allow_aggregations":true,"columns":["field_1","field_2"],"filter":{}},"role":"user"}],"table":{"name":"fake_name","schema":"public"}},{"array_relationships":[],"object_relationships":[],"select_permissions":[{"permission":{"limit":5,"allow_aggregations":true,"columns":["field_2"],"filter":{}},"role":"user"}],"table":{"name":"test_table_3","schema":"public"}},{"array_relationships":[],"object_relationships":[],"select_permissions":[{"permission":{"limit":5,"allow_aggregations":true,"columns":["field_2","field_3"],"filter":{}},"role":"user"}],"table":{"name":"test_table_4","schema":"public"}}],"version":2}`,
+			want: `{"version":3,"sources":[{"name":"mysql","kind":"","tables":[{"object_relationships":[],"array_relationships":[],"select_permissions":[{"role":"user","permission":{"columns":["field_1","field_2"],"limit":5,"allow_aggregations":true,"filter":{}}}],"configuration":{"comment":null,"custom_root_fields":null,"custom_column_names":null},"table":{"schema":"public","name":"test_table"}},{"object_relationships":[],"array_relationships":[],"select_permissions":[{"role":"user","permission":{"columns":["field_1","field_2"],"limit":5,"allow_aggregations":true,"filter":{}}}],"configuration":{"comment":null,"custom_root_fields":null,"custom_column_names":null},"table":{"schema":"public","name":"fake_name"}},{"object_relationships":[],"array_relationships":[],"select_permissions":[{"role":"user","permission":{"columns":["field_2"],"limit":5,"allow_aggregations":true,"filter":{}}}],"configuration":{"comment":null,"custom_root_fields":null,"custom_column_names":null},"table":{"schema":"public","name":"test_table_3"}},{"object_relationships":[],"array_relationships":[],"select_permissions":[{"role":"user","permission":{"columns":["field_2","field_3"],"limit":5,"allow_aggregations":true,"filter":{}}}],"configuration":{"comment":null,"custom_root_fields":null,"custom_column_names":null},"table":{"schema":"public","name":"test_table_4"}}],"configuration":{"connection_info":{"use_prepared_statements":false,"isolation_level":""}}}]}`,
 		},
 	}
 	for _, tt := range tests {
@@ -162,7 +163,7 @@ func TestGenerate(t *testing.T) {
 				t.Errorf("MarshalToString() error = %v", err)
 				return
 			}
-			assert.JSONEq(t, tt.want, gotStr)
+			assert.Equal(t, tt.want, gotStr)
 		})
 	}
 }

hasura/requests.go

@@ -26,7 +26,7 @@ type Metadata struct {
 	Version          int               `json:"version"`
 	Sources          []Source          `json:"sources"`
 	QueryCollections []QueryCollection `json:"query_collections,omitempty"`
-	RestEndpoints    []interface{}     `json:"rest_endpoints"`
+	RestEndpoints    []interface{}     `json:"rest_endpoints,omitempty"`
 }
 
 func newMetadata(version int, sources []Source) *Metadata {
@@ -36,14 +36,41 @@ func newMetadata(version int, sources []Source) *Metadata {
 	}
 }
 
+// Configuration -
 type Configuration struct {
 	ConnectionInfo ConnectionInfo `json:"connection_info"`
 }
 
+// ConnectionInfo -
 type ConnectionInfo struct {
 	UsePreparedStatements bool        `json:"use_prepared_statements"`
 	IsolationLevel        string      `json:"isolation_level"`
-	DatabaseUrl           interface{} `json:"database_url"`
+	DatabaseUrl           DatabaseUrl `json:"database_url,omitempty"`
+}
+
+// DatabaseUrl -
+type DatabaseUrl string
+
+// DatabaseUrlFromEnv -
+type DatabaseUrlFromEnv struct {
+	FromEnv string `json:"from_env"`
+}
+
+// UnmarshalJSON -
+func (d *DatabaseUrl) UnmarshalJSON(data []byte) error {
+	var s string
+	if err := json.Unmarshal(data, &s); err == nil {
+		*d = DatabaseUrl(s)
+		return nil
+	}
+
+	var fromEnv DatabaseUrlFromEnv
+	if err := json.Unmarshal(data, &fromEnv); err != nil {
+		return err
+	}
+
+	*d = DatabaseUrl(fromEnv.FromEnv)
+	return nil
 }
 
 // Source -