From 2be79dd3a03485ff1fe099db246dd184b0947662 Mon Sep 17 00:00:00 2001 From: Mikhail Yohman Date: Tue, 28 Mar 2023 18:59:09 -0600 Subject: [PATCH] Due to update in oapi-codegen it appears it generates different methods/funcs, but tested the provider for manufacturers and it works, not sure if something broke. --- GNUmakefile | 4 ++-- internal/provider/patch.go | 2 +- internal/provider/resource_manufacturer.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 44dce62..c143db8 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -34,8 +34,8 @@ get-api: cd client; wget https://demo.nautobot.com/api/swagger.yaml\?api_version\=1.3 -O swagger.yaml generate: get-api - cd client; oapi-codegen -generate client -o nautobot.go -package nautobot test.swagger.yaml && \ - oapi-codegen -generate types -o types.go -package nautobot test.swagger.yaml && \ + cd client; oapi-codegen -generate client -o nautobot.go -package nautobot swagger.yaml && \ + oapi-codegen -generate types -o types.go -package nautobot swagger.yaml && \ go mod tidy test: diff --git a/internal/provider/patch.go b/internal/provider/patch.go index 4b78c29..39e2408 100644 --- a/internal/provider/patch.go +++ b/internal/provider/patch.go @@ -43,7 +43,7 @@ type Site struct { ContactName *string `json:"contact_name,omitempty"` ContactPhone *string `json:"contact_phone,omitempty"` Created *types.Date `json:"created,omitempty"` - CustomFields *nb.Site_CustomFields `json:"custom_fields,omitempty"` + CustomFields *nb.CustomFieldChoice `json:"custom_fields,omitempty"` Description *string `json:"description,omitempty"` DeviceCount *int `json:"device_count,omitempty"` diff --git a/internal/provider/resource_manufacturer.go b/internal/provider/resource_manufacturer.go index 3b9ab8a..46c194c 100644 --- a/internal/provider/resource_manufacturer.go +++ b/internal/provider/resource_manufacturer.go @@ -102,7 +102,7 @@ func resourceManufacturerCreate(ctx context.Context, d *schema.ResourceData, met c := meta.(*apiClient).Client s := meta.(*apiClient).Server - var m nb.Manufacturer + var m nb.ManufacturerRequest name, ok := d.GetOk("name") n := name.(string) @@ -243,7 +243,7 @@ func resourceManufacturerUpdate(ctx context.Context, d *schema.ResourceData, met name := d.Get("name").(string) id := d.Get("id").(string) - var m nb.PatchedManufacturer + var m nb.PatchedManufacturerRequest if d.HasChange("name") { m.Name = &name