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.

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

Add asset/archive to conformance tests and fix engine working dir issues #16100

Merged
merged 1 commit into from
May 2, 2024

Conversation

Frassle
Copy link
Member

@Frassle Frassle commented May 1, 2024

Description

Fixes #16092.

Two main changes in this PR. Firstly we add a test for assets/archives to the conformance tests, and had to fix up some small issues in the test runner to enable this (copying test data files, correcting project directory layout, handling multi-word package names).

The other change is to fix the engine to respect the programs working directory when serialising/deserialising assets and archives. It does this by passing the programs working directory as a MarshalOption (n.b this option is only really needed in the engine, program SDK doesn't really need it because it doesn't change directories).

Checklist

  • I have run make tidy to update any new dependencies
  • I have run make lint to verify my code passes the lint check
    • I have formatted my code using gofumpt
  • I have added tests that prove my fix is effective or that my feature works
  • I have run make changelog and committed the changelog/pending/<file> documenting my change
  • Yes, there are changes in this PR that warrants bumping the Pulumi Cloud API version

@pulumi-bot
Copy link
Contributor

pulumi-bot commented May 1, 2024

Changelog

[uncommitted] (2024-05-02)

Bug Fixes

  • [engine] Fix an issue with archives/assets at paths outside cwd.
    #16100

@Frassle Frassle marked this pull request as ready for review May 1, 2024 15:57
@Frassle Frassle requested a review from a team as a code owner May 1, 2024 15:57
@Frassle Frassle force-pushed the fraser/fixArchive branch 2 times, most recently from 910d918 to 963b347 Compare May 1, 2024 16:30
@Frassle Frassle enabled auto-merge May 2, 2024 10:50
@Frassle Frassle added this pull request to the merge queue May 2, 2024
Merged via the queue into master with commit bb6b9c6 May 2, 2024
48 of 49 checks passed
@Frassle Frassle deleted the fraser/fixArchive branch May 2, 2024 14:07
@Frassle Frassle mentioned this pull request May 3, 2024
6 tasks
github-merge-queue bot pushed a commit that referenced this pull request May 6, 2024
<!--- 
Thanks so much for your contribution! If this is your first time
contributing, please ensure that you have read the
[CONTRIBUTING](https://github.com/pulumi/pulumi/blob/master/CONTRIBUTING.md)
documentation.
-->

# Description

<!--- Please include a summary of the change and which issue is fixed.
Please also include relevant motivation and context. -->

Fixes #16092.

Last part of the fix started in
#16100. That last PR fixed assets
and archive files, but not archive folders.

## Checklist

- [x] I have run `make tidy` to update any new dependencies
- [x] I have run `make lint` to verify my code passes the lint check
  - [x] I have formatted my code using `gofumpt`

<!--- Please provide details if the checkbox below is to be left
unchecked. -->
- [x] I have added tests that prove my fix is effective or that my
feature works
<!--- 
User-facing changes require a CHANGELOG entry.
-->
- [x] I have run `make changelog` and committed the
`changelog/pending/<file>` documenting my change
<!--
If the change(s) in this PR is a modification of an existing call to the
Pulumi Cloud,
then the service should honor older versions of the CLI where this
change would not exist.
You must then bump the API version in
/pkg/backend/httpstate/client/api.go, as well as add
it to the service.
-->
- [ ] Yes, there are changes in this PR that warrants bumping the Pulumi
Cloud API version
<!-- @pulumi employees: If yes, you must submit corresponding changes in
the service repo. -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants