maxmustermann/pulumi
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

special case allowing duplicate URNs for stack references

Browse source
This commit is contained in:
evanboyle 2021-05-10 22:08:37 -07:00
parent 15418b6789
commit 2e0a8c0dc3
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/operations/resources.go
View file

@ -57,7 +57,7 @@ func makeResourceTreeMap(source []*resource.State) (*Resource, map[resource.URN]
for _, state := range source {
stack = state.URN.Stack()
proj = state.URN.Project()
if !state.Delete {
if !state.Delete && state.URN.Type() != "pulumi:pulumi:StackReference" {
// Only include resources which are not marked as pending-deletion.
contract.Assertf(resources[state.URN] == nil, "Unexpected duplicate resource %s", state.URN)
resources[state.URN] = &Resource{

2
pkg/resource/deploy/deployment.go
View file

@ -280,7 +280,7 @@ func buildResourceMap(prev *Snapshot, preview bool) ([]*resource.State, map[reso
}
urn := oldres.URN
if olds[urn] != nil {
if olds[urn] != nil && urn.Type() != "pulumi:pulumi:StackReference" {
return nil, nil, errors.Errorf("unexpected duplicate resource '%s'", urn)
}
olds[urn] = oldres

2
pkg/resource/deploy/snapshot.go
View file

@ -186,7 +186,7 @@ func (snap *Snapshot) VerifyIntegrity() error {
}
}
if _, has := urns[urn]; has && !state.Delete {
if _, has := urns[urn]; has && !state.Delete && urn.Type() != "pulumi:pulumi:StackReference" {
// The only time we should have duplicate URNs is when all but one of them are marked for deletion.
return errors.Errorf("duplicate resource %s (not marked for deletion)", urn)
}

2
pkg/resource/deploy/step_executor.go
View file

@ -273,7 +273,7 @@ func (se *stepExecutor) executeStep(workerID int, step Step) error {
if err == nil {
// If we have a state object, and this is a create or update, remember it, as we may need to update it later.
if step.Logical() && step.New() != nil {
if prior, has := se.pendingNews.Load(step.URN()); has {
if prior, has := se.pendingNews.Load(step.URN()); has && step.URN().Type() != "pulumi:pulumi:StackReference" {
return errors.Errorf(
"resource '%s' registered twice (%s and %s)", step.URN(), prior.(Step).Op(), step.Op())
}