WIP CLI

config/config.go

@@ -4,14 +4,10 @@ import (
 	"log"
 	"os"
 
+	"bitbucket.org/digitorus/pdfsign/sign"
 	"github.com/BurntSushi/toml"
-	"github.com/asaskevich/govalidator"
 )
 
-func init() {
-	govalidator.SetFieldsRequiredByDefault(true)
-}
-
 var (
 	DefaultLocation string = "./pdfsign.conf" // Default location of the config file
 	Settings        Config                    // Initialized once inside Read method Settings are stored in memory.
@@ -19,24 +15,8 @@ var (
 
 // Config is the root of the config
 type Config struct {
-	//Info:
+	Info sign.SignDataSignatureInfo
-	//Name:        "Jeroen Bobbeldijk",
+	TSA  sign.TSA
-	//Location:    "Rotterdam",
-	//Reason:      "Test",
-	//ContactInfo: "Geen",
-	//CertType: 2,
-	//Approval: false,
-	//TSA: sign.TSA{
-	//URL: "http://aatl-timestamp.globalsign.com/tsa/aohfewat2389535fnasgnlg5m23",
-}
-
-// ValidateFields validates all the fields of the config
-func (c Config) ValidateFields() error {
-	_, err := govalidator.ValidateStruct(c)
-	if err != nil {
-		return err
-	}
-	return nil
 }
 
 func Read(configfile string) {
@@ -50,9 +30,5 @@ func Read(configfile string) {
 	if _, err := toml.DecodeFile(configfile, &c); err != nil {
 	}
 
-	if err := c.ValidateFields(); err != nil {
-		log.Fatal("Config is not valid: ", err)
-	}
-
 	Settings = c
 }

config/config_test.go

@@ -20,18 +20,5 @@ staticPath = "../static"
 	}
 
 	// Root
-	assert.Equal(t, "../static", c.StaticPath)
+	assert.Equal(t, "../static", c)
-
-}
-
-func TestValidation(t *testing.T) {
-	const configContent = ``
-
-	var c config.Config
-	if _, err := toml.Decode(configContent, &c); err != nil {
-		t.Error(err)
-	}
-
-	err := c.ValidateFields()
-	assert.NotNil(t, err)
 }