mirror of
https://github.com/letic/terraform-provider-google.git
synced 2024-10-03 01:01:06 +00:00
Move method from resource to datasource file (#1093)
This commit is contained in:
parent
7977d277ec
commit
21564c36a1
@ -3,6 +3,7 @@ package google
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"google.golang.org/api/compute/v1"
|
||||
"github.com/hashicorp/terraform/helper/schema"
|
||||
)
|
||||
|
||||
@ -105,3 +106,20 @@ func dataSourceGoogleComputeSubnetworkRead(d *schema.ResourceData, meta interfac
|
||||
d.SetId(createSubnetID(subnetwork))
|
||||
return nil
|
||||
}
|
||||
|
||||
func flattenSecondaryRanges(secondaryRanges []*compute.SubnetworkSecondaryRange) []map[string]interface{} {
|
||||
secondaryRangesSchema := make([]map[string]interface{}, 0, len(secondaryRanges))
|
||||
for _, secondaryRange := range secondaryRanges {
|
||||
data := map[string]interface{}{
|
||||
"range_name": secondaryRange.RangeName,
|
||||
"ip_cidr_range": secondaryRange.IpCidrRange,
|
||||
}
|
||||
|
||||
secondaryRangesSchema = append(secondaryRangesSchema, data)
|
||||
}
|
||||
return secondaryRangesSchema
|
||||
}
|
||||
|
||||
func createSubnetID(s *compute.Subnetwork) string {
|
||||
return fmt.Sprintf("%s/%s", s.Region, s.Name)
|
||||
}
|
@ -378,10 +378,6 @@ func resourceComputeSubnetworkImportState(d *schema.ResourceData, meta interface
|
||||
return []*schema.ResourceData{d}, nil
|
||||
}
|
||||
|
||||
func createSubnetID(s *compute.Subnetwork) string {
|
||||
return fmt.Sprintf("%s/%s", s.Region, s.Name)
|
||||
}
|
||||
|
||||
func splitSubnetID(id string) (region string, name string) {
|
||||
parts := strings.Split(id, "/")
|
||||
region = parts[0]
|
||||
@ -417,19 +413,6 @@ func expandSecondaryRangesV0Beta(configured []interface{}) []*computeBeta.Subnet
|
||||
return secondaryRanges
|
||||
}
|
||||
|
||||
func flattenSecondaryRanges(secondaryRanges []*compute.SubnetworkSecondaryRange) []map[string]interface{} {
|
||||
secondaryRangesSchema := make([]map[string]interface{}, 0, len(secondaryRanges))
|
||||
for _, secondaryRange := range secondaryRanges {
|
||||
data := map[string]interface{}{
|
||||
"range_name": secondaryRange.RangeName,
|
||||
"ip_cidr_range": secondaryRange.IpCidrRange,
|
||||
}
|
||||
|
||||
secondaryRangesSchema = append(secondaryRangesSchema, data)
|
||||
}
|
||||
return secondaryRangesSchema
|
||||
}
|
||||
|
||||
func flattenSecondaryRangesV0Beta(secondaryRanges []*computeBeta.SubnetworkSecondaryRange) []map[string]interface{} {
|
||||
secondaryRangesSchema := make([]map[string]interface{}, 0, len(secondaryRanges))
|
||||
for _, secondaryRange := range secondaryRanges {
|
||||
|
Loading…
Reference in New Issue
Block a user