Skip to content

Commit 60b16cb

Browse files
default project cdiff permadiff fixed (#9230) (#16264)
[upstream:e6b4bbe4ef580375d2ff160ae22bbbbe51543c5d] Signed-off-by: Modular Magician <[email protected]>
1 parent 47ed927 commit 60b16cb

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

.changelog/9230.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:none
2+
3+
```

google/tpgresource/utils.go

+6-2
Original file line numberDiff line numberDiff line change
@@ -752,11 +752,15 @@ func DefaultProviderProject(_ context.Context, diff *schema.ResourceDiff, meta i
752752

753753
//project
754754
if project := diff.Get("project"); project != nil {
755-
project, err := GetProjectFromDiff(diff, config)
755+
project2, err := GetProjectFromDiff(diff, config)
756756
if err != nil {
757757
return fmt.Errorf("Failed to retrieve project, pid: %s, err: %s", project, err)
758758
}
759-
err = diff.SetNew("project", project)
759+
if CompareSelfLinkRelativePaths("", project.(string), project2, nil) {
760+
return nil
761+
}
762+
763+
err = diff.SetNew("project", project2)
760764
if err != nil {
761765
return err
762766
}

0 commit comments

Comments
 (0)