From 4282b58e5f6cbd8cc797e2b7bc5d3ac9151c05fe Mon Sep 17 00:00:00 2001 From: Ivan Trubach Date: Sat, 30 Aug 2025 14:00:38 +0300 Subject: [PATCH] pulumi: 3.190.0 -> 3.192.0 (#438505) * python3Packages.pulumi: update for protobuf5 and fix tests * pulumi: 3.190.0 -> 3.192.0 --- pkgs/by-name/pu/pulumi/package.nix | 23 +++++++++++-------- .../pu/pulumi/plugins/pulumi-go/package.nix | 2 +- .../pulumi/plugins/pulumi-nodejs/package.nix | 2 +- .../pulumi/plugins/pulumi-python/package.nix | 2 +- .../python-modules/pulumi/default.nix | 14 ++++++++--- 5 files changed, 28 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/pu/pulumi/package.nix b/pkgs/by-name/pu/pulumi/package.nix index 088bb4e1a1f4..e981ff31fedc 100644 --- a/pkgs/by-name/pu/pulumi/package.nix +++ b/pkgs/by-name/pu/pulumi/package.nix @@ -17,18 +17,18 @@ }: buildGoModule rec { pname = "pulumi"; - version = "3.190.0"; + version = "3.192.0"; src = fetchFromGitHub { owner = "pulumi"; repo = "pulumi"; tag = "v${version}"; - hash = "sha256-n4YjJJZNPRjvR5WuDO3+bCvKxDrmK7VBbS6E6RP0C84="; + hash = "sha256-rcDXC+xlUa67afuXvmEv8UNsYWBvQQ0P4httdtdcrh4="; # Some tests rely on checkout directory name name = "pulumi"; }; - vendorHash = "sha256-ewVZNgnW7JbX0VOU14Ipo7EBkj8evOoXWjf9yLOmJF8="; + vendorHash = "sha256-BaFw8EnPd2GPA/p9wm8XpVy/iE8gqbteRnMQC8Z4NHQ="; sourceRoot = "${src.name}/pkg"; @@ -68,6 +68,10 @@ buildGoModule rec { # Seems to require TTY. "TestProgressEvents" + # Flaky; upstream “fixed” it by increasing timeout. + # https://github.com/pulumi/pulumi/pull/20116 + "TestAnalyzerCancellation" + # Tries to clone repo: https://github.com/pulumi/test-repo.git "TestValidateRelativeDirectory" "TestRepoLookup" @@ -83,6 +87,8 @@ buildGoModule rec { "TestPulumiNewWithoutTemplateSupport" "TestGeneratingProjectWithAIPromptSucceeds" "TestPulumiNewWithRegistryTemplates" + "TestRunNewYesNoTemplate" + "TestRunNewYesWithTemplate" # Connects to https://api.pulumi.com/… "TestGetLatestPluginIncludedVersion" @@ -156,18 +162,17 @@ buildGoModule rec { version = "v${version}"; command = "PULUMI_SKIP_UPDATE_CHECK=1 pulumi version"; }; + # Test building packages that reuse our version and src. inherit (pulumiPackages) pulumi-go pulumi-nodejs pulumi-python; - # Pulumi currently requires protobuf4, but Nixpkgs defaults to a newer - # version. Test that we can actually build the package with protobuf4. - # https://github.com/pulumi/pulumi/issues/16828 - # https://github.com/NixOS/nixpkgs/issues/351751#issuecomment-2462163436 - pythonPackage = + pythonPackage = python3Packages.pulumi; + pythonPackageProtobuf5 = (python3Packages.overrideScope ( final: _: { - protobuf = final.protobuf4; + protobuf = final.protobuf5; } )).pulumi; + pulumiTestHookShellcheck = testers.shellcheck { name = "pulumi-test-hook-shellcheck"; src = ./extra/pulumi-test-hook.sh; diff --git a/pkgs/by-name/pu/pulumi/plugins/pulumi-go/package.nix b/pkgs/by-name/pu/pulumi/plugins/pulumi-go/package.nix index 4632c8353e82..1958b04eeb03 100644 --- a/pkgs/by-name/pu/pulumi/plugins/pulumi-go/package.nix +++ b/pkgs/by-name/pu/pulumi/plugins/pulumi-go/package.nix @@ -9,7 +9,7 @@ buildGoModule rec { sourceRoot = "${src.name}/sdk/go/pulumi-language-go"; - vendorHash = "sha256-SfnGZyHuhgj277DrRqr8TkKE+ZwnPKBFu/7EcPS4OhE="; + vendorHash = "sha256-jwsdMSLDn2PNJFIIVhqwBLH7acFTOFLPgVNMKbI5DZE="; ldflags = [ "-s" diff --git a/pkgs/by-name/pu/pulumi/plugins/pulumi-nodejs/package.nix b/pkgs/by-name/pu/pulumi/plugins/pulumi-nodejs/package.nix index 862436c760dc..af7be805670f 100644 --- a/pkgs/by-name/pu/pulumi/plugins/pulumi-nodejs/package.nix +++ b/pkgs/by-name/pu/pulumi/plugins/pulumi-nodejs/package.nix @@ -12,7 +12,7 @@ buildGoModule rec { sourceRoot = "${src.name}/sdk/nodejs/cmd/pulumi-language-nodejs"; - vendorHash = "sha256-Mf/SsRRDlm/TuSOksLV8f7H7xiT6fkHWyH6fJFo5fCc="; + vendorHash = "sha256-Q5Pk2f3EAiM4oit1vhc+PMEuMxdbrKAue3e0pnrZw2c="; ldflags = [ "-s" diff --git a/pkgs/by-name/pu/pulumi/plugins/pulumi-python/package.nix b/pkgs/by-name/pu/pulumi/plugins/pulumi-python/package.nix index 4672f754ed1e..dfda8bf7764b 100644 --- a/pkgs/by-name/pu/pulumi/plugins/pulumi-python/package.nix +++ b/pkgs/by-name/pu/pulumi/plugins/pulumi-python/package.nix @@ -12,7 +12,7 @@ buildGoModule rec { sourceRoot = "${src.name}/sdk/python/cmd/pulumi-language-python"; - vendorHash = "sha256-cpmB1Vmi8JAh+OKzoZ/x/AxB4uxH95laSo0uBGrj3FQ="; + vendorHash = "sha256-BfkjDesPdPDV2uILYaMJFIvaEBKT15ukwaReAL3yziw="; ldflags = [ "-s" diff --git a/pkgs/development/python-modules/pulumi/default.nix b/pkgs/development/python-modules/pulumi/default.nix index b0bf59d45c62..1d14aa2d186d 100644 --- a/pkgs/development/python-modules/pulumi/default.nix +++ b/pkgs/development/python-modules/pulumi/default.nix @@ -54,6 +54,7 @@ buildPythonPackage { ]; pythonRelaxDeps = [ + "protobuf" "grpcio" "pip" "semver" @@ -66,11 +67,20 @@ buildPythonPackage { pulumi-python ]; + disabledTestPaths = [ + # TODO: remove disabledTestPaths once the test is fixed upstream. + # https://github.com/pulumi/pulumi/pull/19080#discussion_r2309611222 + "lib/test/provider/experimental/test_property_value.py::test_nesting" + ]; + # https://github.com/pulumi/pulumi/blob/0acaf8060640fdd892abccf1ce7435cd6aae69fe/sdk/python/scripts/test_fast.sh#L10-L11 # https://github.com/pulumi/pulumi/blob/0acaf8060640fdd892abccf1ce7435cd6aae69fe/sdk/python/scripts/test_fast.sh#L16 installCheckPhase = '' runHook preInstallCheck - ${python.executable} -m pytest --junit-xml= --ignore=lib/test/automation lib/test + declare -a _disabledTestPathsArray + concatTo _disabledTestPathsArray disabledTestPaths + ${python.executable} -m pytest --junit-xml= --ignore=lib/test/automation lib/test \ + "''${_disabledTestPathsArray[@]/#/--deselect=}" pushd lib/test_with_mocks ${python.executable} -m pytest --junit-xml= popd @@ -86,8 +96,6 @@ buildPythonPackage { description = "Modern Infrastructure as Code. Any cloud, any language"; homepage = "https://www.pulumi.com"; license = lib.licenses.asl20; - # https://github.com/pulumi/pulumi/issues/16828 - broken = lib.versionAtLeast protobuf.version "5"; maintainers = with lib.maintainers; [ teto tie