From c412935d633665dd47c43ab256e5eda048e3cff4 Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 15 Dec 2020 10:52:31 -0800 Subject: [PATCH] correct terraform-bundle default plugins dir docs (#26965) * correct terraform-bundle default plugins dir docs * remove dangling character in local plugin dir log output --- tools/terraform-bundle/README.md | 8 ++++---- tools/terraform-bundle/package.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/terraform-bundle/README.md b/tools/terraform-bundle/README.md index a19ca6afe..dc3879627 100644 --- a/tools/terraform-bundle/README.md +++ b/tools/terraform-bundle/README.md @@ -124,7 +124,7 @@ bundles contain the same core Terraform version. ## Custom Plugins To include custom plugins in the bundle file, create a local directory named -`./plugins` and put all the plugins you want to include there, under the +`./.plugins` and put all the plugins you want to include there, under the required [sub directory](#plugins-directory-layout). Optionally, you can use the `-plugin-dir` flag to specify a location where to find the plugins. To be recognized as a valid plugin, the file must have a name of the form @@ -135,10 +135,10 @@ Typically this will be `linux` and `amd64`. ### Plugins Directory Layout To include custom plugins in the bundle file, you must specify a "source" attribute in the configuration and place the plugin in the appropriate -subdirectory under `./plugins`. The directory must have the following layout: +subdirectory under `./.plugins`. The directory must have the following layout: ``` -./plugins/$SOURCEHOST/$SOURCENAMESPACE/$NAME/$VERSION/$OS_$ARCH/ +./.plugins/$SOURCEHOST/$SOURCENAMESPACE/$NAME/$VERSION/$OS_$ARCH/ ``` When installing custom plugins, you may choose any arbitrary identifier for the @@ -158,7 +158,7 @@ providers { The binary must be placed in the following directory: ``` -./plugins/example.com/myorg/customplugin/0.1/linux_amd64/ +./.plugins/example.com/myorg/customplugin/0.1/linux_amd64/ ``` ## Provider Resolution Behavior diff --git a/tools/terraform-bundle/package.go b/tools/terraform-bundle/package.go index 213059961..35eb25bbd 100644 --- a/tools/terraform-bundle/package.go +++ b/tools/terraform-bundle/package.go @@ -130,7 +130,7 @@ func (c *PackageCommand) Run(args []string) int { localSource := getproviders.NewFilesystemMirrorSource(absPluginDir) if available, err := localSource.AllAvailablePackages(); err == nil { for found := range available { - c.ui.Info(fmt.Sprintf("Found provider %q in %q. p", found.String(), pluginDir)) + c.ui.Info(fmt.Sprintf("Found provider %q in %q.", found.String(), pluginDir)) foundLocally[found] = struct{}{} } }