Skip to content

Commit 42feb33

Browse files
modular-magicianmodular-magician
authored
Add long form project property (#8200) (#5820)
* Add long form project property * Add test, rename field Signed-off-by: Modular Magician <[email protected]>
1 parent 32e7e4c commit 42feb33

9 files changed

+49
-23
lines changed

‎.changelog/8200.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
```release-note:bug
2+
compute: fixed an issue with setting project field to long form in `google_compute_forwarding_rule` and `google_compute_global_forwarding_rule`
3+
```
4+
```release-note:bug
5+
gkehub: fixed an issue with setting project field to long form in `google_gke_hub_feature`
6+
```

‎google-beta/resource_gke_hub_feature_test.go‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ resource "time_sleep" "wait_for_gkehub_enablement" {
6767
create_duration = "150s"
6868
depends_on = [google_project_service.gkehub]
6969
}
70-
70+
7171
resource "google_gke_hub_feature" "feature" {
7272
name = "fleetobservability"
7373
location = "global"
@@ -76,7 +76,7 @@ resource "google_gke_hub_feature" "feature" {
7676
fleetobservability {
7777
logging_config {
7878
default_config {
79-
mode = "MOVE"
79+
mode = "MOVE"
8080
}
8181
fleet_scope_logs_config {
8282
mode = "COPY"
@@ -105,7 +105,7 @@ resource "google_gke_hub_feature" "feature" {
105105
fleetobservability {
106106
logging_config {
107107
default_config {
108-
mode = "MOVE"
108+
mode = "MOVE"
109109
}
110110
}
111111
}
@@ -363,9 +363,10 @@ func TestAccGKEHubFeature_gkehubFeatureMcsd(t *testing.T) {
363363
Config: testAccGKEHubFeature_gkehubFeatureMcsd(context),
364364
},
365365
{
366-
ResourceName: "google_gke_hub_feature.feature",
367-
ImportState: true,
368-
ImportStateVerify: true,
366+
ResourceName: "google_gke_hub_feature.feature",
367+
ImportState: true,
368+
ImportStateVerify: true,
369+
ImportStateVerifyIgnore: []string{"project"},
369370
},
370371
{
371372
Config: testAccGKEHubFeature_gkehubFeatureMcsdUpdate(context),
@@ -384,7 +385,7 @@ func testAccGKEHubFeature_gkehubFeatureMcsd(context map[string]interface{}) stri
384385
resource "google_gke_hub_feature" "feature" {
385386
name = "multiclusterservicediscovery"
386387
location = "global"
387-
project = google_project.project.project_id
388+
project = "projects/${google_project.project.project_id}"
388389
labels = {
389390
foo = "bar"
390391
}

‎google-beta/services/compute/resource_compute_forwarding_rule.go‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -601,6 +601,7 @@ func resourceComputeForwardingRuleCreate(d *schema.ResourceData, meta interface{
601601
if err != nil {
602602
return err
603603
}
604+
url = strings.ReplaceAll(url, "projects/projects/", "projects/")
604605

605606
log.Printf("[DEBUG] Creating new ForwardingRule: %#v", obj)
606607
billingProject := ""
@@ -609,7 +610,7 @@ func resourceComputeForwardingRuleCreate(d *schema.ResourceData, meta interface{
609610
if err != nil {
610611
return fmt.Errorf("Error fetching project for ForwardingRule: %s", err)
611612
}
612-
billingProject = project
613+
billingProject = strings.TrimPrefix(project, "projects/")
613614

614615
// err == nil indicates that the billing_project value was found
615616
if bp, err := tpgresource.GetBillingProject(d, config); err == nil {
@@ -634,6 +635,7 @@ func resourceComputeForwardingRuleCreate(d *schema.ResourceData, meta interface{
634635
if err != nil {
635636
return fmt.Errorf("Error constructing id: %s", err)
636637
}
638+
id = strings.ReplaceAll(id, "projects/projects/", "projects/")
637639
d.SetId(id)
638640

639641
err = ComputeOperationWaitTime(
@@ -705,14 +707,15 @@ func resourceComputeForwardingRuleRead(d *schema.ResourceData, meta interface{})
705707
if err != nil {
706708
return err
707709
}
710+
url = strings.ReplaceAll(url, "projects/projects/", "projects/")
708711

709712
billingProject := ""
710713

711714
project, err := tpgresource.GetProject(d, config)
712715
if err != nil {
713716
return fmt.Errorf("Error fetching project for ForwardingRule: %s", err)
714717
}
715-
billingProject = project
718+
billingProject = strings.TrimPrefix(project, "projects/")
716719

717720
// err == nil indicates that the billing_project value was found
718721
if bp, err := tpgresource.GetBillingProject(d, config); err == nil {
@@ -835,7 +838,7 @@ func resourceComputeForwardingRuleUpdate(d *schema.ResourceData, meta interface{
835838
if err != nil {
836839
return fmt.Errorf("Error fetching project for ForwardingRule: %s", err)
837840
}
838-
billingProject = project
841+
billingProject = strings.TrimPrefix(project, "projects/")
839842

840843
d.Partial(true)
841844

@@ -853,6 +856,7 @@ func resourceComputeForwardingRuleUpdate(d *schema.ResourceData, meta interface{
853856
if err != nil {
854857
return err
855858
}
859+
url = strings.ReplaceAll(url, "projects/projects/", "projects/")
856860

857861
// err == nil indicates that the billing_project value was found
858862
if bp, err := tpgresource.GetBillingProject(d, config); err == nil {
@@ -895,6 +899,7 @@ func resourceComputeForwardingRuleUpdate(d *schema.ResourceData, meta interface{
895899
if err != nil {
896900
return err
897901
}
902+
url = strings.ReplaceAll(url, "projects/projects/", "projects/")
898903

899904
// err == nil indicates that the billing_project value was found
900905
if bp, err := tpgresource.GetBillingProject(d, config); err == nil {
@@ -943,6 +948,7 @@ func resourceComputeForwardingRuleUpdate(d *schema.ResourceData, meta interface{
943948
if err != nil {
944949
return err
945950
}
951+
url = strings.ReplaceAll(url, "projects/projects/", "projects/")
946952

947953
// err == nil indicates that the billing_project value was found
948954
if bp, err := tpgresource.GetBillingProject(d, config); err == nil {
@@ -990,12 +996,13 @@ func resourceComputeForwardingRuleDelete(d *schema.ResourceData, meta interface{
990996
if err != nil {
991997
return fmt.Errorf("Error fetching project for ForwardingRule: %s", err)
992998
}
993-
billingProject = project
999+
billingProject = strings.TrimPrefix(project, "projects/")
9941000

9951001
url, err := tpgresource.ReplaceVars(d, config, "{{ComputeBasePath}}projects/{{project}}/regions/{{region}}/forwardingRules/{{name}}")
9961002
if err != nil {
9971003
return err
9981004
}
1005+
url = strings.ReplaceAll(url, "projects/projects/", "projects/")
9991006

10001007
var obj map[string]interface{}
10011008
log.Printf("[DEBUG] Deleting ForwardingRule %q", d.Id())
@@ -1046,6 +1053,7 @@ func resourceComputeForwardingRuleImport(d *schema.ResourceData, meta interface{
10461053
if err != nil {
10471054
return nil, fmt.Errorf("Error constructing id: %s", err)
10481055
}
1056+
id = strings.ReplaceAll(id, "projects/projects/", "projects/")
10491057
d.SetId(id)
10501058

10511059
return []*schema.ResourceData{d}, nil

‎google-beta/services/compute/resource_compute_global_forwarding_rule.go‎

Lines changed: 12 additions & 4 deletions
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"
@@ -437,6 +438,7 @@ func resourceComputeGlobalForwardingRuleCreate(d *schema.ResourceData, meta inte
437438
if err != nil {
438439
return err
439440
}
441+
url = strings.ReplaceAll(url, "projects/projects/", "projects/")
440442

441443
log.Printf("[DEBUG] Creating new GlobalForwardingRule: %#v", obj)
442444
billingProject := ""
@@ -445,7 +447,7 @@ func resourceComputeGlobalForwardingRuleCreate(d *schema.ResourceData, meta inte
445447
if err != nil {
446448
return fmt.Errorf("Error fetching project for GlobalForwardingRule: %s", err)
447449
}
448-
billingProject = project
450+
billingProject = strings.TrimPrefix(project, "projects/")
449451

450452
// err == nil indicates that the billing_project value was found
451453
if bp, err := tpgresource.GetBillingProject(d, config); err == nil {
@@ -470,6 +472,7 @@ func resourceComputeGlobalForwardingRuleCreate(d *schema.ResourceData, meta inte
470472
if err != nil {
471473
return fmt.Errorf("Error constructing id: %s", err)
472474
}
475+
id = strings.ReplaceAll(id, "projects/projects/", "projects/")
473476
d.SetId(id)
474477

475478
err = ComputeOperationWaitTime(
@@ -541,14 +544,15 @@ func resourceComputeGlobalForwardingRuleRead(d *schema.ResourceData, meta interf
541544
if err != nil {
542545
return err
543546
}
547+
url = strings.ReplaceAll(url, "projects/projects/", "projects/")
544548

545549
billingProject := ""
546550

547551
project, err := tpgresource.GetProject(d, config)
548552
if err != nil {
549553
return fmt.Errorf("Error fetching project for GlobalForwardingRule: %s", err)
550554
}
551-
billingProject = project
555+
billingProject = strings.TrimPrefix(project, "projects/")
552556

553557
// err == nil indicates that the billing_project value was found
554558
if bp, err := tpgresource.GetBillingProject(d, config); err == nil {
@@ -641,7 +645,7 @@ func resourceComputeGlobalForwardingRuleUpdate(d *schema.ResourceData, meta inte
641645
if err != nil {
642646
return fmt.Errorf("Error fetching project for GlobalForwardingRule: %s", err)
643647
}
644-
billingProject = project
648+
billingProject = strings.TrimPrefix(project, "projects/")
645649

646650
d.Partial(true)
647651

@@ -665,6 +669,7 @@ func resourceComputeGlobalForwardingRuleUpdate(d *schema.ResourceData, meta inte
665669
if err != nil {
666670
return err
667671
}
672+
url = strings.ReplaceAll(url, "projects/projects/", "projects/")
668673

669674
// err == nil indicates that the billing_project value was found
670675
if bp, err := tpgresource.GetBillingProject(d, config); err == nil {
@@ -707,6 +712,7 @@ func resourceComputeGlobalForwardingRuleUpdate(d *schema.ResourceData, meta inte
707712
if err != nil {
708713
return err
709714
}
715+
url = strings.ReplaceAll(url, "projects/projects/", "projects/")
710716

711717
// err == nil indicates that the billing_project value was found
712718
if bp, err := tpgresource.GetBillingProject(d, config); err == nil {
@@ -754,12 +760,13 @@ func resourceComputeGlobalForwardingRuleDelete(d *schema.ResourceData, meta inte
754760
if err != nil {
755761
return fmt.Errorf("Error fetching project for GlobalForwardingRule: %s", err)
756762
}
757-
billingProject = project
763+
billingProject = strings.TrimPrefix(project, "projects/")
758764

759765
url, err := tpgresource.ReplaceVars(d, config, "{{ComputeBasePath}}projects/{{project}}/global/forwardingRules/{{name}}")
760766
if err != nil {
761767
return err
762768
}
769+
url = strings.ReplaceAll(url, "projects/projects/", "projects/")
763770

764771
var obj map[string]interface{}
765772
log.Printf("[DEBUG] Deleting GlobalForwardingRule %q", d.Id())
@@ -809,6 +816,7 @@ func resourceComputeGlobalForwardingRuleImport(d *schema.ResourceData, meta inte
809816
if err != nil {
810817
return nil, fmt.Errorf("Error constructing id: %s", err)
811818
}
819+
id = strings.ReplaceAll(id, "projects/projects/", "projects/")
812820
d.SetId(id)
813821

814822
return []*schema.ResourceData{d}, nil

‎google-beta/services/gkehub2/resource_gke_hub_feature.go‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,7 @@ func resourceGKEHub2FeatureCreate(d *schema.ResourceData, meta interface{}) erro
248248
if err != nil {
249249
return err
250250
}
251+
url = strings.ReplaceAll(url, "projects/projects/", "projects/")
251252

252253
log.Printf("[DEBUG] Creating new Feature: %#v", obj)
253254
billingProject := ""
@@ -256,7 +257,7 @@ func resourceGKEHub2FeatureCreate(d *schema.ResourceData, meta interface{}) erro
256257
if err != nil {
257258
return fmt.Errorf("Error fetching project for Feature: %s", err)
258259
}
259-
billingProject = project
260+
billingProject = strings.TrimPrefix(project, "projects/")
260261

261262
// err == nil indicates that the billing_project value was found
262263
if bp, err := tpgresource.GetBillingProject(d, config); err == nil {
@@ -281,6 +282,7 @@ func resourceGKEHub2FeatureCreate(d *schema.ResourceData, meta interface{}) erro
281282
if err != nil {
282283
return fmt.Errorf("Error constructing id: %s", err)
283284
}
285+
id = strings.ReplaceAll(id, "projects/projects/", "projects/")
284286
d.SetId(id)
285287

286288
// Use the resource in the operation response to populate
@@ -301,6 +303,7 @@ func resourceGKEHub2FeatureCreate(d *schema.ResourceData, meta interface{}) erro
301303
if err != nil {
302304
return fmt.Errorf("Error constructing id: %s", err)
303305
}
306+
id = strings.ReplaceAll(id, "projects/projects/", "projects/")
304307
d.SetId(id)
305308

306309
log.Printf("[DEBUG] Finished creating Feature %q: %#v", d.Id(), res)
@@ -319,14 +322,15 @@ func resourceGKEHub2FeatureRead(d *schema.ResourceData, meta interface{}) error
319322
if err != nil {
320323
return err
321324
}
325+
url = strings.ReplaceAll(url, "projects/projects/", "projects/")
322326

323327
billingProject := ""
324328

325329
project, err := tpgresource.GetProject(d, config)
326330
if err != nil {
327331
return fmt.Errorf("Error fetching project for Feature: %s", err)
328332
}
329-
billingProject = project
333+
billingProject = strings.TrimPrefix(project, "projects/")
330334

331335
// err == nil indicates that the billing_project value was found
332336
if bp, err := tpgresource.GetBillingProject(d, config); err == nil {
@@ -386,7 +390,7 @@ func resourceGKEHub2FeatureUpdate(d *schema.ResourceData, meta interface{}) erro
386390
if err != nil {
387391
return fmt.Errorf("Error fetching project for Feature: %s", err)
388392
}
389-
billingProject = project
393+
billingProject = strings.TrimPrefix(project, "projects/")
390394

391395
obj := make(map[string]interface{})
392396
labelsProp, err := expandGKEHub2FeatureLabels(d.Get("labels"), d, config)
@@ -406,6 +410,7 @@ func resourceGKEHub2FeatureUpdate(d *schema.ResourceData, meta interface{}) erro
406410
if err != nil {
407411
return err
408412
}
413+
url = strings.ReplaceAll(url, "projects/projects/", "projects/")
409414

410415
log.Printf("[DEBUG] Updating Feature %q: %#v", d.Id(), obj)
411416
updateMask := []string{}
@@ -469,12 +474,13 @@ func resourceGKEHub2FeatureDelete(d *schema.ResourceData, meta interface{}) erro
469474
if err != nil {
470475
return fmt.Errorf("Error fetching project for Feature: %s", err)
471476
}
472-
billingProject = project
477+
billingProject = strings.TrimPrefix(project, "projects/")
473478

474479
url, err := tpgresource.ReplaceVars(d, config, "{{GKEHub2BasePath}}projects/{{project}}/locations/{{location}}/features/{{name}}")
475480
if err != nil {
476481
return err
477482
}
483+
url = strings.ReplaceAll(url, "projects/projects/", "projects/")
478484

479485
var obj map[string]interface{}
480486
log.Printf("[DEBUG] Deleting Feature %q", d.Id())
@@ -524,6 +530,7 @@ func resourceGKEHub2FeatureImport(d *schema.ResourceData, meta interface{}) ([]*
524530
if err != nil {
525531
return nil, fmt.Errorf("Error constructing id: %s", err)
526532
}
533+
id = strings.ReplaceAll(id, "projects/projects/", "projects/")
527534
d.SetId(id)
528535

529536
return []*schema.ResourceData{d}, nil

‎google-beta/services/gkeonprem/resource_gkeonprem_bare_metal_cluster.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1303,7 +1303,6 @@ func resourceGkeonpremBareMetalClusterCreate(d *schema.ResourceData, meta interf
13031303
config, res, &opRes, project, "Creating BareMetalCluster", userAgent,
13041304
d.Timeout(schema.TimeoutCreate))
13051305
if err != nil {
1306-
13071306
return fmt.Errorf("Error waiting to create BareMetalCluster: %s", err)
13081307
}
13091308

‎google-beta/services/gkeonprem/resource_gkeonprem_bare_metal_node_pool.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,6 @@ func resourceGkeonpremBareMetalNodePoolCreate(d *schema.ResourceData, meta inter
351351
config, res, &opRes, project, "Creating BareMetalNodePool", userAgent,
352352
d.Timeout(schema.TimeoutCreate))
353353
if err != nil {
354-
355354
return fmt.Errorf("Error waiting to create BareMetalNodePool: %s", err)
356355
}
357356

‎google-beta/services/gkeonprem/resource_gkeonprem_vmware_cluster.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -990,7 +990,6 @@ func resourceGkeonpremVmwareClusterCreate(d *schema.ResourceData, meta interface
990990
config, res, &opRes, project, "Creating VmwareCluster", userAgent,
991991
d.Timeout(schema.TimeoutCreate))
992992
if err != nil {
993-
994993
return fmt.Errorf("Error waiting to create VmwareCluster: %s", err)
995994
}
996995

‎google-beta/services/gkeonprem/resource_gkeonprem_vmware_node_pool.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,6 @@ func resourceGkeonpremVmwareNodePoolCreate(d *schema.ResourceData, meta interfac
413413
config, res, &opRes, project, "Creating VmwareNodePool", userAgent,
414414
d.Timeout(schema.TimeoutCreate))
415415
if err != nil {
416-
417416
return fmt.Errorf("Error waiting to create VmwareNodePool: %s", err)
418417
}
419418

0 commit comments

Comments
 (0)