switch terminology to plugin download URL
After a discussion about terminology, the better phrasing is to use pluginDownloadURL
This commit is contained in:
parent
f310c21b85
commit
c25cbf0fc8
|
@ -3,7 +3,7 @@ CHANGELOG
|
|||
|
||||
## HEAD (Unreleased)
|
||||
|
||||
- Add providerURL field to package definition
|
||||
- Add pluginDownloadURL field to package definition
|
||||
[#4947](https://github.com/pulumi/pulumi/pull/4947)
|
||||
|
||||
- Go program gen: Improved handling for pulumi.Map types
|
||||
|
|
|
@ -1221,8 +1221,8 @@ type npmPackage struct {
|
|||
}
|
||||
|
||||
type npmPulumiManifest struct {
|
||||
Resource bool `json:"resource,omitempty"`
|
||||
ProviderURL string `json:"providerURL,omitempty"`
|
||||
Resource bool `json:"resource,omitempty"`
|
||||
PluginDownloadURL string `json:"pluginDownloadURL,omitempty"`
|
||||
}
|
||||
|
||||
func genNPMPackageMetadata(pkg *schema.Package, info NodePackageInfo) string {
|
||||
|
@ -1254,8 +1254,8 @@ func genNPMPackageMetadata(pkg *schema.Package, info NodePackageInfo) string {
|
|||
},
|
||||
DevDependencies: devDependencies,
|
||||
Pulumi: npmPulumiManifest{
|
||||
Resource: true,
|
||||
ProviderURL: pkg.ProviderURL,
|
||||
Resource: true,
|
||||
PluginDownloadURL: pkg.PluginDownloadURL,
|
||||
},
|
||||
}
|
||||
|
||||
|
|
|
@ -774,10 +774,10 @@ func genPackageMetadata(tool string, pkg *schema.Package, requires map[string]st
|
|||
fmt.Fprintf(w, " def run(self):\n")
|
||||
fmt.Fprintf(w, " install.run(self)\n")
|
||||
fmt.Fprintf(w, " try:\n")
|
||||
if pkg.ProviderURL == "" {
|
||||
if pkg.PluginDownloadURL == "" {
|
||||
fmt.Fprintf(w, " check_call(['pulumi', 'plugin', 'install', 'resource', '%s', '${PLUGIN_VERSION}'])\n", pkg.Name)
|
||||
} else {
|
||||
fmt.Fprintf(w, " check_call(['pulumi', 'plugin', 'install', 'resource', '%s', '${PLUGIN_VERSION}', '--server', '%s'])\n", pkg.Name, pkg.ProviderURL)
|
||||
fmt.Fprintf(w, " check_call(['pulumi', 'plugin', 'install', 'resource', '%s', '${PLUGIN_VERSION}', '--server', '%s'])\n", pkg.Name, pkg.PluginDownloadURL)
|
||||
}
|
||||
fmt.Fprintf(w, " except OSError as error:\n")
|
||||
fmt.Fprintf(w, " if error.errno == errno.ENOENT:\n")
|
||||
|
|
|
@ -303,8 +303,8 @@ type Package struct {
|
|||
Repository string
|
||||
// LogoURL is the URL for the package's logo, if any.
|
||||
LogoURL string
|
||||
// ProviderURL is the URL to use to acquire the provider binary, if any.
|
||||
ProviderURL string
|
||||
// PluginDownloadURL is the URL to use to acquire the provider plugin binary, if any.
|
||||
PluginDownloadURL string
|
||||
|
||||
// Types is the list of non-resource types defined by the package.
|
||||
Types []Type
|
||||
|
@ -683,8 +683,8 @@ type PackageSpec struct {
|
|||
Repository string `json:"repository,omitempty"`
|
||||
// LogoURL is the URL for the package's logo, if any.
|
||||
LogoURL string `json:"logoUrl,omitempty"`
|
||||
// ProviderURL is the URL to use to acquire the provider binary, if any.
|
||||
ProviderURL string `json:"providerURL,omitempty"`
|
||||
// PluginDownloadURL is the URL to use to acquire the provider plugin binary, if any.
|
||||
PluginDownloadURLURL string `json:"pluginDownloadURL,omitempty"`
|
||||
|
||||
// Meta contains information for the importer about this package.
|
||||
Meta *MetadataSpec `json:"meta,omitempty"`
|
||||
|
@ -778,22 +778,22 @@ func ImportSpec(spec PackageSpec, languages map[string]Language) (*Package, erro
|
|||
}
|
||||
|
||||
pkg := &Package{
|
||||
moduleFormat: moduleFormatRegexp,
|
||||
Name: spec.Name,
|
||||
Version: version,
|
||||
Description: spec.Description,
|
||||
Keywords: spec.Keywords,
|
||||
Homepage: spec.Homepage,
|
||||
License: spec.License,
|
||||
Attribution: spec.Attribution,
|
||||
Repository: spec.Repository,
|
||||
ProviderURL: spec.ProviderURL,
|
||||
Config: config,
|
||||
Types: typeList,
|
||||
Provider: provider,
|
||||
Resources: resources,
|
||||
Functions: functions,
|
||||
Language: language,
|
||||
moduleFormat: moduleFormatRegexp,
|
||||
Name: spec.Name,
|
||||
Version: version,
|
||||
Description: spec.Description,
|
||||
Keywords: spec.Keywords,
|
||||
Homepage: spec.Homepage,
|
||||
License: spec.License,
|
||||
Attribution: spec.Attribution,
|
||||
Repository: spec.Repository,
|
||||
PluginDownloadURL: spec.PluginDownloadURL,
|
||||
Config: config,
|
||||
Types: typeList,
|
||||
Provider: provider,
|
||||
Resources: resources,
|
||||
Functions: functions,
|
||||
Language: language,
|
||||
}
|
||||
if err := pkg.ImportLanguages(languages); err != nil {
|
||||
return nil, err
|
||||
|
|
Loading…
Reference in a new issue