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

Update mockalloydb and the test golden files #3190

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions mockgcp/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,15 @@ tools:
wget -N -O bin/protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v3.12.4/protoc-3.12.4-linux-x86_64.zip
cd bin; rm -rf protoc; mkdir protoc; cd protoc; unzip ../protoc.zip

GOOGLEAPI_VERSION?=HEAD
.PHONY: sync-repo
sync-repo:
mkdir -p third_party
@if [ ! -d "third_party/googleapis" ]; then \
echo "Cloning googleapis repository..."; \
git clone https://github.com/googleapis/googleapis.git third_party/googleapis; \
fi
@echo "Syncing to commit $(GOOGLEAPI_VERSION)...";
@cd third_party/googleapis && git fetch --all && git reset --hard $(GOOGLEAPI_VERSION)
@echo "Syncing to remote origin/master branch ...";
@cd third_party/googleapis && git fetch --all && git reset --hard origin/master

.PHONY: gen-proto
gen-proto: tools sync-repo
Expand Down Expand Up @@ -54,6 +53,7 @@ gen-proto-no-fixup:
./third_party/googleapis/mockgcp/api/apikeys/v2/*.proto \
./third_party/googleapis/mockgcp/api/serviceusage/v1/*.proto \
./third_party/googleapis/mockgcp/api/serviceusage/v1beta1/*.proto \
./third_party/googleapis/mockgcp/cloud/aiplatform/v1beta1/api_auth*.proto \
./third_party/googleapis/mockgcp/cloud/aiplatform/v1beta1/annotation*.proto \
./third_party/googleapis/mockgcp/cloud/aiplatform/v1beta1/data_item.proto \
./third_party/googleapis/mockgcp/cloud/aiplatform/v1beta1/dataset*.proto \
Expand Down
14 changes: 0 additions & 14 deletions mockgcp/apply-proto-patches.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,3 @@ cd tools/patch-proto
# // The maintenance update policy determines when to allow or deny updates.
# MaintenanceUpdatePolicy maintenance_update_policy = 32;
# EOF

# Use our proto patch tool to add the missing pscConfig field for AlloyDB cluster.
go run . --file ${REPO_ROOT}/mockgcp/third_party/googleapis/google/cloud/alloydb/v1beta/resources.proto --message Cluster <<EOF

// PscConfig contains PSC related configuration at a cluster level.
message PscConfig {
// Optional. Create an instance that allows connections from Private Service
// Connect endpoints to the instance.
bool psc_enabled = 1 [(google.api.field_behavior) = OPTIONAL];
}

// Optional. The configuration for Private Service Connect (PSC) for the cluster.
PscConfig psc_config = 31 [(google.api.field_behavior) = OPTIONAL];
EOF
202 changes: 202 additions & 0 deletions mockgcp/generated/mockgcp/cloud/alloydb/v1beta/csql_resources.pb.go

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

Loading
Loading