Code review changes (hashicorp#1416)

ortaman · Jun 4, 2018 · 409877b · 409877b
1 parent 79d2636
commit 409877b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/google/data_source_google_netblock_ip_ranges.go b/google/data_source_google_netblock_ip_ranges.go
@@ -18,12 +18,12 @@ func dataSourceGoogleNetblockIpRanges() *schema.Resource {
 				Elem:     &schema.Schema{Type: schema.TypeString},
 				Computed: true,
 			},
-			"cidr_blocks_ip4": {
+			"cidr_blocks_ipv4": {
 				Type:     schema.TypeList,
 				Elem:     &schema.Schema{Type: schema.TypeString},
 				Computed: true,
 			},
-			"cidr_blocks_ip6": {
+			"cidr_blocks_ipv6": {
 				Type:     schema.TypeList,
 				Elem:     &schema.Schema{Type: schema.TypeString},
 				Computed: true,
@@ -43,8 +43,8 @@ func dataSourceGoogleNetblockIpRangesRead(d *schema.ResourceData, meta interface
 	}
 
 	d.Set("cidr_blocks", CidrBlocks["cidr_blocks"])
-	d.Set("cidr_blocks_ip4", CidrBlocks["cidr_blocks_ip4"])
-	d.Set("cidr_blocks_ip6", CidrBlocks["cidr_blocks_ip6"])
+	d.Set("cidr_blocks_ipv4", CidrBlocks["cidr_blocks_ipv4"])
+	d.Set("cidr_blocks_ipv6", CidrBlocks["cidr_blocks_ipv6"])
 
 	return nil
 }
@@ -111,11 +111,11 @@ func getCidrBlocks() (map[string][]string, error) {
 
 				if strings.HasPrefix(sp, "ip4") {
 					cdrBlock := strings.Replace(sp, "ip4:", "", 1)
-					cidrBlocks["cidr_blocks_ip4"] = append(cidrBlocks["cidr_blocks_ip4"], cdrBlock)
+					cidrBlocks["cidr_blocks_ipv4"] = append(cidrBlocks["cidr_blocks_ipv4"], cdrBlock)
 
 				} else if strings.HasPrefix(sp, "ip6") {
 					cdrBlock := strings.Replace(sp, "ip6:", "", 1)
-					cidrBlocks["cidr_blocks_ip6"] = append(cidrBlocks["cidr_blocks_ip6"], cdrBlock)
+					cidrBlocks["cidr_blocks_ipv6"] = append(cidrBlocks["cidr_blocks_ipv6"], cdrBlock)
 				}
 			} else if strings.HasPrefix(sp, "include:") {
 				cidr_block := strings.Replace(sp, "include:", "", 1)

diff --git a/google/data_source_google_netblock_ip_ranges_test.go b/google/data_source_google_netblock_ip_ranges_test.go
@@ -20,13 +20,13 @@ func TestAccDataSourceGoogleNetblockIpRanges_basic(t *testing.T) {
 					resource.TestMatchResourceAttr("data.google_netblock_ip_ranges.some",
 						"cidr_blocks.0", regexp.MustCompile("^[0-9./:]+$")),
 					resource.TestMatchResourceAttr("data.google_netblock_ip_ranges.some",
-						"cidr_blocks_ip4.#", regexp.MustCompile(("^[1-9]+[0-9]*$"))),
+						"cidr_blocks_ipv4.#", regexp.MustCompile(("^[1-9]+[0-9]*$"))),
 					resource.TestMatchResourceAttr("data.google_netblock_ip_ranges.some",
-						"cidr_blocks_ip4.0", regexp.MustCompile("^[0-9./]+$")),
+						"cidr_blocks_ipv4.0", regexp.MustCompile("^[0-9./]+$")),
 					resource.TestMatchResourceAttr("data.google_netblock_ip_ranges.some",
-						"cidr_blocks_ip6.#", regexp.MustCompile(("^[1-9]+[0-9]*$"))),
+						"cidr_blocks_ipv6.#", regexp.MustCompile(("^[1-9]+[0-9]*$"))),
 					resource.TestMatchResourceAttr("data.google_netblock_ip_ranges.some",
-						"cidr_blocks_ip6.0", regexp.MustCompile("^[0-9./:]+$")),
+						"cidr_blocks_ipv6.0", regexp.MustCompile("^[0-9./:]+$")),
 				),
 			},
 		},

diff --git a/website/docs/d/datasource_google_netblock_ip_ranges.html.markdown b/website/docs/d/datasource_google_netblock_ip_ranges.html.markdown
@@ -21,19 +21,19 @@ output "cidr_blocks" {
   value = "${data.google_netblock_ip_ranges.netblock.cidr_blocks}"
 }
 
-output "cidr_blocks_ip4" {
-  value = "${data.google_netblock_ip_ranges.netblock.cidr_blocks_ip4}"
+output "cidr_blocks_ipv4" {
+  value = "${data.google_netblock_ip_ranges.netblock.cidr_blocks_ipv4}"
 }
 
-output "cidr_blocks_ip6" {
-  value = "${data.google_netblock_ip_ranges.netblock.cidr_blocks_ip6}"
+output "cidr_blocks_ipv6" {
+  value = "${data.google_netblock_ip_ranges.netblock.cidr_blocks_ipv6}"
 }
 ```
 
 ## Attributes Reference
 
 * `cidr_blocks` - Retrieve list of all CIDR blocks.
 
-* `cidr_blocks_ip4` - Retrieve list of the IP4 CIDR blocks
+* `cidr_blocks_ipv4` - Retrieve list of the IP4 CIDR blocks
 
-* `cidr_blocks_ip6` - Retrieve list of the IP6 CIDR blocks.
+* `cidr_blocks_ipv6` - Retrieve list of the IP6 CIDR blocks.