Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(feature): Add support for .proto inputs #4223

Merged
merged 19 commits into from
Aug 8, 2024
Merged
Show file tree
Hide file tree
Changes from 15 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9 changes: 9 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,15 @@ jobs:
- name: Install
run: yarn install

- uses: bufbuild/[email protected]

- uses: actions/setup-go@v5
with:
go-version: 'stable'

- name: Install protoc-gen-openapi
run: go install github.com/google/gnostic/cmd/[email protected]

- name: Run tests
run: yarn test --maxWorkers 15 --ci --silent

Expand Down
153 changes: 153 additions & 0 deletions .github/workflows/seed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,15 @@ jobs:
- name: Yarn Install
run: yarn install

- uses: bufbuild/[email protected]

- uses: actions/setup-go@v5
with:
go-version: 'stable'

- name: Install protoc-gen-openapi
run: go install github.com/google/gnostic/cmd/[email protected]

- name: Seed Test
env:
FORCE_COLOR: "2"
Expand All @@ -114,6 +123,15 @@ jobs:
- name: Yarn Install
run: yarn install

- uses: bufbuild/[email protected]

- uses: actions/setup-go@v5
with:
go-version: 'stable'

- name: Install protoc-gen-openapi
run: go install github.com/google/gnostic/cmd/[email protected]

- name: Seed Test
env:
FORCE_COLOR: "2"
Expand All @@ -139,6 +157,15 @@ jobs:
- name: Yarn Install
run: yarn install

- uses: bufbuild/[email protected]

- uses: actions/setup-go@v5
with:
go-version: 'stable'

- name: Install protoc-gen-openapi
run: go install github.com/google/gnostic/cmd/[email protected]

- name: Install Poetry
uses: snok/install-poetry@v1

Expand Down Expand Up @@ -171,6 +198,15 @@ jobs:
- name: Yarn Install
run: yarn install

- uses: bufbuild/[email protected]

- uses: actions/setup-go@v5
with:
go-version: 'stable'

- name: Install protoc-gen-openapi
run: go install github.com/google/gnostic/cmd/[email protected]

- name: Install Poetry
uses: snok/install-poetry@v1

Expand Down Expand Up @@ -203,6 +239,15 @@ jobs:
- name: Yarn Install
run: yarn install

- uses: bufbuild/[email protected]

- uses: actions/setup-go@v5
with:
go-version: 'stable'

- name: Install protoc-gen-openapi
run: go install github.com/google/gnostic/cmd/[email protected]

- name: Install Poetry
uses: snok/install-poetry@v1

Expand Down Expand Up @@ -235,6 +280,15 @@ jobs:
- name: Yarn Install
run: yarn install

- uses: bufbuild/[email protected]

- uses: actions/setup-go@v5
with:
go-version: 'stable'

- name: Install protoc-gen-openapi
run: go install github.com/google/gnostic/cmd/[email protected]

- name: Seed Test
env:
FORCE_COLOR: "2"
Expand All @@ -260,6 +314,15 @@ jobs:
- name: Yarn Install
run: yarn install

- uses: bufbuild/[email protected]

- uses: actions/setup-go@v5
with:
go-version: 'stable'

- name: Install protoc-gen-openapi
run: go install github.com/google/gnostic/cmd/[email protected]

- name: Seed Test
env:
FORCE_COLOR: "2"
Expand All @@ -285,6 +348,15 @@ jobs:
- name: Yarn Install
run: yarn install

- uses: bufbuild/[email protected]

- uses: actions/setup-go@v5
with:
go-version: 'stable'

- name: Install protoc-gen-openapi
run: go install github.com/google/gnostic/cmd/[email protected]

- name: Seed Test
env:
FORCE_COLOR: "2"
Expand All @@ -310,6 +382,15 @@ jobs:
- name: Yarn Install
run: yarn install

- uses: bufbuild/[email protected]

- uses: actions/setup-go@v5
with:
go-version: 'stable'

- name: Install protoc-gen-openapi
run: go install github.com/google/gnostic/cmd/[email protected]

- name: Seed Test
env:
FORCE_COLOR: "2"
Expand All @@ -335,6 +416,15 @@ jobs:
- name: Yarn Install
run: yarn install

- uses: bufbuild/[email protected]

- uses: actions/setup-go@v5
with:
go-version: 'stable'

- name: Install protoc-gen-openapi
run: go install github.com/google/gnostic/cmd/[email protected]

- name: Seed Test
env:
FORCE_COLOR: "2"
Expand All @@ -360,6 +450,15 @@ jobs:
- name: Yarn Install
run: yarn install

- uses: bufbuild/[email protected]

- uses: actions/setup-go@v5
with:
go-version: 'stable'

- name: Install protoc-gen-openapi
run: go install github.com/google/gnostic/cmd/[email protected]

- name: Seed Test
env:
FORCE_COLOR: "2"
Expand All @@ -385,6 +484,15 @@ jobs:
- name: Yarn Install
run: yarn install

- uses: bufbuild/[email protected]

- uses: actions/setup-go@v5
with:
go-version: 'stable'

