Update types for api for collections

chriskuchin · Aug 28, 2023 · f2a86f4 · f2a86f4
1 parent 3cfc0a5
commit f2a86f4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/internal/bowtie/client/resources.go b/internal/bowtie/client/resources.go
@@ -49,8 +49,12 @@ type BowtieResourceLocation struct {
 }
 
 type BowtieResourcePorts struct {
-	Range      []int64 `json:"range,omitempty"`
-	Collection []int64 `json:"collection,omitempty"`
+	Range      []int64                      `json:"range,omitempty"`
+	Collection BowtieResourcePortCollection `json:"collection,omitempty"`
+}
+
+type BowtieResourcePortCollection struct {
+	Ports []int64 `json:"ports,omitempty"`
 }
 
 func (c *Client) CreateResource(name, protocol string, ip, cidr, dns string, portRange, portCollection []int64) (string, BowtieResource, error) {
@@ -70,8 +74,10 @@ func (c *Client) UpsertResource(id, name, protocol, ip, cidr, dns string, portRa
 			DNS:  dns,
 		},
 		Ports: BowtieResourcePorts{
-			Range:      portRange,
-			Collection: portCollection,
+			Range: portRange,
+			Collection: BowtieResourcePortCollection{
+				Ports: portCollection,
+			},
 		},
 	}
 

diff --git a/internal/bowtie/resources/resource.go b/internal/bowtie/resources/resource.go
@@ -216,7 +216,7 @@ func (r *resourceResource) Read(ctx context.Context, req resource.ReadRequest, r
 		return
 	}
 
-	if len(resource.Ports.Collection) > 0 {
+	if len(resource.Ports.Collection.Ports) > 0 {
 		state.Ports.Range = types.ListNull(types.Int64Type)
 		collection, diags := types.ListValueFrom(ctx, types.Int64Type, resource.Ports.Collection)
 		resp.Diagnostics.Append(diags...)