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

Jump to bottom

Add rootDirectory to yaml #716

Merged
merged 2 commits into from
Mar 3, 2025
Merged

Add rootDirectory to yaml #716

merged 2 commits into from
Mar 3, 2025

Conversation

brandonpollack23
Copy link
Contributor

@brandonpollack23 brandonpollack23 commented Feb 18, 2025 •
edited
Loading

Add pulumi.rootDirectory to the yaml project generation and evalution.

This is a part of pulumi/pulumi#18565

Blocked by #718 #717 and pulumi/pulumi#18595

@brandonpollack23 brandonpollack23 force-pushed the bpollack/pulumi_yaml_conformance branch 4 times, most recently from e42e908 to 820db82 Compare February 18, 2025 14:46
@brandonpollack23
Copy link
Contributor Author

Only failing due to blockers, will nto merge without green tests after those are submitted

@brandonpollack23 brandonpollack23 marked this pull request as ready for review February 18, 2025 14:50
@brandonpollack23 brandonpollack23 requested a review from a team as a code owner February 18, 2025 14:50
tgummerer
tgummerer approved these changes Feb 18, 2025
View reviewed changes
.changes/unreleased/Improvements-716.yaml Outdated
@@ -0,0 +1,6 @@
component: codegen
kind: Improvements
body: add rootDirectory to codegen, runtime, and convert
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
body: add rootDirectory to codegen, runtime, and convert
body: Add rootDirectory to codegen, runtime, and convert

.github/workflows/stage-lint.yml Outdated
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
submodules: 'recursive'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems to belong to a different PR?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah thats in the blocking changes listed. Just got around to changing the base

pkg/pulumiyaml/codegen/load.go
"stack",
"project",
"cwd",
"organization",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would have preferred to have these re-sorted separately, but I went through all of these and only rootDirectory was added 👍

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah sorry it was so small I wanted to just do it and sneak it in <_<

@brandonpollack23 brandonpollack23 changed the base branch from main to bpollack/gomod_submodule February 18, 2025 16:34
@brandonpollack23 brandonpollack23 force-pushed the bpollack/pulumi_yaml_conformance branch from 820db82 to b28a854 Compare February 19, 2025 05:16
@brandonpollack23
Copy link
Contributor Author

Hold off on more comments for now while I add exceptions to existing tests

@brandonpollack23 brandonpollack23 marked this pull request as draft February 19, 2025 05:24
@brandonpollack23 brandonpollack23 marked this pull request as ready for review February 20, 2025 05:10
@brandonpollack23 brandonpollack23 force-pushed the bpollack/pulumi_yaml_conformance branch 2 times, most recently from d8015ae to 8c65828 Compare February 21, 2025 05:01
@brandonpollack23
Copy link
Contributor Author

This should be good to go

@brandonpollack23 brandonpollack23 force-pushed the bpollack/pulumi_yaml_conformance branch from 8c65828 to 9902824 Compare February 24, 2025 08:30
tgummerer
tgummerer reviewed Feb 24, 2025
View reviewed changes
Copy link
Contributor

@tgummerer tgummerer left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like this needs a rebase on main, which would make reviewing much easier (or maybe fixing the base branch to be main?)

.gitmodules Outdated
@@ -1,3 +1,4 @@
[submodule "pulumi"]
path = pulumi
url = git@github.com:pulumi/pulumi.git
branch = master
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
branch = master
branch = master

Edit: actually this still seems to belong to a different branch.

.mise.toml Outdated
@@ -0,0 +1,15 @@
[env]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The mise setup should also go on a different branch

pkg/pulumiyaml/testing/test/testdata/typeddict-pp/yaml/typeddict.yaml Outdated
@@ -1,11 +0,0 @@
resources:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change was already merged. Needs a rebase on main?

@brandonpollack23 brandonpollack23 force-pushed the bpollack/pulumi_yaml_conformance branch 3 times, most recently from 11957c6 to 91de0f4 Compare February 27, 2025 08:54
@brandonpollack23 brandonpollack23 changed the base branch from bpollack/gomod_submodule to main February 27, 2025 09:09
@brandonpollack23 brandonpollack23 force-pushed the bpollack/pulumi_yaml_conformance branch from 91de0f4 to f361d1c Compare March 3, 2025 02:08
@brandonpollack23 brandonpollack23 force-pushed the bpollack/pulumi_yaml_conformance branch from f361d1c to 9d47e04 Compare March 3, 2025 08:34
Frassle
Frassle reviewed Mar 3, 2025
View reviewed changes
@brandonpollack23 @Frassle
Update pkg/server/server.go
47215db 
Co-authored-by: Fraser Waters <fraser@pulumi.com>
@brandonpollack23 brandonpollack23 enabled auto-merge (squash) March 3, 2025 08:58
@brandonpollack23 brandonpollack23 merged commit d856225 into main Mar 3, 2025
6 checks passed
@brandonpollack23 brandonpollack23 deleted the bpollack/pulumi_yaml_conformance branch March 3, 2025 09:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tgummerer tgummerer tgummerer approved these changes

@Frassle Frassle Frassle left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@brandonpollack23 @tgummerer @Frassle