From 46cac5d99e29eda7a5e0afaa5f59e44df0b4ef0e Mon Sep 17 00:00:00 2001
From: Saswata Mukherjee <saswataminsta@yahoo.com>
Date: Tue, 15 Jun 2021 16:42:41 +0530
Subject: [PATCH] Change transform config to pathorcontent (#45)

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>
---
 main.go                             |  9 ++++++---
 pkg/transform/config.go             | 13 -------------
 pkg/transform/transform.go          |  4 ++--
 pkg/transform/transform_e2e_test.go |  8 ++++++--
 4 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/main.go b/main.go
index 04c02d0..811615a 100644
--- a/main.go
+++ b/main.go
@@ -209,9 +209,12 @@ func validateAnchorDir(anchorDir string, files []string) (_ string, err error) {
 
 func registerTransform(_ context.Context, app *extkingpin.App) {
 	cmd := app.Command("transform", "Transform markdown files in various ways. For example pre process markdown files to allow it for use for popular static HTML websites based on markdown source code and front matter options.")
-	cfg := cmd.Flag("config", "Path to the YAML file with spec defined in github.com/bwplotka/mdox/pkg/transform.Config").
-		Short('c').Default(".mdox.yaml").ExistingFile()
+	cfg := extflag.RegisterPathOrContent(cmd, "config", "Path to the YAML file with spec defined in github.com/bwplotka/mdox/pkg/transform.Config", extflag.WithEnvSubstitution())
 	cmd.Run(func(ctx context.Context, logger log.Logger) error {
-		return transform.Dir(ctx, logger, *cfg)
+		validateConfig, err := cfg.Content()
+		if err != nil {
+			return err
+		}
+		return transform.Dir(ctx, logger, validateConfig)
 	})
 }
diff --git a/pkg/transform/config.go b/pkg/transform/config.go
index a213867..6892dac 100644
--- a/pkg/transform/config.go
+++ b/pkg/transform/config.go
@@ -5,7 +5,6 @@ package transform
 
 import (
 	"bytes"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -116,18 +115,6 @@ type FrontMatterConfig struct {
 	Template string
 }
 
-func parseConfigFile(configFile string) (Config, error) {
-	configFile, err := filepath.Abs(configFile)
-	if err != nil {
-		return Config{}, errors.Wrap(err, "abs")
-	}
-	c, err := ioutil.ReadFile(configFile)
-	if err != nil {
-		return Config{}, errors.Wrap(err, "read config file")
-	}
-	return ParseConfig(c)
-}
-
 func ParseConfig(c []byte) (Config, error) {
 	cfg := Config{}
 	dec := yaml.NewDecoder(bytes.NewReader(c))
diff --git a/pkg/transform/transform.go b/pkg/transform/transform.go
index 5450590..2871bb6 100644
--- a/pkg/transform/transform.go
+++ b/pkg/transform/transform.go
@@ -49,8 +49,8 @@ func prepOutputDir(d string, gitIgnored bool) error {
 }
 
 // Dir transforms directory using given configuration file.
-func Dir(ctx context.Context, logger log.Logger, configFile string) error {
-	c, err := parseConfigFile(configFile)
+func Dir(ctx context.Context, logger log.Logger, config []byte) error {
+	c, err := ParseConfig(config)
 	if err != nil {
 		return err
 	}
diff --git a/pkg/transform/transform_e2e_test.go b/pkg/transform/transform_e2e_test.go
index 8195806..46773f1 100644
--- a/pkg/transform/transform_e2e_test.go
+++ b/pkg/transform/transform_e2e_test.go
@@ -28,11 +28,15 @@ func TestTransform(t *testing.T) {
 
 	testutil.Ok(t, os.RemoveAll(tmpDir))
 	t.Run("mdox1.yaml", func(t *testing.T) {
-		testutil.Ok(t, transform.Dir(context.Background(), logger, filepath.Join(testData, "mdox1.yaml")))
+		mdox1, err := ioutil.ReadFile(filepath.Join(testData, "mdox1.yaml"))
+		testutil.Ok(t, err)
+		testutil.Ok(t, transform.Dir(context.Background(), logger, mdox1))
 		assertDirContent(t, filepath.Join(testData, "expected", "test1"), filepath.Join(tmpDir, "test1"))
 	})
 	t.Run("mdox2.yaml", func(t *testing.T) {
-		testutil.Ok(t, transform.Dir(context.Background(), logger, filepath.Join(testData, "mdox2.yaml")))
+		mdox2, err := ioutil.ReadFile(filepath.Join(testData, "mdox2.yaml"))
+		testutil.Ok(t, err)
+		testutil.Ok(t, transform.Dir(context.Background(), logger, mdox2))
 		assertDirContent(t, filepath.Join(testData, "expected", "test2"), filepath.Join(tmpDir, "test2"))
 
 	})