added dog_inventory group children

relaypro-open · Mar 14, 2023 · 70608a6 · 70608a6
1 parent 3b7ebad
commit 70608a6
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 5 deletions.
diff --git a/go.mod b/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/hashicorp/terraform-plugin-go v0.14.1
 	github.com/hashicorp/terraform-plugin-log v0.7.0
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.24.0
-	github.com/relaypro-open/dog_api_golang v0.0.0-20230314165349-3ab62e33385c
+	github.com/relaypro-open/dog_api_golang v0.0.0-20230314202211-1f206a499fdf
 	golang.org/x/exp v0.0.0-20221114191408-850992195362
 )
 

diff --git a/go.sum b/go.sum
@@ -217,6 +217,8 @@ github.com/relaypro-open/dog_api_golang v0.0.0-20230314145046-afc83bae3332 h1:xr
 github.com/relaypro-open/dog_api_golang v0.0.0-20230314145046-afc83bae3332/go.mod h1:gVISNtT0C/Ej5ZnCePDyppaDQiPRANiq2A/qhx/tH+8=
 github.com/relaypro-open/dog_api_golang v0.0.0-20230314165349-3ab62e33385c h1:ErGp9MPmTLJ+Z/onCWkvXwIFbskhRLcl5usX9k7Ctwk=
 github.com/relaypro-open/dog_api_golang v0.0.0-20230314165349-3ab62e33385c/go.mod h1:gVISNtT0C/Ej5ZnCePDyppaDQiPRANiq2A/qhx/tH+8=
+github.com/relaypro-open/dog_api_golang v0.0.0-20230314202211-1f206a499fdf h1:hjOYbQV/tPMthuxmI4iwtAI85WHJ/h2ac4EHs9T4B/w=
+github.com/relaypro-open/dog_api_golang v0.0.0-20230314202211-1f206a499fdf/go.mod h1:gVISNtT0C/Ej5ZnCePDyppaDQiPRANiq2A/qhx/tH+8=
 github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k=
 github.com/russross/blackfriday v1.6.0 h1:KqfZb0pUVN2lYqZUYRddxF4OR8ZMURnJIG5Y3VRLtww=
 github.com/russross/blackfriday v1.6.0/go.mod h1:ti0ldHuxg49ri4ksnFxlkCfN+hvslNlmVHqNRXXJNAY=

diff --git a/internal/provider/datasource_inventory.go b/internal/provider/datasource_inventory.go
@@ -28,6 +28,7 @@ type (
 		Name  types.String           `tfsdk:"name"`
 		Vars  map[string]string `tfsdk:"vars"`
 		Hosts map[string]map[string]string `tfsdk:"hosts"`
+		Children []string `tfsdk:"children"`
 	}
 )
 

diff --git a/internal/provider/resource_inventory.go b/internal/provider/resource_inventory.go
@@ -57,6 +57,11 @@ func (*inventoryResource) GetSchema(ctx context.Context) (tfsdk.Schema, diag.Dia
 						Required:            true,
 						Type:                types.MapType{ElemType: types.MapType{ElemType: types.StringType}},
 					},
+					"children": {
+						MarkdownDescription: "inventory group children",
+						Required:            true,
+						Type:                types.ListType{ElemType: types.StringType},
+					},
 				}),
 			},
 			"name": {
@@ -112,6 +117,7 @@ func InventoryToCreateRequest(plan inventoryResourceData) api.InventoryCreateReq
 			Name:  group.Name.Value,
 			Vars:  group.Vars,
 			Hosts: group.Hosts,
+			Children: group.Children,
 		}
 		newGroups = append(newGroups, g)
 	}
@@ -129,6 +135,7 @@ func InventoryToUpdateRequest(plan inventoryResourceData) api.InventoryUpdateReq
 			Name:  group.Name.Value,
 			Vars:  group.Vars,
 			Hosts: group.Hosts,
+			Children: group.Children,
 		}
 		newGroups = append(newGroups, g)
 	}
@@ -146,6 +153,7 @@ func ApiToInventory(inventory api.Inventory) Inventory {
 			Name:  types.String{Value: group.Name},
 			Vars:  group.Vars,
 			Hosts: group.Hosts,
+			Children: group.Children,
 		}
 		newGroups = append(newGroups, g)
 	}

diff --git a/internal/provider/test/datasource_inventory_test.go b/internal/provider/test/datasource_inventory_test.go
@@ -42,7 +42,10 @@ resource "dog_inventory" %[1]q {
           host2 = {
             key2 = "value2"
           }
-        }
+        },
+		children = [
+			"test"
+		]
      },
      {
        name = "app"
@@ -53,7 +56,10 @@ resource "dog_inventory" %[1]q {
           host1 = {
             key = "value"
           }
-        }
+        },
+		children = [
+			"test2"
+		]
      }
   ]
 }

diff --git a/internal/provider/test/resource_inventory_test.go b/internal/provider/test/resource_inventory_test.go
@@ -55,7 +55,10 @@ resource %[1]q %[2]q {
           host2 = {
             key2 = "value2"
           }
-        }
+        },
+	children = [
+		"test"
+	]
      },
      {
        name = "app"
@@ -66,7 +69,10 @@ resource %[1]q %[2]q {
           host1 = {
             key = "value"
           }
-        }
+        },
+	children = [
+		"test2"
+	]
      }
   ]
 }