From 5adf0e6d8bab2b9bf05dac033ffedf2d62a92129 Mon Sep 17 00:00:00 2001
From: rahulpa <rahulpa@google.com>
Date: Mon, 20 Aug 2018 17:51:56 -0700
Subject: [PATCH] Revert the projectId

- also remove commented code from frontend/rpc.go
---
 kubernetes-manifests/adservice.yaml |  2 +-
 skaffold.yaml                       | 22 ++++++++++------------
 src/frontend/rpc.go                 | 12 ------------
 3 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/kubernetes-manifests/adservice.yaml b/kubernetes-manifests/adservice.yaml
index 70faa9d..11da28e 100644
--- a/kubernetes-manifests/adservice.yaml
+++ b/kubernetes-manifests/adservice.yaml
@@ -25,7 +25,7 @@ spec:
       terminationGracePeriodSeconds: 5
       containers:
       - name: server
-        image: gcr.io/opencensus-java-stats-demo-app/adservice
+        image: gcr.io/microservices-demo-app/adservice
         ports:
         - containerPort: 9555
         env:
diff --git a/skaffold.yaml b/skaffold.yaml
index 893d511..a05d6eb 100644
--- a/skaffold.yaml
+++ b/skaffold.yaml
@@ -18,27 +18,25 @@ build:
   tagPolicy:
     gitCommit: {}
   artifacts:
-  - imageName: gcr.io/opencensus-java-stats-demo-app/emailservice
+  - imageName: gcr.io/microservices-demo-app/emailservice
     workspace: src/emailservice
-  - imageName: gcr.io/opencensus-java-stats-demo-app/productcatalogservice
+  - imageName: gcr.io/microservices-demo-app/productcatalogservice
     workspace: src/productcatalogservice
-  - imageName: gcr.io/opencensus-java-stats-demo-app/recommendationservice
+  - imageName: gcr.io/microservices-demo-app/recommendationservice
     workspace: src/recommendationservice
-  - imageName: gcr.io/opencensus-java-stats-demo-app/shippingservice
+  - imageName: gcr.io/microservices-demo-app/shippingservice
     workspace: src/shippingservice
-  - imageName: gcr.io/opencensus-java-stats-demo-app/checkoutservice
+  - imageName: gcr.io/microservices-demo-app/checkoutservice
     workspace: src/checkoutservice
-  - imageName: gcr.io/opencensus-java-stats-demo-app/paymentservice
+  - imageName: gcr.io/microservices-demo-app/paymentservice
     workspace: src/paymentservice
-  - imageName: gcr.io/opencensus-java-stats-demo-app/currencyservice
+  - imageName: gcr.io/microservices-demo-app/currencyservice
     workspace: src/currencyservice
-  - imageName: gcr.io/opencensus-java-stats-demo-app/cartservice
+  - imageName: gcr.io/microservices-demo-app/cartservice
     workspace: src/cartservice
-  - imageName: gcr.io/opencensus-java-stats-demo-app/adservice
-    workspace: src/adservice
-  - imageName: gcr.io/opencensus-java-stats-demo-app/frontend
+  - imageName: gcr.io/microservices-demo-app/frontend
     workspace: src/frontend
-  - imageName: gcr.io/opencensus-java-stats-demo-app/loadgenerator
+  - imageName: gcr.io/microservices-demo-app/loadgenerator
     workspace: src/loadgenerator
 deploy:
   kubectl:
diff --git a/src/frontend/rpc.go b/src/frontend/rpc.go
index bdc1237..de00deb 100644
--- a/src/frontend/rpc.go
+++ b/src/frontend/rpc.go
@@ -116,18 +116,6 @@ func (fe *frontendServer) getRecommendations(ctx context.Context, userID string,
 }
 
 func (fe *frontendServer) getAd(ctx context.Context) ([]*pb.Ad, error) {
-	//return []*pb.Ad{
-	//	&pb.Ad{
-	//		Text:        "Try this OG insta camera from 1960s!",
-	//		RedirectUrl: "https://en.wikipedia.org/wiki/Instant_camera#Polaroid_cameras",
-	//	},
-	//	&pb.Ad{
-	//		Text:        "Check out the new instagrammy vacation destinations!",
-	//		RedirectUrl: "https://en.wikipedia.org/wiki/Italy",
-	//	},
-	//}, nil
-
-	// TODO(rghetia): uncomment below and revove the code above
 	resp, err := pb.NewAdServiceClient(fe.adSvcConn).GetAds(ctx, &pb.AdRequest{
 		ContextKeys: nil,
 	})