diff --git a/.github/snippet-bot.yml b/.github/snippet-bot.yml index 6f36eeccc91..26d99f1aa29 100644 --- a/.github/snippet-bot.yml +++ b/.github/snippet-bot.yml @@ -1,4 +1,5 @@ -# Copyright 2022 Google LLC + +# Copyright 2021 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -10,4 +11,4 @@ # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and -# limitations under the License. \ No newline at end of file +# limitations under the License. diff --git a/.github/workflows/ci-pr.yaml b/.github/workflows/ci-pr.yaml index 3cc63409342..ff4e190849d 100644 --- a/.github/workflows/ci-pr.yaml +++ b/.github/workflows/ci-pr.yaml @@ -141,4 +141,4 @@ jobs: -H "Content-Type: application/json" \ -H "Authorization: token $GITHUB_TOKEN" \ --data '{ "body": "🚲 PR staged at '"http://${EXTERNAL_IP}"'"}' - sleep 60 + sleep 60 \ No newline at end of file diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 72ff1d017a4..7299e10150c 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -12,6 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +# [START cloudbuild_microservice_demo_cloudbuild] + # This configuration file is used to build and deploy the app into a # GKE cluster using Google Cloud Build. # @@ -37,3 +39,5 @@ steps: timeout: '3600s' options: machineType: 'N1_HIGHCPU_8' + +# [END cloudbuild_microservice_demo_cloudbuild] \ No newline at end of file diff --git a/hack/make-release-artifacts.sh b/hack/make-release-artifacts.sh index 10fcb25c8b9..959815a2d5f 100755 --- a/hack/make-release-artifacts.sh +++ b/hack/make-release-artifacts.sh @@ -76,13 +76,17 @@ mk_kubernetes_manifests() { print_license_header print_autogenerated_warning + echo '# [START gke_release_kubernetes_manifests_microservices_demo]' echo "${out_manifest}" + echo "# [END gke_release_kubernetes_manifests_microservices_demo]" } mk_istio_manifests() { print_license_header print_autogenerated_warning + echo '# [START servicemesh_release_istio_manifests_microservices_demo]' read_manifests "${SCRIPTDIR}/../istio-manifests" + echo '# [END servicemesh_release_istio_manifests_microservices_demo]' } main() { diff --git a/src/adservice/genproto.sh b/src/adservice/genproto.sh index 57a060810d6..c80b5ea931b 100755 --- a/src/adservice/genproto.sh +++ b/src/adservice/genproto.sh @@ -14,7 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. +# [START gke_adservice_genproto] # protos are needed in adservice folder for compiling during Docker build. mkdir -p proto && \ cp ../../pb/demo.proto src/main/proto + +# [END gke_adservice_genproto] \ No newline at end of file diff --git a/src/checkoutservice/genproto.sh b/src/checkoutservice/genproto.sh index 3ca628c6f1c..8e6629f8cf0 100755 --- a/src/checkoutservice/genproto.sh +++ b/src/checkoutservice/genproto.sh @@ -14,7 +14,11 @@ # See the License for the specific language governing permissions and # limitations under the License. +# [START gke_checkoutservice_genproto] + PATH=$PATH:$GOPATH/bin protodir=../../pb protoc --go-grpc_out=. --go_out=. -I $protodir $protodir/demo.proto + +# [END gke_checkoutservice_genproto] diff --git a/src/currencyservice/genproto.sh b/src/currencyservice/genproto.sh index a9609fd1534..9d28adaffaf 100755 --- a/src/currencyservice/genproto.sh +++ b/src/currencyservice/genproto.sh @@ -14,6 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. +# [START gke_currencyservice_genproto] + # protos are loaded dynamically for node, simply copies over the proto. mkdir -p proto cp -r ../../pb/* ./proto + +# [END gke_currencyservice_genproto] \ No newline at end of file diff --git a/src/currencyservice/package-lock.json b/src/currencyservice/package-lock.json index e4d7b96d3e9..a88e7104cac 100644 --- a/src/currencyservice/package-lock.json +++ b/src/currencyservice/package-lock.json @@ -2112,6 +2112,82 @@ "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", "dev": true }, + "node_modules/node-fetch": { + "version": "2.6.7", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", + "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } + } + }, + "node_modules/node-forge": { + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz", + "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==", + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/nopt": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", + "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", + "dependencies": { + "abbrev": "1" + }, + "bin": { + "nopt": "bin/nopt.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/normalize-package-data": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", + "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", + "dev": true, + "dependencies": { + "hosted-git-info": "^2.1.4", + "resolve": "^1.10.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" + } + }, + "node_modules/normalize-package-data/node_modules/semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true, + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/npmlog": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.0.tgz", + "integrity": "sha512-03ppFRGlsyUaQFbGC2C8QWJN/C/K7PsfyD9aQdhVKAQIH4sQBc8WASqFBP7O+Ut4d2oo5LoeoboB3cGdBZSp6Q==", + "dependencies": { + "are-we-there-yet": "^2.0.0", + "console-control-strings": "^1.1.0", + "gauge": "^4.0.0", + "set-blocking": "^2.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16" + } + }, "node_modules/oauth-sign": { "version": "0.9.0", "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", @@ -4799,6 +4875,58 @@ "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", "dev": true }, + "node-fetch": { + "version": "2.6.7", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", + "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", + "requires": { + "whatwg-url": "^5.0.0" + } + }, + "node-forge": { + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz", + "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==" + }, + "nopt": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", + "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", + "requires": { + "abbrev": "1" + } + }, + "normalize-package-data": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", + "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", + "dev": true, + "requires": { + "hosted-git-info": "^2.1.4", + "resolve": "^1.10.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + } + } + }, + "npmlog": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.0.tgz", + "integrity": "sha512-03ppFRGlsyUaQFbGC2C8QWJN/C/K7PsfyD9aQdhVKAQIH4sQBc8WASqFBP7O+Ut4d2oo5LoeoboB3cGdBZSp6Q==", + "requires": { + "are-we-there-yet": "^2.0.0", + "console-control-strings": "^1.1.0", + "gauge": "^4.0.0", + "set-blocking": "^2.0.0" + } + }, "oauth-sign": { "version": "0.9.0", "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", diff --git a/src/emailservice/genproto.sh b/src/emailservice/genproto.sh index 7f0f4ff47eb..f35887b7afe 100755 --- a/src/emailservice/genproto.sh +++ b/src/emailservice/genproto.sh @@ -14,4 +14,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +# [START gke_emailservice_genproto] + python -m grpc_tools.protoc -I../../pb --python_out=. --grpc_python_out=. ../../pb/demo.proto + +# [END gke_emailservice_genproto] \ No newline at end of file diff --git a/src/frontend/genproto.sh b/src/frontend/genproto.sh index 81cbb714ec3..2cd091b5fbe 100755 --- a/src/frontend/genproto.sh +++ b/src/frontend/genproto.sh @@ -14,7 +14,11 @@ # See the License for the specific language governing permissions and # limitations under the License. +# [START gke_frontend_genproto] + PATH=$PATH:$GOPATH/bin protodir=../../pb -protoc --go-grpc_out=. --go_out=. -I $protodir $protodir/demo.proto \ No newline at end of file +protoc --go-grpc_out=. --go_out=. -I $protodir $protodir/demo.proto + +# [END gke_frontend_genproto] diff --git a/src/paymentservice/genproto.sh b/src/paymentservice/genproto.sh index a9609fd1534..a980703ab0e 100755 --- a/src/paymentservice/genproto.sh +++ b/src/paymentservice/genproto.sh @@ -14,6 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. +# [START gke_paymentservice_genproto] + # protos are loaded dynamically for node, simply copies over the proto. mkdir -p proto cp -r ../../pb/* ./proto + +# [END gke_paymentservice_genproto] \ No newline at end of file diff --git a/src/paymentservice/package-lock.json b/src/paymentservice/package-lock.json index 20c1102a841..ccbfacc3d42 100644 --- a/src/paymentservice/package-lock.json +++ b/src/paymentservice/package-lock.json @@ -2643,12 +2643,66 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, + "node_modules/mute-stream": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", + "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=", + "dev": true + }, + "node_modules/nan": { + "version": "2.15.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz", + "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==" + }, "node_modules/natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", "dev": true }, + "node_modules/node-forge": { + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz", + "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==", + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/nopt": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", + "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", + "dependencies": { + "abbrev": "1" + }, + "bin": { + "nopt": "bin/nopt.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/normalize-package-data": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", + "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", + "dev": true, + "dependencies": { + "hosted-git-info": "^2.1.4", + "resolve": "^1.10.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" + } + }, + "node_modules/normalize-package-data/node_modules/semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true, + "bin": { + "semver": "bin/semver" + } + }, "node_modules/node-fetch": { "version": "2.6.7", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", diff --git a/src/productcatalogservice/genproto.sh b/src/productcatalogservice/genproto.sh index 3ca628c6f1c..8546ab28645 100755 --- a/src/productcatalogservice/genproto.sh +++ b/src/productcatalogservice/genproto.sh @@ -14,7 +14,11 @@ # See the License for the specific language governing permissions and # limitations under the License. +# [START gke_productcatalogservice_genproto] + PATH=$PATH:$GOPATH/bin protodir=../../pb protoc --go-grpc_out=. --go_out=. -I $protodir $protodir/demo.proto + +# [END gke_productcatalogservice_genproto] diff --git a/src/recommendationservice/genproto.sh b/src/recommendationservice/genproto.sh index 22ed156a10a..fc9660c6c91 100755 --- a/src/recommendationservice/genproto.sh +++ b/src/recommendationservice/genproto.sh @@ -14,9 +14,13 @@ # See the License for the specific language governing permissions and # limitations under the License. +# [START gke_recommendationservice_genproto] + # script to compile python protos # # requires gRPC tools: # pip install -r requirements.txt python -m grpc_tools.protoc -I../../pb --python_out=. --grpc_python_out=. ../../pb/demo.proto + +# [END gke_recommendationservice_genproto] \ No newline at end of file diff --git a/src/shippingservice/genproto.sh b/src/shippingservice/genproto.sh index 3ca628c6f1c..721ad0c276a 100755 --- a/src/shippingservice/genproto.sh +++ b/src/shippingservice/genproto.sh @@ -14,7 +14,11 @@ # See the License for the specific language governing permissions and # limitations under the License. +# [START gke_shippingservice_genproto] + PATH=$PATH:$GOPATH/bin protodir=../../pb protoc --go-grpc_out=. --go_out=. -I $protodir $protodir/demo.proto + +# [END gke_shippingservice_genproto]