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

improvement(pulumi): improve preview output #3096

Merged
merged 7 commits into from
Oct 21, 2022
Merged

improvement(pulumi): improve preview output #3096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3862c77
improvement(pulumi): improve preview output
thsig Jul 5, 2022
53e1c98
chore: fix script to compute tool binary SHAs
thsig Sep 22, 2022
5892bc5
chore: bump the supported Pulumi CLI versions
thsig Sep 22, 2022
fbaa13f
improvement(pulumi): handle build deps
thsig Sep 22, 2022
12fe4b0
improvement(pulumi): better preview summaries
thsig Sep 22, 2022
2f5d16b
fix(pulumi): use correct template context
thsig Oct 4, 2022
7ca5f52
feat(pulumi): add --skip-dependencies CLI option
thsig Oct 19, 2022
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
8 changes: 4 additions & 4 deletions docs/reference/providers/pulumi.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ providers:
environments:

# The version of pulumi to use. Set to `null` to use whichever version of `pulumi` is on your PATH.
version: 3.25.1
version: 3.40.0

# Overrides the default plan directory path used when deploying with the `deployFromPreview` option for pulumi
# modules.
Expand Down Expand Up @@ -120,9 +120,9 @@ providers:

The version of pulumi to use. Set to `null` to use whichever version of `pulumi` is on your PATH.

| Type | Allowed Values | Default | Required |
| -------- | ------------------------ | ---------- | -------- |
| `string` | "3.25.1", "3.24.1", null | `"3.25.1"` | Yes |
| Type | Allowed Values | Default | Required |
| -------- | ---------------------------------- | ---------- | -------- |
| `string` | "3.40.0", "3.39.4", "3.25.1", null | `"3.40.0"` | Yes |

### `providers[].previewDir`

Expand Down
93 changes: 71 additions & 22 deletions plugins/pulumi/cli.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,17 +59,17 @@ export class GlobalPulumi extends CliWrapper {
}

