Update Demo for Explore.

.gitignore

@@ -63,3 +63,6 @@ hello-world/
 # Cypress
 **/cypress/downloads
 **/cypress/screenshots
+
+# tanzu
+build-output

README.md

@@ -1,51 +1,57 @@
 # ACME Fitness Store
 
-ACME Fitness store is a fictional online retailer selling sporting goods. This repo contains the source code and deployment scripts for the ACME Fitness store application.
+ACME Fitness store is a fictional, online sporting goods retail store. This repository contains the source code and
+deployment resources for the ACME Fitness store application.
+
+## Architecture
 
-## High Level Architecture
 ![An image showing the services involved in the ACME Fitness Store. It depicts the applications and their dependencies](media/acme-fitness-store-architecture.png)
 
 This application is composed of several services:
 
 * 4 Java Spring Boot applications:
-  * A catalog service for fetching available products. 
-  * A payment service for processing and approving payments for users' orders
-  * An identity service for referencing the authenticated user
-  * An assist service for infusing AI into fitness store
+    - A catalog service for fetching available products.
+    - A payment service for processing and approving payments for users' orders
+    - An identity service for referencing the authenticated user
+    - An assist service for infusing AI into fitness store
 
 * 1 Python application:
-  * A cart service for managing a users' items that have been selected for purchase
+    - A cart service for managing a users' items that have been selected for purchase
 
 * 1 ASP.NET Core applications:
-  * An order service for placing orders to buy products that are in the users' carts
+    - An order service for placing orders to buy products that are in the users' carts
 
-* 1 NodeJS and static HTML Application
-  * A frontend shopping application
+* 1 Node.js and static HTML Application
+    - A frontend shopping application
 
-The sample can be deployed to Azure Spring Apps Enterprise or Tanzu Application Platform. 
+The sample can be deployed to Azure Spring Apps Enterprise or Tanzu Platform.
 
 ## Repo Organization
 
-| Directory                                                        | Purpose |
-| ---------------------------------------------------------------- | ------------- |
-| [apps/](./apps)                                                   | source code for the services  |
+| Directory                                 | Purpose                                                                     |
+|-------------------------------------------|-----------------------------------------------------------------------------|
+| [apps/](./apps)                           | source code for the services                                                |
+| [e2e/](./e2e)                             | end to end frontend tests                                                   |
+| [local-development/](./local-development) | local docker configuration ([documentation](./local-development/README.md)) |
+
+## Deployment
 
-================================================================
-## Deploy on Tanzu Platform for Cloud Foundry (TPCF aka TAS)
+### Tanzu Platform for Cloud Foundry (tPCF aka TAS)
 
 Assumption that the proper Cloud Foundry CLI has been installed.
 
 #### Create Services
+
 ```bash
 cf create-service p.redis on-demand-cache acme-redis 
 cf create-service postgres on-demand-postgres-db acme-postgres
 cf create-service postgres on-demand-postgres-db acme-assist-postgres
 cf create-service postgres on-demand-postgres-db acme-order-postgres       
 
-# This sets up your TAS/TPCF config server. It assumes that your config files are located at <this-repository-url> in the branch config (label) under the directory config (searchPaths). You can checkout the branch to see the structure if you like.
+# This sets up your TAS/tPCF config server. It assumes that your config files are located at <this-repository-url> in the branch config (label) under the directory config (searchPaths). You can checkout the branch to see the structure if you like.
 cf create-service p.config-server standard acme-config  -c  '{ "git": { "uri": "<this-repository-url>", "label": "config", "searchPaths": "config" } }'
 
-# This assumes Tanzu Single Sign on for TAS/TPCF is installed and configured against UAA.  You can also use other identity providers if you change the plan and binding below.
+# This assumes Tanzu Single Sign on for TAS/tPCF is installed and configured against UAA.  You can also use other identity providers if you change the plan and binding below.
 cf create-service p-identity uaa acme-sso   
 cf create-service p.service-registry standard acme-registry  
 cf create-service p.gateway standard acme-gateway -c '{"sso": { "plan": "uaa", "scopes": ["openid", "profile", "email"] }, "host": "acme-fitness" ,"cors": { "allowed-origins": [ "*" ] }}'
@@ -56,6 +62,7 @@ cf create-service genai <EMBED MODEL PLAN> acme-genai-embed
 ```
 
 #### Identity Service
