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

mockgcp: support for ApigeeOrganization #2297

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

mockgcp: support for ApigeeOrganization #2297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
29f878b
mockgcp: update service enablement APIs for fidelity with GCP
justinsb Jul 16, 2024
0dd320f
tests: update golden output for service tests
justinsb Jul 16, 2024
a3564f9
mockgcp: updates for generating apigee
justinsb Jul 15, 2024
c4ca9fb
autogen: generated proto code for apigee
justinsb Jul 15, 2024
c80d737
tests: fix apigee organization sample
justinsb Jul 15, 2024
78249d7
mockgcp: support for ApigeeOrganization
justinsb Jul 15, 2024
cc5cf05
tests: default TEST_BILLING_ACCOUNT_ID in record-gcp
justinsb Jul 16, 2024
37076d5
chore: add golden data for apigeeorganization test
justinsb Jul 15, 2024
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
2 changes: 2 additions & 0 deletions config/tests/samples/create/harness.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,6 +629,8 @@ func MaybeSkip(t *testing.T, name string, resources []*unstructured.Unstructured
case schema.GroupKind{Group: "alloydb.cnrm.cloud.google.com", Kind: "AlloyDBCluster"}:
case schema.GroupKind{Group: "alloydb.cnrm.cloud.google.com", Kind: "AlloyDBInstance"}:

case schema.GroupKind{Group: "apigee.cnrm.cloud.google.com", Kind: "ApigeeOrganization"}:

case schema.GroupKind{Group: "apikeys.cnrm.cloud.google.com", Kind: "APIKeysKey"}:

case schema.GroupKind{Group: "artifactregistry.cnrm.cloud.google.com", Kind: "ArtifactRegistryRepository"}:
Expand Down
5 changes: 5 additions & 0 deletions hack/record-gcp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ echo "Using project: ${GCP_PROJECT_ID}"
TEST_FOLDER_ID=$(gcloud projects describe ${GCP_PROJECT_ID} --format='value(parent.id)')
export TEST_FOLDER_ID

if [[ -z "${TEST_BILLING_ACCOUNT_ID:-}" ]]; then
TEST_BILLING_ACCOUNT_ID=$(gcloud billing projects describe ${GCP_PROJECT_ID} --format='value(billingAccountName)' | sed -e s@billingAccounts/@@g)
export TEST_BILLING_ACCOUNT_ID
fi

# Run e2e tests against real gcp, capturing output
ARTIFACTS=$(pwd)/artifactz/realgcp \
E2E_KUBE_TARGET=envtest \
Expand Down
5 changes: 5 additions & 0 deletions mockgcp/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ gen-proto-no-fixup:
--grpc-gateway_opt logtostderr=true \
--grpc-gateway_opt paths=source_relative \
--experimental_allow_proto3_optional \
./apis/mockgcp/cloud/apigee/v1/*.proto \
./apis/mockgcp/cloud/bigquery/v2/*.proto \
./apis/mockgcp/cloud/ids/v1/*.proto \
./apis/mockgcp/cloud/servicenetworking/v1/*.proto \
Expand Down Expand Up @@ -125,4 +126,8 @@ generate-protos-from-openapi:
mkdir -p apis/mockgcp/cloud/ids/v1/
cd tools/gapic; go run . --proto-version=2 ../../temp/ids-api-v1.json > ../../apis/mockgcp/cloud/ids/v1/service.proto

wget -O temp/apigee-api-v1.json https://raw.githubusercontent.com/googleapis/google-api-go-client/main/apigee/v1/apigee-api.json
mkdir -p apis/mockgcp/cloud/apigee/v1/
cd tools/gapic; go run . --proto-version=2 ../../temp/apigee-api-v1.json > ../../apis/mockgcp/cloud/apigee/v1/service.proto

rm -r temp
Loading
Loading