Add conformance for rootDirectory pcl function #466

brandonpollack23 · 2025-02-14T10:15:43Z

Add conformance for projectRoot pcl function

Part of pulumi/pulumi#18565
Blocked by pulumi/pulumi#18595

Changes required to get project root in dotnet and have conformance
tests pass.

brandonpollack23 · 2025-02-24T08:28:28Z

This should be good once blocking PR is done

brandonpollack23 · 2025-02-25T07:43:49Z

blocking PR is approved, just running tests so this should be good to review

Update `pulumi` submodule to the v3.153.0 tag. This brings in two new conformance tests. - `l1-builtin-project-root` support is being added in #466 - `l2-component-property-deps` is blocked on .NET programgen support for `Call` (and #488) Somewhat suspicious that a couple generated SDKs changed (I ran the conformance tests with `PULUMI_ACCEPT=true`). Are we not snapshot comparing those?

CONTRIBUTING.md

Frassle · 2025-03-03T08:55:56Z

sdk/Pulumi/Deployment/Deployment.cs


        /// <summary>
        /// The current running deployment instance. This is only available from inside the function
        /// passed to <see cref="Deployment.RunAsync(Action)"/> (or its overloads).
        /// </summary>
        public static DeploymentInstance Instance
        {
-            get => _instance.Value ?? throw new InvalidOperationException("Trying to acquire Deployment.Instance before 'Run' was called.");
+            get =>


Don't reformat whitespace everywhere, just makes the diff noisy.

that shoudl be better, wasn't aware I had a strict formatter turned on

I also added a cache clear before testing to purge any old versions with the same version number if present, as well as some docs describing this issue which cost me an hour. Part of #18565 Blocked by #18595 Changes required to get project root in dotnet and have conformance tests pass.

Frassle · 2025-03-03T09:59:16Z

sdk/Pulumi/Deployment/Deployment.cs

@@ -119,6 +121,7 @@ private Deployment(RunnerOptions? runnerOptions = null)
            if (string.IsNullOrEmpty(monitor) ||
                string.IsNullOrEmpty(engine) ||
                string.IsNullOrEmpty(project) ||
+                string.IsNullOrEmpty(rootDirectory) ||


You can't add this here. If someone uses a new SDK with the old language host it will error out on this.

Frassle · 2025-03-03T10:00:09Z

sdk/Pulumi/Deployment/Deployment_Inline.cs

@@ -17,6 +17,7 @@ private Deployment(IDeploymentBuilder builder, InlineDeploymentSettings settings

            _organizationName = settings.Organization ?? "organization";
            _projectName = settings.Project;
+            _rootDirectory = "rootDirectory";


We should probably make root directory nulllable. Both running against the old engine, and running inline programs won't have a root directory.

Frassle · 2025-03-04T08:43:24Z

sdk/Pulumi/Deployment/Deployment.cs

@@ -160,6 +163,7 @@ internal Deployment(IEngine engine, IMonitor monitor, TestOptions? options)
            _isDryRun = options?.IsPreview ?? true;
            _stackName = options?.StackName ?? "stack";
            _projectName = options?.ProjectName ?? "project";
+            _rootDirectory = options?.RootDirectory ?? "rootDirectory";


Not sure this should default to anything? Like null is easier to match against than "rootDirectory'

I suppose so, the others aren't nullable but it kinda makes me think they should be as well

Well the others always get set except org and "organisation" was I suppose a half sensible default choice for that, although in hindsight maybe that should have been nullable or throwing as well for old engines.

I think this probably could be set for inline programs as well (the autoapi does make a temp folder for them to run in). So it's just what to do for old engines, which I think has three choices:

Be nullable, return null for old engines

Don't be nullable and throw a runtime exception if running against an old engine. We do this for other things like transforms

Don't be nullable and have a default value, but I'm not sure anything makes sense for that.

So actually thinking about it (and sorry to go back and forth on you like this) but maybe we should do option 2. Make the user API non-nullable, but internally track if it's actually set by the engine or not and if the user tries to access it throw an exception like we do if they try and register a stack transform and it isn't supported: throw new Exception("The Pulumi CLI does not support root directory. Please update the Pulumi CLI.");

Yup, agreed

Ok this is done now

…n instead

sdk/Pulumi/Deployment/Deployment.cs

sdk/Pulumi/Deployment/Deployment_Inline.cs

sdk/Pulumi/Deployment/IDeployment.cs

sdk/Pulumi/Deployment/DeploymentInstance.cs

sdk/Pulumi/Deployment/Deployment.cs

Co-authored-by: Fraser Waters <[email protected]>

brandonpollack23 force-pushed the bpollack/projectrootconformance branch 6 times, most recently from 8d0797e to 70227ac Compare February 18, 2025 09:54

brandonpollack23 changed the title ~~Add conformance for projectRoot pcl function~~ Add conformance for rootDirectory pcl function Feb 18, 2025

brandonpollack23 force-pushed the bpollack/projectrootconformance branch 2 times, most recently from e758114 to 96e3aa7 Compare February 20, 2025 05:31

brandonpollack23 changed the base branch from main to bpollack/gomod_update February 20, 2025 05:32

brandonpollack23 marked this pull request as ready for review February 20, 2025 05:33

brandonpollack23 requested a review from a team as a code owner February 20, 2025 05:33

brandonpollack23 force-pushed the bpollack/gomod_update branch from a54d28f to 12f56a3 Compare February 20, 2025 08:02

brandonpollack23 force-pushed the bpollack/projectrootconformance branch 2 times, most recently from 11c9fda to c9e0260 Compare February 20, 2025 10:00

brandonpollack23 force-pushed the bpollack/gomod_update branch 2 times, most recently from d9c4a33 to fd16e43 Compare February 20, 2025 10:21

brandonpollack23 force-pushed the bpollack/projectrootconformance branch from c9e0260 to 0b45515 Compare February 20, 2025 10:21

Base automatically changed from bpollack/gomod_update to main February 20, 2025 11:18

brandonpollack23 force-pushed the bpollack/projectrootconformance branch from 0b45515 to ec84337 Compare February 25, 2025 02:01

justinvp mentioned this pull request Feb 27, 2025

Update pulumi submodule to v3.153.0 tag #523

Merged

brandonpollack23 force-pushed the bpollack/projectrootconformance branch from ec84337 to cc541d6 Compare March 3, 2025 08:26

Frassle reviewed Mar 3, 2025

View reviewed changes

brandonpollack23 force-pushed the bpollack/projectrootconformance branch from cc541d6 to a8cf4fa Compare March 3, 2025 09:48

Frassle reviewed Mar 3, 2025

View reviewed changes

make nullable

6702a49

Frassle reviewed Mar 4, 2025

View reviewed changes

remove check that will break back compat

c77d2d7

brandonpollack23 force-pushed the bpollack/projectrootconformance branch from 046af8d to c77d2d7 Compare March 4, 2025 14:14

go back to making this not nullable and add throw update cli exceptio…

6ce0eaf

…n instead

Frassle reviewed Mar 10, 2025

View reviewed changes

Apply suggestions from code review

e629b48

brandonpollack23 mentioned this pull request Mar 10, 2025

Send root_directory in Provider Construct call pulumi/pulumi#18843

Open

6 tasks

remove nullability but add exception on access

2d10121

brandonpollack23 force-pushed the bpollack/projectrootconformance branch from c0fecc7 to 2d10121 Compare March 10, 2025 08:58

Frassle reviewed Mar 10, 2025

View reviewed changes

sdk/Pulumi/Deployment/Deployment.cs Outdated Show resolved Hide resolved

Update sdk/Pulumi/Deployment/Deployment.cs

89e5d82

Co-authored-by: Fraser Waters <[email protected]>

brandonpollack23 force-pushed the bpollack/projectrootconformance branch from 38a47e3 to 89e5d82 Compare March 10, 2025 09:39

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add conformance for rootDirectory pcl function #466

Add conformance for rootDirectory pcl function #466

brandonpollack23 commented Feb 14, 2025 •

edited

Loading

brandonpollack23 commented Feb 24, 2025

brandonpollack23 commented Feb 25, 2025

Frassle Mar 3, 2025

brandonpollack23 Mar 3, 2025

Frassle Mar 3, 2025

brandonpollack23 Mar 4, 2025

Frassle Mar 3, 2025

brandonpollack23 Mar 4, 2025

Frassle Mar 4, 2025

brandonpollack23 Mar 4, 2025

Frassle Mar 4, 2025

brandonpollack23 Mar 6, 2025

brandonpollack23 Mar 10, 2025

Add conformance for rootDirectory pcl function #466

Are you sure you want to change the base?

Add conformance for rootDirectory pcl function #466

Conversation

brandonpollack23 commented Feb 14, 2025 • edited Loading

brandonpollack23 commented Feb 24, 2025

brandonpollack23 commented Feb 25, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

brandonpollack23 commented Feb 14, 2025 •

edited

Loading