Skip to content

terraform: only use embedded plugins when release tag is set #949

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Dec 20, 2018
Merged

terraform: only use embedded plugins when release tag is set #949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 5 additions & 19 deletions pkg/terraform/exec/exec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ import (
"log"
"os"
"os/signal"
"path/filepath"
"runtime"

"github.com/hashicorp/go-plugin"
"github.com/hashicorp/logutils"
Expand Down Expand Up @@ -51,8 +49,11 @@ func runner(cmd string, dir string, args []string, stdout, stderr io.Writer) int
sdCh, cancel := makeShutdownCh()
defer cancel()

pluginDirs := globalPluginDirs(stderr)
pluginDirs = append(pluginDirs, filepath.Join(dir, "plugins"))
pluginDirs, err := globalPluginDirs(dir)
if err != nil {
fmt.Fprintf(stderr, "Error discovering plugin directories for Terraform: %v", err)
return 1
}
meta := command.Meta{
Color: false,
GlobalPluginDirs: pluginDirs,
Expand Down Expand Up @@ -123,18 +124,3 @@ func makeShutdownCh() (<-chan struct{}, func()) {

return resultCh, func() { signal.Reset(handle...) }
}

func globalPluginDirs(stderr io.Writer) []string {
var ret []string
// Look in ~/.terraform.d/plugins/ , or its equivalent on non-UNIX
dir, err := configDir()
if err != nil {
fmt.Fprintf(stderr, "Error finding global config directory: %s", err)
} else {
machineDir := fmt.Sprintf("%s_%s", runtime.GOOS, runtime.GOARCH)
ret = append(ret, filepath.Join(dir, "plugins"))
ret = append(ret, filepath.Join(dir, "plugins", machineDir))
}

return ret
}
26 changes: 26 additions & 0 deletions pkg/terraform/exec/plugin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
// +build !release

package exec

import (
"fmt"
"path/filepath"
"runtime"
)

func globalPluginDirs(datadir string) ([]string, error) {
var ret []string
// Look in ~/.terraform.d/plugins/ , or its equivalent on non-UNIX
cdir, err := configDir()
if err != nil {
return ret, fmt.Errorf("error finding global config directory: %s", err)
}

for _, d := range []string{cdir, datadir} {
machineDir := fmt.Sprintf("%s_%s", runtime.GOOS, runtime.GOARCH)
ret = append(ret, filepath.Join(d, "plugins"))
ret = append(ret, filepath.Join(d, "plugins", machineDir))
}

return ret, nil
}
19 changes: 19 additions & 0 deletions pkg/terraform/exec/plugin_release.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// +build release

package exec

import (
"fmt"
"path/filepath"
"runtime"
)

func globalPluginDirs(datadir string) ([]string, error) {
var ret []string
for _, d := range []string{datadir} {
machineDir := fmt.Sprintf("%s_%s", runtime.GOOS, runtime.GOARCH)
ret = append(ret, filepath.Join(d, "plugins"))
ret = append(ret, filepath.Join(d, "plugins", machineDir))
}
return ret, nil
}