github/wp-opentofu
0
0
Fork 0
mirror of https://github.com/thegeeklab/wp-opentofu.git synced 2024-11-22 00:30:40 +00:00
Code Issues Releases Activity

revert godotenv.Load to main.go

Browse Source
This commit is contained in:
Neemias Junior 2019-11-26 21:52:36 +01:00 committed by Jacob McCann
parent 22f9a710f1
commit efe3702937
No known key found for this signature in database
GPG Key ID: B5A476DE32B9AE72
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main.go
View File

@ -5,6 +5,7 @@ import (
"os" "os"
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/joho/godotenv"
"github.com/urfave/cli" "github.com/urfave/cli"
) )
@ -125,6 +126,10 @@ func run(c *cli.Context) error {
"Revision": revision, "Revision": revision,
}).Info("Drone Terraform Plugin Version") }).Info("Drone Terraform Plugin Version")
if c.String("env_file") != "" {
_ = godotenv.Load(c.String("env_file"))
}
var vars map[string]string var vars map[string]string
if c.String("vars") != "" { if c.String("vars") != "" {
if err := json.Unmarshal([]byte(c.String("vars")), &vars); err != nil { if err := json.Unmarshal([]byte(c.String("vars")), &vars); err != nil {
@ -157,7 +162,6 @@ func run(c *cli.Context) error {
Parallelism: c.Int("parallelism"), Parallelism: c.Int("parallelism"),
Targets: c.StringSlice("targets"), Targets: c.StringSlice("targets"),
VarFiles: c.StringSlice("var_files"), VarFiles: c.StringSlice("var_files"),
EnvFile: c.String("env_file"),
TerraformDataDir: c.String("tf_data_dir"), TerraformDataDir: c.String("tf_data_dir"),
}, },
Netrc: Netrc{ Netrc: Netrc{

6
plugin.go
View File

@ -16,7 +16,6 @@ import (
"github.com/aws/aws-sdk-go/aws/credentials/stscreds" "github.com/aws/aws-sdk-go/aws/credentials/stscreds"
"github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/sts" "github.com/aws/aws-sdk-go/service/sts"
"github.com/joho/godotenv"
) )
type ( type (
@ -34,7 +33,6 @@ type (
Parallelism int Parallelism int
Targets []string Targets []string
VarFiles []string VarFiles []string
EnvFile string
TerraformDataDir string TerraformDataDir string
} }
@ -79,10 +77,6 @@ func (p Plugin) Exec() error {
} }
} }
if p.Config.EnvFile != "" {
_ = godotenv.Load(p.Config.EnvFile)
}
if p.Config.RoleARN != "" { if p.Config.RoleARN != "" {
assumeRole(p.Config.RoleARN) assumeRole(p.Config.RoleARN)
} }