Skip to content

Commit 23f7fe8

Browse files
modular-magiciantrodge
authored andcommitted
Add legacy long form project (#8320) (#5876)
* Add legacy long form project * Changed Name to ProjectId Signed-off-by: Modular Magician <[email protected]>
1 parent 25c60cc commit 23f7fe8

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

.changelog/8320.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
monitoring: fixed an issue causing `google_monitoring_monitored_project` to appear to be deleted
3+
```

google-beta/services/monitoring/resource_monitoring_monitored_project.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
"fmt"
2222
"log"
2323
"reflect"
24+
"strings"
2425
"time"
2526

2627
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -91,6 +92,7 @@ func resourceMonitoringMonitoredProjectCreate(d *schema.ResourceData, meta inter
9192
if err != nil {
9293
return err
9394
}
95+
url = strings.ReplaceAll(url, "projects/projects/", "projects/")
9496

9597
log.Printf("[DEBUG] Creating new MonitoredProject: %#v", obj)
9698
billingProject := ""
@@ -118,6 +120,7 @@ func resourceMonitoringMonitoredProjectCreate(d *schema.ResourceData, meta inter
118120
if err != nil {
119121
return fmt.Errorf("Error constructing id: %s", err)
120122
}
123+
id = strings.ReplaceAll(id, "projects/projects/", "projects/")
121124
d.SetId(id)
122125

123126
log.Printf("[DEBUG] Finished creating MonitoredProject %q: %#v", d.Id(), res)
@@ -136,6 +139,7 @@ func resourceMonitoringMonitoredProjectRead(d *schema.ResourceData, meta interfa
136139
if err != nil {
137140
return err
138141
}
142+
url = strings.ReplaceAll(url, "projects/projects/", "projects/")
139143

140144
billingProject := ""
141145

@@ -202,6 +206,7 @@ func resourceMonitoringMonitoredProjectDelete(d *schema.ResourceData, meta inter
202206
if err != nil {
203207
return err
204208
}
209+
url = strings.ReplaceAll(url, "projects/projects/", "projects/")
205210

206211
var obj map[string]interface{}
207212
log.Printf("[DEBUG] Deleting MonitoredProject %q", d.Id())
@@ -242,6 +247,7 @@ func resourceMonitoringMonitoredProjectImport(d *schema.ResourceData, meta inter
242247
if err != nil {
243248
return nil, fmt.Errorf("Error constructing id: %s", err)
244249
}
250+
id = strings.ReplaceAll(id, "projects/projects/", "projects/")
245251
d.SetId(id)
246252

247253
return []*schema.ResourceData{d}, nil
@@ -334,7 +340,7 @@ func resourceMonitoringMonitoredProjectDecoder(d *schema.ResourceData, meta inte
334340
if err != nil {
335341
return nil, err
336342
}
337-
res["name"] = project.Name
343+
res["name"] = project.ProjectId
338344
}
339345
return res, nil
340346
}

0 commit comments

Comments
 (0)