From 0ce95ada95b633ad172dce19936db739a4fa8c08 Mon Sep 17 00:00:00 2001 From: Nick Miyake Date: Mon, 23 Jan 2023 13:58:59 -0800 Subject: [PATCH 1/4] Ensure that imports are not removed in generated code Makes it such that the "ptimports.Process" call on generated code does not add or remove imports. Fixes an issue where generated code would not include imports that referenced packages where the last component of the package path was of the form "v[0-9]+". Fixes #405 --- conjure/outputs.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/conjure/outputs.go b/conjure/outputs.go index adcf0ced..250d3e4b 100644 --- a/conjure/outputs.go +++ b/conjure/outputs.go @@ -57,7 +57,10 @@ func (f *OutputFile) Render() ([]byte, error) { return nil, errors.Wrapf(err, "failed to generate Go source for file %s", f.absPath) } - goFileSrc, err := ptimports.Process("", buf.Bytes(), &ptimports.Options{Refactor: true}) + goFileSrc, err := ptimports.Process("", buf.Bytes(), &ptimports.Options{ + Refactor: true, + FormatOnly: true, + }) if err != nil { return nil, errors.Wrapf(err, "failed to run ptimports on generated Go source for file %s", f.absPath) } From 79e5dd80f74ad313549ea2820cd222eb40f86fa6 Mon Sep 17 00:00:00 2001 From: Nick Miyake Date: Mon, 23 Jan 2023 14:51:57 -0800 Subject: [PATCH 2/4] Update generated code and add an integration test case --- .../verification/server/services.conjure.go | 2 +- .../testgenerated/auth/api/cli.conjure.go | 4 +- .../testgenerated/auth/api/servers.conjure.go | 2 +- .../auth/api/services.conjure.go | 2 +- .../testgenerated/binary/api/cli.conjure.go | 4 +- .../binary/api/servers.conjure.go | 2 +- .../binary/api/services.conjure.go | 2 +- .../testgenerated/cli/api/cli.conjure.go | 4 +- .../testgenerated/cli/api/servers.conjure.go | 2 +- .../testgenerated/cli/api/services.conjure.go | 2 +- .../testgenerated/client/api/cli.conjure.go | 4 +- .../client/api/servers.conjure.go | 2 +- .../client/api/services.conjure.go | 2 +- .../errors/api/errors.conjure.go | 2 +- .../testgenerated/imports/imports.yml | 5 +++ .../imports/pkg1/v2/structs.conjure.go | 28 +++++++++++++ .../imports/pkg3/api/unions.conjure.go | 40 +++++++++++++++---- .../pkg3/api/unions_generics.conjure.go | 4 ++ .../testgenerated/post/api/cli.conjure.go | 4 +- .../testgenerated/post/api/servers.conjure.go | 2 +- .../post/api/services.conjure.go | 2 +- .../queryparam/api/cli.conjure.go | 4 +- .../queryparam/api/servers.conjure.go | 2 +- .../queryparam/api/services.conjure.go | 2 +- .../testgenerated/server/api/cli.conjure.go | 4 +- .../server/api/servers.conjure.go | 2 +- .../server/api/services.conjure.go | 2 +- 27 files changed, 99 insertions(+), 38 deletions(-) create mode 100644 integration_test/testgenerated/imports/pkg1/v2/structs.conjure.go diff --git a/conjure-go-verifier/conjure/verification/server/services.conjure.go b/conjure-go-verifier/conjure/verification/server/services.conjure.go index dc745073..3ab19331 100644 --- a/conjure-go-verifier/conjure/verification/server/services.conjure.go +++ b/conjure-go-verifier/conjure/verification/server/services.conjure.go @@ -15,7 +15,7 @@ import ( "github.com/palantir/pkg/rid" "github.com/palantir/pkg/safelong" "github.com/palantir/pkg/uuid" - werror "github.com/palantir/witchcraft-go-error" + "github.com/palantir/witchcraft-go-error" ) type AutoDeserializeConfirmServiceClient interface { diff --git a/integration_test/testgenerated/auth/api/cli.conjure.go b/integration_test/testgenerated/auth/api/cli.conjure.go index 8936a37e..0b7e3320 100644 --- a/integration_test/testgenerated/auth/api/cli.conjure.go +++ b/integration_test/testgenerated/auth/api/cli.conjure.go @@ -10,9 +10,9 @@ import ( "github.com/palantir/conjure-go-runtime/v2/conjure-go-client/httpclient" "github.com/palantir/pkg/bearertoken" - werror "github.com/palantir/witchcraft-go-error" + "github.com/palantir/witchcraft-go-error" "github.com/palantir/witchcraft-go-logging/wlog" - wlogzap "github.com/palantir/witchcraft-go-logging/wlog-zap" + "github.com/palantir/witchcraft-go-logging/wlog-zap" "github.com/palantir/witchcraft-go-logging/wlog/evtlog/evt2log" "github.com/palantir/witchcraft-go-logging/wlog/svclog/svc1log" "github.com/palantir/witchcraft-go-logging/wlog/trclog/trc1log" diff --git a/integration_test/testgenerated/auth/api/servers.conjure.go b/integration_test/testgenerated/auth/api/servers.conjure.go index 8e1fd72d..3e5e4fbf 100644 --- a/integration_test/testgenerated/auth/api/servers.conjure.go +++ b/integration_test/testgenerated/auth/api/servers.conjure.go @@ -11,7 +11,7 @@ import ( "github.com/palantir/conjure-go-runtime/v2/conjure-go-contract/errors" "github.com/palantir/conjure-go-runtime/v2/conjure-go-server/httpserver" "github.com/palantir/pkg/bearertoken" - werror "github.com/palantir/witchcraft-go-error" + "github.com/palantir/witchcraft-go-error" "github.com/palantir/witchcraft-go-server/v2/witchcraft/wresource" "github.com/palantir/witchcraft-go-server/v2/wrouter" ) diff --git a/integration_test/testgenerated/auth/api/services.conjure.go b/integration_test/testgenerated/auth/api/services.conjure.go index ca1ebf7b..75c27c38 100644 --- a/integration_test/testgenerated/auth/api/services.conjure.go +++ b/integration_test/testgenerated/auth/api/services.conjure.go @@ -10,7 +10,7 @@ import ( "github.com/palantir/conjure-go-runtime/v2/conjure-go-client/httpclient" "github.com/palantir/pkg/bearertoken" - werror "github.com/palantir/witchcraft-go-error" + "github.com/palantir/witchcraft-go-error" ) type BothAuthServiceClient interface { diff --git a/integration_test/testgenerated/binary/api/cli.conjure.go b/integration_test/testgenerated/binary/api/cli.conjure.go index aa07c245..27951858 100644 --- a/integration_test/testgenerated/binary/api/cli.conjure.go +++ b/integration_test/testgenerated/binary/api/cli.conjure.go @@ -14,9 +14,9 @@ import ( "github.com/palantir/conjure-go-runtime/v2/conjure-go-client/httpclient" "github.com/palantir/conjure-go-runtime/v2/conjure-go-contract/codecs" - werror "github.com/palantir/witchcraft-go-error" + "github.com/palantir/witchcraft-go-error" "github.com/palantir/witchcraft-go-logging/wlog" - wlogzap "github.com/palantir/witchcraft-go-logging/wlog-zap" + "github.com/palantir/witchcraft-go-logging/wlog-zap" "github.com/palantir/witchcraft-go-logging/wlog/evtlog/evt2log" "github.com/palantir/witchcraft-go-logging/wlog/svclog/svc1log" "github.com/palantir/witchcraft-go-logging/wlog/trclog/trc1log" diff --git a/integration_test/testgenerated/binary/api/servers.conjure.go b/integration_test/testgenerated/binary/api/servers.conjure.go index 5940bb8c..46f9100c 100644 --- a/integration_test/testgenerated/binary/api/servers.conjure.go +++ b/integration_test/testgenerated/binary/api/servers.conjure.go @@ -10,7 +10,7 @@ import ( "github.com/palantir/conjure-go-runtime/v2/conjure-go-contract/codecs" "github.com/palantir/conjure-go-runtime/v2/conjure-go-contract/errors" "github.com/palantir/conjure-go-runtime/v2/conjure-go-server/httpserver" - werror "github.com/palantir/witchcraft-go-error" + "github.com/palantir/witchcraft-go-error" "github.com/palantir/witchcraft-go-server/v2/witchcraft/wresource" "github.com/palantir/witchcraft-go-server/v2/wrouter" ) diff --git a/integration_test/testgenerated/binary/api/services.conjure.go b/integration_test/testgenerated/binary/api/services.conjure.go index 7376113b..c474ed35 100644 --- a/integration_test/testgenerated/binary/api/services.conjure.go +++ b/integration_test/testgenerated/binary/api/services.conjure.go @@ -8,7 +8,7 @@ import ( "net/http" "github.com/palantir/conjure-go-runtime/v2/conjure-go-client/httpclient" - werror "github.com/palantir/witchcraft-go-error" + "github.com/palantir/witchcraft-go-error" ) type TestServiceClient interface { diff --git a/integration_test/testgenerated/cli/api/cli.conjure.go b/integration_test/testgenerated/cli/api/cli.conjure.go index 9a0024f5..17ed744a 100644 --- a/integration_test/testgenerated/cli/api/cli.conjure.go +++ b/integration_test/testgenerated/cli/api/cli.conjure.go @@ -21,9 +21,9 @@ import ( "github.com/palantir/pkg/rid" "github.com/palantir/pkg/safelong" "github.com/palantir/pkg/uuid" - werror "github.com/palantir/witchcraft-go-error" + "github.com/palantir/witchcraft-go-error" "github.com/palantir/witchcraft-go-logging/wlog" - wlogzap "github.com/palantir/witchcraft-go-logging/wlog-zap" + "github.com/palantir/witchcraft-go-logging/wlog-zap" "github.com/palantir/witchcraft-go-logging/wlog/evtlog/evt2log" "github.com/palantir/witchcraft-go-logging/wlog/svclog/svc1log" "github.com/palantir/witchcraft-go-logging/wlog/trclog/trc1log" diff --git a/integration_test/testgenerated/cli/api/servers.conjure.go b/integration_test/testgenerated/cli/api/servers.conjure.go index 7b668fdd..27918269 100644 --- a/integration_test/testgenerated/cli/api/servers.conjure.go +++ b/integration_test/testgenerated/cli/api/servers.conjure.go @@ -16,7 +16,7 @@ import ( "github.com/palantir/pkg/rid" "github.com/palantir/pkg/safelong" "github.com/palantir/pkg/uuid" - werror "github.com/palantir/witchcraft-go-error" + "github.com/palantir/witchcraft-go-error" "github.com/palantir/witchcraft-go-server/v2/witchcraft/wresource" "github.com/palantir/witchcraft-go-server/v2/wrouter" ) diff --git a/integration_test/testgenerated/cli/api/services.conjure.go b/integration_test/testgenerated/cli/api/services.conjure.go index 222e129b..943aa889 100644 --- a/integration_test/testgenerated/cli/api/services.conjure.go +++ b/integration_test/testgenerated/cli/api/services.conjure.go @@ -15,7 +15,7 @@ import ( "github.com/palantir/pkg/rid" "github.com/palantir/pkg/safelong" "github.com/palantir/pkg/uuid" - werror "github.com/palantir/witchcraft-go-error" + "github.com/palantir/witchcraft-go-error" ) type TestServiceClient interface { diff --git a/integration_test/testgenerated/client/api/cli.conjure.go b/integration_test/testgenerated/client/api/cli.conjure.go index acae08c1..3008e0ed 100644 --- a/integration_test/testgenerated/client/api/cli.conjure.go +++ b/integration_test/testgenerated/client/api/cli.conjure.go @@ -12,9 +12,9 @@ import ( "github.com/palantir/conjure-go-runtime/v2/conjure-go-client/httpclient" "github.com/palantir/conjure-go-runtime/v2/conjure-go-contract/errors" "github.com/palantir/pkg/rid" - werror "github.com/palantir/witchcraft-go-error" + "github.com/palantir/witchcraft-go-error" "github.com/palantir/witchcraft-go-logging/wlog" - wlogzap "github.com/palantir/witchcraft-go-logging/wlog-zap" + "github.com/palantir/witchcraft-go-logging/wlog-zap" "github.com/palantir/witchcraft-go-logging/wlog/evtlog/evt2log" "github.com/palantir/witchcraft-go-logging/wlog/svclog/svc1log" "github.com/palantir/witchcraft-go-logging/wlog/trclog/trc1log" diff --git a/integration_test/testgenerated/client/api/servers.conjure.go b/integration_test/testgenerated/client/api/servers.conjure.go index 8c6c5298..e08d1d7f 100644 --- a/integration_test/testgenerated/client/api/servers.conjure.go +++ b/integration_test/testgenerated/client/api/servers.conjure.go @@ -11,7 +11,7 @@ import ( "github.com/palantir/conjure-go-runtime/v2/conjure-go-contract/errors" "github.com/palantir/conjure-go-runtime/v2/conjure-go-server/httpserver" "github.com/palantir/pkg/rid" - werror "github.com/palantir/witchcraft-go-error" + "github.com/palantir/witchcraft-go-error" "github.com/palantir/witchcraft-go-server/v2/witchcraft/wresource" "github.com/palantir/witchcraft-go-server/v2/wrouter" ) diff --git a/integration_test/testgenerated/client/api/services.conjure.go b/integration_test/testgenerated/client/api/services.conjure.go index cc1cff89..bc5214e3 100644 --- a/integration_test/testgenerated/client/api/services.conjure.go +++ b/integration_test/testgenerated/client/api/services.conjure.go @@ -11,7 +11,7 @@ import ( "github.com/palantir/conjure-go-runtime/v2/conjure-go-client/httpclient" "github.com/palantir/pkg/rid" - werror "github.com/palantir/witchcraft-go-error" + "github.com/palantir/witchcraft-go-error" ) type TestServiceClient interface { diff --git a/integration_test/testgenerated/errors/api/errors.conjure.go b/integration_test/testgenerated/errors/api/errors.conjure.go index 450c12d7..669e0dcb 100644 --- a/integration_test/testgenerated/errors/api/errors.conjure.go +++ b/integration_test/testgenerated/errors/api/errors.conjure.go @@ -11,7 +11,7 @@ import ( "github.com/palantir/pkg/safejson" "github.com/palantir/pkg/safeyaml" "github.com/palantir/pkg/uuid" - werror "github.com/palantir/witchcraft-go-error" + "github.com/palantir/witchcraft-go-error" ) type myInternal struct { diff --git a/integration_test/testgenerated/imports/imports.yml b/integration_test/testgenerated/imports/imports.yml index f48295e1..98549547 100644 --- a/integration_test/testgenerated/imports/imports.yml +++ b/integration_test/testgenerated/imports/imports.yml @@ -9,8 +9,13 @@ types: package: com.palantir.pkg2.api fields: data: Struct1 + ObjectInPackageEndingInVersion: + package: com.palantir.pkg1.v2 + fields: + name: string Union: package: com.palantir.pkg3.api union: one: Struct1 two: Struct2 + three: ObjectInPackageEndingInVersion diff --git a/integration_test/testgenerated/imports/pkg1/v2/structs.conjure.go b/integration_test/testgenerated/imports/pkg1/v2/structs.conjure.go new file mode 100644 index 00000000..e52c8ccd --- /dev/null +++ b/integration_test/testgenerated/imports/pkg1/v2/structs.conjure.go @@ -0,0 +1,28 @@ +// This file was generated by Conjure and should not be manually edited. + +package v2 + +import ( + "github.com/palantir/pkg/safejson" + "github.com/palantir/pkg/safeyaml" +) + +type ObjectInPackageEndingInVersion struct { + Name string `json:"name"` +} + +func (o ObjectInPackageEndingInVersion) MarshalYAML() (interface{}, error) { + jsonBytes, err := safejson.Marshal(o) + if err != nil { + return nil, err + } + return safeyaml.JSONtoYAMLMapSlice(jsonBytes) +} + +func (o *ObjectInPackageEndingInVersion) UnmarshalYAML(unmarshal func(interface{}) error) error { + jsonBytes, err := safeyaml.UnmarshalerToJSONBytes(unmarshal) + if err != nil { + return err + } + return safejson.Unmarshal(jsonBytes, *&o) +} diff --git a/integration_test/testgenerated/imports/pkg3/api/unions.conjure.go b/integration_test/testgenerated/imports/pkg3/api/unions.conjure.go index c855b064..207cba9b 100644 --- a/integration_test/testgenerated/imports/pkg3/api/unions.conjure.go +++ b/integration_test/testgenerated/imports/pkg3/api/unions.conjure.go @@ -7,25 +7,28 @@ import ( "fmt" "github.com/palantir/conjure-go/v6/integration_test/testgenerated/imports/pkg1/api" + "github.com/palantir/conjure-go/v6/integration_test/testgenerated/imports/pkg1/v2" api1 "github.com/palantir/conjure-go/v6/integration_test/testgenerated/imports/pkg2/api" "github.com/palantir/pkg/safejson" "github.com/palantir/pkg/safeyaml" ) type Union struct { - typ string - one *api.Struct1 - two *api1.Struct2 + typ string + one *api.Struct1 + two *api1.Struct2 + three *v2.ObjectInPackageEndingInVersion } type unionDeserializer struct { - Type string `json:"type"` - One *api.Struct1 `json:"one"` - Two *api1.Struct2 `json:"two"` + Type string `json:"type"` + One *api.Struct1 `json:"one"` + Two *api1.Struct2 `json:"two"` + Three *v2.ObjectInPackageEndingInVersion `json:"three"` } func (u *unionDeserializer) toStruct() Union { - return Union{typ: u.Type, one: u.One, two: u.Two} + return Union{typ: u.Type, one: u.One, two: u.Two, three: u.Three} } func (u *Union) toSerializer() (interface{}, error) { @@ -42,6 +45,11 @@ func (u *Union) toSerializer() (interface{}, error) { Type string `json:"type"` Two api1.Struct2 `json:"two"` }{Type: "two", Two: *u.two}, nil + case "three": + return struct { + Type string `json:"type"` + Three v2.ObjectInPackageEndingInVersion `json:"three"` + }{Type: "three", Three: *u.three}, nil } } @@ -78,7 +86,7 @@ func (u *Union) UnmarshalYAML(unmarshal func(interface{}) error) error { return safejson.Unmarshal(jsonBytes, *&u) } -func (u *Union) AcceptFuncs(oneFunc func(api.Struct1) error, twoFunc func(api1.Struct2) error, unknownFunc func(string) error) error { +func (u *Union) AcceptFuncs(oneFunc func(api.Struct1) error, twoFunc func(api1.Struct2) error, threeFunc func(v2.ObjectInPackageEndingInVersion) error, unknownFunc func(string) error) error { switch u.typ { default: if u.typ == "" { @@ -89,6 +97,8 @@ func (u *Union) AcceptFuncs(oneFunc func(api.Struct1) error, twoFunc func(api1.S return oneFunc(*u.one) case "two": return twoFunc(*u.two) + case "three": + return threeFunc(*u.three) } } @@ -100,6 +110,10 @@ func (u *Union) TwoNoopSuccess(api1.Struct2) error { return nil } +func (u *Union) ThreeNoopSuccess(v2.ObjectInPackageEndingInVersion) error { + return nil +} + func (u *Union) ErrorOnUnknown(typeName string) error { return fmt.Errorf("invalid value in union type. Type name: %s", typeName) } @@ -115,12 +129,15 @@ func (u *Union) Accept(v UnionVisitor) error { return v.VisitOne(*u.one) case "two": return v.VisitTwo(*u.two) + case "three": + return v.VisitThree(*u.three) } } type UnionVisitor interface { VisitOne(v api.Struct1) error VisitTwo(v api1.Struct2) error + VisitThree(v v2.ObjectInPackageEndingInVersion) error VisitUnknown(typeName string) error } @@ -135,12 +152,15 @@ func (u *Union) AcceptWithContext(ctx context.Context, v UnionVisitorWithContext return v.VisitOneWithContext(ctx, *u.one) case "two": return v.VisitTwoWithContext(ctx, *u.two) + case "three": + return v.VisitThreeWithContext(ctx, *u.three) } } type UnionVisitorWithContext interface { VisitOneWithContext(ctx context.Context, v api.Struct1) error VisitTwoWithContext(ctx context.Context, v api1.Struct2) error + VisitThreeWithContext(ctx context.Context, v v2.ObjectInPackageEndingInVersion) error VisitUnknownWithContext(ctx context.Context, typeName string) error } @@ -151,3 +171,7 @@ func NewUnionFromOne(v api.Struct1) Union { func NewUnionFromTwo(v api1.Struct2) Union { return Union{typ: "two", two: &v} } + +func NewUnionFromThree(v v2.ObjectInPackageEndingInVersion) Union { + return Union{typ: "three", three: &v} +} diff --git a/integration_test/testgenerated/imports/pkg3/api/unions_generics.conjure.go b/integration_test/testgenerated/imports/pkg3/api/unions_generics.conjure.go index 28c64509..ae064691 100644 --- a/integration_test/testgenerated/imports/pkg3/api/unions_generics.conjure.go +++ b/integration_test/testgenerated/imports/pkg3/api/unions_generics.conjure.go @@ -9,6 +9,7 @@ import ( "fmt" "github.com/palantir/conjure-go/v6/integration_test/testgenerated/imports/pkg1/api" + "github.com/palantir/conjure-go/v6/integration_test/testgenerated/imports/pkg1/v2" api1 "github.com/palantir/conjure-go/v6/integration_test/testgenerated/imports/pkg2/api" ) @@ -26,11 +27,14 @@ func (u *UnionWithT[T]) Accept(ctx context.Context, v UnionVisitorWithT[T]) (T, return v.VisitOne(ctx, *u.one) case "two": return v.VisitTwo(ctx, *u.two) + case "three": + return v.VisitThree(ctx, *u.three) } } type UnionVisitorWithT[T any] interface { VisitOne(ctx context.Context, v api.Struct1) (T, error) VisitTwo(ctx context.Context, v api1.Struct2) (T, error) + VisitThree(ctx context.Context, v v2.ObjectInPackageEndingInVersion) (T, error) VisitUnknown(ctx context.Context, typ string) (T, error) } diff --git a/integration_test/testgenerated/post/api/cli.conjure.go b/integration_test/testgenerated/post/api/cli.conjure.go index 6c290c38..5ed402d2 100644 --- a/integration_test/testgenerated/post/api/cli.conjure.go +++ b/integration_test/testgenerated/post/api/cli.conjure.go @@ -9,9 +9,9 @@ import ( "os" "github.com/palantir/conjure-go-runtime/v2/conjure-go-client/httpclient" - werror "github.com/palantir/witchcraft-go-error" + "github.com/palantir/witchcraft-go-error" "github.com/palantir/witchcraft-go-logging/wlog" - wlogzap "github.com/palantir/witchcraft-go-logging/wlog-zap" + "github.com/palantir/witchcraft-go-logging/wlog-zap" "github.com/palantir/witchcraft-go-logging/wlog/evtlog/evt2log" "github.com/palantir/witchcraft-go-logging/wlog/svclog/svc1log" "github.com/palantir/witchcraft-go-logging/wlog/trclog/trc1log" diff --git a/integration_test/testgenerated/post/api/servers.conjure.go b/integration_test/testgenerated/post/api/servers.conjure.go index d5874b4d..e78bae73 100644 --- a/integration_test/testgenerated/post/api/servers.conjure.go +++ b/integration_test/testgenerated/post/api/servers.conjure.go @@ -9,7 +9,7 @@ import ( "github.com/palantir/conjure-go-runtime/v2/conjure-go-contract/codecs" "github.com/palantir/conjure-go-runtime/v2/conjure-go-contract/errors" "github.com/palantir/conjure-go-runtime/v2/conjure-go-server/httpserver" - werror "github.com/palantir/witchcraft-go-error" + "github.com/palantir/witchcraft-go-error" "github.com/palantir/witchcraft-go-server/v2/witchcraft/wresource" "github.com/palantir/witchcraft-go-server/v2/wrouter" ) diff --git a/integration_test/testgenerated/post/api/services.conjure.go b/integration_test/testgenerated/post/api/services.conjure.go index 0b675653..91ed23f1 100644 --- a/integration_test/testgenerated/post/api/services.conjure.go +++ b/integration_test/testgenerated/post/api/services.conjure.go @@ -6,7 +6,7 @@ import ( "context" "github.com/palantir/conjure-go-runtime/v2/conjure-go-client/httpclient" - werror "github.com/palantir/witchcraft-go-error" + "github.com/palantir/witchcraft-go-error" ) type TestServiceClient interface { diff --git a/integration_test/testgenerated/queryparam/api/cli.conjure.go b/integration_test/testgenerated/queryparam/api/cli.conjure.go index c97a71e9..b22c3c6c 100644 --- a/integration_test/testgenerated/queryparam/api/cli.conjure.go +++ b/integration_test/testgenerated/queryparam/api/cli.conjure.go @@ -14,9 +14,9 @@ import ( "github.com/palantir/conjure-go-runtime/v2/conjure-go-client/httpclient" "github.com/palantir/conjure-go-runtime/v2/conjure-go-contract/codecs" "github.com/palantir/conjure-go-runtime/v2/conjure-go-contract/errors" - werror "github.com/palantir/witchcraft-go-error" + "github.com/palantir/witchcraft-go-error" "github.com/palantir/witchcraft-go-logging/wlog" - wlogzap "github.com/palantir/witchcraft-go-logging/wlog-zap" + "github.com/palantir/witchcraft-go-logging/wlog-zap" "github.com/palantir/witchcraft-go-logging/wlog/evtlog/evt2log" "github.com/palantir/witchcraft-go-logging/wlog/svclog/svc1log" "github.com/palantir/witchcraft-go-logging/wlog/trclog/trc1log" diff --git a/integration_test/testgenerated/queryparam/api/servers.conjure.go b/integration_test/testgenerated/queryparam/api/servers.conjure.go index 35edec8a..5458f63d 100644 --- a/integration_test/testgenerated/queryparam/api/servers.conjure.go +++ b/integration_test/testgenerated/queryparam/api/servers.conjure.go @@ -10,7 +10,7 @@ import ( "github.com/palantir/conjure-go-runtime/v2/conjure-go-contract/codecs" "github.com/palantir/conjure-go-runtime/v2/conjure-go-contract/errors" "github.com/palantir/conjure-go-runtime/v2/conjure-go-server/httpserver" - werror "github.com/palantir/witchcraft-go-error" + "github.com/palantir/witchcraft-go-error" "github.com/palantir/witchcraft-go-server/v2/witchcraft/wresource" "github.com/palantir/witchcraft-go-server/v2/wrouter" ) diff --git a/integration_test/testgenerated/queryparam/api/services.conjure.go b/integration_test/testgenerated/queryparam/api/services.conjure.go index cef5f77e..f787a5c8 100644 --- a/integration_test/testgenerated/queryparam/api/services.conjure.go +++ b/integration_test/testgenerated/queryparam/api/services.conjure.go @@ -8,7 +8,7 @@ import ( "net/url" "github.com/palantir/conjure-go-runtime/v2/conjure-go-client/httpclient" - werror "github.com/palantir/witchcraft-go-error" + "github.com/palantir/witchcraft-go-error" ) type TestServiceClient interface { diff --git a/integration_test/testgenerated/server/api/cli.conjure.go b/integration_test/testgenerated/server/api/cli.conjure.go index 57dbf3ad..2bee3311 100644 --- a/integration_test/testgenerated/server/api/cli.conjure.go +++ b/integration_test/testgenerated/server/api/cli.conjure.go @@ -21,9 +21,9 @@ import ( "github.com/palantir/pkg/rid" "github.com/palantir/pkg/safelong" "github.com/palantir/pkg/uuid" - werror "github.com/palantir/witchcraft-go-error" + "github.com/palantir/witchcraft-go-error" "github.com/palantir/witchcraft-go-logging/wlog" - wlogzap "github.com/palantir/witchcraft-go-logging/wlog-zap" + "github.com/palantir/witchcraft-go-logging/wlog-zap" "github.com/palantir/witchcraft-go-logging/wlog/evtlog/evt2log" "github.com/palantir/witchcraft-go-logging/wlog/svclog/svc1log" "github.com/palantir/witchcraft-go-logging/wlog/trclog/trc1log" diff --git a/integration_test/testgenerated/server/api/servers.conjure.go b/integration_test/testgenerated/server/api/servers.conjure.go index 476f68ec..cdf7c6a7 100644 --- a/integration_test/testgenerated/server/api/servers.conjure.go +++ b/integration_test/testgenerated/server/api/servers.conjure.go @@ -16,7 +16,7 @@ import ( "github.com/palantir/pkg/rid" "github.com/palantir/pkg/safelong" "github.com/palantir/pkg/uuid" - werror "github.com/palantir/witchcraft-go-error" + "github.com/palantir/witchcraft-go-error" "github.com/palantir/witchcraft-go-server/v2/witchcraft/wresource" "github.com/palantir/witchcraft-go-server/v2/wrouter" ) diff --git a/integration_test/testgenerated/server/api/services.conjure.go b/integration_test/testgenerated/server/api/services.conjure.go index 86dc76ee..45c5e0e6 100644 --- a/integration_test/testgenerated/server/api/services.conjure.go +++ b/integration_test/testgenerated/server/api/services.conjure.go @@ -15,7 +15,7 @@ import ( "github.com/palantir/pkg/rid" "github.com/palantir/pkg/safelong" "github.com/palantir/pkg/uuid" - werror "github.com/palantir/witchcraft-go-error" + "github.com/palantir/witchcraft-go-error" ) type TestServiceClient interface { From 2a1d6a96b14201512ed3952d94376f7ab82f51ac Mon Sep 17 00:00:00 2001 From: Nick Miyake Date: Mon, 23 Jan 2023 15:58:58 -0800 Subject: [PATCH 3/4] Run ptimports.Process on all generated files after they have all been written --- .../verification/server/services.conjure.go | 2 +- conjure/conjure.go | 16 ++++++++++++++++ .../testgenerated/auth/api/cli.conjure.go | 4 ++-- .../testgenerated/auth/api/servers.conjure.go | 2 +- .../testgenerated/auth/api/services.conjure.go | 2 +- .../testgenerated/binary/api/cli.conjure.go | 4 ++-- .../testgenerated/binary/api/servers.conjure.go | 2 +- .../testgenerated/binary/api/services.conjure.go | 2 +- .../testgenerated/cli/api/cli.conjure.go | 4 ++-- .../testgenerated/cli/api/servers.conjure.go | 2 +- .../testgenerated/cli/api/services.conjure.go | 2 +- .../testgenerated/client/api/cli.conjure.go | 4 ++-- .../testgenerated/client/api/servers.conjure.go | 2 +- .../testgenerated/client/api/services.conjure.go | 2 +- .../testgenerated/errors/api/errors.conjure.go | 2 +- .../testgenerated/imports/imports.yml | 2 +- .../testgenerated/imports/imports_test.go | 13 ------------- .../imports/pkg3/api/unions.conjure.go | 2 +- .../imports/pkg3/api/unions_generics.conjure.go | 2 +- .../imports/{pkg1 => pkg4}/v2/structs.conjure.go | 0 .../testgenerated/post/api/cli.conjure.go | 4 ++-- .../testgenerated/post/api/servers.conjure.go | 2 +- .../testgenerated/post/api/services.conjure.go | 2 +- .../testgenerated/queryparam/api/cli.conjure.go | 4 ++-- .../queryparam/api/servers.conjure.go | 2 +- .../queryparam/api/services.conjure.go | 2 +- .../testgenerated/server/api/cli.conjure.go | 4 ++-- .../testgenerated/server/api/servers.conjure.go | 2 +- .../testgenerated/server/api/services.conjure.go | 2 +- 29 files changed, 49 insertions(+), 46 deletions(-) delete mode 100644 integration_test/testgenerated/imports/imports_test.go rename integration_test/testgenerated/imports/{pkg1 => pkg4}/v2/structs.conjure.go (100%) diff --git a/conjure-go-verifier/conjure/verification/server/services.conjure.go b/conjure-go-verifier/conjure/verification/server/services.conjure.go index 3ab19331..dc745073 100644 --- a/conjure-go-verifier/conjure/verification/server/services.conjure.go +++ b/conjure-go-verifier/conjure/verification/server/services.conjure.go @@ -15,7 +15,7 @@ import ( "github.com/palantir/pkg/rid" "github.com/palantir/pkg/safelong" "github.com/palantir/pkg/uuid" - "github.com/palantir/witchcraft-go-error" + werror "github.com/palantir/witchcraft-go-error" ) type AutoDeserializeConfirmServiceClient interface { diff --git a/conjure/conjure.go b/conjure/conjure.go index 3214a9c1..e65639e2 100644 --- a/conjure/conjure.go +++ b/conjure/conjure.go @@ -15,6 +15,7 @@ package conjure import ( + "os" "path/filepath" "sort" @@ -22,6 +23,7 @@ import ( "github.com/palantir/conjure-go/v6/conjure-api/conjure/spec" "github.com/palantir/conjure-go/v6/conjure/snip" "github.com/palantir/conjure-go/v6/conjure/types" + "github.com/palantir/go-ptimports/v2/ptimports" "github.com/pkg/errors" ) @@ -30,11 +32,25 @@ func Generate(conjureDefinition spec.ConjureDefinition, outputConfiguration Outp if err != nil { return err } + // write the generated files for _, file := range files { if err := file.Write(); err != nil { return err } } + // format all the generated files after they have been written. + // Must be done after all the files are written to ensure that imports are processed correctly (goimports adds named + // aliases for imports where the inferred package name differs from the actual package name, and this can only be + // properly determined after all generated code is written -- see https://github.com/palantir/conjure-go/issues/405). + for _, file := range files { + goFileSrc, err := ptimports.Process(file.absPath, nil, nil) + if err != nil { + return errors.Wrapf(err, "failed to run ptimports on generated Go source for file %s", file.absPath) + } + if err := os.WriteFile(file.absPath, goFileSrc, 0644); err != nil { + return errors.Wrapf(err, "failed to write file") + } + } return nil } diff --git a/integration_test/testgenerated/auth/api/cli.conjure.go b/integration_test/testgenerated/auth/api/cli.conjure.go index 0b7e3320..8936a37e 100644 --- a/integration_test/testgenerated/auth/api/cli.conjure.go +++ b/integration_test/testgenerated/auth/api/cli.conjure.go @@ -10,9 +10,9 @@ import ( "github.com/palantir/conjure-go-runtime/v2/conjure-go-client/httpclient" "github.com/palantir/pkg/bearertoken" - "github.com/palantir/witchcraft-go-error" + werror "github.com/palantir/witchcraft-go-error" "github.com/palantir/witchcraft-go-logging/wlog" - "github.com/palantir/witchcraft-go-logging/wlog-zap" + wlogzap "github.com/palantir/witchcraft-go-logging/wlog-zap" "github.com/palantir/witchcraft-go-logging/wlog/evtlog/evt2log" "github.com/palantir/witchcraft-go-logging/wlog/svclog/svc1log" "github.com/palantir/witchcraft-go-logging/wlog/trclog/trc1log" diff --git a/integration_test/testgenerated/auth/api/servers.conjure.go b/integration_test/testgenerated/auth/api/servers.conjure.go index 3e5e4fbf..8e1fd72d 100644 --- a/integration_test/testgenerated/auth/api/servers.conjure.go +++ b/integration_test/testgenerated/auth/api/servers.conjure.go @@ -11,7 +11,7 @@ import ( "github.com/palantir/conjure-go-runtime/v2/conjure-go-contract/errors" "github.com/palantir/conjure-go-runtime/v2/conjure-go-server/httpserver" "github.com/palantir/pkg/bearertoken" - "github.com/palantir/witchcraft-go-error" + werror "github.com/palantir/witchcraft-go-error" "github.com/palantir/witchcraft-go-server/v2/witchcraft/wresource" "github.com/palantir/witchcraft-go-server/v2/wrouter" ) diff --git a/integration_test/testgenerated/auth/api/services.conjure.go b/integration_test/testgenerated/auth/api/services.conjure.go index 75c27c38..ca1ebf7b 100644 --- a/integration_test/testgenerated/auth/api/services.conjure.go +++ b/integration_test/testgenerated/auth/api/services.conjure.go @@ -10,7 +10,7 @@ import ( "github.com/palantir/conjure-go-runtime/v2/conjure-go-client/httpclient" "github.com/palantir/pkg/bearertoken" - "github.com/palantir/witchcraft-go-error" + werror "github.com/palantir/witchcraft-go-error" ) type BothAuthServiceClient interface { diff --git a/integration_test/testgenerated/binary/api/cli.conjure.go b/integration_test/testgenerated/binary/api/cli.conjure.go index 27951858..aa07c245 100644 --- a/integration_test/testgenerated/binary/api/cli.conjure.go +++ b/integration_test/testgenerated/binary/api/cli.conjure.go @@ -14,9 +14,9 @@ import ( "github.com/palantir/conjure-go-runtime/v2/conjure-go-client/httpclient" "github.com/palantir/conjure-go-runtime/v2/conjure-go-contract/codecs" - "github.com/palantir/witchcraft-go-error" + werror "github.com/palantir/witchcraft-go-error" "github.com/palantir/witchcraft-go-logging/wlog" - "github.com/palantir/witchcraft-go-logging/wlog-zap" + wlogzap "github.com/palantir/witchcraft-go-logging/wlog-zap" "github.com/palantir/witchcraft-go-logging/wlog/evtlog/evt2log" "github.com/palantir/witchcraft-go-logging/wlog/svclog/svc1log" "github.com/palantir/witchcraft-go-logging/wlog/trclog/trc1log" diff --git a/integration_test/testgenerated/binary/api/servers.conjure.go b/integration_test/testgenerated/binary/api/servers.conjure.go index 46f9100c..5940bb8c 100644 --- a/integration_test/testgenerated/binary/api/servers.conjure.go +++ b/integration_test/testgenerated/binary/api/servers.conjure.go @@ -10,7 +10,7 @@ import ( "github.com/palantir/conjure-go-runtime/v2/conjure-go-contract/codecs" "github.com/palantir/conjure-go-runtime/v2/conjure-go-contract/errors" "github.com/palantir/conjure-go-runtime/v2/conjure-go-server/httpserver" - "github.com/palantir/witchcraft-go-error" + werror "github.com/palantir/witchcraft-go-error" "github.com/palantir/witchcraft-go-server/v2/witchcraft/wresource" "github.com/palantir/witchcraft-go-server/v2/wrouter" ) diff --git a/integration_test/testgenerated/binary/api/services.conjure.go b/integration_test/testgenerated/binary/api/services.conjure.go index c474ed35..7376113b 100644 --- a/integration_test/testgenerated/binary/api/services.conjure.go +++ b/integration_test/testgenerated/binary/api/services.conjure.go @@ -8,7 +8,7 @@ import ( "net/http" "github.com/palantir/conjure-go-runtime/v2/conjure-go-client/httpclient" - "github.com/palantir/witchcraft-go-error" + werror "github.com/palantir/witchcraft-go-error" ) type TestServiceClient interface { diff --git a/integration_test/testgenerated/cli/api/cli.conjure.go b/integration_test/testgenerated/cli/api/cli.conjure.go index 17ed744a..9a0024f5 100644 --- a/integration_test/testgenerated/cli/api/cli.conjure.go +++ b/integration_test/testgenerated/cli/api/cli.conjure.go @@ -21,9 +21,9 @@ import ( "github.com/palantir/pkg/rid" "github.com/palantir/pkg/safelong" "github.com/palantir/pkg/uuid" - "github.com/palantir/witchcraft-go-error" + werror "github.com/palantir/witchcraft-go-error" "github.com/palantir/witchcraft-go-logging/wlog" - "github.com/palantir/witchcraft-go-logging/wlog-zap" + wlogzap "github.com/palantir/witchcraft-go-logging/wlog-zap" "github.com/palantir/witchcraft-go-logging/wlog/evtlog/evt2log" "github.com/palantir/witchcraft-go-logging/wlog/svclog/svc1log" "github.com/palantir/witchcraft-go-logging/wlog/trclog/trc1log" diff --git a/integration_test/testgenerated/cli/api/servers.conjure.go b/integration_test/testgenerated/cli/api/servers.conjure.go index 27918269..7b668fdd 100644 --- a/integration_test/testgenerated/cli/api/servers.conjure.go +++ b/integration_test/testgenerated/cli/api/servers.conjure.go @@ -16,7 +16,7 @@ import ( "github.com/palantir/pkg/rid" "github.com/palantir/pkg/safelong" "github.com/palantir/pkg/uuid" - "github.com/palantir/witchcraft-go-error" + werror "github.com/palantir/witchcraft-go-error" "github.com/palantir/witchcraft-go-server/v2/witchcraft/wresource" "github.com/palantir/witchcraft-go-server/v2/wrouter" ) diff --git a/integration_test/testgenerated/cli/api/services.conjure.go b/integration_test/testgenerated/cli/api/services.conjure.go index 943aa889..222e129b 100644 --- a/integration_test/testgenerated/cli/api/services.conjure.go +++ b/integration_test/testgenerated/cli/api/services.conjure.go @@ -15,7 +15,7 @@ import ( "github.com/palantir/pkg/rid" "github.com/palantir/pkg/safelong" "github.com/palantir/pkg/uuid" - "github.com/palantir/witchcraft-go-error" + werror "github.com/palantir/witchcraft-go-error" ) type TestServiceClient interface { diff --git a/integration_test/testgenerated/client/api/cli.conjure.go b/integration_test/testgenerated/client/api/cli.conjure.go index 3008e0ed..acae08c1 100644 --- a/integration_test/testgenerated/client/api/cli.conjure.go +++ b/integration_test/testgenerated/client/api/cli.conjure.go @@ -12,9 +12,9 @@ import ( "github.com/palantir/conjure-go-runtime/v2/conjure-go-client/httpclient" "github.com/palantir/conjure-go-runtime/v2/conjure-go-contract/errors" "github.com/palantir/pkg/rid" - "github.com/palantir/witchcraft-go-error" + werror "github.com/palantir/witchcraft-go-error" "github.com/palantir/witchcraft-go-logging/wlog" - "github.com/palantir/witchcraft-go-logging/wlog-zap" + wlogzap "github.com/palantir/witchcraft-go-logging/wlog-zap" "github.com/palantir/witchcraft-go-logging/wlog/evtlog/evt2log" "github.com/palantir/witchcraft-go-logging/wlog/svclog/svc1log" "github.com/palantir/witchcraft-go-logging/wlog/trclog/trc1log" diff --git a/integration_test/testgenerated/client/api/servers.conjure.go b/integration_test/testgenerated/client/api/servers.conjure.go index e08d1d7f..8c6c5298 100644 --- a/integration_test/testgenerated/client/api/servers.conjure.go +++ b/integration_test/testgenerated/client/api/servers.conjure.go @@ -11,7 +11,7 @@ import ( "github.com/palantir/conjure-go-runtime/v2/conjure-go-contract/errors" "github.com/palantir/conjure-go-runtime/v2/conjure-go-server/httpserver" "github.com/palantir/pkg/rid" - "github.com/palantir/witchcraft-go-error" + werror "github.com/palantir/witchcraft-go-error" "github.com/palantir/witchcraft-go-server/v2/witchcraft/wresource" "github.com/palantir/witchcraft-go-server/v2/wrouter" ) diff --git a/integration_test/testgenerated/client/api/services.conjure.go b/integration_test/testgenerated/client/api/services.conjure.go index bc5214e3..cc1cff89 100644 --- a/integration_test/testgenerated/client/api/services.conjure.go +++ b/integration_test/testgenerated/client/api/services.conjure.go @@ -11,7 +11,7 @@ import ( "github.com/palantir/conjure-go-runtime/v2/conjure-go-client/httpclient" "github.com/palantir/pkg/rid" - "github.com/palantir/witchcraft-go-error" + werror "github.com/palantir/witchcraft-go-error" ) type TestServiceClient interface { diff --git a/integration_test/testgenerated/errors/api/errors.conjure.go b/integration_test/testgenerated/errors/api/errors.conjure.go index 669e0dcb..450c12d7 100644 --- a/integration_test/testgenerated/errors/api/errors.conjure.go +++ b/integration_test/testgenerated/errors/api/errors.conjure.go @@ -11,7 +11,7 @@ import ( "github.com/palantir/pkg/safejson" "github.com/palantir/pkg/safeyaml" "github.com/palantir/pkg/uuid" - "github.com/palantir/witchcraft-go-error" + werror "github.com/palantir/witchcraft-go-error" ) type myInternal struct { diff --git a/integration_test/testgenerated/imports/imports.yml b/integration_test/testgenerated/imports/imports.yml index 98549547..3442bec8 100644 --- a/integration_test/testgenerated/imports/imports.yml +++ b/integration_test/testgenerated/imports/imports.yml @@ -10,7 +10,7 @@ types: fields: data: Struct1 ObjectInPackageEndingInVersion: - package: com.palantir.pkg1.v2 + package: com.palantir.pkg4.v2 fields: name: string Union: diff --git a/integration_test/testgenerated/imports/imports_test.go b/integration_test/testgenerated/imports/imports_test.go deleted file mode 100644 index 1de11118..00000000 --- a/integration_test/testgenerated/imports/imports_test.go +++ /dev/null @@ -1,13 +0,0 @@ -package imports - -import ( - "testing" - - "github.com/palantir/conjure-go/v6/integration_test/testgenerated/imports/pkg3/api" -) - -// TestImportNameConflict ensures that we can import a type which includes types of the same package name. -// This is only testing that the relevant code compiles, and does not do anything in the test body. -func TestImportNameConflict(t *testing.T) { - _ = api.Union{} -} diff --git a/integration_test/testgenerated/imports/pkg3/api/unions.conjure.go b/integration_test/testgenerated/imports/pkg3/api/unions.conjure.go index 207cba9b..df86935c 100644 --- a/integration_test/testgenerated/imports/pkg3/api/unions.conjure.go +++ b/integration_test/testgenerated/imports/pkg3/api/unions.conjure.go @@ -7,8 +7,8 @@ import ( "fmt" "github.com/palantir/conjure-go/v6/integration_test/testgenerated/imports/pkg1/api" - "github.com/palantir/conjure-go/v6/integration_test/testgenerated/imports/pkg1/v2" api1 "github.com/palantir/conjure-go/v6/integration_test/testgenerated/imports/pkg2/api" + v2 "github.com/palantir/conjure-go/v6/integration_test/testgenerated/imports/pkg4/v2" "github.com/palantir/pkg/safejson" "github.com/palantir/pkg/safeyaml" ) diff --git a/integration_test/testgenerated/imports/pkg3/api/unions_generics.conjure.go b/integration_test/testgenerated/imports/pkg3/api/unions_generics.conjure.go index ae064691..8dedc334 100644 --- a/integration_test/testgenerated/imports/pkg3/api/unions_generics.conjure.go +++ b/integration_test/testgenerated/imports/pkg3/api/unions_generics.conjure.go @@ -9,8 +9,8 @@ import ( "fmt" "github.com/palantir/conjure-go/v6/integration_test/testgenerated/imports/pkg1/api" - "github.com/palantir/conjure-go/v6/integration_test/testgenerated/imports/pkg1/v2" api1 "github.com/palantir/conjure-go/v6/integration_test/testgenerated/imports/pkg2/api" + v2 "github.com/palantir/conjure-go/v6/integration_test/testgenerated/imports/pkg4/v2" ) type UnionWithT[T any] Union diff --git a/integration_test/testgenerated/imports/pkg1/v2/structs.conjure.go b/integration_test/testgenerated/imports/pkg4/v2/structs.conjure.go similarity index 100% rename from integration_test/testgenerated/imports/pkg1/v2/structs.conjure.go rename to integration_test/testgenerated/imports/pkg4/v2/structs.conjure.go diff --git a/integration_test/testgenerated/post/api/cli.conjure.go b/integration_test/testgenerated/post/api/cli.conjure.go index 5ed402d2..6c290c38 100644 --- a/integration_test/testgenerated/post/api/cli.conjure.go +++ b/integration_test/testgenerated/post/api/cli.conjure.go @@ -9,9 +9,9 @@ import ( "os" "github.com/palantir/conjure-go-runtime/v2/conjure-go-client/httpclient" - "github.com/palantir/witchcraft-go-error" + werror "github.com/palantir/witchcraft-go-error" "github.com/palantir/witchcraft-go-logging/wlog" - "github.com/palantir/witchcraft-go-logging/wlog-zap" + wlogzap "github.com/palantir/witchcraft-go-logging/wlog-zap" "github.com/palantir/witchcraft-go-logging/wlog/evtlog/evt2log" "github.com/palantir/witchcraft-go-logging/wlog/svclog/svc1log" "github.com/palantir/witchcraft-go-logging/wlog/trclog/trc1log" diff --git a/integration_test/testgenerated/post/api/servers.conjure.go b/integration_test/testgenerated/post/api/servers.conjure.go index e78bae73..d5874b4d 100644 --- a/integration_test/testgenerated/post/api/servers.conjure.go +++ b/integration_test/testgenerated/post/api/servers.conjure.go @@ -9,7 +9,7 @@ import ( "github.com/palantir/conjure-go-runtime/v2/conjure-go-contract/codecs" "github.com/palantir/conjure-go-runtime/v2/conjure-go-contract/errors" "github.com/palantir/conjure-go-runtime/v2/conjure-go-server/httpserver" - "github.com/palantir/witchcraft-go-error" + werror "github.com/palantir/witchcraft-go-error" "github.com/palantir/witchcraft-go-server/v2/witchcraft/wresource" "github.com/palantir/witchcraft-go-server/v2/wrouter" ) diff --git a/integration_test/testgenerated/post/api/services.conjure.go b/integration_test/testgenerated/post/api/services.conjure.go index 91ed23f1..0b675653 100644 --- a/integration_test/testgenerated/post/api/services.conjure.go +++ b/integration_test/testgenerated/post/api/services.conjure.go @@ -6,7 +6,7 @@ import ( "context" "github.com/palantir/conjure-go-runtime/v2/conjure-go-client/httpclient" - "github.com/palantir/witchcraft-go-error" + werror "github.com/palantir/witchcraft-go-error" ) type TestServiceClient interface { diff --git a/integration_test/testgenerated/queryparam/api/cli.conjure.go b/integration_test/testgenerated/queryparam/api/cli.conjure.go index b22c3c6c..c97a71e9 100644 --- a/integration_test/testgenerated/queryparam/api/cli.conjure.go +++ b/integration_test/testgenerated/queryparam/api/cli.conjure.go @@ -14,9 +14,9 @@ import ( "github.com/palantir/conjure-go-runtime/v2/conjure-go-client/httpclient" "github.com/palantir/conjure-go-runtime/v2/conjure-go-contract/codecs" "github.com/palantir/conjure-go-runtime/v2/conjure-go-contract/errors" - "github.com/palantir/witchcraft-go-error" + werror "github.com/palantir/witchcraft-go-error" "github.com/palantir/witchcraft-go-logging/wlog" - "github.com/palantir/witchcraft-go-logging/wlog-zap" + wlogzap "github.com/palantir/witchcraft-go-logging/wlog-zap" "github.com/palantir/witchcraft-go-logging/wlog/evtlog/evt2log" "github.com/palantir/witchcraft-go-logging/wlog/svclog/svc1log" "github.com/palantir/witchcraft-go-logging/wlog/trclog/trc1log" diff --git a/integration_test/testgenerated/queryparam/api/servers.conjure.go b/integration_test/testgenerated/queryparam/api/servers.conjure.go index 5458f63d..35edec8a 100644 --- a/integration_test/testgenerated/queryparam/api/servers.conjure.go +++ b/integration_test/testgenerated/queryparam/api/servers.conjure.go @@ -10,7 +10,7 @@ import ( "github.com/palantir/conjure-go-runtime/v2/conjure-go-contract/codecs" "github.com/palantir/conjure-go-runtime/v2/conjure-go-contract/errors" "github.com/palantir/conjure-go-runtime/v2/conjure-go-server/httpserver" - "github.com/palantir/witchcraft-go-error" + werror "github.com/palantir/witchcraft-go-error" "github.com/palantir/witchcraft-go-server/v2/witchcraft/wresource" "github.com/palantir/witchcraft-go-server/v2/wrouter" ) diff --git a/integration_test/testgenerated/queryparam/api/services.conjure.go b/integration_test/testgenerated/queryparam/api/services.conjure.go index f787a5c8..cef5f77e 100644 --- a/integration_test/testgenerated/queryparam/api/services.conjure.go +++ b/integration_test/testgenerated/queryparam/api/services.conjure.go @@ -8,7 +8,7 @@ import ( "net/url" "github.com/palantir/conjure-go-runtime/v2/conjure-go-client/httpclient" - "github.com/palantir/witchcraft-go-error" + werror "github.com/palantir/witchcraft-go-error" ) type TestServiceClient interface { diff --git a/integration_test/testgenerated/server/api/cli.conjure.go b/integration_test/testgenerated/server/api/cli.conjure.go index 2bee3311..57dbf3ad 100644 --- a/integration_test/testgenerated/server/api/cli.conjure.go +++ b/integration_test/testgenerated/server/api/cli.conjure.go @@ -21,9 +21,9 @@ import ( "github.com/palantir/pkg/rid" "github.com/palantir/pkg/safelong" "github.com/palantir/pkg/uuid" - "github.com/palantir/witchcraft-go-error" + werror "github.com/palantir/witchcraft-go-error" "github.com/palantir/witchcraft-go-logging/wlog" - "github.com/palantir/witchcraft-go-logging/wlog-zap" + wlogzap "github.com/palantir/witchcraft-go-logging/wlog-zap" "github.com/palantir/witchcraft-go-logging/wlog/evtlog/evt2log" "github.com/palantir/witchcraft-go-logging/wlog/svclog/svc1log" "github.com/palantir/witchcraft-go-logging/wlog/trclog/trc1log" diff --git a/integration_test/testgenerated/server/api/servers.conjure.go b/integration_test/testgenerated/server/api/servers.conjure.go index cdf7c6a7..476f68ec 100644 --- a/integration_test/testgenerated/server/api/servers.conjure.go +++ b/integration_test/testgenerated/server/api/servers.conjure.go @@ -16,7 +16,7 @@ import ( "github.com/palantir/pkg/rid" "github.com/palantir/pkg/safelong" "github.com/palantir/pkg/uuid" - "github.com/palantir/witchcraft-go-error" + werror "github.com/palantir/witchcraft-go-error" "github.com/palantir/witchcraft-go-server/v2/witchcraft/wresource" "github.com/palantir/witchcraft-go-server/v2/wrouter" ) diff --git a/integration_test/testgenerated/server/api/services.conjure.go b/integration_test/testgenerated/server/api/services.conjure.go index 45c5e0e6..86dc76ee 100644 --- a/integration_test/testgenerated/server/api/services.conjure.go +++ b/integration_test/testgenerated/server/api/services.conjure.go @@ -15,7 +15,7 @@ import ( "github.com/palantir/pkg/rid" "github.com/palantir/pkg/safelong" "github.com/palantir/pkg/uuid" - "github.com/palantir/witchcraft-go-error" + werror "github.com/palantir/witchcraft-go-error" ) type TestServiceClient interface { From 92bdcf5b97a0537093de5fca536b6a458812726e Mon Sep 17 00:00:00 2001 From: svc-changelog Date: Tue, 24 Jan 2023 00:04:30 +0000 Subject: [PATCH 4/4] Add generated changelog entries --- changelog/@unreleased/pr-406.v2.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 changelog/@unreleased/pr-406.v2.yml diff --git a/changelog/@unreleased/pr-406.v2.yml b/changelog/@unreleased/pr-406.v2.yml new file mode 100644 index 00000000..c51f33cb --- /dev/null +++ b/changelog/@unreleased/pr-406.v2.yml @@ -0,0 +1,7 @@ +type: fix +fix: + description: Fixes an issue where generated code would not include imports that + referenced packages where the last component of the package path was of the form + "v[0-9]+". + links: + - https://github.com/palantir/conjure-go/pull/406