chore: upgrade metal-go to 0.22.2 and fix enum type errors #350
Conversation
| @@ -44,12 +44,11 @@ func (c *Client) Retrieve() *cobra.Command { | |||
|
|
|||
| RunE: func(cmd *cobra.Command, args []string) error { | |||
| cmd.SilenceUsage = true | |||
| include := []string{"Inner_example"} | |||
| exclude := []string{"Inner_example"} | |||
| withoutProjects := "withoutProjects_example" | |||
There was a problem hiding this comment.
The withoutProjects option did not exist prior to metal-go conversion, and is not wired up to any user-facing flags, so I've opted to remove it rather than fix the type error for now.
| @@ -108,13 +108,13 @@ func GetAllEvents(s metal.ApiFindEventsRequest) ([]metal.Event, error) { | |||
| } | |||
| } | |||
|
|
|||
| func GetAllOrganizations(s metal.OrganizationsApiService, include, exclude []string, withOutProjects string) ([]metal.Organization, error) { | |||
| func GetAllOrganizations(s metal.OrganizationsApiService, include, exclude []string) ([]metal.Organization, error) { | |||
There was a problem hiding this comment.
Removing the withoutProjects setting from the organization get subcommand means we can also remove it here.
| request = request.Type_(filters["type"]) | ||
| validType, err := metal.NewFindPlansTypeParameterFromValue(filters["type"]) | ||
| if err != nil { | ||
| return err |
There was a problem hiding this comment.
I opted to just return the error here rather than wrapping it, since the error that's thrown is already helpful: https://github.com/equinix-labs/metal-go/blob/main/metal/v1/model_plan_type.go#L60
| for _, role := range roles { | ||
| validRole, err := metal.NewInvitationRolesInnerFromValue(role) | ||
| if err != nil { | ||
| return nil, err |
There was a problem hiding this comment.
Again opted to return the original error without wrapping it, since the message looks good to me: https://github.com/equinix-labs/metal-go/blob/main/metal/v1/model_invitation_roles_inner.go#L62
| if billingCycle != "" { | ||
| validBillingCycle, err = metal.NewDeviceCreateInputBillingCycleFromValue(billingCycle) | ||
| if err != nil { | ||
| return err |
There was a problem hiding this comment.
This is returning the original error because that message is nicely descriptive: https://github.com/equinix-labs/metal-go/blob/main/metal/v1/model_device_create_input_billing_cycle.go#L52
The error message does make mention of the type DeviceCreateInputBillingCycle; it would be preferable to reference either the CLI flag name or the attribute name there, but IMO tweaking that is not worth the effort at the moment.
|
The API spec for the plan type enum has |
ctreatma
force-pushed
the
metal-go-enums
branch
from
a2a8f7c to
1259486
Compare
ctreatma
changed the title
ctreatma
force-pushed
the
metal-go-enums
branch
from
1259486 to
43bef41
Compare
|
There were other data validation issues that I missed somehow when running these tests locally; another |
ctreatma
force-pushed
the
metal-go-enums
branch
from
43bef41 to
3f69aec
Compare
ctreatma
changed the title
|
Updated to run with |
The latest release of metal-go introduced true enum fields. Previously, metal-go generated enum fields as plain strings due to a bug in openapi-generator. Now that enum fields are generated as Go enums, we need to convert user-provided string values for those fields to the correct enum type for input and we need to convert the enum values to plain strings for output.
This updates metal-go to the latest release and addresses type errors for metal-go client code as it exists in the
mainbranch; PRs that introduce metal-go elsewhere in the CLI may need to be updated as well before they can be merged.