From d7fcf6b99563188312d397789139616f5a9ab9d1 Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <dev@dominik-schmidt.de>
Date: Tue, 13 Nov 2018 21:44:10 +0100
Subject: [PATCH 1/3] Fix passing DRONE_* env vars in drone exec

---
 drone/exec/env.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drone/exec/env.go b/drone/exec/env.go
index ce5e8b9..d37dd0e 100644
--- a/drone/exec/env.go
+++ b/drone/exec/env.go
@@ -46,7 +46,7 @@ func getEnv(c *cli.Context) map[string]string {
 func prefixedEnviron(environ []string) map[string]string {
 	envs := map[string]string{}
 	for _, env := range environ {
-		if !strings.HasSuffix(env, "DRONE_") {
+		if !strings.HasPrefix(env, "DRONE_") {
 			continue
 		}
 		parts := strings.SplitN(env, "=", 2)

From 08d5aeced71f992e3ff83dd849a272db92f0259b Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <dev@dominik-schmidt.de>
Date: Tue, 13 Nov 2018 21:45:44 +0100
Subject: [PATCH 2/3] Add --env-file and fix --secret-file in drone exec

---
 drone/exec/exec.go | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/drone/exec/exec.go b/drone/exec/exec.go
index 2782916..42a7703 100644
--- a/drone/exec/exec.go
+++ b/drone/exec/exec.go
@@ -87,6 +87,10 @@ var Command = cli.Command{
 			Name:  "secret-file",
 			Usage: "secret file",
 		},
+		cli.StringFlag{
+			Name:  "env-file",
+			Usage: "env file",
+		},
 		cli.StringSliceFlag{
 			Name:  "privileged",
 			Usage: "privileged plugins",
@@ -249,9 +253,14 @@ func exec(c *cli.Context) error {
 			c.StringSlice("network"),
 		),
 		transform.WithProxy(),
+		transform.WithEnviron(
+			readParams(
+				c.String("secret-file"),
+			),
+		),
 		transform.WithSecrets(
 			readParams(
-				c.String("env-file"),
+				c.String("secret-file"),
 			),
 		),
 		transform.WithVolumes(

From 92d62d84d998afb5e041d0ca40930eb563b04e80 Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <dev@dominik-schmidt.de>
Date: Wed, 14 Nov 2018 11:44:31 +0100
Subject: [PATCH 3/3] Do not add all secrets to env but require using
 from_secret

---
 drone/exec/exec.go | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drone/exec/exec.go b/drone/exec/exec.go
index 42a7703..a685013 100644
--- a/drone/exec/exec.go
+++ b/drone/exec/exec.go
@@ -85,7 +85,7 @@ var Command = cli.Command{
 		},
 		cli.StringFlag{
 			Name:  "secret-file",
-			Usage: "secret file",
+			Usage: "secret file, define values that can be used with from_secret",
 		},
 		cli.StringFlag{
 			Name:  "env-file",
@@ -253,11 +253,6 @@ func exec(c *cli.Context) error {
 			c.StringSlice("network"),
 		),
 		transform.WithProxy(),
-		transform.WithEnviron(
-			readParams(
-				c.String("secret-file"),
-			),
-		),
 		transform.WithSecrets(
 			readParams(
 				c.String("secret-file"),