Skip to content

Commit

Permalink
Merge #11100
Browse files Browse the repository at this point in the history
11100: Only trigger an import when needed during refresh r=iwahbe a=iwahbe

<!--- 
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 #11099

## Checklist

<!--- Please provide details if the checkbox below is to be left unchecked. -->
- [ ] 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 Service,
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 Service API version
  <!-- `@Pulumi` employees: If yes, you must submit corresponding changes in the service repo. -->


Co-authored-by: Ian Wahbe <ian@wahbe.com>
  • Loading branch information
bors[bot] and iwahbe committed Oct 20, 2022
2 parents 41d582d + dae956d commit 973740b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
@@ -0,0 +1,4 @@
changes:
- type: fix
scope: cli/import
description: Only trigger an import when necessary during refresh.
2 changes: 1 addition & 1 deletion pkg/cmd/pulumi/refresh.go
Expand Up @@ -163,7 +163,7 @@ func newRefreshCmd() *cobra.Command {
}

// First we handle explicit create->imports we were given
if importPendingCreates != nil {
if importPendingCreates != nil && len(*importPendingCreates) > 0 {
stderr := opts.Display.Stderr
if stderr == nil {
stderr = os.Stderr
Expand Down

0 comments on commit 973740b

Please sign in to comment.