+
 ```bash
 cd acme-identity
 ./gradlew assemble
@@ -75,7 +82,9 @@ cf bind-service acme-identity acme-gateway -c identity-routes.json
 cf start acme-identity
 
 ```
+
 #### Cart Service
+
 ```bash
 cd ../acme-cart
 cf push --no-start
@@ -84,6 +93,7 @@ cf start acme-cart
 ```
 
 #### Payment Service
+
 ```bash
 cd ../acme-payment
 ./gradlew assemble
@@ -93,6 +103,7 @@ cf start acme-payment
 ```
 
 #### Catalog Service
+
 ```bash
 cd ../acme-catalog
 ./gradlew clean assemble
@@ -102,6 +113,7 @@ cf start acme-catalog
 ```
 
 #### Acme Assist
+
 ```bash
 cd ../acme-assist
 ./gradlew clean assemble
@@ -114,6 +126,7 @@ cf start acme-assist
 ```
 
 #### Order Service
+
 ```bash
 cd ../acme-order
 dotnet publish -r linux-x64
@@ -124,24 +137,58 @@ cf start acme-order
 ```
 
 #### Shopping Service
+
 ```bash
 cd ../acme-shopping-react
+npm install
+npm run build
 cf push --no-start
 cf bind-service acme-shopping acme-gateway -c frontend-routes.json
 cf start acme-shopping
 ```
-=================================================
-
-Note: ensure that the environment variable for TAS has 
-`SPRING_MVC_STATIC_PATH_PATTERN: /static/images/**` set.  Currently have an issue with the value taken from config server being overwritten.
 
-## Local Development setup
-- [Local Development guide](local-development/README.md)
+> [!NOTE]  
+> Ensure that the environment variable for TAS has `SPRING_MVC_STATIC_PATH_PATTERN: /static/images/**` set. Currently,
+> there is an issue with the value taken from config server being overwritten.
 
-## TAS Development Tricks
+#### tPCF Development Tricks
 
-### Connecting to Database
+##### Connecting to Database
 
 https://docs.cloudfoundry.org/devguide/deploy-apps/ssh-services.html
 
 `cf ssh -L 65432:{host-of-database-on-TAS}:5432 {application-name}`
