Skip to content

Commit

Permalink
fix(pulumi): remove PULUMI_EXPERIMENTAL flag due to side effects (#4617)
Browse files Browse the repository at this point in the history 
Backported from (#4585)

Co-authored-by: Veeti Haapsamo <[email protected]>
  • Loading branch information
@TimBeyer @Walther
TimBeyer and Walther authored Jun 14, 2023
1 parent 8779c39 commit e02f9bf
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 176 deletions.
8 changes: 4 additions & 4 deletions docs/reference/providers/pulumi.md
View file
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.64.0
version: 3.70.0

# Overrides the default plan directory path used when deploying with the `deployFromPreview` option for pulumi
# modules.
Expand Down Expand Up @@ -126,9 +126,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.64.0", "3.48.0", "3.40.0", "3.39.4", "3.25.1", null | `"3.64.0"` | Yes |
| Type | Allowed Values | Default | Required |
| -------- | ------------------------ | ---------- | -------- |
| `string` | "3.70.0", "3.64.0", null | `"3.70.0"` | Yes |

### `providers[].previewDir`

Expand Down
195 changes: 23 additions & 172 deletions plugins/pulumi/cli.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,7 @@ import { ConfigurationError, RuntimeError } from "@garden-io/sdk/exceptions"
import { LogEntry, PluginContext, PluginToolSpec } from "@garden-io/sdk/types"
import { PulumiProvider } from "./config"

/**
* We're using functionality in the pulumi CLI that's experimental as of February 2022, which is enabled by
* setting the `PULUMI_EXPERIMENTAL` env var to `true` when calling the command.
*/
export const defaultPulumiEnv = {
PULUMI_EXPERIMENTAL: "true",
// This suppresses the "warning: A new version of Pulumi is available" output when running pulumi commands.
PULUMI_SKIP_UPDATE_CHECK: "true",
// TODO: Make user explicitly pick which (or all) env vars to merge in here?
Expand Down Expand Up @@ -59,113 +54,17 @@ export class GlobalPulumi extends CliWrapper {
}

export const pulumiCliSPecs: { [version: string]: PluginToolSpec } = {
"3.64.0": {
name: "pulumi-3-64-0",
description: "The pulumi CLI, v3.64.0",
"3.70.0": {
name: "pulumi-3-70-0",
description: "The pulumi CLI, v3.70.0",
type: "binary",
_includeInGardenImage: true,
builds: [
{
platform: "darwin",
architecture: "amd64",
url: "https://github.com/pulumi/pulumi/releases/download/v3.64.0/pulumi-v3.64.0-darwin-x64.tar.gz",
sha256: "ee62df4a40ab7cb016491f529e0256761a8ced6962dea28f88409d692cafcc82",
extract: {
format: "tar",
targetPath: "pulumi/pulumi",
},
},
{
platform: "darwin",
architecture: "arm64",
url: "https://github.com/pulumi/pulumi/releases/download/v3.64.0/pulumi-v3.64.0-darwin-arm64.tar.gz",
sha256: "a531dc361dd016a72c22476d2981f71cc9892d210d11c19b4e1fcc8d6c629d1a",
extract: {
format: "tar",
targetPath: "pulumi/pulumi",
},
},
{
platform: "linux",
architecture: "amd64",
url: "https://github.com/pulumi/pulumi/releases/download/v3.64.0/pulumi-v3.64.0-linux-x64.tar.gz",
sha256: "2560cce127c838c8367541e9493ec12ae9a3144884f98c2afb99b01a14b6b0f7",
extract: {
format: "tar",
targetPath: "pulumi/pulumi",
},
},
{
platform: "windows",
architecture: "amd64",
url: "https://github.com/pulumi/pulumi/releases/download/v3.64.0/pulumi-v3.64.0-windows-x64.zip",
sha256: "b0424ad34a2abbd196f78b62cac9a72bafe080c84c6068bede3a4e31e48a0a48",
extract: {
format: "zip",
targetPath: "pulumi/bin/pulumi.exe",
},
},
],
},
"3.48.0": {
name: "pulumi-3-48-0",
description: "The pulumi CLI, v3.48.0",
type: "binary",
_includeInGardenImage: false,
builds: [
{
platform: "darwin",
architecture: "amd64",
url: "https://github.com/pulumi/pulumi/releases/download/v3.48.0/pulumi-v3.48.0-darwin-x64.tar.gz",
sha256: "77c9580af73f8f0e0e4e04e3c791acb43cca8c0eab28ddb54c6d865beab20eff",
extract: {
format: "tar",
targetPath: "pulumi/pulumi",
},
},
{
platform: "darwin",
architecture: "arm64",
url: "https://github.com/pulumi/pulumi/releases/download/v3.48.0/pulumi-v3.48.0-darwin-arm64.tar.gz",
sha256: "4963b9a2dbe09eaba2e30f7823dfacbe878023767550ea312668f579a61473fd",
extract: {
format: "tar",
targetPath: "pulumi/pulumi",
},
},
{
platform: "linux",
architecture: "amd64",
url: "https://github.com/pulumi/pulumi/releases/download/v3.48.0/pulumi-v3.48.0-linux-x64.tar.gz",
sha256: "4ef798dff47dce7a45d7799e389cafc199b8eaf7d817b65e49e96aa058e20206",
extract: {
format: "tar",
targetPath: "pulumi/pulumi",
},
},
{
platform: "windows",
architecture: "amd64",
url: "https://github.com/pulumi/pulumi/releases/download/v3.48.0/pulumi-v3.48.0-windows-x64.zip",
sha256: "d68ff65973094a160f58143dfc2bb682f9a50c73a9cc840397816708fcf51419",
extract: {
format: "zip",
targetPath: "pulumi/bin/pulumi.exe",
},
},
],
},
"3.40.0": {
name: "pulumi-3-40-0",
description: "The pulumi CLI, v3.40.0",
type: "binary",
_includeInGardenImage: false,
builds: [
{
platform: "darwin",
architecture: "amd64",
url: "https://github.com/pulumi/pulumi/releases/download/v3.40.0/pulumi-v3.40.0-darwin-x64.tar.gz",
sha256: "3d48d917b64fb3a1380d47a5733726edb99c3a0f5565fe04cfa26ccb67cb415a",
url: "https://github.com/pulumi/pulumi/releases/download/v3.70.0/pulumi-v3.70.0-darwin-x64.tar.gz",
sha256: "03833c283e24e395a1946c2412a46cb21dbbe72d595a992deebc2aa01a2c8513",
extract: {
format: "tar",
targetPath: "pulumi/pulumi",
Expand All @@ -174,8 +73,8 @@ export const pulumiCliSPecs: { [version: string]: PluginToolSpec } = {
{
platform: "darwin",
architecture: "arm64",
url: "https://github.com/pulumi/pulumi/releases/download/v3.40.0/pulumi-v3.40.0-darwin-arm64.tar.gz",
sha256: "f093cc460aa4a4773e6910db2b9a3ba71f6443b99194d8ad2752be66c4822861",
url: "https://github.com/pulumi/pulumi/releases/download/v3.70.0/pulumi-v3.70.0-darwin-arm64.tar.gz",
sha256: "3e0f3471d7b9184fa0cb87b0716f7b2470a6d25318433bf7f9019442d35fe7f4",
extract: {
format: "tar",
targetPath: "pulumi/pulumi",
Expand All @@ -184,8 +83,8 @@ export const pulumiCliSPecs: { [version: string]: PluginToolSpec } = {
{
platform: "linux",
architecture: "amd64",
url: "https://github.com/pulumi/pulumi/releases/download/v3.40.0/pulumi-v3.40.0-linux-x64.tar.gz",
sha256: "7abc0ccb17e6b0b1ed89be0897bd6a73cb3c6784d7fb5c2e20ad2a8d976c42fe",
url: "https://github.com/pulumi/pulumi/releases/download/v3.70.0/pulumi-v3.70.0-linux-x64.tar.gz",
sha256: "3585a5d2ae64ba7869e287ed2ac14e86a7c99732cc0e74bf1c0ebb6982af2251",
extract: {
format: "tar",
targetPath: "pulumi/pulumi",
Expand All @@ -194,74 +93,26 @@ export const pulumiCliSPecs: { [version: string]: PluginToolSpec } = {
{
platform: "windows",
architecture: "amd64",
url: "https://github.com/pulumi/pulumi/releases/download/v3.40.0/pulumi-v3.40.0-windows-x64.zip",
sha256: "f0ca025d7a47175852ed5a6e7f7c4e97f1d1326c448bd172e81e7130bd447b74",
url: "https://github.com/pulumi/pulumi/releases/download/v3.70.0/pulumi-v3.70.0-windows-x64.zip",
sha256: "bd31daf17fb3066907d67b479c11910461bea046fa9018df8765753f3ddd570b",
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.25.1": {
name: "pulumi-3-25-1",
description: "The pulumi CLI, v3.24.1",
"3.64.0": {
name: "pulumi-3-64-0",
description: "The pulumi CLI, v3.64.0",
type: "binary",
_includeInGardenImage: false,
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.64.0/pulumi-v3.64.0-darwin-x64.tar.gz",
sha256: "ee62df4a40ab7cb016491f529e0256761a8ced6962dea28f88409d692cafcc82",
extract: {
format: "tar",
targetPath: "pulumi/pulumi",
Expand All @@ -270,8 +121,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.64.0/pulumi-v3.64.0-darwin-arm64.tar.gz",
sha256: "a531dc361dd016a72c22476d2981f71cc9892d210d11c19b4e1fcc8d6c629d1a",
extract: {
format: "tar",
targetPath: "pulumi/pulumi",
Expand All @@ -280,8 +131,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.64.0/pulumi-v3.64.0-linux-x64.tar.gz",
sha256: "2560cce127c838c8367541e9493ec12ae9a3144884f98c2afb99b01a14b6b0f7",
extract: {
format: "tar",
targetPath: "pulumi/pulumi",
Expand All @@ -290,8 +141,8 @@ 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: "7ccaace585dfd9b44659c876ac87c33ea892cd91c34cb7ad00081cec8032a329",
url: "https://github.com/pulumi/pulumi/releases/download/v3.64.0/pulumi-v3.64.0-windows-x64.zip",
sha256: "b0424ad34a2abbd196f78b62cac9a72bafe080c84c6068bede3a4e31e48a0a48",
extract: {
format: "zip",
targetPath: "pulumi/bin/pulumi.exe",
Expand All @@ -304,4 +155,4 @@ export const pulumiCliSPecs: { [version: string]: PluginToolSpec } = {
export const supportedVersions = Object.keys(pulumiCliSPecs)

// Default to latest pulumi version
export const defaultPulumiVersion = "3.64.0"
export const defaultPulumiVersion = "3.70.0"

0 comments on commit e02f9bf

Please sign in to comment.