pulumi: 3.156.0 -> 3.162.0 (NixOS#393740)

Author: wolfgangwalther

pkgs/by-name/pu/pulumi/package.nix

@@ -10,21 +10,25 @@
   callPackage,
   testers,
   pulumi,
+  pulumiPackages,
+  python3Packages,
+  nix-update-script,
+  _experimental-update-script-combinators,
 }:
 buildGoModule rec {
   pname = "pulumi";
-  version = "3.156.0";
+  version = "3.162.0";
 
   src = fetchFromGitHub {
     owner = "pulumi";
     repo = "pulumi";
     tag = "v${version}";
-    hash = "sha256-1iML+WCEkLMdAJ7e+F5XwBzM+pn3eZQsCaSi3Ui/JdM=";
+    hash = "sha256-avtqURmj3PL82j89kLmVsBWqJJHnOFqR1huoUESt4L4=";
     # Some tests rely on checkout directory name
     name = "pulumi";
   };
 
-  vendorHash = "sha256-2hpn1IKJvWtXgNKgf56dZABA4VO1aT0cDsHOmCEPrGo=";
+  vendorHash = "sha256-fJFpwhbRkxSI2iQfNJ9qdL9oYM1SVVMJ30VIymoZBmg=";
 
   sourceRoot = "${src.name}/pkg";
 
@@ -56,6 +60,11 @@ buildGoModule rec {
     # Skip tests that fail in Nix sandbox.
     "-skip=^${
       lib.concatStringsSep "$|^" [
+        # Concurrent map modification in test case.
+        # TODO: remove after the fix is merged and released.
+        # https://github.com/pulumi/pulumi/pull/19200
+        "TestGetDocLinkForPulumiType"
+
         # Seems to require TTY.
         "TestProgressEvents"
 
@@ -68,6 +77,10 @@ buildGoModule rec {
         "TestGenerateOnlyProjectCheck"
         "TestPulumiNewSetsTemplateTag"
         "TestPulumiPromptRuntimeOptions"
+        "TestPulumiNewOrgTemplate"
+        "TestPulumiNewWithOrgTemplates"
+        "TestPulumiNewWithoutPulumiAccessToken"
+        "TestPulumiNewWithoutTemplateSupport"
 
         # Connects to https://pulumi-testing.vault.azure.net/…
         "TestAzureCloudManager"
@@ -117,12 +130,39 @@ buildGoModule rec {
   passthru = {
     pkgs = callPackage ./plugins.nix { };
     withPackages = callPackage ./with-packages.nix { };
+    updateScript = _experimental-update-script-combinators.sequence [
+      (nix-update-script { })
+      (nix-update-script {
+        attrPath = "pulumiPackages.pulumi-go";
+        extraArgs = [ "--version=skip" ];
+      })
+      (nix-update-script {
+        attrPath = "pulumiPackages.pulumi-nodejs";
+        extraArgs = [ "--version=skip" ];
+      })
+      (nix-update-script {
+        attrPath = "pulumiPackages.pulumi-python";
+        extraArgs = [ "--version=skip" ];
+      })
+    ];
     tests = {
       version = testers.testVersion {
         package = pulumi;
         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 =
+        (python3Packages.overrideScope (
+          final: _: {
+            protobuf = final.protobuf4;
+          }
+        )).pulumi;
       pulumiTestHookShellcheck = testers.shellcheck {
         name = "pulumi-test-hook-shellcheck";
         src = ./extra/pulumi-test-hook.sh;

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-MqqkDuCAHsxyzcofufMSzf1TpntnMy+sNHhBY5vr+TE=";
+  vendorHash = "sha256-3I9Kh3Zqpu0gT0pQNzg2mMwxQUdhEpjITZOrO7Yt50A=";
 
   ldflags = [
     "-s"

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-Blhbjc9nNj2ZDKs6uO/IZ5RuFJJTkS2wJF/7Egc7VvA=";
+  vendorHash = "sha256-UvfSmHWRFRZkmcgzUrLkqktQAt8ZlVDEzP6y+pxUOGc=";
 
   ldflags = [
     "-s"

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-x3dWYM8/2cWWhTmfGEDdrGHntqIDObYwQicSHIXr1rw=";
+  vendorHash = "sha256-5tr3mQ5x6jMOa9meHK6gaoRjNgLoHkWiTiaYXXqmUDo=";
 
   ldflags = [
     "-s"

pkgs/development/python-modules/pulumi/default.nix

@@ -70,9 +70,9 @@ buildPythonPackage {
   # https://github.com/pulumi/pulumi/blob/0acaf8060640fdd892abccf1ce7435cd6aae69fe/sdk/python/scripts/test_fast.sh#L16
   installCheckPhase = ''
     runHook preInstallCheck
-    ${python.executable} -m pytest --ignore=lib/test/automation lib/test
+    ${python.executable} -m pytest --junit-xml= --ignore=lib/test/automation lib/test
     pushd lib/test_with_mocks
-    ${python.executable} -m pytest
+    ${python.executable} -m pytest --junit-xml=
     popd
     runHook postInstallCheck
   '';