Merge pull request #109 from SAP-samples/endresult-updates-november-2023

versions, kyma cli, btp operator, ...

code/day2-operations/deployment/k8s/elk-stack/kibana-expose.yaml

@@ -24,7 +24,7 @@ metadata:
   name: kibana-expose
 spec:
   gateway: kyma-gateway.kyma-system.svc.cluster.local
-  host: kibana
+  host: kibana 
   service:
     name: ef-kibana-kb-http
     port: 5601    

code/day2-operations/source/day2-service/src/main/java/dev/kyma/samples/easyfranchise/day2/rest/service/UserRestControler.java

@@ -11,6 +11,7 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -31,6 +32,7 @@ public class UserRestControler {
 	@Autowired
 	private UserLoginInfoService userLoginInfoService;
 
+	@CrossOrigin //we have to allow CrossOrigin for local testing. Don't allow CrossOrigin for production running applications!! 
 	@GetMapping("/user/metric")
 	public List<UserMetric> getUserMetric(@RequestParam @NotNull int year,
 			@RequestParam @NotNull @Min(1) @Max(12) Integer month) {

code/day2-operations/source/day2-ui/README.md

@@ -1,4 +1,4 @@
-# Metering Dashboard UI
+# Day2 UI
 
 ## How to Run the Service 
 

code/easyfranchise/deployment/docker/Dockerfile-approuter

@@ -1,4 +1,4 @@
-FROM node:14
+FROM --platform=linux/amd64 node:20
 
 WORKDIR /app
 

code/easyfranchise/deployment/docker/Dockerfile-bp-service

@@ -1,4 +1,4 @@
-FROM maven:3-openjdk-17-slim as BUILDER
+FROM --platform=linux/amd64 maven:3-openjdk-17-slim as BUILDER
 WORKDIR /opt/app
 COPY code/easyfranchise/source/backend/bp-service/pom.xml bp-service/pom.xml
 COPY code/easyfranchise/source/backend/db-service/pom.xml db-service/pom.xml
@@ -12,7 +12,7 @@ COPY code/easyfranchise/source/backend/db-service/src /opt/app/db-service/src
 RUN mvn clean install -DskipTests=true
 
 # At this point, BUILDER stage should have your .jar or whatever in some path
-FROM sapmachine:16 as production-stage
+FROM --platform=linux/amd64 sapmachine:latest as production-stage
 LABEL maintainer="[email protected]"
 WORKDIR /opt/app
 COPY --from=BUILDER /opt/app/bp-service/target/bp-service.jar /opt/app/bp-service.jar

code/easyfranchise/deployment/docker/Dockerfile-broker

@@ -1,4 +1,4 @@
-FROM node:14
+FROM --platform=linux/amd64 node:14
 
 EXPOSE 3002
 

code/easyfranchise/deployment/docker/Dockerfile-business-partner-mock

@@ -1,4 +1,4 @@
-FROM node:latest
+FROM --platform=linux/amd64 node:latest
 
 EXPOSE 8081
 

code/easyfranchise/deployment/docker/Dockerfile-db-service

@@ -1,4 +1,4 @@
-FROM maven:3-openjdk-17-slim as BUILDER
+FROM --platform=linux/amd64 maven:3-openjdk-17-slim as BUILDER
 WORKDIR /opt/app
 COPY code/easyfranchise/source/backend/bp-service/pom.xml bp-service/pom.xml
 COPY code/easyfranchise/source/backend/db-service/pom.xml db-service/pom.xml
@@ -11,13 +11,11 @@ COPY code/easyfranchise/source/backend/ef-service/src /opt/app/ef-service/src
 COPY code/easyfranchise/source/backend/db-service/src /opt/app/db-service/src
 RUN mvn clean install -DskipTests=true
 
-FROM sapmachine:16 as production-stage
+FROM --platform=linux/amd64 sapmachine:latest as production-stage
 LABEL maintainer="[email protected]"
 WORKDIR /opt/app
 COPY --from=BUILDER /opt/app/db-service/target/db-service.jar /opt/app/db-service.jar
 COPY --from=BUILDER /opt/app/db-service/target/dependency/* /opt/app/
 ENV JAVA_OPTS=""
 EXPOSE 8080
-EXPOSE 9999
-
-CMD ["java", "-Dcom.sun.management.jmxremote.port=9999", "-Dcom.sun.management.jmxremote.authenticate=false", "-Dcom.sun.management.jmxremote.ssl=false", "-cp",  "/opt/app/*", "dev.kyma.samples.easyfranchise.ServerApp", "8080"]
+CMD ["java", "-cp",  "/opt/app/*", "dev.kyma.samples.easyfranchise.ServerApp", "8080"]    

code/easyfranchise/deployment/docker/Dockerfile-ef-service

@@ -1,4 +1,4 @@
-FROM maven:3-openjdk-17-slim as BUILDER
+FROM --platform=linux/amd64 maven:3-openjdk-17-slim as BUILDER
 WORKDIR /opt/app
 COPY code/easyfranchise/source/backend/bp-service/pom.xml bp-service/pom.xml
 COPY code/easyfranchise/source/backend/db-service/pom.xml db-service/pom.xml
@@ -11,7 +11,7 @@ COPY code/easyfranchise/source/backend/ef-service/src /opt/app/ef-service/src
 COPY code/easyfranchise/source/backend/db-service/src /opt/app/db-service/src
 RUN mvn clean install -DskipTests=true
 
-FROM sapmachine:16 as production-stage
+FROM --platform=linux/amd64 sapmachine:latest as production-stage
 LABEL maintainer="[email protected]"
 WORKDIR /opt/app
 COPY --from=BUILDER /opt/app/ef-service/target/ef-service.jar /opt/app/ef-service.jar

code/easyfranchise/deployment/docker/Dockerfile-email-service

@@ -1,4 +1,4 @@
-FROM node:latest
+FROM --platform=linux/amd64 node:latest
 
 EXPOSE 3002
 

code/easyfranchise/deployment/docker/Dockerfile-ui

@@ -1,13 +1,13 @@
 # build stage
-FROM node:14-alpine as build-stage
+FROM --platform=linux/amd64 node:14-alpine as build-stage
 WORKDIR /app
 COPY code/easyfranchise/source/ui/package*.json ./
 RUN npm install
 COPY code/easyfranchise/source/ui/. .
 RUN npm run build
 
 # production stage
-FROM nginx:stable-alpine as production-stage
+FROM --platform=linux/amd64 nginx:stable-alpine as production-stage
 COPY --from=build-stage /app/resources /usr/share/nginx/html
 EXPOSE 80
 CMD ["nginx", "-g", "daemon off;"]

code/easyfranchise/deployment/k8s/bp-service.yaml

@@ -21,7 +21,7 @@ spec:
       imagePullSecrets:
         - name: registry-secret
       containers:
-      - image: <image-name>
+      - image: <image-name> # use your own image
         name: bp-service
         imagePullPolicy: Always
         resources: {}

code/easyfranchise/deployment/k8s/broker.yaml

@@ -18,7 +18,7 @@ spec:
       imagePullSecrets:
         - name: registry-secret # replace with your own registry secret
       containers:
-      - image: <image-name> #cp-enablement.docker.repositories.sap.ondemand.com/easyfranchise/broker # use your own image
+      - image: <image-name> # use your own image
         name: broker
         imagePullPolicy: Always
         env:

code/easyfranchise/deployment/k8s/business-partner-mock.yaml

@@ -18,7 +18,7 @@ spec:
       imagePullSecrets:
         - name: registry-secret # replace with your own registry secret      
       containers:
-      - image: <image-name> # e.g. cp-enablement.docker.repositories.sap.ondemand.com/com.sap.easyfranchise/s4hanamock:<version>
+      - image: <image-name> # use your own image
         name: business-partner-mock
         imagePullPolicy: Always
         ports:

code/easyfranchise/source/README.md

@@ -0,0 +1,14 @@
+# Easy Franchise Components
+
+This section contains all components that are needed to run the Easy Franchise application.
+
+- [backend](backend): JAVA-based backend services that manage database, SAP S/4HANA Cloud system and the logic of the application
+    - [Database Service](backend/db-service)
+    - [Business Partner Service](backend/bp-service)
+    - [Easy Franchise Service](backend/ef-service)
+- [email-service](email-service): node.js-based service that sends notifications
+- [ui](ui): vue.js-based user interface
+- [Approuter](approuter): node.js-based application router for authorization and authentication
+- [broker](broker): service that onboards/offboards new customers of the multitenant application
+- [business-partner-mock-server](business-partner-mock-server): service to simulate an SAP S/4HANA Cloud system if not available
+

code/easyfranchise/source/approuter/approuter-start.js

@@ -1,7 +1,7 @@
-const jwt_decode = require('jwt-decode');
 const approuter = require('@sap/approuter');
 const xssec = require('@sap/xssec');
 const xsenv = require('@sap/xsenv');
+const { jwtDecode } = require('jwt-decode');
 
 var ar = approuter();
 ar.beforeRequestHandler.use('/backend', function (req, res, next) {
@@ -10,7 +10,7 @@ ar.beforeRequestHandler.use('/backend', function (req, res, next) {
         res.statusCode = 403;
         res.end("Missing JWT Token");
     } else {
-        const decodedToken = jwt_decode(token);
+        const decodedToken = jwtDecode(token);
         const tenant = decodedToken && decodedToken.zid;
         req.headers['x-tenant-id'] = tenant;
         next();
@@ -24,7 +24,7 @@ ar.beforeRequestHandler.use('/userInfo', function (req, res, next) {
         res.end("Missing JWT Token");
     } else {
         res.statusCode = 200;
-        let decodedToken = jwt_decode(token);
+        let decodedToken = jwtDecode(token);
         res.end(JSON.stringify({
             userid: decodedToken.user_name,
             email: decodedToken.email,

code/easyfranchise/source/approuter/package.json

@@ -7,13 +7,13 @@
     "start": "node approuter-start.js"
   },
   "dependencies": {
-    "@sap/approuter": "10.8.2",
-    "@sap/xsenv": "^3.1.1",
-    "@sap/xssec": "^3.2.8",
-    "jwt-decode": "^3.1.2"
+    "@sap/approuter": "14.3.4",
+    "@sap/xsenv": "^4.0.0",
+    "@sap/xssec": "^3.4.0",
+    "jwt-decode": "^4.0.0"
   },
   "devDependencies": {},
   "engines": {
-    "node": "14.x.x"
+    "node": "20.x.x"
   }
 }

code/easyfranchise/source/approuter/readme.md

@@ -0,0 +1,3 @@
+# Easy Franchise Approuter
+
+Please refer to [documentation](/documentation/explore/approuter/README.md) for more details.

code/easyfranchise/source/backend/README.md

@@ -0,0 +1,3 @@
+# Easy Franchise Backend
+
+Please refer to [documentation](/documentation/explore/README.md) for more details.

code/easyfranchise/source/backend/bp-service/src/main/java/dev/kyma/samples/easyfranchise/bpservice/BPService.java

@@ -1,8 +1,5 @@
 package dev.kyma.samples.easyfranchise.bpservice;
 
-import java.net.InetSocketAddress;
-import java.net.Proxy;
-
 import org.apache.http.HttpStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -19,10 +16,10 @@
 import jakarta.ws.rs.WebApplicationException;
 import jakarta.ws.rs.container.ContainerRequestContext;
 import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.HttpHeaders;
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.UriInfo;
-import jakarta.ws.rs.core.HttpHeaders;
 /**
  * Rest service for S/4HANA  connectivity
  *

code/easyfranchise/source/backend/pom.xml

@@ -7,9 +7,9 @@
 	<version>1.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<properties>
-		<jetty.version>11.0.3</jetty.version>
-		<jersey.version>3.0.1</jersey.version>
-		<slf4j.version>2.0.0-alpha1</slf4j.version>
+		<jetty.version>11.0.18</jetty.version>
+		<jersey.version>3.1.3</jersey.version>
+		<slf4j.version>2.0.9</slf4j.version>
 		<project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
 	</properties>
 	<build>
@@ -20,7 +20,7 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.8.1</version>
 				<configuration>
-					<release>15</release>
+					<release>17</release>
 				</configuration>
 			</plugin>
 			<plugin>

code/easyfranchise/source/backend/shared-code/src/main/java/dev/kyma/samples/easyfranchise/communication/Connection.java

@@ -4,9 +4,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.HttpURLConnection;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.Proxy;
 import java.net.SocketTimeoutException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;

code/easyfranchise/source/broker/readme.md

@@ -0,0 +1,3 @@
+# Broker
+
+Please refer to [documentation](/documentation/explore/broker/README.md) for more details.

code/easyfranchise/source/business-partner-mock-server/readme.md

@@ -0,0 +1,3 @@
+# SAP Business Partner Mock Server
+
+Please refer to [documentation](/documentation/appendix/business-partner-mock) for more details.

code/easyfranchise/source/business-partner-mock-server/server.js

@@ -17,7 +17,7 @@ app.get('/sap/opu/odata/sap/API_BUSINESS_PARTNER/A_BusinessPartner', function (r
     });
  })
 
-var server = app.listen(8081, '127.0.0.1', function () {
+var server = app.listen(8081, '0.0.0.0', function () {
    var host = server.address().address;
    if (host === '::') {
         host = 'localhost';

code/easyfranchise/source/email-service/README.md

@@ -0,0 +1,3 @@
+# Email Service
+
+Please refer to [documentation](/documentation/explore/email-service/README.md) for more details.

code/easyfranchise/source/ui/README.md

@@ -0,0 +1,3 @@
+# Easy Franchise Backend
+
+Please refer to [documentation](/documentation/explore/ui/README.md) for more details.

code/easyfranchise/source/ui/public/index.html

@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <link rel="icon" href="<%= BASE_URL %>ui/favicon.ico">
     <link href="https://unpkg.com/fiori-fundamentals@latest/dist/fiori-fundamentals.min.css" rel="stylesheet">
     <title><%= htmlWebpackPlugin.options.title %></title>
     <link href="header.css" rel="stylesheet">

code/easyfranchise/source/ui/vue.config.js

@@ -2,6 +2,6 @@ module.exports = {
     devServer: {
         host: '0.0.0.0',
         hot: true,
-        allowedHosts: "all",
+        allowedHosts: ['all'],
       },
 };