Merge pull request #98 from ConductorOne/lauren/choice-id-string-int

Handle int or string for choice id

Author: laurenleach

go.mod

@@ -6,7 +6,7 @@ toolchain go1.24.1
 
 require (
 	github.com/conductorone/baton-sdk v0.2.89
-	github.com/conductorone/go-jira/v2 v2.0.0-20250328233613-c40bf74e4876
+	github.com/conductorone/go-jira/v2 v2.0.0-20250912213052-5fc74fd2093d
 	github.com/ennyjfrick/ruleguard-logfatal v0.0.2
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
 	github.com/quasilyte/go-ruleguard/dsl v0.3.22

go.sum

@@ -66,8 +66,8 @@ github.com/conductorone/dpop/integrations/dpop_grpc v0.2.3 h1:kLMCNIh0Mo2vbvvkCm
 github.com/conductorone/dpop/integrations/dpop_grpc v0.2.3/go.mod h1:LYNoUc1lkvozk9HBio+xI2w8YyfYy0v2cAJtIgrkj8o=
 github.com/conductorone/dpop/integrations/dpop_oauth2 v0.2.3 h1:KhFaxiTzj9FteI9IE2tIGdSjJKyFW5ZcUF2SrgLnA28=
 github.com/conductorone/dpop/integrations/dpop_oauth2 v0.2.3/go.mod h1:2eI0qv+XaEhoCw0GKFF1yH4X8Mp4KLVEVnQKRFEy4zs=
-github.com/conductorone/go-jira/v2 v2.0.0-20250328233613-c40bf74e4876 h1:xbbvcbOVJA3BpFmb1Fl//oND/GNQoJqUpeOED/ba2d8=
-github.com/conductorone/go-jira/v2 v2.0.0-20250328233613-c40bf74e4876/go.mod h1:OrjKGnogFU21xIdvtF3SeYFUZhzcgoyNHy4qQXKMTtM=
+github.com/conductorone/go-jira/v2 v2.0.0-20250912213052-5fc74fd2093d h1:BC3eRjTM7LB5MfSWnmmgm/VjShhKGVTh30cxPGjYZ7Y=
+github.com/conductorone/go-jira/v2 v2.0.0-20250912213052-5fc74fd2093d/go.mod h1:OrjKGnogFU21xIdvtF3SeYFUZhzcgoyNHy4qQXKMTtM=
 github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

pkg/connector/tickets.go

@@ -266,7 +266,7 @@ func (d *Connector) getCustomFieldsForIssueType(ctx context.Context, projectId s
 					displayName = choice.Value
 				}
 				allowedValues = append(allowedValues, &v2.TicketCustomFieldObjectValue{
-					Id:          choice.Id,
+					Id:          string(choice.Id),
 					DisplayName: displayName,
 				})
 			}

vendor/github.com/conductorone/go-jira/v2/onpremise/metaissue.go

@@ -218,7 +218,7 @@ github.com/conductorone/dpop/integrations/dpop_grpc
 # github.com/conductorone/dpop/integrations/dpop_oauth2 v0.2.3
 ## explicit; go 1.23.4
 github.com/conductorone/dpop/integrations/dpop_oauth2
-# github.com/conductorone/go-jira/v2 v2.0.0-20250328233613-c40bf74e4876
+# github.com/conductorone/go-jira/v2 v2.0.0-20250912213052-5fc74fd2093d
 ## explicit; go 1.22
 github.com/conductorone/go-jira/v2/onpremise
 # github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc