ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

correct terraform-bundle default plugins dir docs (#26965) 

* correct terraform-bundle default plugins dir docs

* remove dangling character in local plugin dir log output
This commit is contained in:
Robert 2020-12-15 10:52:31 -08:00 committed by GitHub
parent 6bfc4a8809
commit c412935d63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/terraform-bundle/README.md
View File

@ -124,7 +124,7 @@ bundles contain the same core Terraform version.
## Custom Plugins ## Custom Plugins
To include custom plugins in the bundle file, create a local directory named 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 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 `-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 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 ### Plugins Directory Layout
To include custom plugins in the bundle file, you must specify a "source" To include custom plugins in the bundle file, you must specify a "source"
attribute in the configuration and place the plugin in the appropriate 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 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: 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 ## Provider Resolution Behavior

2
tools/terraform-bundle/package.go
View File

@ -130,7 +130,7 @@ func (c *PackageCommand) Run(args []string) int {
localSource := getproviders.NewFilesystemMirrorSource(absPluginDir) localSource := getproviders.NewFilesystemMirrorSource(absPluginDir)
if available, err := localSource.AllAvailablePackages(); err == nil { if available, err := localSource.AllAvailablePackages(); err == nil {
for found := range available { 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{}{} foundLocally[found] = struct{}{}
} }
} }