+
+## Deploy on Tanzu Platform for Kubernetes (tPk8s)
+
+Assume Tanzu Platform has been configured with a project, space, and clusters.
+
+> [!NOTE]  
+> These steps are only relevant for deploying `acme-catalog`
+
+1. Install Tanzu CLI ([documentation](https://docs.vmware.com/en/VMware-Tanzu-CLI/1.4/tanzu-cli/index.html))
+    ```bash
+    brew update
+    brew install vmware-tanzu/tanzu/tanzu-cli
+    ```
+
+2. Install the Tanzu Platform plugin
+   group ([documentation](https://docs.vmware.com/en/VMware-Tanzu-CLI/1.4/tanzu-cli/tanzu-plugin.html#tanzu-plugin-install-8))
+    ```bash
+    tanzu plugin install --group vmware-tanzu/app-developer
+    ```
+
+3. Login to Tanzu Platform and set project / space scope
+    ```bash
+    tanzu login
+    tanzu project use
+    tanzu space use
+    ```
+
+   > [!TIP]
+   > This can be verified using `tanzu context current`
+
+4. Build the application using buildpacks and deploy.
+    ```bash
+    tanzu deploy
+    ```

apps/acme-assist/manifest.yml

@@ -14,5 +14,5 @@ applications:
     - route: acme-assist.apps.internal
   env:
     JBP_CONFIG_SPRING_AUTO_RECONFIGURATION: '{enabled: false}'
-    SPRING_PROFILES_ACTIVE: http2,cloud
+    SPRING_PROFILES_ACTIVE: http2,cloud,k8s
     JBP_CONFIG_OPEN_JDK_JRE: '{ jre: { version: 21.+ } }'

apps/acme-assist/src/main/java/com/example/acme/assist/ProductRepository.java

@@ -7,6 +7,7 @@
 import org.apache.logging.log4j.util.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.http.ResponseEntity;
@@ -20,6 +21,9 @@
 @Repository
 public class ProductRepository {
 
+    @Value("${app.catalog.url:default}")
+    private String catalogUrl;
+
     private static final Logger log = LoggerFactory.getLogger(ProductRepository.class);
     private static List<Product> products;
     private final RestTemplate restTemplate = new RestTemplate();
@@ -28,7 +32,10 @@ public class ProductRepository {
     public ProductRepository(DiscoveryClient discoveryClient) {
         this.discoveryClient = discoveryClient;
     }
-    private String getCatalogService() {
+    private String getCatalogServiceUrl() {
+        if ( catalogUrl != null && !catalogUrl.equals("default")) {
+            return catalogUrl;
+        }
         List<ServiceInstance> services = discoveryClient.getInstances("acme-catalog");
         if (services.size() > 0) 
             return services.get(0).getUri().toString();
@@ -43,7 +50,7 @@ public Product getProductById(String id) {
             return null;
         }
         try {
-            String catalogService = getCatalogService();
+            String catalogService = getCatalogServiceUrl();
             if (catalogService == null) 
                 return null;
 
@@ -57,7 +64,7 @@ public Product getProductById(String id) {
     }
 
     public void refreshProductList() {
-        String catalogService = getCatalogService();
+        String catalogService = getCatalogServiceUrl();
         if (catalogService == null) 
             return;
         ResponseEntity<CatalogProductListResponse> response = this.restTemplate
@@ -68,7 +75,7 @@ public void refreshProductList() {
     @PostConstruct
     public List<Product> getProductList() {
         if (products == null) {
-            String catalogService = getCatalogService();
+            String catalogService = getCatalogServiceUrl();
             if (catalogService == null) 
                 return new ArrayList<Product>();
 

apps/acme-assist/src/main/resources/application-k8s.yaml

@@ -0,0 +1,3 @@
+app:
+  catalog:
+    url: http://acme-fitness-catalog.vmtanzu.net

apps/acme-catalog/.gitignore

@@ -35,3 +35,6 @@ out/
 
 ### VS Code ###
 .vscode/
+
+### TANZU ###
+build-output

apps/acme-catalog/.tanzu/config/acme-catalog.yml

@@ -0,0 +1,23 @@
+apiVersion: apps.tanzu.vmware.com/v1
+kind: ContainerApp
+metadata:
+  creationTimestamp: null
+  name: acme-catalog
+spec:
+  build:
+    buildpacks: {}
+    nonSecretEnv:
+      - name: BP_JVM_VERSION
+        value: "21"
+    path: ../..
+  nonSecretEnv:
+    - name: SPRING_PROFILES_ACTIVE
+      value: k8s
+  ports:
+  - name: main
+    port: 8080
+
+  acceptedServiceBindings:
+    - name: db
+      types:
+        - postgresql

apps/acme-catalog/.tanzu/config/http-route.yaml

@@ -0,0 +1,28 @@
+apiVersion: gateway.networking.k8s.io/v1beta1
+kind: HTTPRoute
+metadata:
+  name: acme-catalog
+  annotations:
+    healthcheck.gslb.tanzu.vmware.com/service: acme-catalog
+    healthcheck.gslb.tanzu.vmware.com/path: /
+    healthcheck.gslb.tanzu.vmware.com/port: "8080"
+spec:
+  parentRefs:
+    - group: gateway.networking.k8s.io
+      kind: Gateway
+      name: default-gateway
+      sectionName: http-acme-fitness-catalog
+  rules:
+    - backendRefs:
+        - group: ""
+          kind: Service
+          name: acme-catalog
+          port: 8080
+          weight: 1
+      matches:
+        - path:
+            type: PathPrefix
+            value: /products
+        - path:
+            type: PathPrefix
+            value: /static