fixed provider crash in google_compute_network_endpoints (#15707)

Author: shuyama1

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

@@ -38,23 +38,31 @@ func NetworkEndpointsNetworkEndpointConvertToAny(endpoint NetworkEndpointsNetwor
 	return m
 }
 
-// Continues to read network endpoints as long as there are unread pages remaining
-func networkEndpointsPaginatedRead(d *schema.ResourceData, config *transport_tpg.Config, userAgent, url, project, billingProject, pt string) ([]interface{}, error) {
+// Read network endpoints as long as there are unread pages remaining
+func networkEndpointsPaginatedRead(d *schema.ResourceData, config *transport_tpg.Config, userAgent, url, project, billingProject string, res map[string]interface{}) ([]interface{}, error) {
 	var allEndpoints []interface{}
-	for len(pt) > 0 {
-		res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
-			Config:	config,
-			Method:	"POST",
+	var err error
+
+	for {
+		if items, ok := res["items"].([]interface{}); ok {
+			allEndpoints = append(allEndpoints, items...)
+		}
+
+		pt, ok := res["nextPageToken"].(string)
+		if !ok || pt == "" {
+			break
+		}
+
+		res, err = transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
+			Config:    config,
+			Method:    "POST",
 			Project:   billingProject,
-			RawURL:	fmt.Sprintf("%s?pageToken=%s", url, pt),
+			RawURL:    fmt.Sprintf("%s?pageToken=%s", url, pt),
 			UserAgent: userAgent,
 		})
 		if err != nil {
 			return nil, transport_tpg.HandleNotFoundError(err, d, fmt.Sprintf("ComputeNetworkEndpoints %q", d.Id()))
 		}
-		resEndpoints := res["items"].([]interface{})
-		allEndpoints = append(allEndpoints, resEndpoints...)
-		pt, _ = res["nextPageToken"].(string)
 	}
 	return allEndpoints, nil
 }

mmv1/templates/terraform/decoders/network_endpoints.go.tmpl

@@ -33,22 +33,21 @@ billingProject = project
 if bp, err := tpgresource.GetBillingProject(d, config); err == nil {
     billingProject = bp
 }
-// Read past the first page to get all endpoints.
-pt, _ := res["nextPageToken"].(string)
-allEndpoints, err := networkEndpointsPaginatedRead(d, config, userAgent, url, project, billingProject, pt)
+
+allEndpoints, err := networkEndpointsPaginatedRead(d, config, userAgent, url, project, billingProject, res)
 if err != nil {
-    // networkEndpointsPaginatedRead already adds error description
-    return nil, err
+	return nil, err
 }
-firstPage := res["items"].([]interface{})
-allEndpoints = append(firstPage, allEndpoints...)
 
 // listNetworkEndpoints returns data in a different structure, so we need to
 // convert to the Terraform schema.
 var transformed []interface{}
 for _, e := range allEndpoints {
-    t := e.(map[string]interface{})["networkEndpoint"]
-    transformed = append(transformed, t)
+	if item, ok := e.(map[string]interface{}); ok {
+		if t, ok := item["networkEndpoint"]; ok {
+			transformed = append(transformed, t)
+		}
+	}
 }
 
 return map[string]interface{}{"networkEndpoints": transformed}, nil

mmv1/templates/terraform/pre_create/network_endpoints.go.tmpl

@@ -1,5 +1,9 @@
 chunkSize := 500 // API only accepts 500 endpoints at a time
-lastPage, err := networkEndpointsPaginatedMutate(d, obj["networkEndpoints"].([]interface{}), config, userAgent, url, project, billingProject, chunkSize, true)
+var endpoints []interface{}
+if v, ok := obj["networkEndpoints"].([]interface{}); ok {
+    endpoints = v
+}
+lastPage, err := networkEndpointsPaginatedMutate(d, endpoints, config, userAgent, url, project, billingProject, chunkSize, true)
 if err != nil {
     // networkEndpointsPaginatedMutate already adds error description
     return err