Skip to content

Commit

Permalink
Prefer pluginDownloadURLOverrides over PluginDownloadURL specified in…
Browse files Browse the repository at this point in the history
… the package (#16186)

<!--- 
Thanks so much for your contribution! If this is your first time
contributing, please ensure that you have read the
[CONTRIBUTING](https://github.com/pulumi/pulumi/blob/master/CONTRIBUTING.md)
documentation.
-->

# Description

Overriding plugin download URLs with compilation flags was originally
added in #8798. Its intent was allowing our customers to override
download locations for all plugins, so that only trusted pre-approved
plugins could be downloaded.

Since then, we've added `PluginDownloadURL` for a package, which is the
default URL for that package's binary if it's shipped outside our Pulumi
org. Currently, `PluginDownloadURL` takes precedence over
`pluginDownloadURLOverrides`, which means it's impossible to override
third-party package binary locations.

This PR changes plugin source resolution to flip the priority of those
two. If an override matches regex, its URL will take priority over the
default `PluginDownloadURL` specified in the package.

I have added tests to verify `pluginDownloadURLOverrides` with and
without `PluginDownloadURL`. The second one fails before my change.

Resolves #16058

## Checklist

- [x] I have run `make tidy` to update any new dependencies
- [x] I have run `make lint` to verify my code passes the lint check
  - [ ] I have formatted my code using `gofumpt`

<!--- Please provide details if the checkbox below is to be left
unchecked. -->
- [x] I have added tests that prove my fix is effective or that my
feature works
<!--- 
User-facing changes require a CHANGELOG entry.
-->
- [x] I have run `make changelog` and committed the
`changelog/pending/<file>` documenting my change
<!--
If the change(s) in this PR is a modification of an existing call to the
Pulumi Cloud,
then the service should honor older versions of the CLI where this
change would not exist.
You must then bump the API version in
/pkg/backend/httpstate/client/api.go, as well as add
it to the service.
-->
- [ ] Yes, there are changes in this PR that warrants bumping the Pulumi
Cloud API version
<!-- @pulumi employees: If yes, you must submit corresponding changes in
the service repo. -->
  • Loading branch information
mikhailshilkov authored May 13, 2024
1 parent dacabae commit 3e0aede
Show file tree
Hide file tree
Showing 3 changed files with 69 additions and 5 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
changes:
- type: feat
scope: sdk/go
description: Prefer pluginDownloadURLOverrides over PluginDownloadURL specified in the package
10 changes: 5 additions & 5 deletions sdk/go/common/workspace/plugins.go
Original file line number Diff line number Diff line change
Expand Up @@ -871,6 +871,11 @@ func (info *PluginInfo) SetFileMetadata(path string) error {

func (spec PluginSpec) GetSource() (PluginSource, error) {
baseSource, err := func() (PluginSource, error) {
// If the plugin name matches an override, download the plugin from the override URL.
if url, ok := pluginDownloadURLOverridesParsed.get(spec.Name); ok {
return newHTTPSource(spec.Name, spec.Kind, urlMustParse(url)), nil
}

// The plugin has a set URL use that.
if spec.PluginDownloadURL != "" {
// Support schematised URLS if the URL has a "schema" part we recognize
Expand All @@ -891,11 +896,6 @@ func (spec PluginSpec) GetSource() (PluginSource, error) {
}
}

// If the plugin name matches an override, download the plugin from the override URL.
if url, ok := pluginDownloadURLOverridesParsed.get(spec.Name); ok {
return newHTTPSource(spec.Name, spec.Kind, urlMustParse(url)), nil
}

// Use our default fallback behaviour of github then get.pulumi.com
return newFallbackSource(spec.Name, spec.Kind), nil
}()
Expand Down
60 changes: 60 additions & 0 deletions sdk/go/common/workspace/plugins_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -688,6 +688,66 @@ func TestPluginDownload(t *testing.T) {
assert.Equal(t, int(l), len(readBytes))
assert.Equal(t, expectedBytes, readBytes)
})

t.Run("Source Override", func(t *testing.T) {
version := semver.MustParse("1.23.4")
spec := PluginSpec{
PluginDownloadURL: "",
Name: "mock-override",
Version: &version,
Kind: apitype.PluginKind("resource"),
}
pluginDownloadURLOverridesParsed = []pluginDownloadURLOverride{
{
reg: regexp.MustCompile("mock-override"),
url: "http://mock-override.com",
},
}
source, err := spec.GetSource()
require.NoError(t, err)
getHTTPResponse := func(req *http.Request) (io.ReadCloser, int64, error) {
assert.Equal(t,
"http://mock-override.com/pulumi-resource-mock-override-v1.23.4-windows-arm64.tar.gz",
req.URL.String())
return newMockReadCloser(expectedBytes)
}
r, l, err := source.Download(*spec.Version, "windows", "arm64", getHTTPResponse)
require.NoError(t, err)
readBytes, err := io.ReadAll(r)
require.NoError(t, err)
assert.Equal(t, int(l), len(readBytes))
assert.Equal(t, expectedBytes, readBytes)
})

t.Run("Source Override with Plugin Download Url", func(t *testing.T) {
version := semver.MustParse("1.23.4")
spec := PluginSpec{
PluginDownloadURL: "http://should-not-use-me.com",
Name: "mock-override",
Version: &version,
Kind: apitype.PluginKind("resource"),
}
pluginDownloadURLOverridesParsed = []pluginDownloadURLOverride{
{
reg: regexp.MustCompile("mock-override"),
url: "http://mock-override.com",
},
}
source, err := spec.GetSource()
require.NoError(t, err)
getHTTPResponse := func(req *http.Request) (io.ReadCloser, int64, error) {
assert.Equal(t,
"http://mock-override.com/pulumi-resource-mock-override-v1.23.4-windows-arm64.tar.gz",
req.URL.String())
return newMockReadCloser(expectedBytes)
}
r, l, err := source.Download(*spec.Version, "windows", "arm64", getHTTPResponse)
require.NoError(t, err)
readBytes, err := io.ReadAll(r)
require.NoError(t, err)
assert.Equal(t, int(l), len(readBytes))
assert.Equal(t, expectedBytes, readBytes)
})
}

//nolint:paralleltest // mutates environment variables
Expand Down

0 comments on commit 3e0aede

Please sign in to comment.