Răsfoiți Sursa

Use config package in compiler

Andrea Fazzi 7 ani în urmă
părinte
comite
9cd908f96c
3 a modificat fișierele cu 28 adăugiri și 2 ștergeri
  1. 23 1
      compiler/compiler_test.go
  2. 4 0
      compiler/testdata/config.yaml
  3. 1 1
      main.go

+ 23 - 1
compiler/compiler_test.go

@@ -34,6 +34,7 @@ import (
 	"text/template"
 
 	"github.com/remogatto/cloud"
+        "gogs.carducci-dante.gov.it/karmen/config"
 )
 
 func main() {
@@ -41,10 +42,18 @@ func main() {
 		WebDAVUrl      = "http://karmen_cloud_test/remote.php/webdav/"
 		WebDavUsername = "admin"
 		WebDAVPassword = "password"
+                config         config.ConfigT
 		data           struct{ Data string }
 		output         bytes.Buffer
 	)
-	client, err := cloud.Dial(WebDAVUrl, WebDavUsername, WebDAVPassword)
+	content, err := client.Download("Config/config.yaml")
+	if err != nil {
+		fmt.Print(err)
+	}
+        if err := config.Read(configData, &config); err != nil {
+                fmt.Print(err)
+        }
+	client, err := cloud.Dial(config.Cloud.Url, config.Cloud.Username, config.Cloud.Password)
 	if err != nil {
 		fmt.Print(err)
 	}
@@ -107,6 +116,19 @@ func (t *testSuite) BeforeAll() {
 		panic(err)
 	}
 
+	if !client.Exists("Config") {
+		if err := client.Mkdir("Config"); err != nil {
+			panic(err)
+		}
+	}
+	configData, err := ioutil.ReadFile("testdata/config.yaml")
+	if err != nil {
+		panic(err)
+	}
+	if err := client.Upload(configData, "Config/config.yaml"); err != nil {
+		panic(err)
+	}
+
 }
 
 func (t *testSuite) TestRunSimpleMain() {

+ 4 - 0
compiler/testdata/config.yaml

@@ -0,0 +1,4 @@
+cloud:
+  url: "http://karmen_cloud_test/remote.php/webdav/"
+  username: "admin"
+  password: "password"

+ 1 - 1
main.go

@@ -40,7 +40,7 @@ func regenerateRelations(db *gorm.DB) error {
 
 func main() {
 	log.Println("Loading config file...")
-	err := config.Load("config/config.yaml", config.Config)
+	err := config.ReadFile("config/config.yaml", config.Config)
 	if err != nil {
 		panic(err)
 	}