Merge pull request #10 from umich-vci/ip4_network

Ip4 network

Author: adarobin

CHANGELOG.md

@@ -1,8 +1,18 @@
-## 0.3.0 (Unreleased)
+## 0.3.0 (October 10, 2021)
+
+FEATURES:
+
+* **New Datasource:** `bluecat_ip4_network`
+
+BUG FIXES:
+
+* Error if no entity is found with the bluecat_entity datasource.
 
 IMPROVEMENTS:
 
-* Updated [Terraform SDK](https://github.com/hashicorp/terraform-plugin-sdk/) to 2.7.0
+* Updated [Terraform SDK](https://github.com/hashicorp/terraform-plugin-sdk/) to 2.8.0
+
+* Updated [terraform-plugin-docs](https://github.com/hashicorp/terraform-plugin-docs) to 0.5.0
 
 * Reworked code to follow [Terraform Provider Scaffolding](https://github.com/hashicorp/terraform-provider-scaffolding)
 

docs/data-sources/ip4_network-block-range.md

@@ -3,12 +3,12 @@
 page_title: "bluecat_ip4_network-block-range Data Source - terraform-provider-bluecat"
 subcategory: ""
 description: |-
-  Data source to access the attributes of an IPv4 network, IPv4 Block, or DHCPv4 Range.
+  Data source to access the attributes of an IPv4 network, IPv4 Block, or DHCPv4 Range from an IPv4 address.
 ---
 
 # bluecat_ip4_network-block-range (Data Source)
 
-Data source to access the attributes of an IPv4 network, IPv4 Block, or DHCPv4 Range.
+Data source to access the attributes of an IPv4 network, IPv4 Block, or DHCPv4 Range from an IPv4 address.
 
 ## Example Usage
 

docs/data-sources/ip4_network.md

@@ -0,0 +1,51 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "bluecat_ip4_network Data Source - terraform-provider-bluecat"
+subcategory: ""
+description: |-
+  Data source to access the attributes of an IPv4 network from a hint based search.
+---
+
+# bluecat_ip4_network (Data Source)
+
+Data source to access the attributes of an IPv4 network from a hint based search.
+
+
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- **container_id** (String) The object ID of a container that contains the specified IPv4 network.
+- **hint** (String) Hint to find the IP4Network
+
+### Optional
+
+- **id** (String) The ID of this resource.
+
+### Read-Only
+
+- **addresses_free** (Number) The number of addresses unallocated/free on the network.
+- **addresses_in_use** (Number) The number of addresses allocated/in use on the network.
+- **allow_duplicate_host** (String) Duplicate host names check.
+- **cidr** (String) The CIDR address of the IPv4 network.
+- **custom_properties** (Map of String) A map of all custom properties associated with the IPv4 network.
+- **default_domains** (Set of String) TODO
+- **default_view** (String) The object id of the default DNS View for the network.
+- **dns_restrictions** (Set of String) TODO
+- **gateway** (String) The gateway of the IPv4 network.
+- **inherit_allow_duplicate_host** (Boolean) Duplicate host names check is inherited.
+- **inherit_default_domains** (Boolean) Default domains are inherited.
+- **inherit_default_view** (Boolean) The default DNS View is inherited.
+- **inherit_dns_restrictions** (Boolean) DNS restrictions are inherited.
+- **inherit_ping_before_assign** (Boolean) The network pings an address before assignment is inherited.
+- **location_code** (String) TODO
+- **location_inherited** (Boolean) TODO
+- **name** (String) The name assigned the resource.
+- **ping_before_assign** (String) The network pings an address before assignment.
+- **properties** (String) The properties of the resource as returned by the API (pipe delimited).
+- **template** (String) TODO
+- **type** (String) The type of the IP4Network
+
+

docs/resources/host_record.md

@@ -14,7 +14,7 @@ Resource create a host record.
 
 ```terraform
 resource "bluecat_host_record" "hostname" {
-  view      = data.bluecat_entity.view.id
+  view_id   = data.bluecat_entity.view.id
   name      = "hostname"
   dns_zone  = "example.com"
   addresses = ["192.168.1.100"]

examples/resources/bluecat_host_record/resource.tf

@@ -1,5 +1,5 @@
 resource "bluecat_host_record" "hostname" {
-  view      = data.bluecat_entity.view.id
+  view_id   = data.bluecat_entity.view.id
   name      = "hostname"
   dns_zone  = "example.com"
   addresses = ["192.168.1.100"]

go.mod

@@ -5,5 +5,5 @@ go 1.16
 require (
 	github.com/hashicorp/terraform-plugin-docs v0.5.0
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.8.0
-	github.com/umich-vci/gobam v0.0.0-20201026200032-5742f663694f
+	github.com/umich-vci/gobam v0.0.0-20211001185159-1f491fdadbd8
 )

go.sum

@@ -200,10 +200,10 @@ github.com/hashicorp/terraform-json v0.12.0 h1:8czPgEEWWPROStjkWPUnTQDXmpmZPlkQA
 github.com/hashicorp/terraform-json v0.12.0/go.mod h1:pmbq9o4EuL43db5+0ogX10Yofv1nozM+wskr/bGFJpI=
 github.com/hashicorp/terraform-plugin-docs v0.5.0 h1:Rso/yNznoGl7KVb/Z5RefiHsLJaGTbok9sEnad+V1t4=
 github.com/hashicorp/terraform-plugin-docs v0.5.0/go.mod h1:Z4q6unfv05W7fjpEy8ZC+nFijZmcm64Iag6I2HKRMSA=
-github.com/hashicorp/terraform-plugin-go v0.3.0 h1:AJqYzP52JFYl9NABRI7smXI1pNjgR5Q/y2WyVJ/BOZA=
-github.com/hashicorp/terraform-plugin-go v0.3.0/go.mod h1:dFHsQMaTLpON2gWhVWT96fvtlc/MF1vSy3OdMhWBzdM=
-github.com/hashicorp/terraform-plugin-sdk/v2 v2.7.0 h1:SuI59MqNjYDrL7EfqHX9V6P/24isgqYx/FdglwVs9bg=
-github.com/hashicorp/terraform-plugin-sdk/v2 v2.7.0/go.mod h1:grseeRo9g3yNkYW09iFlV8LG78jTa1ssBgouogQg/RU=
+github.com/hashicorp/terraform-plugin-go v0.4.0 h1:LFbXNeLDo0J/wR0kUzSPq0RpdmFh2gNedzU0n/gzPAo=
+github.com/hashicorp/terraform-plugin-go v0.4.0/go.mod h1:7u/6nt6vaiwcWE2GuJKbJwNlDFnf5n95xKw4hqIVr58=
+github.com/hashicorp/terraform-plugin-sdk/v2 v2.8.0 h1:GSumgrL6GGcRYU37YuF1CC59hRPR7Yzy6tpoFlo8wr4=
+github.com/hashicorp/terraform-plugin-sdk/v2 v2.8.0/go.mod h1:6KbP09YzlB++S6XSUKYl83WyoHVN4MgeoCbPRsdfCtA=
 github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
 github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d h1:kJCB4vdITiW1eC1vq2e6IsrXKrZit1bv/TDYFGMp4BQ=
 github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
@@ -304,8 +304,8 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/ulikunitz/xz v0.5.8 h1:ERv8V6GKqVi23rgu5cj9pVfVzJbOqAY2Ntl88O6c2nQ=
 github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
-github.com/umich-vci/gobam v0.0.0-20201026200032-5742f663694f h1:KWw7Cv8RftECmBCYaaT8VTU2V+183TO9zpJOd6De3Gc=
-github.com/umich-vci/gobam v0.0.0-20201026200032-5742f663694f/go.mod h1:XgS74BOgjV2krJLMpvpOsF+vYyc7MQdYztgE1Q/3dtY=
+github.com/umich-vci/gobam v0.0.0-20211001185159-1f491fdadbd8 h1:v7RX6m4HuMi1M7OAyZ98H5SY8q6CwWG8MgM+VufRb3M=
+github.com/umich-vci/gobam v0.0.0-20211001185159-1f491fdadbd8/go.mod h1:XgS74BOgjV2krJLMpvpOsF+vYyc7MQdYztgE1Q/3dtY=
 github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
 github.com/vmihailenco/msgpack v4.0.4+incompatible h1:dSLoQfGFAo3F6OoNhwUmLwVgaUXK79GlxNBwueZn0xI=
 github.com/vmihailenco/msgpack v4.0.4+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=

internal/provider/data_source_entity.go

@@ -47,6 +47,7 @@ func dataSourceEntity() *schema.Resource {
 func dataSourceEntityRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	mutex.Lock()
 	client := meta.(*apiClient).Client
+	client.Login(meta.(*apiClient).Username, meta.(*apiClient).Password)
 
 	parentID, err := strconv.ParseInt(d.Get("parent_id").(string), 10, 64)
 	if err = gobam.LogoutClientIfError(client, err, "Unable to convert parent_id from string to int64"); err != nil {
@@ -61,6 +62,17 @@ func dataSourceEntityRead(ctx context.Context, d *schema.ResourceData, meta inte
 		return diag.FromErr(err)
 	}
 
+	if *resp.Id == 0 {
+		var diags diag.Diagnostics
+		err := gobam.LogoutClientWithError(client, "Entity not found")
+		mutex.Unlock()
+
+		diags = append(diags, diag.FromErr(err)...)
+		diags = append(diags, diag.Errorf("Entity ID returned was 0")...)
+
+		return diags
+	}
+
 	d.SetId(strconv.FormatInt(*resp.Id, 10))
 	d.Set("properties", resp.Properties)
 

internal/provider/data_source_host_record.go

@@ -98,6 +98,7 @@ func dataSourceHostRecord() *schema.Resource {
 func dataSourceHostRecordRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	mutex.Lock()
 	client := meta.(*apiClient).Client
+	client.Login(meta.(*apiClient).Username, meta.(*apiClient).Password)
 
 	start := d.Get("start").(int)
 	count := d.Get("result_count").(int)

internal/provider/data_source_ip4_address.go

@@ -68,6 +68,7 @@ func dataSourceIP4Address() *schema.Resource {
 func dataSourceIP4AddressRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	mutex.Lock()
 	client := meta.(*apiClient).Client
+	client.Login(meta.(*apiClient).Username, meta.(*apiClient).Password)
 
 	containerID, err := strconv.ParseInt(d.Get("container_id").(string), 10, 64)
 	if err = gobam.LogoutClientIfError(client, err, "Unable to convert container_id from string to int64"); err != nil {