Move cycles package to root level (#567)

palantir · Mar 25, 2024 · 57ff987 · 57ff987
1 parent bd4e119
commit 57ff987
Show file tree

Hide file tree

Showing 87 changed files with 57 additions and 71 deletions.
diff --git a/.gitattributes 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
@@ -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 → cycles/README.md b/conjure/cycles/README.md → cycles/README.md
diff --git a/conjure/cycles/bitset.go → cycles/bitset.go b/conjure/cycles/bitset.go → cycles/bitset.go
diff --git a/conjure/cycles/bitset_test.go → cycles/bitset_test.go b/conjure/cycles/bitset_test.go → cycles/bitset_test.go
diff --git a/conjure/cycles/graph.go → cycles/graph.go b/conjure/cycles/graph.go → cycles/graph.go
diff --git a/conjure/cycles/graph_test.go → cycles/graph_test.go b/conjure/cycles/graph_test.go → cycles/graph_test.go
diff --git a/conjure/cycles/images/disallowed.png → cycles/images/disallowed.png b/conjure/cycles/images/disallowed.png → cycles/images/disallowed.png
diff --git a/conjure/cycles/images/sccs.png → cycles/images/sccs.png b/conjure/cycles/images/sccs.png → cycles/images/sccs.png
diff --git a/conjure/cycles/kosaraju.go → cycles/kosaraju.go b/conjure/cycles/kosaraju.go → cycles/kosaraju.go
diff --git a/conjure/cycles/kosaraju_test.go → cycles/kosaraju_test.go b/conjure/cycles/kosaraju_test.go → cycles/kosaraju_test.go
diff --git a/conjure/cycles/package.go → cycles/package.go b/conjure/cycles/package.go → cycles/package.go
diff --git a/conjure/cycles/package_test.go → cycles/package_test.go b/conjure/cycles/package_test.go → cycles/package_test.go
diff --git a/conjure/cycles/partition.go → cycles/partition.go b/conjure/cycles/partition.go → cycles/partition.go
diff --git a/conjure/cycles/partition_test.go → cycles/partition_test.go b/conjure/cycles/partition_test.go → cycles/partition_test.go
diff --git a/...njure/com/palantir/bar/aliases.conjure.go → ...njure/com/palantir/bar/aliases.conjure.go b/...njure/com/palantir/bar/aliases.conjure.go → ...njure/com/palantir/bar/aliases.conjure.go
diff --git a/...njure/com/palantir/bar/structs.conjure.go → ...njure/com/palantir/bar/structs.conjure.go b/...njure/com/palantir/bar/structs.conjure.go → ...njure/com/palantir/bar/structs.conjure.go
diff --git a/...onjure/com/palantir/buzz/enums.conjure.go → ...onjure/com/palantir/buzz/enums.conjure.go b/...onjure/com/palantir/buzz/enums.conjure.go → ...onjure/com/palantir/buzz/enums.conjure.go
diff --git a/...ure/com/palantir/errors/errors.conjure.go → ...ure/com/palantir/errors/errors.conjure.go b/...ure/com/palantir/errors/errors.conjure.go → ...ure/com/palantir/errors/errors.conjure.go
diff --git a/...jure/com/palantir/fizz/aliases.conjure.go → ...jure/com/palantir/fizz/aliases.conjure.go b/...jure/com/palantir/fizz/aliases.conjure.go → ...jure/com/palantir/fizz/aliases.conjure.go
diff --git a/...njure/com/palantir/foo/aliases.conjure.go → ...njure/com/palantir/foo/aliases.conjure.go b/...njure/com/palantir/foo/aliases.conjure.go → ...njure/com/palantir/foo/aliases.conjure.go
diff --git a/...njure/com/palantir/foo/structs.conjure.go → ...njure/com/palantir/foo/structs.conjure.go b/...njure/com/palantir/foo/structs.conjure.go → ...njure/com/palantir/foo/structs.conjure.go
diff --git a/...onjure/com/palantir/foo/unions.conjure.go → ...onjure/com/palantir/foo/unions.conjure.go b/...onjure/com/palantir/foo/unions.conjure.go → ...onjure/com/palantir/foo/unions.conjure.go
diff --git a/...m/palantir/foo/unions_generics.conjure.go → ...m/palantir/foo/unions_generics.conjure.go b/...m/palantir/foo/unions_generics.conjure.go → ...m/palantir/foo/unions_generics.conjure.go
diff --git a/...com/palantir/services/services.conjure.go → ...com/palantir/services/services.conjure.go b/...com/palantir/services/services.conjure.go → ...com/palantir/services/services.conjure.go
diff --git a/...estdata/cycle-within-pkg/illustration.png → ...estdata/cycle-within-pkg/illustration.png b/...estdata/cycle-within-pkg/illustration.png → ...estdata/cycle-within-pkg/illustration.png
diff --git a/...testdata/cycle-within-pkg/in.conjure.json → ...testdata/cycle-within-pkg/in.conjure.json b/...testdata/cycle-within-pkg/in.conjure.json → ...testdata/cycle-within-pkg/in.conjure.json
diff --git a/...estdata/cycle-within-pkg/out.conjure.json → ...estdata/cycle-within-pkg/out.conjure.json b/...estdata/cycle-within-pkg/out.conjure.json → ...estdata/cycle-within-pkg/out.conjure.json
diff --git a/conjure/cycles/testdata/generate.go → cycles/testdata/generate.go b/conjure/cycles/testdata/generate.go → cycles/testdata/generate.go
diff --git a/...njure/com/palantir/bar/aliases.conjure.go → ...njure/com/palantir/bar/aliases.conjure.go b/...njure/com/palantir/bar/aliases.conjure.go → ...njure/com/palantir/bar/aliases.conjure.go
diff --git a/...njure/com/palantir/bar/structs.conjure.go → ...njure/com/palantir/bar/structs.conjure.go b/...njure/com/palantir/bar/structs.conjure.go → ...njure/com/palantir/bar/structs.conjure.go
diff --git a/...onjure/com/palantir/buzz/enums.conjure.go → ...onjure/com/palantir/buzz/enums.conjure.go b/...onjure/com/palantir/buzz/enums.conjure.go → ...onjure/com/palantir/buzz/enums.conjure.go
diff --git a/...ure/com/palantir/errors/errors.conjure.go → ...ure/com/palantir/errors/errors.conjure.go b/...ure/com/palantir/errors/errors.conjure.go → ...ure/com/palantir/errors/errors.conjure.go
diff --git a/...jure/com/palantir/fizz/aliases.conjure.go → ...jure/com/palantir/fizz/aliases.conjure.go b/...jure/com/palantir/fizz/aliases.conjure.go → ...jure/com/palantir/fizz/aliases.conjure.go
diff --git a/...njure/com/palantir/foo/aliases.conjure.go → ...njure/com/palantir/foo/aliases.conjure.go b/...njure/com/palantir/foo/aliases.conjure.go → ...njure/com/palantir/foo/aliases.conjure.go
diff --git a/...njure/com/palantir/foo/structs.conjure.go → ...njure/com/palantir/foo/structs.conjure.go b/...njure/com/palantir/foo/structs.conjure.go → ...njure/com/palantir/foo/structs.conjure.go
diff --git a/...onjure/com/palantir/foo/unions.conjure.go → ...onjure/com/palantir/foo/unions.conjure.go b/...onjure/com/palantir/foo/unions.conjure.go → ...onjure/com/palantir/foo/unions.conjure.go
diff --git a/...m/palantir/foo/unions_generics.conjure.go → ...m/palantir/foo/unions_generics.conjure.go b/...m/palantir/foo/unions_generics.conjure.go → ...m/palantir/foo/unions_generics.conjure.go
diff --git a/...com/palantir/services/services.conjure.go → ...com/palantir/services/services.conjure.go b/...com/palantir/services/services.conjure.go → ...com/palantir/services/services.conjure.go
diff --git a/...ycles/testdata/no-cycles/illustration.png → cycles/testdata/no-cycles/illustration.png b/...ycles/testdata/no-cycles/illustration.png → cycles/testdata/no-cycles/illustration.png
diff --git a/...cycles/testdata/no-cycles/in.conjure.json → cycles/testdata/no-cycles/in.conjure.json b/...cycles/testdata/no-cycles/in.conjure.json → cycles/testdata/no-cycles/in.conjure.json
diff --git a/...ycles/testdata/no-cycles/out.conjure.json → cycles/testdata/no-cycles/out.conjure.json b/...ycles/testdata/no-cycles/out.conjure.json → cycles/testdata/no-cycles/out.conjure.json
diff --git a/...njure/com/palantir/bar/aliases.conjure.go → ...njure/com/palantir/bar/aliases.conjure.go b/...njure/com/palantir/bar/aliases.conjure.go → ...njure/com/palantir/bar/aliases.conjure.go
diff --git a/...njure/com/palantir/bar/structs.conjure.go → ...njure/com/palantir/bar/structs.conjure.go b/...njure/com/palantir/bar/structs.conjure.go → ...njure/com/palantir/bar/structs.conjure.go
diff --git a/...onjure/com/palantir/buzz/enums.conjure.go → ...onjure/com/palantir/buzz/enums.conjure.go b/...onjure/com/palantir/buzz/enums.conjure.go → ...onjure/com/palantir/buzz/enums.conjure.go
diff --git a/...ure/com/palantir/errors/errors.conjure.go → ...ure/com/palantir/errors/errors.conjure.go b/...ure/com/palantir/errors/errors.conjure.go → ...ure/com/palantir/errors/errors.conjure.go
diff --git a/...jure/com/palantir/fizz/aliases.conjure.go → ...jure/com/palantir/fizz/aliases.conjure.go b/...jure/com/palantir/fizz/aliases.conjure.go → ...jure/com/palantir/fizz/aliases.conjure.go
diff --git a/...njure/com/palantir/foo/aliases.conjure.go → ...njure/com/palantir/foo/aliases.conjure.go b/...njure/com/palantir/foo/aliases.conjure.go → ...njure/com/palantir/foo/aliases.conjure.go
diff --git a/...njure/com/palantir/foo/structs.conjure.go → ...njure/com/palantir/foo/structs.conjure.go b/...njure/com/palantir/foo/structs.conjure.go → ...njure/com/palantir/foo/structs.conjure.go
diff --git a/...jure/com/palantir/foo1/structs.conjure.go → ...jure/com/palantir/foo1/structs.conjure.go b/...jure/com/palantir/foo1/structs.conjure.go → ...jure/com/palantir/foo1/structs.conjure.go
diff --git a/...njure/com/palantir/foo1/unions.conjure.go → ...njure/com/palantir/foo1/unions.conjure.go b/...njure/com/palantir/foo1/unions.conjure.go → ...njure/com/palantir/foo1/unions.conjure.go
diff --git a/.../palantir/foo1/unions_generics.conjure.go → .../palantir/foo1/unions_generics.conjure.go b/.../palantir/foo1/unions_generics.conjure.go → .../palantir/foo1/unions_generics.conjure.go
diff --git a/...com/palantir/services/services.conjure.go → ...com/palantir/services/services.conjure.go b/...com/palantir/services/services.conjure.go → ...com/palantir/services/services.conjure.go
diff --git a/...a/pkg-cycle-disconnected/illustration.png → ...a/pkg-cycle-disconnected/illustration.png b/...a/pkg-cycle-disconnected/illustration.png → ...a/pkg-cycle-disconnected/illustration.png
diff --git a/...ta/pkg-cycle-disconnected/in.conjure.json → ...ta/pkg-cycle-disconnected/in.conjure.json b/...ta/pkg-cycle-disconnected/in.conjure.json → ...ta/pkg-cycle-disconnected/in.conjure.json
diff --git a/...a/pkg-cycle-disconnected/out.conjure.json → ...a/pkg-cycle-disconnected/out.conjure.json b/...a/pkg-cycle-disconnected/out.conjure.json → ...a/pkg-cycle-disconnected/out.conjure.json
diff --git a/...njure/com/palantir/bar/aliases.conjure.go → ...njure/com/palantir/bar/aliases.conjure.go b/...njure/com/palantir/bar/aliases.conjure.go → ...njure/com/palantir/bar/aliases.conjure.go
diff --git a/...njure/com/palantir/bar/structs.conjure.go → ...njure/com/palantir/bar/structs.conjure.go b/...njure/com/palantir/bar/structs.conjure.go → ...njure/com/palantir/bar/structs.conjure.go
diff --git a/...onjure/com/palantir/buzz/enums.conjure.go → ...onjure/com/palantir/buzz/enums.conjure.go b/...onjure/com/palantir/buzz/enums.conjure.go → ...onjure/com/palantir/buzz/enums.conjure.go
diff --git a/...ure/com/palantir/errors/errors.conjure.go → ...ure/com/palantir/errors/errors.conjure.go b/...ure/com/palantir/errors/errors.conjure.go → ...ure/com/palantir/errors/errors.conjure.go
diff --git a/...jure/com/palantir/fizz/aliases.conjure.go → ...jure/com/palantir/fizz/aliases.conjure.go b/...jure/com/palantir/fizz/aliases.conjure.go → ...jure/com/palantir/fizz/aliases.conjure.go
diff --git a/...njure/com/palantir/foo/aliases.conjure.go → ...njure/com/palantir/foo/aliases.conjure.go b/...njure/com/palantir/foo/aliases.conjure.go → ...njure/com/palantir/foo/aliases.conjure.go
diff --git a/...njure/com/palantir/foo/structs.conjure.go → ...njure/com/palantir/foo/structs.conjure.go b/...njure/com/palantir/foo/structs.conjure.go → ...njure/com/palantir/foo/structs.conjure.go
diff --git a/...jure/com/palantir/foo1/structs.conjure.go → ...jure/com/palantir/foo1/structs.conjure.go b/...jure/com/palantir/foo1/structs.conjure.go → ...jure/com/palantir/foo1/structs.conjure.go
diff --git a/...njure/com/palantir/foo1/unions.conjure.go → ...njure/com/palantir/foo1/unions.conjure.go b/...njure/com/palantir/foo1/unions.conjure.go → ...njure/com/palantir/foo1/unions.conjure.go
diff --git a/.../palantir/foo1/unions_generics.conjure.go → .../palantir/foo1/unions_generics.conjure.go b/.../palantir/foo1/unions_generics.conjure.go → .../palantir/foo1/unions_generics.conjure.go
diff --git a/...com/palantir/services/services.conjure.go → ...com/palantir/services/services.conjure.go b/...com/palantir/services/services.conjure.go → ...com/palantir/services/services.conjure.go
diff --git a/...ycles/testdata/pkg-cycle/illustration.png → cycles/testdata/pkg-cycle/illustration.png b/...ycles/testdata/pkg-cycle/illustration.png → cycles/testdata/pkg-cycle/illustration.png
diff --git a/...cycles/testdata/pkg-cycle/in.conjure.json → cycles/testdata/pkg-cycle/in.conjure.json b/...cycles/testdata/pkg-cycle/in.conjure.json → cycles/testdata/pkg-cycle/in.conjure.json
diff --git a/...ycles/testdata/pkg-cycle/out.conjure.json → cycles/testdata/pkg-cycle/out.conjure.json b/...ycles/testdata/pkg-cycle/out.conjure.json → cycles/testdata/pkg-cycle/out.conjure.json
diff --git a/...njure/com/palantir/bar/aliases.conjure.go → ...njure/com/palantir/bar/aliases.conjure.go b/...njure/com/palantir/bar/aliases.conjure.go → ...njure/com/palantir/bar/aliases.conjure.go
diff --git a/...e/com/palantir/bar_foo/aliases.conjure.go → ...e/com/palantir/bar_foo/aliases.conjure.go b/...e/com/palantir/bar_foo/aliases.conjure.go → ...e/com/palantir/bar_foo/aliases.conjure.go
diff --git a/...e/com/palantir/bar_foo/structs.conjure.go → ...e/com/palantir/bar_foo/structs.conjure.go b/...e/com/palantir/bar_foo/structs.conjure.go → ...e/com/palantir/bar_foo/structs.conjure.go
diff --git a/...re/com/palantir/bar_foo/unions.conjure.go → ...re/com/palantir/bar_foo/unions.conjure.go b/...re/com/palantir/bar_foo/unions.conjure.go → ...re/com/palantir/bar_foo/unions.conjure.go
diff --git a/...lantir/bar_foo/unions_generics.conjure.go → ...lantir/bar_foo/unions_generics.conjure.go b/...lantir/bar_foo/unions_generics.conjure.go → ...lantir/bar_foo/unions_generics.conjure.go
diff --git a/...onjure/com/palantir/buzz/enums.conjure.go → ...onjure/com/palantir/buzz/enums.conjure.go b/...onjure/com/palantir/buzz/enums.conjure.go → ...onjure/com/palantir/buzz/enums.conjure.go
diff --git a/...ure/com/palantir/errors/errors.conjure.go → ...ure/com/palantir/errors/errors.conjure.go b/...ure/com/palantir/errors/errors.conjure.go → ...ure/com/palantir/errors/errors.conjure.go
diff --git a/...jure/com/palantir/fizz/aliases.conjure.go → ...jure/com/palantir/fizz/aliases.conjure.go b/...jure/com/palantir/fizz/aliases.conjure.go → ...jure/com/palantir/fizz/aliases.conjure.go
diff --git a/...njure/com/palantir/foo/structs.conjure.go → ...njure/com/palantir/foo/structs.conjure.go b/...njure/com/palantir/foo/structs.conjure.go → ...njure/com/palantir/foo/structs.conjure.go
diff --git a/...com/palantir/services/services.conjure.go → ...com/palantir/services/services.conjure.go b/...com/palantir/services/services.conjure.go → ...com/palantir/services/services.conjure.go
diff --git a/...cles/testdata/type-cycle/illustration.png → cycles/testdata/type-cycle/illustration.png b/...cles/testdata/type-cycle/illustration.png → cycles/testdata/type-cycle/illustration.png
diff --git a/...ycles/testdata/type-cycle/in.conjure.json → cycles/testdata/type-cycle/in.conjure.json b/...ycles/testdata/type-cycle/in.conjure.json → cycles/testdata/type-cycle/in.conjure.json
diff --git a/...cles/testdata/type-cycle/out.conjure.json → cycles/testdata/type-cycle/out.conjure.json b/...cles/testdata/type-cycle/out.conjure.json → cycles/testdata/type-cycle/out.conjure.json
diff --git a/conjure/cycles/type_graph.go → cycles/type_graph.go b/conjure/cycles/type_graph.go → cycles/type_graph.go
diff --git a/conjure/cycles/type_graph_test.go → cycles/type_graph_test.go b/conjure/cycles/type_graph_test.go → cycles/type_graph_test.go
diff --git 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
@@ -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$"