Merge pull request #523 from suzuki-shunsuke/feat/remove-complement-2

fix: remove the configuration complement and some template functions for security

github-comment.yaml

@@ -1,11 +1,11 @@
 ---
 post:
   default: |
-    CIRCLE_PULL_REQUEST: {{Env "CIRCLE_PULL_REQUEST"}}
+    foo
   hello:
     # update: 'Comment.HasMeta && Comment.Meta.TemplateKey == "hello"'
     template: |
-      $Hello: {{Env "HELLO"}} {{ "hello!" | upper | repeat 5 }}
+      $Hello: foo {{ "hello!" | upper | repeat 5 }}
 
 exec:
   hello:
@@ -18,7 +18,6 @@ exec:
         combined output: {{.CombinedOutput}}
     - when: true
       template: |
-        $Hello: {{Env "HELLO"}}
         exit code: {{.ExitCode}}
         stdout: {{.Stdout}}
         stderr: {{.Stderr}}

pkg/api/exec.go

@@ -118,7 +118,6 @@ func (ctrl *ExecController) Exec(ctx context.Context, opts *option.ExecOptions)
 		TemplateKey:    opts.TemplateKey,
 		Template:       opts.Template,
 		Vars:           cfg.Vars,
-		Env:            ctrl.Getenv,
 	}, templates); err != nil {
 		if !opts.Silent {
 			fmt.Fprintf(ctrl.Stderr, "github-comment error: %+v\n", err)
@@ -137,7 +136,6 @@ type ExecCommentParams struct {
 	Command        string
 	JoinCommand    string
 	ExitCode       int
-	Env            func(string) string
 	// PRNumber is the pull request number where the comment is posted
 	PRNumber int
 	// Org is the GitHub Organization or User name

pkg/api/hide.go

@@ -36,7 +36,7 @@ func (ctrl *HideController) Hide(ctx context.Context, opts *option.HideOptions)
 		return err
 	}
 	nodeIDs, err := listHiddenComments(
-		ctx, ctrl.GitHub, ctrl.Expr, ctrl.Getenv, param, nil)
+		ctx, ctrl.GitHub, ctrl.Expr, param, nil)
 	if err != nil {
 		return err
 	}
@@ -139,7 +139,6 @@ type ParamListHiddenComments struct {
 func listHiddenComments( //nolint:funlen
 	ctx context.Context,
 	gh GitHub, exp Expr,
-	getEnv func(string) string,
 	param *ParamListHiddenComments,
 	paramExpr map[string]interface{},
 ) ([]string, error) {
@@ -203,7 +202,6 @@ func listHiddenComments( //nolint:funlen
 			},
 			"HideKey": param.HideKey,
 			"Vars":    param.Vars,
-			"Env":     getEnv,
 		}
 		for k, v := range paramExpr {
 			paramMap[k] = v

pkg/api/post.go

@@ -100,7 +100,6 @@ func (ctrl *PostController) setUpdatedCommentID(ctx context.Context, cmt *github
 				"SHA1":     cmt.SHA1,
 			},
 			"Vars": cmt.Vars,
-			"Env":  ctrl.Getenv,
 		}
 
 		logrus.WithFields(logrus.Fields{

pkg/api/post_internal_test.go

@@ -143,7 +143,7 @@ func TestPostController_getCommentParams(t *testing.T) { //nolint:funlen
 					Repo:     "github-comment",
 					Token:    "xxx",
 					PRNumber: 1,
-					Template: `{{Env "FOO"}} {{.Org}} {{.Repo}} {{.PRNumber}}`,
+					Template: `{{.Org}} {{.Repo}} {{.PRNumber}}`,
 				},
 			},
 			exp: &github.Comment{

pkg/cmd/exec.go

@@ -79,7 +79,7 @@ func (runner *Runner) execAction(c *cli.Context) error {
 	opts.SkipNoToken = opts.SkipNoToken || cfg.SkipNoToken
 	opts.Silent = opts.Silent || cfg.Silent
 
-	var pt api.Platform = platform.Get(getPlatformParam(cfg.Complement))
+	var pt api.Platform = platform.Get()
 
 	gh, err := getGitHub(c.Context, &opts.Options, cfg)
 	if err != nil {

pkg/cmd/hide.go

@@ -63,7 +63,7 @@ func (runner *Runner) hideAction(c *cli.Context) error {
 	}
 	opts.SkipNoToken = opts.SkipNoToken || cfg.SkipNoToken
 
-	var pt api.Platform = platform.Get(getPlatformParam(cfg.Complement))
+	var pt api.Platform = platform.Get()
 
 	gh, err := getGitHub(c.Context, &opts.Options, cfg)
 	if err != nil {

pkg/cmd/post.go

@@ -147,7 +147,7 @@ func (runner *Runner) postAction(c *cli.Context) error {
 	}
 	opts.SkipNoToken = opts.SkipNoToken || cfg.SkipNoToken
 
-	var pt api.Platform = platform.Get(getPlatformParam(cfg.Complement))
+	var pt api.Platform = platform.Get()
 
 	gh, err := getGitHub(c.Context, &opts.Options, cfg)
 	if err != nil {

pkg/config/config.go

@@ -19,7 +19,6 @@ type Config struct {
 	Hide               map[string]string
 	SkipNoToken        bool `yaml:"skip_no_token"`
 	Silent             bool
-	Complement         *Complement
 }
 
 type Base struct {