Add codegen/build-clients.sh script, update codegen/apis submodule
#49
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| PINECONE_API_KEY="<Project API Key>" | ||
| TEST_PODS_INDEX_NAME="<Pod based Index name>" | ||
| TEST_SERVERLESS_INDEX_NAME="<Serverless based Index name>" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| [submodule "codegen/apis"] | ||
| path = codegen/apis | ||
| url = [email protected]:pinecone-io/apis.git | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| #!/bin/bash | ||
|
There was a problem hiding this comment. I was modeling this after the work @jhamon had done in other repos, but this diverges a bit in that I'm not using a docker image, and we're doing both OAS and proto files in here. Let me know if this doesn't make sense - or any other feedback. I didn't want to make too many changes to the dependencies we were using to generate code. |
||
|
|
||
| set -eux -o pipefail | ||
|
|
||
| version=$1 # e.g. 2024-07 | ||
|
|
||
| # data_destination must align with the option go_package: | ||
| # https://github.com/pinecone-io/apis/blob/e9b47c76f649656002f4911946ca6c4c4a6f04fc/src/release/data/data.proto#L3 | ||
| data_destination="internal/gen/data" | ||
| control_destination="internal/gen/control" | ||
| version_file="internal/gen/api_version.go" | ||
|
|
||
| update_apis_repo() { | ||
| echo "Updating apis repo" | ||
| pushd codegen/apis | ||
| git fetch | ||
| git checkout main | ||
| git pull | ||
| just build | ||
| popd | ||
| } | ||
|
|
||
| verify_spec_version() { | ||
| local version=$1 | ||
| echo "Verifying spec version has been provided: $version" | ||
| if [ -z "$version" ]; then | ||
| echo "Version is required" | ||
| exit 1 | ||
| fi | ||
|
Comment on lines
+25
to
+29
There was a problem hiding this comment. I should maybe do some actual checking against the folder names under |
||
| } | ||
|
|
||
| generate_oas_client() { | ||
| oas_file="codegen/apis/_build/${version}/control_${version}.oas.yaml" | ||
|
|
||
| oapi-codegen --package=control \ | ||
| --generate types,client \ | ||
| "${oas_file}" > "${control_destination}/control_plane.oas.go" | ||
|
There was a problem hiding this comment. There's a |
||
| } | ||
|
|
||
| generate_proto_client() { | ||
| proto_file="codegen/apis/_build/${version}/data_${version}.proto" | ||
|
|
||
| protoc --experimental_allow_proto3_optional \ | ||
| --proto_path=codegen/apis/vendor/protos \ | ||
| --proto_path=codegen/apis/_build/${version} \ | ||
| --go_opt=module="github.com/pinecone-io/go-pinecone" \ | ||
| --go-grpc_opt=module="github.com/pinecone-io/go-pinecone" \ | ||
| --go_out=. \ | ||
| --go-grpc_out=. \ | ||
| "${proto_file}" | ||
| } | ||
|
|
||
| generate_version_file() { | ||
| echo "Generating version file" | ||
| cat > "${version_file}" <<EOL | ||
| // Code generated by build-clients.sh - DO NOT EDIT. | ||
| package gen | ||
|
|
||
| const PineconeApiVersion = "${version}" | ||
| EOL | ||
| } | ||
|
|
||
| update_apis_repo | ||
| verify_spec_version $version | ||
|
|
||
| # Generate control plane client code | ||
| rm -rf "${control_destination}" | ||
| mkdir -p "${control_destination}" | ||
|
|
||
| generate_oas_client | ||
|
|
||
| # Generate data plane client code | ||
| rm -rf "${data_destination}" | ||
| mkdir -p "${data_destination}" | ||
|
|
||
| generate_proto_client | ||
|
|
||
| # Generate version file | ||
| rm -rf "${version_file}" | ||
|
|
||
| generate_version_file | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,6 @@ module github.com/pinecone-io/go-pinecone | |
| go 1.21 | ||
|
|
||
| require ( | ||
|
There was a problem hiding this comment. I ran There was a problem hiding this comment. Yeah, we should prefer google.golang.org according to https://protobuf.dev/reference/go/faq/. |
||
| github.com/google/go-cmp v0.6.0 | ||
| github.com/google/uuid v1.6.0 | ||
| github.com/oapi-codegen/runtime v1.1.1 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Moving to new submodule location, and swapping the underlying repo.