export const pulumiCliSPecs: { [version: string]: PluginToolSpec } = {
"3.25.1": {
name: "pulumi-3-25-1",
description: "The pulumi CLI, v3.24.1",
"3.40.0": {
name: "pulumi-3-40-0",
description: "The pulumi CLI, v3.40.0",
type: "binary",
_includeInGardenImage: true,
builds: [
{
platform: "darwin",
architecture: "amd64",
url: "https://github.com/pulumi/pulumi/releases/download/v3.25.1/pulumi-v3.25.1-darwin-x64.tar.gz",
sha256: "c91ef64aedcd10a925858a21fc4b52f9a566b4f14bc0d175c0c51c7745cdd175",
url: "https://github.com/pulumi/pulumi/releases/download/v3.40.0/pulumi-v3.40.0-darwin-x64.tar.gz",
sha256: "3d48d917b64fb3a1380d47a5733726edb99c3a0f5565fe04cfa26ccb67cb415a",
extract: {
format: "tar",
targetPath: "pulumi/pulumi",
Expand All @@ -78,8 +78,8 @@ export const pulumiCliSPecs: { [version: string]: PluginToolSpec } = {
{
platform: "darwin",
architecture: "arm64",
url: "https://github.com/pulumi/pulumi/releases/download/v3.25.1/pulumi-v3.25.1-darwin-arm64.tar.gz",
sha256: "a5ab29db86733b5f730a0f352b407aed64b82337a222a0c7cd1492b55189e6c1",
url: "https://github.com/pulumi/pulumi/releases/download/v3.40.0/pulumi-v3.40.0-darwin-arm64.tar.gz",
sha256: "f093cc460aa4a4773e6910db2b9a3ba71f6443b99194d8ad2752be66c4822861",
extract: {
format: "tar",
targetPath: "pulumi/pulumi",
Expand All @@ -88,8 +88,8 @@ export const pulumiCliSPecs: { [version: string]: PluginToolSpec } = {
{
platform: "linux",
architecture: "amd64",
url: "https://github.com/pulumi/pulumi/releases/download/v3.25.1/pulumi-v3.25.1-linux-x64.tar.gz",
sha256: "71e94634492b54e09810649f3753a5b414f4a1895b012ee445c275f1a0f94c5c",
url: "https://github.com/pulumi/pulumi/releases/download/v3.40.0/pulumi-v3.40.0-linux-x64.tar.gz",
sha256: "7abc0ccb17e6b0b1ed89be0897bd6a73cb3c6784d7fb5c2e20ad2a8d976c42fe",
extract: {
format: "tar",
targetPath: "pulumi/pulumi",
Expand All @@ -98,26 +98,74 @@ export const pulumiCliSPecs: { [version: string]: PluginToolSpec } = {
{
platform: "windows",
architecture: "amd64",
url: "https://github.com/pulumi/pulumi/releases/download/v3.25.1/pulumi-v3.25.1-windows-x64.zip",
sha256: "60d891f65e69e0eb14acb26e0a8a102d54ebc432060631f867c44b84cde09bdb",
url: "https://github.com/pulumi/pulumi/releases/download/v3.40.0/pulumi-v3.40.0-windows-x64.zip",
sha256: "f0ca025d7a47175852ed5a6e7f7c4e97f1d1326c448bd172e81e7130bd447b74",
extract: {
format: "zip",
targetPath: "pulumi/bin/pulumi.exe",
},
},
],
},
"3.39.4": {
name: "pulumi-3-39-4",
description: "The pulumi CLI, v3.39.4",
type: "binary",
_includeInGardenImage: false,
builds: [
{
platform: "darwin",
architecture: "amd64",
url: "https://github.com/pulumi/pulumi/releases/download/v3.39.4/pulumi-v3.39.4-darwin-x64.tar.gz",
sha256: "a563f7d7f3dbda84fae61316ef335e204606ac4e79f8e43ffb6103972b9c26ff",
extract: {
format: "tar",
targetPath: "pulumi/pulumi",
},
},
{
platform: "darwin",
architecture: "arm64",
url: "https://github.com/pulumi/pulumi/releases/download/v3.39.4/pulumi-v3.39.4-darwin-arm64.tar.gz",
sha256: "20493f365df1d73417c8159b0259624f06afe7fa5bcb15305e47edbfb7c20eca",
extract: {
format: "tar",
targetPath: "pulumi/pulumi",
},
},
{
platform: "linux",
architecture: "amd64",
url: "https://github.com/pulumi/pulumi/releases/download/v3.39.4/pulumi-v3.39.4-linux-x64.tar.gz",
sha256: "dd3ad77debfb664bc9a79cc88789a091f1f4f420780a2feb622d31cda028ade9",
extract: {
format: "tar",
targetPath: "pulumi/pulumi",
},
},
{
platform: "windows",
architecture: "amd64",
url: "https://github.com/pulumi/pulumi/releases/download/v3.39.4/pulumi-v3.39.4-windows-x64.zip",
sha256: "fdea4e4caca4be39801f7e63bb36c9826a9965a36cac37cfa1244f5110d66864",
extract: {
format: "zip",
targetPath: "pulumi/bin/pulumi.exe",
},
},
],
},
"3.24.1": {
name: "pulumi-3-24-1",
"3.25.1": {
name: "pulumi-3-25-1",
description: "The pulumi CLI, v3.24.1",
type: "binary",
_includeInGardenImage: true,
_includeInGardenImage: false,
builds: [
{
platform: "darwin",
architecture: "amd64",
url: "https://github.com/pulumi/pulumi/releases/download/v3.24.1/pulumi-v3.24.1-darwin-x64.tar.gz",
sha256: "1bfafd10f189c4e57b9961ddf899055efb55649e7403fc1bdd33c89e5a9cce1c",
url: "https://github.com/pulumi/pulumi/releases/download/v3.25.1/pulumi-v3.25.1-darwin-x64.tar.gz",
sha256: "c91ef64aedcd10a925858a21fc4b52f9a566b4f14bc0d175c0c51c7745cdd175",
extract: {
format: "tar",
targetPath: "pulumi/pulumi",
Expand All @@ -126,8 +174,8 @@ export const pulumiCliSPecs: { [version: string]: PluginToolSpec } = {
{
platform: "darwin",
architecture: "arm64",
url: "https://github.com/pulumi/pulumi/releases/download/v3.24.1/pulumi-v3.24.1-darwin-arm64.tar.gz",
sha256: "cdfd2d05beb66380b7eb2354ef45abbce17865441a465294cf8e5448a534eb7f",
url: "https://github.com/pulumi/pulumi/releases/download/v3.25.1/pulumi-v3.25.1-darwin-arm64.tar.gz",
sha256: "a5ab29db86733b5f730a0f352b407aed64b82337a222a0c7cd1492b55189e6c1",
extract: {
format: "tar",
targetPath: "pulumi/pulumi",
Expand All @@ -136,8 +184,8 @@ export const pulumiCliSPecs: { [version: string]: PluginToolSpec } = {
{
platform: "linux",
architecture: "amd64",
url: "https://github.com/pulumi/pulumi/releases/download/v3.24.1/pulumi-v3.24.1-linux-x64.tar.gz",
sha256: "9341c23c1b0266a39ebc6dab2f36b20041226143481714cb0ba8bfbf3ef7ae7e",
url: "https://github.com/pulumi/pulumi/releases/download/v3.25.1/pulumi-v3.25.1-linux-x64.tar.gz",
sha256: "71e94634492b54e09810649f3753a5b414f4a1895b012ee445c275f1a0f94c5c",
extract: {
format: "tar",
targetPath: "pulumi/pulumi",
Expand All @@ -146,7 +194,7 @@ export const pulumiCliSPecs: { [version: string]: PluginToolSpec } = {
{
platform: "windows",
architecture: "amd64",
url: "https://github.com/pulumi/pulumi/releases/download/v3.24.1/pulumi-v3.24.1-windows-x64.zip",
url: "https://github.com/pulumi/pulumi/releases/download/v3.25.1/pulumi-v3.25.1-windows-x64.zip",
sha256: "7ccaace585dfd9b44659c876ac87c33ea892cd91c34cb7ad00081cec8032a329",
extract: {
format: "zip",
Expand All @@ -160,4 +208,5 @@ export const pulumiCliSPecs: { [version: string]: PluginToolSpec } = {
export const supportedVersions = Object.keys(pulumiCliSPecs)

// Default to latest pulumi version
export const defaultPulumiVersion = "3.25.1"
export const defaultPulumiVersion = "3.40.0"
// export const defaultPulumiVersion = "3.25.1"
vvagaytsev marked this conversation as resolved.
Show resolved Hide resolved
Loading