diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..a61b65ce2 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,3 @@ +go.sum linguist-generated=true +**/*.conjure.go linguist-generated=true +vendor/** linguist-generated=true diff --git a/conjure/types/conjure_definition.go b/conjure/types/conjure_definition.go index 2c91960cc..3d502f676 100644 --- a/conjure/types/conjure_definition.go +++ b/conjure/types/conjure_definition.go @@ -24,8 +24,8 @@ import ( "github.com/dave/jennifer/jen" "github.com/palantir/conjure-go/v6/conjure-api/conjure/spec" - "github.com/palantir/conjure-go/v6/conjure/cycles" "github.com/palantir/conjure-go/v6/conjure/transforms" + "github.com/palantir/conjure-go/v6/cycles" werror "github.com/palantir/witchcraft-go-error" "github.com/pkg/errors" ) diff --git a/conjure/cycles/README.md b/cycles/README.md similarity index 100% rename from conjure/cycles/README.md rename to cycles/README.md diff --git a/conjure/cycles/bitset.go b/cycles/bitset.go similarity index 100% rename from conjure/cycles/bitset.go rename to cycles/bitset.go diff --git a/conjure/cycles/bitset_test.go b/cycles/bitset_test.go similarity index 100% rename from conjure/cycles/bitset_test.go rename to cycles/bitset_test.go diff --git a/conjure/cycles/graph.go b/cycles/graph.go similarity index 100% rename from conjure/cycles/graph.go rename to cycles/graph.go diff --git a/conjure/cycles/graph_test.go b/cycles/graph_test.go similarity index 100% rename from conjure/cycles/graph_test.go rename to cycles/graph_test.go diff --git a/conjure/cycles/images/disallowed.png b/cycles/images/disallowed.png similarity index 100% rename from conjure/cycles/images/disallowed.png rename to cycles/images/disallowed.png diff --git a/conjure/cycles/images/sccs.png b/cycles/images/sccs.png similarity index 100% rename from conjure/cycles/images/sccs.png rename to cycles/images/sccs.png diff --git a/conjure/cycles/kosaraju.go b/cycles/kosaraju.go similarity index 100% rename from conjure/cycles/kosaraju.go rename to cycles/kosaraju.go diff --git a/conjure/cycles/kosaraju_test.go b/cycles/kosaraju_test.go similarity index 100% rename from conjure/cycles/kosaraju_test.go rename to cycles/kosaraju_test.go diff --git a/conjure/cycles/package.go b/cycles/package.go similarity index 100% rename from conjure/cycles/package.go rename to cycles/package.go diff --git a/conjure/cycles/package_test.go b/cycles/package_test.go similarity index 100% rename from conjure/cycles/package_test.go rename to cycles/package_test.go diff --git a/conjure/cycles/partition.go b/cycles/partition.go similarity index 100% rename from conjure/cycles/partition.go rename to cycles/partition.go diff --git a/conjure/cycles/partition_test.go b/cycles/partition_test.go similarity index 100% rename from conjure/cycles/partition_test.go rename to cycles/partition_test.go diff --git a/conjure/cycles/testdata/cycle-within-pkg/conjure/com/palantir/bar/aliases.conjure.go b/cycles/testdata/cycle-within-pkg/conjure/com/palantir/bar/aliases.conjure.go similarity index 100% rename from conjure/cycles/testdata/cycle-within-pkg/conjure/com/palantir/bar/aliases.conjure.go rename to cycles/testdata/cycle-within-pkg/conjure/com/palantir/bar/aliases.conjure.go diff --git a/conjure/cycles/testdata/no-cycles/conjure/com/palantir/bar/structs.conjure.go b/cycles/testdata/cycle-within-pkg/conjure/com/palantir/bar/structs.conjure.go similarity index 86% rename from conjure/cycles/testdata/no-cycles/conjure/com/palantir/bar/structs.conjure.go rename to cycles/testdata/cycle-within-pkg/conjure/com/palantir/bar/structs.conjure.go index e18ac0ebc..6ac437968 100644 --- a/conjure/cycles/testdata/no-cycles/conjure/com/palantir/bar/structs.conjure.go +++ b/cycles/testdata/cycle-within-pkg/conjure/com/palantir/bar/structs.conjure.go @@ -3,7 +3,7 @@ package bar import ( - "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/no-cycles/conjure/com/palantir/buzz" + "github.com/palantir/conjure-go/v6/cycles/testdata/cycle-within-pkg/conjure/com/palantir/buzz" "github.com/palantir/pkg/safejson" "github.com/palantir/pkg/safeyaml" ) diff --git a/conjure/cycles/testdata/cycle-within-pkg/conjure/com/palantir/buzz/enums.conjure.go b/cycles/testdata/cycle-within-pkg/conjure/com/palantir/buzz/enums.conjure.go similarity index 100% rename from conjure/cycles/testdata/cycle-within-pkg/conjure/com/palantir/buzz/enums.conjure.go rename to cycles/testdata/cycle-within-pkg/conjure/com/palantir/buzz/enums.conjure.go diff --git a/conjure/cycles/testdata/pkg-cycle/conjure/com/palantir/errors/errors.conjure.go b/cycles/testdata/cycle-within-pkg/conjure/com/palantir/errors/errors.conjure.go similarity index 98% rename from conjure/cycles/testdata/pkg-cycle/conjure/com/palantir/errors/errors.conjure.go rename to cycles/testdata/cycle-within-pkg/conjure/com/palantir/errors/errors.conjure.go index a4f2e9fb2..8053d4958 100644 --- a/conjure/cycles/testdata/pkg-cycle/conjure/com/palantir/errors/errors.conjure.go +++ b/cycles/testdata/cycle-within-pkg/conjure/com/palantir/errors/errors.conjure.go @@ -8,7 +8,7 @@ import ( "reflect" "github.com/palantir/conjure-go-runtime/v2/conjure-go-contract/errors" - "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/pkg-cycle/conjure/com/palantir/bar" + "github.com/palantir/conjure-go/v6/cycles/testdata/cycle-within-pkg/conjure/com/palantir/bar" "github.com/palantir/pkg/safejson" "github.com/palantir/pkg/safeyaml" "github.com/palantir/pkg/uuid" diff --git a/conjure/cycles/testdata/cycle-within-pkg/conjure/com/palantir/fizz/aliases.conjure.go b/cycles/testdata/cycle-within-pkg/conjure/com/palantir/fizz/aliases.conjure.go similarity index 100% rename from conjure/cycles/testdata/cycle-within-pkg/conjure/com/palantir/fizz/aliases.conjure.go rename to cycles/testdata/cycle-within-pkg/conjure/com/palantir/fizz/aliases.conjure.go diff --git a/conjure/cycles/testdata/cycle-within-pkg/conjure/com/palantir/foo/aliases.conjure.go b/cycles/testdata/cycle-within-pkg/conjure/com/palantir/foo/aliases.conjure.go similarity index 89% rename from conjure/cycles/testdata/cycle-within-pkg/conjure/com/palantir/foo/aliases.conjure.go rename to cycles/testdata/cycle-within-pkg/conjure/com/palantir/foo/aliases.conjure.go index 86b6aa369..3605ff755 100644 --- a/conjure/cycles/testdata/cycle-within-pkg/conjure/com/palantir/foo/aliases.conjure.go +++ b/cycles/testdata/cycle-within-pkg/conjure/com/palantir/foo/aliases.conjure.go @@ -3,7 +3,7 @@ package foo import ( - "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/cycle-within-pkg/conjure/com/palantir/fizz" + "github.com/palantir/conjure-go/v6/cycles/testdata/cycle-within-pkg/conjure/com/palantir/fizz" "github.com/palantir/pkg/safejson" "github.com/palantir/pkg/safeyaml" ) diff --git a/conjure/cycles/testdata/cycle-within-pkg/conjure/com/palantir/foo/structs.conjure.go b/cycles/testdata/cycle-within-pkg/conjure/com/palantir/foo/structs.conjure.go similarity index 91% rename from conjure/cycles/testdata/cycle-within-pkg/conjure/com/palantir/foo/structs.conjure.go rename to cycles/testdata/cycle-within-pkg/conjure/com/palantir/foo/structs.conjure.go index acc2df6a2..bd35bd351 100644 --- a/conjure/cycles/testdata/cycle-within-pkg/conjure/com/palantir/foo/structs.conjure.go +++ b/cycles/testdata/cycle-within-pkg/conjure/com/palantir/foo/structs.conjure.go @@ -3,7 +3,7 @@ package foo import ( - "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/cycle-within-pkg/conjure/com/palantir/buzz" + "github.com/palantir/conjure-go/v6/cycles/testdata/cycle-within-pkg/conjure/com/palantir/buzz" "github.com/palantir/pkg/safejson" "github.com/palantir/pkg/safeyaml" ) diff --git a/conjure/cycles/testdata/no-cycles/conjure/com/palantir/foo/unions.conjure.go b/cycles/testdata/cycle-within-pkg/conjure/com/palantir/foo/unions.conjure.go similarity index 98% rename from conjure/cycles/testdata/no-cycles/conjure/com/palantir/foo/unions.conjure.go rename to cycles/testdata/cycle-within-pkg/conjure/com/palantir/foo/unions.conjure.go index 17166b1e1..55f30ceb4 100644 --- a/conjure/cycles/testdata/no-cycles/conjure/com/palantir/foo/unions.conjure.go +++ b/cycles/testdata/cycle-within-pkg/conjure/com/palantir/foo/unions.conjure.go @@ -6,7 +6,7 @@ import ( "context" "fmt" - "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/no-cycles/conjure/com/palantir/bar" + "github.com/palantir/conjure-go/v6/cycles/testdata/cycle-within-pkg/conjure/com/palantir/bar" "github.com/palantir/pkg/safejson" "github.com/palantir/pkg/safeyaml" ) diff --git a/conjure/cycles/testdata/no-cycles/conjure/com/palantir/foo/unions_generics.conjure.go b/cycles/testdata/cycle-within-pkg/conjure/com/palantir/foo/unions_generics.conjure.go similarity index 92% rename from conjure/cycles/testdata/no-cycles/conjure/com/palantir/foo/unions_generics.conjure.go rename to cycles/testdata/cycle-within-pkg/conjure/com/palantir/foo/unions_generics.conjure.go index 81c14223c..c64f6af42 100644 --- a/conjure/cycles/testdata/no-cycles/conjure/com/palantir/foo/unions_generics.conjure.go +++ b/cycles/testdata/cycle-within-pkg/conjure/com/palantir/foo/unions_generics.conjure.go @@ -8,7 +8,7 @@ import ( "context" "fmt" - "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/no-cycles/conjure/com/palantir/bar" + "github.com/palantir/conjure-go/v6/cycles/testdata/cycle-within-pkg/conjure/com/palantir/bar" ) type Type3WithT[T any] Type3 diff --git a/conjure/cycles/testdata/no-cycles/conjure/com/palantir/services/services.conjure.go b/cycles/testdata/cycle-within-pkg/conjure/com/palantir/services/services.conjure.go similarity index 95% rename from conjure/cycles/testdata/no-cycles/conjure/com/palantir/services/services.conjure.go rename to cycles/testdata/cycle-within-pkg/conjure/com/palantir/services/services.conjure.go index f90a02bb0..601ffa8cc 100644 --- a/conjure/cycles/testdata/no-cycles/conjure/com/palantir/services/services.conjure.go +++ b/cycles/testdata/cycle-within-pkg/conjure/com/palantir/services/services.conjure.go @@ -8,8 +8,8 @@ import ( "net/url" "github.com/palantir/conjure-go-runtime/v2/conjure-go-client/httpclient" - "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/no-cycles/conjure/com/palantir/buzz" - "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/no-cycles/conjure/com/palantir/foo" + "github.com/palantir/conjure-go/v6/cycles/testdata/cycle-within-pkg/conjure/com/palantir/buzz" + "github.com/palantir/conjure-go/v6/cycles/testdata/cycle-within-pkg/conjure/com/palantir/foo" "github.com/palantir/pkg/bearertoken" werror "github.com/palantir/witchcraft-go-error" ) diff --git a/conjure/cycles/testdata/cycle-within-pkg/illustration.png b/cycles/testdata/cycle-within-pkg/illustration.png similarity index 100% rename from conjure/cycles/testdata/cycle-within-pkg/illustration.png rename to cycles/testdata/cycle-within-pkg/illustration.png diff --git a/conjure/cycles/testdata/cycle-within-pkg/in.conjure.json b/cycles/testdata/cycle-within-pkg/in.conjure.json similarity index 100% rename from conjure/cycles/testdata/cycle-within-pkg/in.conjure.json rename to cycles/testdata/cycle-within-pkg/in.conjure.json diff --git a/conjure/cycles/testdata/cycle-within-pkg/out.conjure.json b/cycles/testdata/cycle-within-pkg/out.conjure.json similarity index 100% rename from conjure/cycles/testdata/cycle-within-pkg/out.conjure.json rename to cycles/testdata/cycle-within-pkg/out.conjure.json diff --git a/conjure/cycles/testdata/generate.go b/cycles/testdata/generate.go similarity index 100% rename from conjure/cycles/testdata/generate.go rename to cycles/testdata/generate.go diff --git a/conjure/cycles/testdata/no-cycles/conjure/com/palantir/bar/aliases.conjure.go b/cycles/testdata/no-cycles/conjure/com/palantir/bar/aliases.conjure.go similarity index 100% rename from conjure/cycles/testdata/no-cycles/conjure/com/palantir/bar/aliases.conjure.go rename to cycles/testdata/no-cycles/conjure/com/palantir/bar/aliases.conjure.go diff --git a/conjure/cycles/testdata/cycle-within-pkg/conjure/com/palantir/bar/structs.conjure.go b/cycles/testdata/no-cycles/conjure/com/palantir/bar/structs.conjure.go similarity index 85% rename from conjure/cycles/testdata/cycle-within-pkg/conjure/com/palantir/bar/structs.conjure.go rename to cycles/testdata/no-cycles/conjure/com/palantir/bar/structs.conjure.go index accff319a..a77a6bca5 100644 --- a/conjure/cycles/testdata/cycle-within-pkg/conjure/com/palantir/bar/structs.conjure.go +++ b/cycles/testdata/no-cycles/conjure/com/palantir/bar/structs.conjure.go @@ -3,7 +3,7 @@ package bar import ( - "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/cycle-within-pkg/conjure/com/palantir/buzz" + "github.com/palantir/conjure-go/v6/cycles/testdata/no-cycles/conjure/com/palantir/buzz" "github.com/palantir/pkg/safejson" "github.com/palantir/pkg/safeyaml" ) diff --git a/conjure/cycles/testdata/no-cycles/conjure/com/palantir/buzz/enums.conjure.go b/cycles/testdata/no-cycles/conjure/com/palantir/buzz/enums.conjure.go similarity index 100% rename from conjure/cycles/testdata/no-cycles/conjure/com/palantir/buzz/enums.conjure.go rename to cycles/testdata/no-cycles/conjure/com/palantir/buzz/enums.conjure.go diff --git a/conjure/cycles/testdata/no-cycles/conjure/com/palantir/errors/errors.conjure.go b/cycles/testdata/no-cycles/conjure/com/palantir/errors/errors.conjure.go similarity index 98% rename from conjure/cycles/testdata/no-cycles/conjure/com/palantir/errors/errors.conjure.go rename to cycles/testdata/no-cycles/conjure/com/palantir/errors/errors.conjure.go index 5ed9b95ac..a01086d35 100644 --- a/conjure/cycles/testdata/no-cycles/conjure/com/palantir/errors/errors.conjure.go +++ b/cycles/testdata/no-cycles/conjure/com/palantir/errors/errors.conjure.go @@ -8,7 +8,7 @@ import ( "reflect" "github.com/palantir/conjure-go-runtime/v2/conjure-go-contract/errors" - "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/no-cycles/conjure/com/palantir/bar" + "github.com/palantir/conjure-go/v6/cycles/testdata/no-cycles/conjure/com/palantir/bar" "github.com/palantir/pkg/safejson" "github.com/palantir/pkg/safeyaml" "github.com/palantir/pkg/uuid" diff --git a/conjure/cycles/testdata/no-cycles/conjure/com/palantir/fizz/aliases.conjure.go b/cycles/testdata/no-cycles/conjure/com/palantir/fizz/aliases.conjure.go similarity index 100% rename from conjure/cycles/testdata/no-cycles/conjure/com/palantir/fizz/aliases.conjure.go rename to cycles/testdata/no-cycles/conjure/com/palantir/fizz/aliases.conjure.go diff --git a/conjure/cycles/testdata/pkg-cycle/conjure/com/palantir/foo/aliases.conjure.go b/cycles/testdata/no-cycles/conjure/com/palantir/foo/aliases.conjure.go similarity index 90% rename from conjure/cycles/testdata/pkg-cycle/conjure/com/palantir/foo/aliases.conjure.go rename to cycles/testdata/no-cycles/conjure/com/palantir/foo/aliases.conjure.go index 148106853..2019d25bc 100644 --- a/conjure/cycles/testdata/pkg-cycle/conjure/com/palantir/foo/aliases.conjure.go +++ b/cycles/testdata/no-cycles/conjure/com/palantir/foo/aliases.conjure.go @@ -3,7 +3,7 @@ package foo import ( - "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/pkg-cycle/conjure/com/palantir/fizz" + "github.com/palantir/conjure-go/v6/cycles/testdata/no-cycles/conjure/com/palantir/fizz" "github.com/palantir/pkg/safejson" "github.com/palantir/pkg/safeyaml" ) diff --git a/conjure/cycles/testdata/no-cycles/conjure/com/palantir/foo/structs.conjure.go b/cycles/testdata/no-cycles/conjure/com/palantir/foo/structs.conjure.go similarity index 89% rename from conjure/cycles/testdata/no-cycles/conjure/com/palantir/foo/structs.conjure.go rename to cycles/testdata/no-cycles/conjure/com/palantir/foo/structs.conjure.go index a866c0eac..ab84e870c 100644 --- a/conjure/cycles/testdata/no-cycles/conjure/com/palantir/foo/structs.conjure.go +++ b/cycles/testdata/no-cycles/conjure/com/palantir/foo/structs.conjure.go @@ -3,8 +3,8 @@ package foo import ( - "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/no-cycles/conjure/com/palantir/buzz" - "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/no-cycles/conjure/com/palantir/fizz" + "github.com/palantir/conjure-go/v6/cycles/testdata/no-cycles/conjure/com/palantir/buzz" + "github.com/palantir/conjure-go/v6/cycles/testdata/no-cycles/conjure/com/palantir/fizz" "github.com/palantir/pkg/safejson" "github.com/palantir/pkg/safeyaml" ) diff --git a/conjure/cycles/testdata/cycle-within-pkg/conjure/com/palantir/foo/unions.conjure.go b/cycles/testdata/no-cycles/conjure/com/palantir/foo/unions.conjure.go similarity index 98% rename from conjure/cycles/testdata/cycle-within-pkg/conjure/com/palantir/foo/unions.conjure.go rename to cycles/testdata/no-cycles/conjure/com/palantir/foo/unions.conjure.go index 71ecdd0fa..c21f3221e 100644 --- a/conjure/cycles/testdata/cycle-within-pkg/conjure/com/palantir/foo/unions.conjure.go +++ b/cycles/testdata/no-cycles/conjure/com/palantir/foo/unions.conjure.go @@ -6,7 +6,7 @@ import ( "context" "fmt" - "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/cycle-within-pkg/conjure/com/palantir/bar" + "github.com/palantir/conjure-go/v6/cycles/testdata/no-cycles/conjure/com/palantir/bar" "github.com/palantir/pkg/safejson" "github.com/palantir/pkg/safeyaml" ) diff --git a/conjure/cycles/testdata/cycle-within-pkg/conjure/com/palantir/foo/unions_generics.conjure.go b/cycles/testdata/no-cycles/conjure/com/palantir/foo/unions_generics.conjure.go similarity index 91% rename from conjure/cycles/testdata/cycle-within-pkg/conjure/com/palantir/foo/unions_generics.conjure.go rename to cycles/testdata/no-cycles/conjure/com/palantir/foo/unions_generics.conjure.go index 36b75290c..2d27a7ac4 100644 --- a/conjure/cycles/testdata/cycle-within-pkg/conjure/com/palantir/foo/unions_generics.conjure.go +++ b/cycles/testdata/no-cycles/conjure/com/palantir/foo/unions_generics.conjure.go @@ -8,7 +8,7 @@ import ( "context" "fmt" - "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/cycle-within-pkg/conjure/com/palantir/bar" + "github.com/palantir/conjure-go/v6/cycles/testdata/no-cycles/conjure/com/palantir/bar" ) type Type3WithT[T any] Type3 diff --git a/conjure/cycles/testdata/cycle-within-pkg/conjure/com/palantir/services/services.conjure.go b/cycles/testdata/no-cycles/conjure/com/palantir/services/services.conjure.go similarity index 95% rename from conjure/cycles/testdata/cycle-within-pkg/conjure/com/palantir/services/services.conjure.go rename to cycles/testdata/no-cycles/conjure/com/palantir/services/services.conjure.go index 6f7f3286b..bb103b4e8 100644 --- a/conjure/cycles/testdata/cycle-within-pkg/conjure/com/palantir/services/services.conjure.go +++ b/cycles/testdata/no-cycles/conjure/com/palantir/services/services.conjure.go @@ -8,8 +8,8 @@ import ( "net/url" "github.com/palantir/conjure-go-runtime/v2/conjure-go-client/httpclient" - "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/cycle-within-pkg/conjure/com/palantir/buzz" - "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/cycle-within-pkg/conjure/com/palantir/foo" + "github.com/palantir/conjure-go/v6/cycles/testdata/no-cycles/conjure/com/palantir/buzz" + "github.com/palantir/conjure-go/v6/cycles/testdata/no-cycles/conjure/com/palantir/foo" "github.com/palantir/pkg/bearertoken" werror "github.com/palantir/witchcraft-go-error" ) diff --git a/conjure/cycles/testdata/no-cycles/illustration.png b/cycles/testdata/no-cycles/illustration.png similarity index 100% rename from conjure/cycles/testdata/no-cycles/illustration.png rename to cycles/testdata/no-cycles/illustration.png diff --git a/conjure/cycles/testdata/no-cycles/in.conjure.json b/cycles/testdata/no-cycles/in.conjure.json similarity index 100% rename from conjure/cycles/testdata/no-cycles/in.conjure.json rename to cycles/testdata/no-cycles/in.conjure.json diff --git a/conjure/cycles/testdata/no-cycles/out.conjure.json b/cycles/testdata/no-cycles/out.conjure.json similarity index 100% rename from conjure/cycles/testdata/no-cycles/out.conjure.json rename to cycles/testdata/no-cycles/out.conjure.json diff --git a/conjure/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/bar/aliases.conjure.go b/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/bar/aliases.conjure.go similarity index 100% rename from conjure/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/bar/aliases.conjure.go rename to cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/bar/aliases.conjure.go diff --git a/conjure/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/bar/structs.conjure.go b/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/bar/structs.conjure.go similarity index 74% rename from conjure/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/bar/structs.conjure.go rename to cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/bar/structs.conjure.go index 74e42527c..42d2cda6f 100644 --- a/conjure/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/bar/structs.conjure.go +++ b/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/bar/structs.conjure.go @@ -3,8 +3,8 @@ package bar import ( - "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/buzz" - "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/foo" + "github.com/palantir/conjure-go/v6/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/buzz" + "github.com/palantir/conjure-go/v6/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/foo" "github.com/palantir/pkg/safejson" "github.com/palantir/pkg/safeyaml" ) diff --git a/conjure/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/buzz/enums.conjure.go b/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/buzz/enums.conjure.go similarity index 100% rename from conjure/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/buzz/enums.conjure.go rename to cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/buzz/enums.conjure.go diff --git a/conjure/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/errors/errors.conjure.go b/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/errors/errors.conjure.go similarity index 98% rename from conjure/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/errors/errors.conjure.go rename to cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/errors/errors.conjure.go index 913b699f0..834bde3c4 100644 --- a/conjure/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/errors/errors.conjure.go +++ b/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/errors/errors.conjure.go @@ -8,7 +8,7 @@ import ( "reflect" "github.com/palantir/conjure-go-runtime/v2/conjure-go-contract/errors" - "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/bar" + "github.com/palantir/conjure-go/v6/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/bar" "github.com/palantir/pkg/safejson" "github.com/palantir/pkg/safeyaml" "github.com/palantir/pkg/uuid" diff --git a/conjure/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/fizz/aliases.conjure.go b/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/fizz/aliases.conjure.go similarity index 100% rename from conjure/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/fizz/aliases.conjure.go rename to cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/fizz/aliases.conjure.go diff --git a/conjure/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/foo/aliases.conjure.go b/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/foo/aliases.conjure.go similarity index 53% rename from conjure/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/foo/aliases.conjure.go rename to cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/foo/aliases.conjure.go index 2fcb81273..7a6db7305 100644 --- a/conjure/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/foo/aliases.conjure.go +++ b/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/foo/aliases.conjure.go @@ -3,7 +3,7 @@ package foo import ( - "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/fizz" + "github.com/palantir/conjure-go/v6/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/fizz" ) type Type2 map[fizz.Type1]int diff --git a/conjure/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/foo/structs.conjure.go b/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/foo/structs.conjure.go similarity index 90% rename from conjure/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/foo/structs.conjure.go rename to cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/foo/structs.conjure.go index 4aa5ecc35..b84510ba7 100644 --- a/conjure/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/foo/structs.conjure.go +++ b/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/foo/structs.conjure.go @@ -3,7 +3,7 @@ package foo import ( - "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/fizz" + "github.com/palantir/conjure-go/v6/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/fizz" "github.com/palantir/pkg/safejson" "github.com/palantir/pkg/safeyaml" ) diff --git a/conjure/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/foo1/structs.conjure.go b/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/foo1/structs.conjure.go similarity index 100% rename from conjure/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/foo1/structs.conjure.go rename to cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/foo1/structs.conjure.go diff --git a/conjure/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/foo1/unions.conjure.go b/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/foo1/unions.conjure.go similarity index 96% rename from conjure/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/foo1/unions.conjure.go rename to cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/foo1/unions.conjure.go index d1c21bf4d..efbf8ebcb 100644 --- a/conjure/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/foo1/unions.conjure.go +++ b/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/foo1/unions.conjure.go @@ -6,7 +6,7 @@ import ( "context" "fmt" - "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/bar" + "github.com/palantir/conjure-go/v6/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/bar" "github.com/palantir/pkg/safejson" "github.com/palantir/pkg/safeyaml" ) diff --git a/conjure/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/foo1/unions_generics.conjure.go b/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/foo1/unions_generics.conjure.go similarity index 86% rename from conjure/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/foo1/unions_generics.conjure.go rename to cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/foo1/unions_generics.conjure.go index 67c7dc55d..7b561d9a3 100644 --- a/conjure/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/foo1/unions_generics.conjure.go +++ b/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/foo1/unions_generics.conjure.go @@ -8,7 +8,7 @@ import ( "context" "fmt" - "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/bar" + "github.com/palantir/conjure-go/v6/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/bar" ) type Type3WithT[T any] Type3 diff --git a/conjure/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/services/services.conjure.go b/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/services/services.conjure.go similarity index 92% rename from conjure/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/services/services.conjure.go rename to cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/services/services.conjure.go index 9d2111db4..5f26ab37c 100644 --- a/conjure/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/services/services.conjure.go +++ b/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/services/services.conjure.go @@ -8,9 +8,9 @@ import ( "net/url" "github.com/palantir/conjure-go-runtime/v2/conjure-go-client/httpclient" - "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/buzz" - "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/foo" - "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/foo1" + "github.com/palantir/conjure-go/v6/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/buzz" + "github.com/palantir/conjure-go/v6/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/foo" + "github.com/palantir/conjure-go/v6/cycles/testdata/pkg-cycle-disconnected/conjure/com/palantir/foo1" "github.com/palantir/pkg/bearertoken" werror "github.com/palantir/witchcraft-go-error" ) diff --git a/conjure/cycles/testdata/pkg-cycle-disconnected/illustration.png b/cycles/testdata/pkg-cycle-disconnected/illustration.png similarity index 100% rename from conjure/cycles/testdata/pkg-cycle-disconnected/illustration.png rename to cycles/testdata/pkg-cycle-disconnected/illustration.png diff --git a/conjure/cycles/testdata/pkg-cycle-disconnected/in.conjure.json b/cycles/testdata/pkg-cycle-disconnected/in.conjure.json similarity index 100% rename from conjure/cycles/testdata/pkg-cycle-disconnected/in.conjure.json rename to cycles/testdata/pkg-cycle-disconnected/in.conjure.json diff --git a/conjure/cycles/testdata/pkg-cycle-disconnected/out.conjure.json b/cycles/testdata/pkg-cycle-disconnected/out.conjure.json similarity index 100% rename from conjure/cycles/testdata/pkg-cycle-disconnected/out.conjure.json rename to cycles/testdata/pkg-cycle-disconnected/out.conjure.json diff --git a/conjure/cycles/testdata/pkg-cycle/conjure/com/palantir/bar/aliases.conjure.go b/cycles/testdata/pkg-cycle/conjure/com/palantir/bar/aliases.conjure.go similarity index 100% rename from conjure/cycles/testdata/pkg-cycle/conjure/com/palantir/bar/aliases.conjure.go rename to cycles/testdata/pkg-cycle/conjure/com/palantir/bar/aliases.conjure.go diff --git a/conjure/cycles/testdata/pkg-cycle/conjure/com/palantir/bar/structs.conjure.go b/cycles/testdata/pkg-cycle/conjure/com/palantir/bar/structs.conjure.go similarity index 77% rename from conjure/cycles/testdata/pkg-cycle/conjure/com/palantir/bar/structs.conjure.go rename to cycles/testdata/pkg-cycle/conjure/com/palantir/bar/structs.conjure.go index 84a324003..098317bfb 100644 --- a/conjure/cycles/testdata/pkg-cycle/conjure/com/palantir/bar/structs.conjure.go +++ b/cycles/testdata/pkg-cycle/conjure/com/palantir/bar/structs.conjure.go @@ -3,8 +3,8 @@ package bar import ( - "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/pkg-cycle/conjure/com/palantir/buzz" - "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/pkg-cycle/conjure/com/palantir/foo" + "github.com/palantir/conjure-go/v6/cycles/testdata/pkg-cycle/conjure/com/palantir/buzz" + "github.com/palantir/conjure-go/v6/cycles/testdata/pkg-cycle/conjure/com/palantir/foo" "github.com/palantir/pkg/safejson" "github.com/palantir/pkg/safeyaml" ) diff --git a/conjure/cycles/testdata/pkg-cycle/conjure/com/palantir/buzz/enums.conjure.go b/cycles/testdata/pkg-cycle/conjure/com/palantir/buzz/enums.conjure.go similarity index 100% rename from conjure/cycles/testdata/pkg-cycle/conjure/com/palantir/buzz/enums.conjure.go rename to cycles/testdata/pkg-cycle/conjure/com/palantir/buzz/enums.conjure.go diff --git a/conjure/cycles/testdata/cycle-within-pkg/conjure/com/palantir/errors/errors.conjure.go b/cycles/testdata/pkg-cycle/conjure/com/palantir/errors/errors.conjure.go similarity index 98% rename from conjure/cycles/testdata/cycle-within-pkg/conjure/com/palantir/errors/errors.conjure.go rename to cycles/testdata/pkg-cycle/conjure/com/palantir/errors/errors.conjure.go index 90f0b67fb..27f4fadff 100644 --- a/conjure/cycles/testdata/cycle-within-pkg/conjure/com/palantir/errors/errors.conjure.go +++ b/cycles/testdata/pkg-cycle/conjure/com/palantir/errors/errors.conjure.go @@ -8,7 +8,7 @@ import ( "reflect" "github.com/palantir/conjure-go-runtime/v2/conjure-go-contract/errors" - "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/cycle-within-pkg/conjure/com/palantir/bar" + "github.com/palantir/conjure-go/v6/cycles/testdata/pkg-cycle/conjure/com/palantir/bar" "github.com/palantir/pkg/safejson" "github.com/palantir/pkg/safeyaml" "github.com/palantir/pkg/uuid" diff --git a/conjure/cycles/testdata/pkg-cycle/conjure/com/palantir/fizz/aliases.conjure.go b/cycles/testdata/pkg-cycle/conjure/com/palantir/fizz/aliases.conjure.go similarity index 100% rename from conjure/cycles/testdata/pkg-cycle/conjure/com/palantir/fizz/aliases.conjure.go rename to cycles/testdata/pkg-cycle/conjure/com/palantir/fizz/aliases.conjure.go diff --git a/conjure/cycles/testdata/no-cycles/conjure/com/palantir/foo/aliases.conjure.go b/cycles/testdata/pkg-cycle/conjure/com/palantir/foo/aliases.conjure.go similarity index 90% rename from conjure/cycles/testdata/no-cycles/conjure/com/palantir/foo/aliases.conjure.go rename to cycles/testdata/pkg-cycle/conjure/com/palantir/foo/aliases.conjure.go index ff09743a2..417cc5ed5 100644 --- a/conjure/cycles/testdata/no-cycles/conjure/com/palantir/foo/aliases.conjure.go +++ b/cycles/testdata/pkg-cycle/conjure/com/palantir/foo/aliases.conjure.go @@ -3,7 +3,7 @@ package foo import ( - "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/no-cycles/conjure/com/palantir/fizz" + "github.com/palantir/conjure-go/v6/cycles/testdata/pkg-cycle/conjure/com/palantir/fizz" "github.com/palantir/pkg/safejson" "github.com/palantir/pkg/safeyaml" ) diff --git a/conjure/cycles/testdata/pkg-cycle/conjure/com/palantir/foo/structs.conjure.go b/cycles/testdata/pkg-cycle/conjure/com/palantir/foo/structs.conjure.go similarity index 86% rename from conjure/cycles/testdata/pkg-cycle/conjure/com/palantir/foo/structs.conjure.go rename to cycles/testdata/pkg-cycle/conjure/com/palantir/foo/structs.conjure.go index 320977d82..dd9a8268b 100644 --- a/conjure/cycles/testdata/pkg-cycle/conjure/com/palantir/foo/structs.conjure.go +++ b/cycles/testdata/pkg-cycle/conjure/com/palantir/foo/structs.conjure.go @@ -3,7 +3,7 @@ package foo import ( - "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/pkg-cycle/conjure/com/palantir/buzz" + "github.com/palantir/conjure-go/v6/cycles/testdata/pkg-cycle/conjure/com/palantir/buzz" "github.com/palantir/pkg/safejson" "github.com/palantir/pkg/safeyaml" ) diff --git a/conjure/cycles/testdata/pkg-cycle/conjure/com/palantir/foo1/structs.conjure.go b/cycles/testdata/pkg-cycle/conjure/com/palantir/foo1/structs.conjure.go similarity index 85% rename from conjure/cycles/testdata/pkg-cycle/conjure/com/palantir/foo1/structs.conjure.go rename to cycles/testdata/pkg-cycle/conjure/com/palantir/foo1/structs.conjure.go index 5037fe778..7a3d8b514 100644 --- a/conjure/cycles/testdata/pkg-cycle/conjure/com/palantir/foo1/structs.conjure.go +++ b/cycles/testdata/pkg-cycle/conjure/com/palantir/foo1/structs.conjure.go @@ -3,8 +3,8 @@ package foo1 import ( - "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/pkg-cycle/conjure/com/palantir/fizz" - "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/pkg-cycle/conjure/com/palantir/foo" + "github.com/palantir/conjure-go/v6/cycles/testdata/pkg-cycle/conjure/com/palantir/fizz" + "github.com/palantir/conjure-go/v6/cycles/testdata/pkg-cycle/conjure/com/palantir/foo" "github.com/palantir/pkg/safejson" "github.com/palantir/pkg/safeyaml" ) diff --git a/conjure/cycles/testdata/pkg-cycle/conjure/com/palantir/foo1/unions.conjure.go b/cycles/testdata/pkg-cycle/conjure/com/palantir/foo1/unions.conjure.go similarity index 96% rename from conjure/cycles/testdata/pkg-cycle/conjure/com/palantir/foo1/unions.conjure.go rename to cycles/testdata/pkg-cycle/conjure/com/palantir/foo1/unions.conjure.go index b85af9de1..dd12f638f 100644 --- a/conjure/cycles/testdata/pkg-cycle/conjure/com/palantir/foo1/unions.conjure.go +++ b/cycles/testdata/pkg-cycle/conjure/com/palantir/foo1/unions.conjure.go @@ -6,8 +6,8 @@ import ( "context" "fmt" - "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/pkg-cycle/conjure/com/palantir/bar" - "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/pkg-cycle/conjure/com/palantir/foo" + "github.com/palantir/conjure-go/v6/cycles/testdata/pkg-cycle/conjure/com/palantir/bar" + "github.com/palantir/conjure-go/v6/cycles/testdata/pkg-cycle/conjure/com/palantir/foo" "github.com/palantir/pkg/safejson" "github.com/palantir/pkg/safeyaml" ) diff --git a/conjure/cycles/testdata/pkg-cycle/conjure/com/palantir/foo1/unions_generics.conjure.go b/cycles/testdata/pkg-cycle/conjure/com/palantir/foo1/unions_generics.conjure.go similarity index 85% rename from conjure/cycles/testdata/pkg-cycle/conjure/com/palantir/foo1/unions_generics.conjure.go rename to cycles/testdata/pkg-cycle/conjure/com/palantir/foo1/unions_generics.conjure.go index 548d07ada..ed77200f8 100644 --- a/conjure/cycles/testdata/pkg-cycle/conjure/com/palantir/foo1/unions_generics.conjure.go +++ b/cycles/testdata/pkg-cycle/conjure/com/palantir/foo1/unions_generics.conjure.go @@ -8,8 +8,8 @@ import ( "context" "fmt" - "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/pkg-cycle/conjure/com/palantir/bar" - "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/pkg-cycle/conjure/com/palantir/foo" + "github.com/palantir/conjure-go/v6/cycles/testdata/pkg-cycle/conjure/com/palantir/bar" + "github.com/palantir/conjure-go/v6/cycles/testdata/pkg-cycle/conjure/com/palantir/foo" ) type Type3WithT[T any] Type3 diff --git a/conjure/cycles/testdata/pkg-cycle/conjure/com/palantir/services/services.conjure.go b/cycles/testdata/pkg-cycle/conjure/com/palantir/services/services.conjure.go similarity index 93% rename from conjure/cycles/testdata/pkg-cycle/conjure/com/palantir/services/services.conjure.go rename to cycles/testdata/pkg-cycle/conjure/com/palantir/services/services.conjure.go index 695e63614..133796d44 100644 --- a/conjure/cycles/testdata/pkg-cycle/conjure/com/palantir/services/services.conjure.go +++ b/cycles/testdata/pkg-cycle/conjure/com/palantir/services/services.conjure.go @@ -8,9 +8,9 @@ import ( "net/url" "github.com/palantir/conjure-go-runtime/v2/conjure-go-client/httpclient" - "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/pkg-cycle/conjure/com/palantir/buzz" - "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/pkg-cycle/conjure/com/palantir/foo" - "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/pkg-cycle/conjure/com/palantir/foo1" + "github.com/palantir/conjure-go/v6/cycles/testdata/pkg-cycle/conjure/com/palantir/buzz" + "github.com/palantir/conjure-go/v6/cycles/testdata/pkg-cycle/conjure/com/palantir/foo" + "github.com/palantir/conjure-go/v6/cycles/testdata/pkg-cycle/conjure/com/palantir/foo1" "github.com/palantir/pkg/bearertoken" werror "github.com/palantir/witchcraft-go-error" ) diff --git a/conjure/cycles/testdata/pkg-cycle/illustration.png b/cycles/testdata/pkg-cycle/illustration.png similarity index 100% rename from conjure/cycles/testdata/pkg-cycle/illustration.png rename to cycles/testdata/pkg-cycle/illustration.png diff --git a/conjure/cycles/testdata/pkg-cycle/in.conjure.json b/cycles/testdata/pkg-cycle/in.conjure.json similarity index 100% rename from conjure/cycles/testdata/pkg-cycle/in.conjure.json rename to cycles/testdata/pkg-cycle/in.conjure.json diff --git a/conjure/cycles/testdata/pkg-cycle/out.conjure.json b/cycles/testdata/pkg-cycle/out.conjure.json similarity index 100% rename from conjure/cycles/testdata/pkg-cycle/out.conjure.json rename to cycles/testdata/pkg-cycle/out.conjure.json diff --git a/conjure/cycles/testdata/type-cycle/conjure/com/palantir/bar/aliases.conjure.go b/cycles/testdata/type-cycle/conjure/com/palantir/bar/aliases.conjure.go similarity index 100% rename from conjure/cycles/testdata/type-cycle/conjure/com/palantir/bar/aliases.conjure.go rename to cycles/testdata/type-cycle/conjure/com/palantir/bar/aliases.conjure.go diff --git a/conjure/cycles/testdata/type-cycle/conjure/com/palantir/bar_foo/aliases.conjure.go b/cycles/testdata/type-cycle/conjure/com/palantir/bar_foo/aliases.conjure.go similarity index 94% rename from conjure/cycles/testdata/type-cycle/conjure/com/palantir/bar_foo/aliases.conjure.go rename to cycles/testdata/type-cycle/conjure/com/palantir/bar_foo/aliases.conjure.go index f524cc143..a5dc08557 100644 --- a/conjure/cycles/testdata/type-cycle/conjure/com/palantir/bar_foo/aliases.conjure.go +++ b/cycles/testdata/type-cycle/conjure/com/palantir/bar_foo/aliases.conjure.go @@ -3,7 +3,7 @@ package barfoo import ( - "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/type-cycle/conjure/com/palantir/fizz" + "github.com/palantir/conjure-go/v6/cycles/testdata/type-cycle/conjure/com/palantir/fizz" "github.com/palantir/pkg/safejson" "github.com/palantir/pkg/safeyaml" ) diff --git a/conjure/cycles/testdata/type-cycle/conjure/com/palantir/bar_foo/structs.conjure.go b/cycles/testdata/type-cycle/conjure/com/palantir/bar_foo/structs.conjure.go similarity index 92% rename from conjure/cycles/testdata/type-cycle/conjure/com/palantir/bar_foo/structs.conjure.go rename to cycles/testdata/type-cycle/conjure/com/palantir/bar_foo/structs.conjure.go index b00054670..d79dfefe4 100644 --- a/conjure/cycles/testdata/type-cycle/conjure/com/palantir/bar_foo/structs.conjure.go +++ b/cycles/testdata/type-cycle/conjure/com/palantir/bar_foo/structs.conjure.go @@ -3,7 +3,7 @@ package barfoo import ( - "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/type-cycle/conjure/com/palantir/buzz" + "github.com/palantir/conjure-go/v6/cycles/testdata/type-cycle/conjure/com/palantir/buzz" "github.com/palantir/pkg/safejson" "github.com/palantir/pkg/safeyaml" ) diff --git a/conjure/cycles/testdata/type-cycle/conjure/com/palantir/bar_foo/unions.conjure.go b/cycles/testdata/type-cycle/conjure/com/palantir/bar_foo/unions.conjure.go similarity index 100% rename from conjure/cycles/testdata/type-cycle/conjure/com/palantir/bar_foo/unions.conjure.go rename to cycles/testdata/type-cycle/conjure/com/palantir/bar_foo/unions.conjure.go diff --git a/conjure/cycles/testdata/type-cycle/conjure/com/palantir/bar_foo/unions_generics.conjure.go b/cycles/testdata/type-cycle/conjure/com/palantir/bar_foo/unions_generics.conjure.go similarity index 100% rename from conjure/cycles/testdata/type-cycle/conjure/com/palantir/bar_foo/unions_generics.conjure.go rename to cycles/testdata/type-cycle/conjure/com/palantir/bar_foo/unions_generics.conjure.go diff --git a/conjure/cycles/testdata/type-cycle/conjure/com/palantir/buzz/enums.conjure.go b/cycles/testdata/type-cycle/conjure/com/palantir/buzz/enums.conjure.go similarity index 100% rename from conjure/cycles/testdata/type-cycle/conjure/com/palantir/buzz/enums.conjure.go rename to cycles/testdata/type-cycle/conjure/com/palantir/buzz/enums.conjure.go diff --git a/conjure/cycles/testdata/type-cycle/conjure/com/palantir/errors/errors.conjure.go b/cycles/testdata/type-cycle/conjure/com/palantir/errors/errors.conjure.go similarity index 96% rename from conjure/cycles/testdata/type-cycle/conjure/com/palantir/errors/errors.conjure.go rename to cycles/testdata/type-cycle/conjure/com/palantir/errors/errors.conjure.go index a43986de5..e6392b47a 100644 --- a/conjure/cycles/testdata/type-cycle/conjure/com/palantir/errors/errors.conjure.go +++ b/cycles/testdata/type-cycle/conjure/com/palantir/errors/errors.conjure.go @@ -8,8 +8,8 @@ import ( "reflect" "github.com/palantir/conjure-go-runtime/v2/conjure-go-contract/errors" - "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/type-cycle/conjure/com/palantir/bar" - barfoo "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/type-cycle/conjure/com/palantir/bar_foo" + "github.com/palantir/conjure-go/v6/cycles/testdata/type-cycle/conjure/com/palantir/bar" + barfoo "github.com/palantir/conjure-go/v6/cycles/testdata/type-cycle/conjure/com/palantir/bar_foo" "github.com/palantir/pkg/safejson" "github.com/palantir/pkg/safeyaml" "github.com/palantir/pkg/uuid" diff --git a/conjure/cycles/testdata/type-cycle/conjure/com/palantir/fizz/aliases.conjure.go b/cycles/testdata/type-cycle/conjure/com/palantir/fizz/aliases.conjure.go similarity index 100% rename from conjure/cycles/testdata/type-cycle/conjure/com/palantir/fizz/aliases.conjure.go rename to cycles/testdata/type-cycle/conjure/com/palantir/fizz/aliases.conjure.go diff --git a/conjure/cycles/testdata/type-cycle/conjure/com/palantir/foo/structs.conjure.go b/cycles/testdata/type-cycle/conjure/com/palantir/foo/structs.conjure.go similarity index 84% rename from conjure/cycles/testdata/type-cycle/conjure/com/palantir/foo/structs.conjure.go rename to cycles/testdata/type-cycle/conjure/com/palantir/foo/structs.conjure.go index 11247d736..dca5262f8 100644 --- a/conjure/cycles/testdata/type-cycle/conjure/com/palantir/foo/structs.conjure.go +++ b/cycles/testdata/type-cycle/conjure/com/palantir/foo/structs.conjure.go @@ -3,8 +3,8 @@ package foo import ( - barfoo "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/type-cycle/conjure/com/palantir/bar_foo" - "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/type-cycle/conjure/com/palantir/fizz" + barfoo "github.com/palantir/conjure-go/v6/cycles/testdata/type-cycle/conjure/com/palantir/bar_foo" + "github.com/palantir/conjure-go/v6/cycles/testdata/type-cycle/conjure/com/palantir/fizz" "github.com/palantir/pkg/safejson" "github.com/palantir/pkg/safeyaml" ) diff --git a/conjure/cycles/testdata/type-cycle/conjure/com/palantir/services/services.conjure.go b/cycles/testdata/type-cycle/conjure/com/palantir/services/services.conjure.go similarity index 93% rename from conjure/cycles/testdata/type-cycle/conjure/com/palantir/services/services.conjure.go rename to cycles/testdata/type-cycle/conjure/com/palantir/services/services.conjure.go index f37ae793f..b2be7246a 100644 --- a/conjure/cycles/testdata/type-cycle/conjure/com/palantir/services/services.conjure.go +++ b/cycles/testdata/type-cycle/conjure/com/palantir/services/services.conjure.go @@ -8,9 +8,9 @@ import ( "net/url" "github.com/palantir/conjure-go-runtime/v2/conjure-go-client/httpclient" - barfoo "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/type-cycle/conjure/com/palantir/bar_foo" - "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/type-cycle/conjure/com/palantir/buzz" - "github.com/palantir/conjure-go/v6/conjure/cycles/testdata/type-cycle/conjure/com/palantir/foo" + barfoo "github.com/palantir/conjure-go/v6/cycles/testdata/type-cycle/conjure/com/palantir/bar_foo" + "github.com/palantir/conjure-go/v6/cycles/testdata/type-cycle/conjure/com/palantir/buzz" + "github.com/palantir/conjure-go/v6/cycles/testdata/type-cycle/conjure/com/palantir/foo" "github.com/palantir/pkg/bearertoken" werror "github.com/palantir/witchcraft-go-error" ) diff --git a/conjure/cycles/testdata/type-cycle/illustration.png b/cycles/testdata/type-cycle/illustration.png similarity index 100% rename from conjure/cycles/testdata/type-cycle/illustration.png rename to cycles/testdata/type-cycle/illustration.png diff --git a/conjure/cycles/testdata/type-cycle/in.conjure.json b/cycles/testdata/type-cycle/in.conjure.json similarity index 100% rename from conjure/cycles/testdata/type-cycle/in.conjure.json rename to cycles/testdata/type-cycle/in.conjure.json diff --git a/conjure/cycles/testdata/type-cycle/out.conjure.json b/cycles/testdata/type-cycle/out.conjure.json similarity index 100% rename from conjure/cycles/testdata/type-cycle/out.conjure.json rename to cycles/testdata/type-cycle/out.conjure.json diff --git a/conjure/cycles/type_graph.go b/cycles/type_graph.go similarity index 100% rename from conjure/cycles/type_graph.go rename to cycles/type_graph.go diff --git a/conjure/cycles/type_graph_test.go b/cycles/type_graph_test.go similarity index 100% rename from conjure/cycles/type_graph_test.go rename to cycles/type_graph_test.go diff --git a/godel/config/generate-plugin.yml b/godel/config/generate-plugin.yml index b8a12e547..31b233ad5 100644 --- a/godel/config/generate-plugin.yml +++ b/godel/config/generate-plugin.yml @@ -10,10 +10,10 @@ generators: paths: - conjure-api conjure-graph-testdata: - go-generate-dir: conjure/cycles/testdata + go-generate-dir: cycles/testdata gen-paths: paths: - - conjure/cycles/testdata + - cycles/testdata conjure-verifier: go-generate-dir: conjure-go-verifier gen-paths: diff --git a/godel/config/godel.yml b/godel/config/godel.yml index af5116498..52598075b 100644 --- a/godel/config/godel.yml +++ b/godel/config/godel.yml @@ -19,21 +19,4 @@ exclude: names: - "\\..+" - "vendor" - paths: - - "godel" - - "conjure/cycles/testdata/no-cycles/conjure" - - "conjure/cycles/testdata/cycle-within-pkg/conjure" - - "conjure/cycles/testdata/pkg-cycle/conjure" - - "conjure/cycles/testdata/pkg-cycle-disconnected/conjure" - - "conjure/cycles/testdata/type-cycle/conjure" - - "conjure-api/conjure" - - "conjure-go-verifier/conjure" - - "integration_test/testgenerated/auth/api" - - "integration_test/testgenerated/binary/api" - - "integration_test/testgenerated/cli/api" - - "integration_test/testgenerated/client/api" - - "integration_test/testgenerated/errors/api" - - "integration_test/testgenerated/post/api" - - "integration_test/testgenerated/objects/api" - - "integration_test/testgenerated/server/api" - - "integration_test/testgenerated/queryparam/api" + - ".*\\.conjure\\.go$"