Skip to content
This repository has been archived by the owner on Oct 23, 2023. It is now read-only.

Commit

Permalink
fix: regen proto after merge
Browse files Browse the repository at this point in the history
Signed-off-by: Kenny Workman <[email protected]>
  • Loading branch information
kennyworkman committed Dec 3, 2021
1 parent a4e4c50 commit 17fc33f
Show file tree
Hide file tree
Showing 10 changed files with 48 additions and 5 deletions.
4 changes: 4 additions & 0 deletions boilerplate/flyte/golang_test_targets/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
download_tooling: #download dependencies (including test deps) for the package
@boilerplate/flyte/golang_test_targets/download_tooling.sh

.PHONY: generate
generate: download_tooling #generate go code
@boilerplate/flyte/golang_test_targets/go-gen.sh

.PHONY: lint
lint: download_tooling #lints the package for common code smells
GL_DEBUG=linters_output,env golangci-lint run --deadline=5m --exclude deprecated -v
Expand Down
22 changes: 22 additions & 0 deletions boilerplate/flyte/golang_test_targets/go-gen.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#!/usr/bin/env bash

set -ex

echo "Running go generate"
go generate ./...

# This section is used by GitHub workflow to ensure that the generation step was run
if [ -n "$DELTA_CHECK" ]; then
DIRTY=$(git status --porcelain)
if [ -n "$DIRTY" ]; then
echo "FAILED: Go code updated without commiting generated code."
echo "Ensure make generate has run and all changes are committed."
DIFF=$(git diff)
echo "diff detected: $DIFF"
DIFF=$(git diff --name-only)
echo "files different: $DIFF"
exit 1
else
echo "SUCCESS: Generated code is up to date."
fi
fi
1 change: 1 addition & 0 deletions gen/pb-go/flyteidl/core/types.pb.go

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

3 changes: 2 additions & 1 deletion gen/pb-go/flyteidl/service/admin.swagger.json
Original file line number Diff line number Diff line change
Expand Up @@ -6047,7 +6047,8 @@
"$ref": "#/definitions/protobufStruct",
"description": "A arbitrary JSON payload to describe a type."
}
}
},
"description": "TypeAnnotation encapsulates registration time information about a type. This can be used for various control-plane operations. TypeAnnotation will not be available at runtime when a task runs."
},
"coreTypedInterface": {
"type": "object",
Expand Down
3 changes: 3 additions & 0 deletions gen/pb-go/flyteidl/service/flyteadmin/api/swagger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30852,6 +30852,9 @@ definitions:
annotations:
description: "A arbitrary JSON payload to describe a type."
$ref: "#/definitions/protobufStruct"
description: "TypeAnnotation encapsulates registration time information about\
\ a type. This can be used for various control-plane operations. TypeAnnotation\
\ will not be available at runtime when a task runs."
example:
annotations:
fields:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

package flyteadmin

// TypeAnnotation encapsulates registration time information about a type. This can be used for various control-plane operations. TypeAnnotation will not be available at runtime when a task runs.
type CoreTypeAnnotation struct {
// A arbitrary JSON payload to describe a type.
Annotations *ProtobufStruct `json:"annotations,omitempty"`
Expand Down
6 changes: 3 additions & 3 deletions gen/pb-go/flyteidl/service/openapi.go

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions gen/pb-java/flyteidl/core/Types.java

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

3 changes: 3 additions & 0 deletions protos/docs/admin/admin.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2511,6 +2511,8 @@ Purposefully empty, may be populated in the future.





.. _ref_flyteidl.admin.ProjectDomainAttributesGetRequest:

ProjectDomainAttributesGetRequest
Expand Down Expand Up @@ -2590,6 +2592,7 @@ Purposefully empty, may be populated in the future.




<!-- end messages -->

<!-- end enums -->
Expand Down
2 changes: 1 addition & 1 deletion protos/docs/core/core.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2416,7 +2416,7 @@ SchemaType.SchemaColumn
TypeAnnotation
------------------------------------------------------------------


TypeAnnotation encapsulates registration time information about a type. This can be used for various control-plane operations. TypeAnnotation will not be available at runtime when a task runs.



Expand Down

0 comments on commit 17fc33f

Please sign in to comment.