- name: Install protoc-gen-openapi
run: go install github.com/google/gnostic/cmd/[email protected]

- name: Seed Test
env:
FORCE_COLOR: "2"
Expand All @@ -410,6 +518,15 @@ jobs:
- name: Yarn Install
run: yarn install

- uses: bufbuild/[email protected]

- uses: actions/setup-go@v5
with:
go-version: 'stable'

- name: Install protoc-gen-openapi
run: go install github.com/google/gnostic/cmd/[email protected]

- name: Seed Test
env:
FORCE_COLOR: "2"
Expand All @@ -435,6 +552,15 @@ jobs:
- name: Yarn Install
run: yarn install

- uses: bufbuild/[email protected]

- uses: actions/setup-go@v5
with:
go-version: 'stable'

- name: Install protoc-gen-openapi
run: go install github.com/google/gnostic/cmd/[email protected]

- name: Seed Test
env:
FORCE_COLOR: "2"
Expand All @@ -460,6 +586,15 @@ jobs:
- name: Yarn Install
run: yarn install

- uses: bufbuild/[email protected]

- uses: actions/setup-go@v5
with:
go-version: 'stable'

- name: Install protoc-gen-openapi
run: go install github.com/google/gnostic/cmd/[email protected]

- name: Seed Test
env:
FORCE_COLOR: "2"
Expand All @@ -485,6 +620,15 @@ jobs:
- name: Yarn Install
run: yarn install

- uses: bufbuild/[email protected]

- uses: actions/setup-go@v5
with:
go-version: 'stable'

- name: Install protoc-gen-openapi
run: go install github.com/google/gnostic/cmd/[email protected]

- name: Seed Test
env:
FORCE_COLOR: "2"
Expand All @@ -510,6 +654,15 @@ jobs:
- name: Yarn Install
run: yarn install

- uses: bufbuild/[email protected]

- uses: actions/setup-go@v5
with:
go-version: 'stable'

- name: Install protoc-gen-openapi
run: go install github.com/google/gnostic/cmd/[email protected]

- name: Seed Test
env:
FORCE_COLOR: "2"
Expand Down
24 changes: 24 additions & 0 deletions .github/workflows/setup-seed.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Setup Seed

on: workflow_call

jobs:
setup:
runs-on: ubuntu-latest
steps:
- uses: actions/setup-node@v3
with:
node-version: 18
cache: "yarn"

- name: Yarn Install
run: yarn install

- uses: bufbuild/[email protected]

- uses: actions/setup-go@v5
with:
go-version: 'stable'

- name: Install protoc-gen-openapi
run: go install github.com/google/gnostic/cmd/[email protected]
9 changes: 9 additions & 0 deletions .github/workflows/test-definitions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@ jobs:
- name: Install Deps
run: yarn install

- uses: bufbuild/[email protected]

- uses: actions/setup-go@v5
with:
go-version: 'stable'

- name: Install protoc-gen-openapi
run: go install github.com/google/gnostic/cmd/[email protected]

- name: Fern check
env:
FORCE_COLOR: "2"
Expand Down
1 change: 1 addition & 0 deletions .pnp.cjs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { AbsoluteFilePath, stringifyLargeObject } from "@fern-api/fs-utils";
import { serialization } from "@fern-api/openapi-ir-sdk";
import { parse } from "@fern-api/openapi-parser";
import { Project } from "@fern-api/project-loader";
import { LazyFernWorkspace } from "@fern-api/workspace-loader";
import { getAllOpenAPISpecs, LazyFernWorkspace } from "@fern-api/workspace-loader";
import { writeFile } from "fs/promises";
import path from "path";
import { CliContext } from "../../cli-context/CliContext";
Expand All @@ -26,8 +26,9 @@ export async function generateOpenAPIIrForWorkspaces({
context.logger.info("Skipping, API is specified as a Fern Definition.");
return;
}
const openAPISpecs = await getAllOpenAPISpecs({ context, specs: workspace.specs });
const openAPIIr = await parse({
specs: workspace.specs,
specs: openAPISpecs,
taskContext: context
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { getEndpointLocation } from "@fern-api/openapi-ir-to-fern";
import { parse } from "@fern-api/openapi-parser";
import { Project } from "@fern-api/project-loader";
import { TaskContext } from "@fern-api/task-context";
import { OSSWorkspace } from "@fern-api/workspace-loader";
import { getAllOpenAPISpecs, OSSWorkspace } from "@fern-api/workspace-loader";
import { readFile, writeFile } from "fs/promises";
import yaml from "js-yaml";
import { CliContext } from "../../cli-context/CliContext";
Expand Down Expand Up @@ -58,7 +58,8 @@ async function writeDefinitionForOpenAPIWorkspace({
includeModels: boolean;
context: TaskContext;
}): Promise<void> {
for (const spec of workspace.specs) {
const specs = await getAllOpenAPISpecs({ context, specs: workspace.specs });
for (const spec of specs) {
const ir = await parse({
specs: [spec],
taskContext: context
Expand Down
Loading
Loading