From a7abdc23201bb1c3d304400e938648e262c419e7 Mon Sep 17 00:00:00 2001 From: dsinghvi Date: Sun, 21 Apr 2024 18:57:50 -0400 Subject: [PATCH] get ready to merge --- .github/workflows/seed.yml | 4 ++-- .../basicauth/client.go | 6 ------ .../client/client.go | 6 ------ seed/go-sdk/examples/snippet.json | 2 +- seed/go-sdk/literal/.inputs/config.json | 12 ++++++++---- 5 files changed, 11 insertions(+), 19 deletions(-) diff --git a/.github/workflows/seed.yml b/.github/workflows/seed.yml index 1629b2cee39..426bf6b727e 100644 --- a/.github/workflows/seed.yml +++ b/.github/workflows/seed.yml @@ -493,7 +493,7 @@ jobs: env: FORCE_COLOR: "2" run: | - yarn seed:local test --workspace csharp-model --parallel 16 + yarn seed:local test --generator csharp-model --parallel 16 - name: Ensure no changes to git-tracked files run: git --no-pager diff --exit-code @@ -518,7 +518,7 @@ jobs: env: FORCE_COLOR: "2" run: | - yarn seed:local test --workspace csharp-sdk --parallel 16 + yarn seed:local test --generator csharp-sdk --parallel 16 - name: Ensure no changes to git-tracked files run: git --no-pager diff --exit-code diff --git a/seed/go-sdk/basic-auth-environment-variables/basicauth/client.go b/seed/go-sdk/basic-auth-environment-variables/basicauth/client.go index c56a9f0952a..062c72fac6b 100644 --- a/seed/go-sdk/basic-auth-environment-variables/basicauth/client.go +++ b/seed/go-sdk/basic-auth-environment-variables/basicauth/client.go @@ -12,10 +12,7 @@ import ( option "github.com/basic-auth-environment-variables/fern/option" io "io" http "net/http" -<<<<<<< HEAD os "os" -======= ->>>>>>> 925464783 (fix) ) type Client struct { @@ -26,15 +23,12 @@ type Client struct { func NewClient(opts ...option.RequestOption) *Client { options := core.NewRequestOptions(opts...) -<<<<<<< HEAD if options.Username == "" { options.Username = os.Getenv("USERNAME") } if options.Password == "" { options.Password = os.Getenv("PASSWORD") } -======= ->>>>>>> 925464783 (fix) return &Client{ baseURL: options.BaseURL, caller: core.NewCaller( diff --git a/seed/go-sdk/basic-auth-environment-variables/client/client.go b/seed/go-sdk/basic-auth-environment-variables/client/client.go index 6f01cee070e..7db92b53328 100644 --- a/seed/go-sdk/basic-auth-environment-variables/client/client.go +++ b/seed/go-sdk/basic-auth-environment-variables/client/client.go @@ -7,10 +7,7 @@ import ( core "github.com/basic-auth-environment-variables/fern/core" option "github.com/basic-auth-environment-variables/fern/option" http "net/http" -<<<<<<< HEAD os "os" -======= ->>>>>>> 925464783 (fix) ) type Client struct { @@ -23,15 +20,12 @@ type Client struct { func NewClient(opts ...option.RequestOption) *Client { options := core.NewRequestOptions(opts...) -<<<<<<< HEAD if options.Username == "" { options.Username = os.Getenv("USERNAME") } if options.Password == "" { options.Password = os.Getenv("PASSWORD") } -======= ->>>>>>> 925464783 (fix) return &Client{ baseURL: options.BaseURL, caller: core.NewCaller( diff --git a/seed/go-sdk/examples/snippet.json b/seed/go-sdk/examples/snippet.json index d97fbbd4a9c..58c2f2ec0f3 100644 --- a/seed/go-sdk/examples/snippet.json +++ b/seed/go-sdk/examples/snippet.json @@ -57,7 +57,7 @@ }, "snippet": { "type": "go", - "client": "import (\n\tcontext \"context\"\n\tfern \"github.com/examples/fern\"\n\tfernclient \"github.com/examples/fern/client\"\n\toption \"github.com/examples/fern/option\"\n)\n\nclient := fernclient.NewClient(\n\toption.WithToken(\n\t\t\"\u003cYOUR_AUTH_TOKEN\u003e\",\n\t),\n\toption.WithBaseURL(\n\t\tfern.Environments.Production,\n\t),\n)\nresponse, err := client.Service.CreateMovie(\n\tcontext.TODO(),\n\t\u0026fern.Movie{\n\t\tId: \"movie-c06a4ad7\",\n\t\tPrequel: fern.String(\n\t\t\t\"movie-cv9b914f\",\n\t\t),\n\t\tTitle: \"The Boy and the Heron\",\n\t\tFrom: \"Hayao Miyazaki\",\n\t\tRating: 8,\n\t\tTag: \"tag-wf9as23d\",\n\t\tMetadata: map[string]interface{}{\n\t\t\t\"actors\": []interface{}{\n\t\t\t\t\"Christian Bale\",\n\t\t\t\t\"Florence Pugh\",\n\t\t\t\t\"Willem Dafoe\",\n\t\t\t},\n\t\t\t\"releaseDate\": \"2023-12-08\",\n\t\t\t\"ratings\": map[string]interface{}{\n\t\t\t\t\"imdb\": 7.6,\n\t\t\t\t\"rottenTomatoes\": 97,\n\t\t\t},\n\t\t},\n\t},\n)\n" + "client": "import (\n\tcontext \"context\"\n\tfern \"github.com/examples/fern\"\n\tfernclient \"github.com/examples/fern/client\"\n\toption \"github.com/examples/fern/option\"\n)\n\nclient := fernclient.NewClient(\n\toption.WithToken(\n\t\t\"\u003cYOUR_AUTH_TOKEN\u003e\",\n\t),\n\toption.WithBaseURL(\n\t\tfern.Environments.Production,\n\t),\n)\nresponse, err := client.Service.CreateMovie(\n\tcontext.TODO(),\n\t\u0026fern.Movie{\n\t\tId: \"movie-c06a4ad7\",\n\t\tPrequel: fern.String(\n\t\t\t\"movie-cv9b914f\",\n\t\t),\n\t\tTitle: \"The Boy and the Heron\",\n\t\tFrom: \"Hayao Miyazaki\",\n\t\tRating: 8,\n\t\tTag: \"tag-wf9as23d\",\n\t\tMetadata: map[string]interface{}{\n\t\t\t\"actors\": []interface{}{\n\t\t\t\t\"Christian Bale\",\n\t\t\t\t\"Florence Pugh\",\n\t\t\t\t\"Willem Dafoe\",\n\t\t\t},\n\t\t\t\"releaseDate\": \"2023-12-08\",\n\t\t\t\"ratings\": map[string]interface{}{\n\t\t\t\t\"rottenTomatoes\": 97,\n\t\t\t\t\"imdb\": 7.6,\n\t\t\t},\n\t\t},\n\t},\n)\n" } }, { diff --git a/seed/go-sdk/literal/.inputs/config.json b/seed/go-sdk/literal/.inputs/config.json index df550411bb2..dd79a594aa3 100644 --- a/seed/go-sdk/literal/.inputs/config.json +++ b/seed/go-sdk/literal/.inputs/config.json @@ -1,17 +1,21 @@ { - "irFilepath": "./ir.json", + "irFilepath": "/fern/ir.json", "output": { "mode": { + "type": "github", "repoUrl": "https://github.com/literal/fern", "version": "0.0.1", - "type": "github" + "publishInfo": null }, - "path": "../" + "path": "/fern/output", + "publishingMetadata": null, + "snippetFilepath": "/fern/snippet.json" }, + "publish": null, "workspaceName": "literal", "organization": "seed", "environment": { - "type": "local" + "_type": "local" }, "dryRun": false, "whitelabel": false,