Upstream changes (#5)

* cleanup: add region tags to yaml and sh (GoogleCloudPlatform#684) * Added region tags to yaml and sh, edited the asm and gke files * Fix skaffold artifacts * make-release adds region tag to istio and k8 manifest * Addressed comments, changed gke to container per discussion * Replaced instances of container with gke, discarded uncessecary white space changes * Remove changes in github workflow, captured cloudbuild yaml tag * Bump node-fetch from 2.6.6 to 2.6.7 in /src/paymentservice (GoogleCloudPlatform#707) Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.6 to 2.6.7. - [Release notes](https://github.com/node-fetch/node-fetch/releases) - [Commits](node-fetch/node-fetch@v2.6.6...v2.6.7) --- updated-dependencies: - dependency-name: node-fetch dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump node-fetch from 2.6.6 to 2.6.7 in /src/currencyservice (GoogleCloudPlatform#708) Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.6 to 2.6.7. - [Release notes](https://github.com/node-fetch/node-fetch/releases) - [Commits](node-fetch/node-fetch@v2.6.6...v2.6.7) --- updated-dependencies: - dependency-name: node-fetch dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Shabir Mohamed Abdul Samadh <[email protected]> Co-authored-by: Christine Kim <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Shabir Mohamed Abdul Samadh <[email protected]>
julianocosta89 · Feb 5, 2022 · 96ea9eb · 96ea9eb
1 parent 0b80d95
commit 96ea9eb
Show file tree

Hide file tree

Showing 15 changed files with 230 additions and 4 deletions.
diff --git 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.
+# limitations under the License.
diff --git 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
diff --git 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]
diff --git 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
@@ -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]
diff --git 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
@@ -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]
diff --git a/src/currencyservice/package-lock.json b/src/currencyservice/package-lock.json
diff --git 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]
diff --git 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
+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
@@ -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]
diff --git a/src/paymentservice/package-lock.json b/src/paymentservice/package-lock.json
diff --git 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
@@ -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]
diff --git 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]