@@ -359,6 +359,75 @@ func TestBuildImportFile_ExistingProvider(t *testing.T) {
359359 assert .Equal (t , expected , importFile .Resources [0 ])
360360}
361361
362+ // TestBuildImportFile_RenamedProviderReference tests that if a provider's generated import-file
363+ // name is renamed after a resource has already referenced it, the resource's Provider field is
364+ // updated to the provider's new name.
365+ func TestBuildImportFile_RenamedProviderReference (t * testing.T ) {
366+ t .Parallel ()
367+
368+ events := make (chan engine.Event )
369+ importFilePromise := buildImportFile (t .Context (), events , sdkconfig .NopEncrypter )
370+
371+ events <- engine .NewEvent (engine.ResourcePreEventPayload {
372+ Metadata : makeRootStackMetadata (deploy .OpSame ),
373+ })
374+
375+ // Occupy the provider's logical name so the provider is initially renamed from "prov" to "provPkg".
376+ existingState := makeStateMetadata (t , "prov" , "other:index:Existing" , true , stateOptions {})
377+ events <- engine .NewEvent (engine.ResourcePreEventPayload {
378+ Metadata : makeMetadata (deploy .OpSame , existingState ),
379+ })
380+
381+ providerState := makeStateMetadata (t , "prov" , "pulumi:providers:pkg" , true , stateOptions {
382+ Inputs : resource .NewPropertyMapFromMap (map [string ]any {
383+ "version" : "3.2.1" ,
384+ }),
385+ })
386+ uuid , err := uuid .NewV4 ()
387+ require .NoError (t , err )
388+ providerState .ID = resource .ID (uuid .String ())
389+ events <- engine .NewEvent (engine.ResourcePreEventPayload {
390+ Metadata : makeMetadata (deploy .OpSame , providerState ),
391+ })
392+
393+ providerRef , err := providers .NewReference (providerState .URN , providerState .ID )
394+ require .NoError (t , err )
395+ usesProvider := makeStateMetadata (t , "usesProvider" , "pkg:mod:typ" , true , stateOptions {
396+ Provider : & providerRef ,
397+ })
398+ events <- engine .NewEvent (engine.ResourcePreEventPayload {
399+ Metadata : makeMetadata (deploy .OpCreate , usesProvider ),
400+ })
401+
402+ // This resource takes the provider's current generated name, forcing the provider alias to
403+ // be renamed again from "provPkg" to "provPkg2".
404+ conflictingState := makeStateMetadata (t , "provPkg" , "other:index:Conflict" , true , stateOptions {})
405+ events <- engine .NewEvent (engine.ResourcePreEventPayload {
406+ Metadata : makeMetadata (deploy .OpCreate , conflictingState ),
407+ })
408+
409+ close (events )
410+ importFile , err := importFilePromise .Result (t .Context ())
411+ require .NoError (t , err )
412+
413+ require .Len (t , importFile .NameTable , 1 )
414+ assert .Equal (t , providerState .URN , importFile .NameTable ["provPkg2" ])
415+
416+ require .Len (t , importFile .Resources , 2 )
417+ assert .Equal (t , importSpec {
418+ ID : "<PLACEHOLDER>" ,
419+ Type : "pkg:mod:typ" ,
420+ Name : "usesProvider" ,
421+ Provider : "provPkg2" ,
422+ Version : "3.2.1" ,
423+ }, importFile .Resources [0 ])
424+ assert .Equal (t , importSpec {
425+ ID : "<PLACEHOLDER>" ,
426+ Type : "other:index:Conflict" ,
427+ Name : "provPkg" ,
428+ }, importFile .Resources [1 ])
429+ }
430+
362431// TestBuildImportFile_NewProvider tests that we can generate an import file for a resource that uses
363432// an explicit provider that is also being created in the same deployment (#15453).
364433func TestBuildImportFile_NewProvider (t * testing.T ) {
@@ -613,3 +682,65 @@ func TestBuildImportFile_regress_15068(t *testing.T) {
613682 _ , err := importFilePromise .Result (t .Context ())
614683 assert .ErrorContains (t , err , "could not parse provider reference" )
615684}
685+
686+ // Regression test for https://github.com/pulumi/pulumi/issues/24056
687+ // Tests that when multiple existing component resources share the same name,
688+ // generated import resources still reference the correct distinct parents.
689+ func TestBuildImportFile_regress_24056 (t * testing.T ) {
690+ t .Parallel ()
691+
692+ events := make (chan engine.Event )
693+ importFilePromise := buildImportFile (t .Context (), events , sdkconfig .NopEncrypter )
694+
695+ // Pretend the root stack already exists.
696+ events <- engine .NewEvent (engine.ResourcePreEventPayload {
697+ Metadata : makeRootStackMetadata (deploy .OpSame ),
698+ })
699+
700+ // Two existing components with the same logical name.
701+ parentA := makeStateMetadata (t , "bug" , "example:components:ComponentResourceA" , false , stateOptions {})
702+ events <- engine .NewEvent (engine.ResourcePreEventPayload {
703+ Metadata : makeMetadata (deploy .OpSame , parentA ),
704+ })
705+
706+ parentB := makeStateMetadata (t , "bug" , "example:components:ComponentResourceB" , false , stateOptions {})
707+ events <- engine .NewEvent (engine.ResourcePreEventPayload {
708+ Metadata : makeMetadata (deploy .OpSame , parentB ),
709+ })
710+
711+ // Each created resource has one of the existing components as its parent.
712+ childA := makeStateMetadata (t , "child-a" , "example:components:ChildA" , false , stateOptions {Parent : parentA .URN })
713+ events <- engine .NewEvent (engine.ResourcePreEventPayload {
714+ Metadata : makeMetadata (deploy .OpCreate , childA ),
715+ })
716+
717+ childB := makeStateMetadata (t , "child-b" , "example:components:ChildB" , false , stateOptions {Parent : parentB .URN })
718+ events <- engine .NewEvent (engine.ResourcePreEventPayload {
719+ Metadata : makeMetadata (deploy .OpCreate , childB ),
720+ })
721+
722+ close (events )
723+
724+ importFile , err := importFilePromise .Result (t .Context ())
725+ require .NoError (t , err )
726+ require .Len (t , importFile .Resources , 2 )
727+
728+ parentsByType := map [tokens.Type ]string {}
729+ for _ , spec := range importFile .Resources {
730+ parentsByType [spec .Type ] = spec .Parent
731+ }
732+
733+ parentAliasA , ok := parentsByType [childA .Type ]
734+ require .True (t , ok )
735+ require .NotEmpty (t , parentAliasA )
736+ parentAliasB , ok := parentsByType [childB .Type ]
737+ require .True (t , ok )
738+ require .NotEmpty (t , parentAliasB )
739+
740+ // The two distinct parents must not collapse to the same alias.
741+ assert .NotEqual (t , parentAliasA , parentAliasB )
742+
743+ // And each alias must resolve to the correct parent URN in the name table.
744+ assert .Equal (t , parentA .URN , importFile .NameTable [parentAliasA ])
745+ assert .Equal (t , parentB .URN , importFile .NameTable [parentAliasB ])
746+ }
0 commit comments