Skip to content

Commit d870fd6

Browse files
melinathBBBmau
authored andcommitted
Removed colab schedule post_create logic related to setting name (GoogleCloudPlatform#13965)
1 parent 50c3e4d commit d870fd6

File tree

8 files changed

+6
-30
lines changed

8 files changed

+6
-30
lines changed

mmv1/templates/terraform/constants/router_nat.go.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ func computeRouterNatSubnetworkHash(v interface{}) int {
8484
}
8585
}
8686

87-
return schema.HashString(tpgresource.NameFromSelfLinkStateFunc(name)) + sourceIpRangesHash + secondaryIpRangeHash
87+
return schema.HashString(tpgresource.GetResourceNameFromSelfLink(name.(string))) + sourceIpRangesHash + secondaryIpRangeHash
8888
}
8989

9090
func computeRouterNatIPsHash(v interface{}) int {

mmv1/templates/terraform/custom_flatten/name_from_self_link.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ func flatten{{$.GetPrefix}}{{$.TitlelizeProperty}}(v interface{}, d *schema.Reso
1414
if v == nil {
1515
return v
1616
}
17-
return tpgresource.NameFromSelfLinkStateFunc(v)
17+
return tpgresource.GetResourceNameFromSelfLink(v.(string))
1818
}

mmv1/templates/terraform/post_create/colab_schedule.go.tmpl

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,3 @@
1-
// The response for create request contains the generated name generated name that we need
2-
// in order to perform a READ. We need to access the object inside of it as
3-
// a map[string]interface, so let's do that.
4-
5-
longName := res["name"].(string)
6-
name := tpgresource.GetResourceNameFromSelfLink(longName)
7-
log.Printf("[DEBUG] Setting resource name to %s", name)
8-
if err := d.Set("name", name); err != nil {
9-
return fmt.Errorf("Error setting name: %s", err)
10-
}
11-
12-
parts := strings.Split(longName, "/")
13-
parts[1] = project
14-
updatedLongName := strings.Join(parts, "/")
15-
d.SetId(updatedLongName)
16-
171
if p, ok := d.GetOk("desired_state"); ok && p.(string) == "PAUSED" {
182
_, err := modifyScheduleState(config, d, project, billingProject, userAgent, "pause")
193
if err != nil {

mmv1/third_party/cai2hcl/services/compute/compute_forwarding_rule.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,5 +307,5 @@ func flattenComputeForwardingRuleRegion(v interface{}, d *schema.ResourceData, c
307307
if v == nil {
308308
return v
309309
}
310-
return tpgresource.NameFromSelfLinkStateFunc(v)
310+
return tpgresource.GetResourceNameFromSelfLink(v.(string))
311311
}

mmv1/third_party/cai2hcl/services/compute/compute_region_backend_service.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1394,5 +1394,5 @@ func flattenComputeRegionBackendServiceRegion(v interface{}, d *schema.ResourceD
13941394
if v == nil {
13951395
return v
13961396
}
1397-
return tpgresource.NameFromSelfLinkStateFunc(v)
1397+
return tpgresource.GetResourceNameFromSelfLink(v.(string))
13981398
}

mmv1/third_party/cai2hcl/services/compute/compute_region_health_check.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,5 +564,5 @@ func flattenComputeRegionHealthCheckRegion(v interface{}, d *schema.ResourceData
564564
if v == nil {
565565
return v
566566
}
567-
return tpgresource.NameFromSelfLinkStateFunc(v)
567+
return tpgresource.GetResourceNameFromSelfLink(v.(string))
568568
}

mmv1/third_party/terraform/services/osconfig/resource_os_config_os_policy_assignment.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1485,7 +1485,7 @@ func flattenOSConfigOSPolicyAssignmentName(v interface{}, d *schema.ResourceData
14851485
if v == nil {
14861486
return v
14871487
}
1488-
return tpgresource.NameFromSelfLinkStateFunc(v)
1488+
return tpgresource.GetResourceNameFromSelfLink(v.(string))
14891489
}
14901490

14911491
func flattenOSConfigOSPolicyAssignmentDescription(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {

mmv1/third_party/terraform/tpgresource/self_link_helpers.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,6 @@ func GetResourceNameFromSelfLink(link string) string {
102102
return parts[len(parts)-1]
103103
}
104104

105-
func NameFromSelfLinkStateFunc(v interface{}) string {
106-
return GetResourceNameFromSelfLink(v.(string))
107-
}
108-
109-
func StoreResourceName(resourceLink interface{}) string {
110-
return GetResourceNameFromSelfLink(resourceLink.(string))
111-
}
112-
113105
type LocationType int
114106

115107
const (

0 commit comments

Comments
 (0)