Skip to content
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

Jump to bottom

Fix executable checks for windows #11692

Merged
merged 1 commit into from Dec 20, 2022
+11 −1
Merged

Fix executable checks for windows #11692

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions changelog/pending/20221220--cli-plugin--fix-check-of-executable-bits-on-windows.yaml
View file
Open in desktop
@@ -0,0 +1,4 @@
changes:
- type: fix
scope: cli/plugin
description: Fix check of executable bits on Windows.
5 changes: 5 additions & 0 deletions pkg/cmd/pulumi/package.go
View file
Open in desktop
Expand Up @@ -20,6 +20,7 @@ import (
"io/fs"
"os"
"path/filepath"
"runtime"
"strings"

"github.com/blang/semver"
Expand Down Expand Up @@ -109,6 +110,10 @@ func schemaFromSchemaSource(packageSource string) (*schema.Package, error) {
}

isExecutable := func(info fs.FileInfo) bool {
// Windows doesn't have executable bits to check
if runtime.GOOS == "windows" {
return !info.IsDir()
}
return info.Mode()&0111 != 0 && !info.IsDir()
}

Expand Down
3 changes: 2 additions & 1 deletion pkg/cmd/pulumi/plugin_install.go
View file
Open in desktop
Expand Up @@ -233,7 +233,8 @@ func getFilePayload(file string, spec workspace.PluginSpec) (workspace.PluginCon
return nil, fmt.Errorf("seeking back in file %s: %w", source, err)
}
if !encoding.IsCompressed(compressHeader) {
if (stat.Mode() & 0100) == 0 {
// Windows doesn't have executable bits to check
if runtime.GOOS != "windows" && (stat.Mode()&0100) == 0 {
return nil, fmt.Errorf("%s is not executable", source)
}
return workspace.SingleFilePlugin(f, spec), nil
Expand Down