Skip to content

Support providing a package name that is different from the provider name #6205

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

Open
yoerayo wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Support providing a package name that is different from the provider name #6205

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
2 changes: 1 addition & 1 deletion cmd/sst/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,7 @@ var root = &cli.Command{
return err
}
}
entry, err := project.FindProvider(pkg, "latest")
entry, err := project.FindProvider(pkg, pkg, "latest")
if err != nil {
return util.NewReadableError(err, "Could not find provider "+pkg)
}
Expand Down
12 changes: 8 additions & 4 deletions pkg/project/install.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ func (p *Project) writeTypes() error {
file.WriteString(` interface Providers {` + "\n")
file.WriteString(` providers?: {` + "\n")
for _, entry := range p.lock {
file.WriteString(` "` + entry.Name + `"?: (_` + entry.Alias + `.ProviderArgs & { version?: string }) | boolean | string;` + "\n")
file.WriteString(` "` + entry.Name + `"?: (_` + entry.Alias + `.ProviderArgs & { package?: string, version?: string }) | boolean | string;` + "\n")
}
file.WriteString(` }` + "\n")
file.WriteString(` }` + "\n")
Expand Down Expand Up @@ -218,12 +218,16 @@ func (p *Project) generateProviderLock() error {
}
for name, config := range p.app.Providers {
n := name
pkgName := config.(map[string]interface{})["package"]
if pkgName == nil || pkgName == "" {
pkgName = n
}
version := config.(map[string]interface{})["version"]
if version == nil || version == "" {
version = "latest"
}
wg.Go(func() error {
result, err := FindProvider(n, version.(string))
result, err := FindProvider(n, pkgName.(string), version.(string))
if err != nil {
return err
}
Expand Down Expand Up @@ -257,9 +261,9 @@ func (p *Project) generateProviderLock() error {
return nil
}

func FindProvider(name string, version string) (*ProviderLockEntry, error) {
func FindProvider(name string, pkgName string, version string) (*ProviderLockEntry, error) {
for _, prefix := range []string{"@sst-provider/", "@pulumi/", "@pulumiverse/", "pulumi-", "@", ""} {
pkg, err := npm.Get(prefix+name, version)
pkg, err := npm.Get(prefix+pkgName, version)
if err != nil {
continue
}
Expand Down
3 changes: 3 additions & 0 deletions pkg/project/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,9 @@ func (p *Project) RunNext(ctx context.Context, input *StackInput) error {
if input.Command == "deploy" || input.Command == "diff" {
for provider, opts := range p.app.Providers {
for key, value := range opts.(map[string]interface{}) {
if key == "package" || key == "version" {
continue
}
switch v := value.(type) {
case map[string]interface{}:
bytes, err := json.Marshal(v)
Expand Down