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.

Sign up for GitHub

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

Jump to bottom

feat: adds processing logic for bpmetadata to use protobuf #1705

Merged
merged 12 commits into from
Jul 31, 2023
Merged

feat: adds processing logic for bpmetadata to use protobuf #1705

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2ecf021
feat: adds prcoessing logic for bpmetadata to use protobuf
g-awmalik Jul 6, 2023
51a0a42
whitespace
g-awmalik Jul 10, 2023
0397e9b
int overflow error fix
g-awmalik Jul 10, 2023
32e29dd
changed defaultValue to Value type
g-awmalik Jul 13, 2023
a79c47c
adding back the protogen files
g-awmalik Jul 13, 2023
041261a
Merge branch 'master' into feat/bpmeta-protoc-impl
g-awmalik Jul 13, 2023
0a532a5
added build to test target
g-awmalik Jul 13, 2023
71de7f0
Merge branch 'master' into feat/bpmeta-protoc-impl
g-awmalik Jul 13, 2023
b5c742b
Merge branch 'master' into feat/bpmeta-protoc-impl
g-awmalik Jul 18, 2023
35d15bc
Merge branch 'master' into feat/bpmeta-protoc-impl
g-awmalik Jul 31, 2023
4eac7a8
Merge branch 'master' into feat/bpmeta-protoc-impl
g-awmalik Jul 31, 2023
4a91f11
reconciling makefile changes
g-awmalik Jul 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,4 @@ config-connector/tests/testcases/environments.yaml
.DS_Store
.vscode
*.pyc
cli/bpmetadata/proto/out*
cli/bpmetadata/int-test/.working
29 changes: 19 additions & 10 deletions cli/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
SHELL := /bin/bash

# Changing this value will trigger a new release
VERSION=v1.1.10
VERSION=v1.2.0
BINARY=bin/cft
GITHUB_REPO=github.com/GoogleCloudPlatform/cloud-foundation-toolkit
PLATFORMS := linux windows darwin
Expand All @@ -10,21 +10,30 @@ NAME=cft
BUCKET=gs://cft-cli
INT_TEST_DIR=./bpmetadata/int-test
SCHEMA_DIR=./bpmetadata/schema
PROTO_DIR=./bpmetadata/proto
SRC_PROTO_DIR=./bpmetadata/proto
PROTOC_DIR=./bpmetadata

# Setup the -ldflags option for go build here, interpolate the variable values
LDFLAGS=-ldflags "-X $(GITHUB_REPO)/cli/cmd.Version=$(VERSION)"

# need an extra build command to embed an most up to date schema in the binary
.PHONY: build
build:
go run ./${SCHEMA_DIR} -output=${SCHEMA_DIR}
build: protoc-gen build-schema
go build ${LDFLAGS} -o ${BUILD_DIR}/${NAME}

.PHONY: protoc
protoc:
protoc --go_out=${PROTO_DIR}/out --go_opt=paths=source_relative ${PROTO_DIR}/*.proto
go build ${PROTO_DIR}/out/...
.PHONY: build-schema
build-schema:
go run ./${SCHEMA_DIR} -output=${SCHEMA_DIR}

.PHONY: protoc-gen
protoc-gen:
protoc -I=${SRC_PROTO_DIR} --go_opt=paths=source_relative --go_out=${PROTOC_DIR} ${SRC_PROTO_DIR}/*.proto
protoc-go-inject-tag -input="${PROTOC_DIR}/*.pb.go"

.PHONY: protoc-deps
protoc-deps:
go install google.golang.org/protobuf/cmd/[email protected]
go install google.golang.org/grpc/cmd/[email protected]
go install github.com/favadi/[email protected]

.PHONY: publish
publish:
Expand All @@ -43,7 +52,7 @@ int_test:
${INT_TEST_DIR}/workflow.sh ${INT_TEST_DIR}

.PHONY: go_test
go_test:
go_test: build
go test ./...

.PHONY: test
Expand Down
Loading