Push latest changes

.vscode/settings.json

@@ -0,0 +1 @@
+{}

deploy/cf/mta.yaml

@@ -12,13 +12,8 @@ build-parameters:
   before-all:
     - builder: custom
       commands:
-        ### Deployment w/o csv sample files ###
         - npm install --include=dev --prefix=../../code
-        - npx -p @sap/[email protected] cds build -in ../../code --profile production
-
-        ### Deployment w/ csv sample files ###
-        #- npm install --include=dev --prefix=../../code
-        #- npx -p @sap/cds-dk cds build --profile production,csv
+        - npx -p @sap/cds-dk@7 cds build -in ../../code --profile production
 
 modules:
   # --------------------- APPROUTER MODULE ---------------------

docu/1-discover/1-discover-tutorial-target/README.md

@@ -1,8 +1,10 @@
 # Discover the Tutorial Target
 
-In this tutorial, you will learn how to set up a multitenant Software as a Service (SaaS) application using CAP in your SAP Business Technology Platform (SAP BTP) environment. This use-case can be deployed to the **SAP BTP, Cloud Foundry** and also SAP's managed Kubernetes offering, the **SAP BTP, Kyma Runtime**. You will find separate step-by-step tutorials in case the deployment steps differentiate. 
+In this tutorial, you will learn how to set up a multitenant Software as a Service (SaaS) application using CAP in your SAP Business Technology Platform (SAP BTP) environment. This use-case can be deployed to the **SAP BTP, Cloud Foundry** and also SAP's managed Kubernetes offering, the **SAP BTP, Kyma Runtime**. You are flexible to choose which runtime suits your needs or skills. 
 
-The sample application has a focus on the topic of Sustainability and is called **Sustainable SaaS** (SusaaS). It allows **consumers** of your SaaS application to extend their SAP solutions like SAP S/4HANA with additional features provided by you as a SaaS **Provider**. 
+> **Hint** - You will find separate step-by-step tutorials in case the deployment steps differentiate. Ensure to check the chapter introductions, as those will clearly indicate whether a the content targets a specific runtime! Feel free to ignore any content or chapters not related to your chosen runtime! 
+
+The sample application has a focus on the topic of Sustainability and is therefore called **Sustainable SaaS** (Susaas). It allows **consumers** of your SaaS application to extend their SAP solutions like SAP S/4HANA with additional features provided by you as a SaaS **Provider**. 
 
 - [Discover the Tutorial Target](#discover-the-tutorial-target)
   - [1. Tutorial Versions](#1-tutorial-versions)
@@ -15,12 +17,16 @@ The sample application has a focus on the topic of Sustainability and is called
 
 In this simple scenario, the application allows you to assign users to multiple projects, in which they can assess dedicated circularity metrics of products imported from an SAP backend system like SAP S/4HANA. Besides the assessment of financial product sales data, the app also allows to import or to enter recycling data or product design information. See the following screenshots to get an idea of the application features. The details will be described in later parts of the tutorial (click to enlarge).
 
-[<img src="./images/App_Overview.png" width="250" />](./images/App_Overview.png?raw=true)
-[<img src="./images/App_Launchpad.png" width="300" />](./images/App_Launchpad.png?raw=true)
-[<img src="./images/App_Assessment_01.png" width="300" />](./images/App_Assessment_01.png?raw=true)
-[<img src="./images/App_Assessment_02.png" width="300" />](./images/App_Assessment_02.png?raw=true)
+[<img src="./images/App_Overview.png" height="175" />](./images/App_Overview.png?raw=true)
+[<img src="./images/App_Launchpad.png" height="175" />](./images/App_Launchpad.png?raw=true)
+[<img src="./images/App_Assessment_01.png" height="175" />](./images/App_Assessment_01.png?raw=true)
+[<img src="./images/App_Assessment_02.png" height="175" />](./images/App_Assessment_02.png?raw=true)
+
+Due to the technical and theoretical complexity of the topic, the sample application shall not be seen or used in any kind for productive scenarios. Furthermore, it shall give you a lot of ideas and approaches for your own scenario implementation. 
 
-Due to the technical and theoretical complexity of the topic, the sample application shall not be seen or used in any kind for productive scenarios. Furthermore, it shall give you a lot of ideas and approaches for your own scenario implementation. We aim to cover as many topics as possible but not in the greatest depth that might justify productive usability. Below you can find a solution architecture diagram of the sample application for the Cloud Foundry and Kyma Runtime. As you can see, the app contains a lot of SAP BTP services and tools which you will use during the course of this tutorial. 
+We aim to cover as many topics as possible but not in the greatest depth that might justify productive usability. Below you can find a solution architecture diagram of the sample application for the **Cloud Foundry** and **Kyma** Runtime. The business logic for both runtimes is congruent and only the onboarding of new SaaS tenants requires a few runtime specific code blocks.
+
+As you can see, the app contains a lot of SAP BTP services and tools which you will use during the course of this tutorial. In the context of Kyma, a few services have been replaced by native Kyma or Kubernetes features like **Secrets** replacing the **Credential Store** or **Horizontal Pod Autoscalers** instead of **Autoscaler**. 
 
 **Cloud Foundry**
 
@@ -30,7 +36,13 @@ Due to the technical and theoretical complexity of the topic, the sample applica
 
 [<img src="./images/App_Architecture_Kyma.png" width="600" />](./images/App_Architecture_Kyma.png?raw=true)
 
-As you might have noticed, the architectures of the Kyma and Cloud Foundry are pretty much similar. Same applies for the provided sample code, which only differs in a few runtime specific aspects but is otherwise runtime independent. Anyway, for the Kubernetes experts amongst you, please feel free to check out a more detailed and Kubernetes focused architecture below. If you are new to Kubernetes, don't worry as we will get you covered along the way if you decide to walk along the Kyma path.  
+As you might have noticed, the architectures of the Kyma and Cloud Foundry are pretty much similar. Same applies for the provided sample code, which only differs in a few runtime specific aspects but is otherwise runtime independent. 
+
+> **Important** - All deployment related artifacts have been removed from the actual code-line into a separate *deploy* directory, so the actual *code* is (except for a few spots) completely runtime independent! 
+
+For the Kubernetes experts amongst you, please feel free to check out a more detailed and Kubernetes focused architecture below. If you are new to Kubernetes, don't worry as we will get you covered along the way if you decide to walk along the Kyma path. 
+
+**Kyma**
 
 [<img src="./images/App_ArchitectureDetails.png" width="600" />](./images/App_ArchitectureDetails.png?raw=true)
 
@@ -41,49 +53,62 @@ This tutorial is structured in three major versions which are the **Basic** and
 
 **Basic Version**
 
-The **Basic Version** contains a very comprehensive version of the **SusaaS (Sustainable SaaS)** application, which can be deployed to your SAP BTP account using **free (tier) service plans** only. You can use any SAP BTP account type including Trial accounts to deploy this version of the sample application to either a Kyma or Cloud Foundry environment. Furthermore, the Basic Version is the foundation of the Advanced Version and contains the most important components of a SAP BTP SaaS solution (including an Inbound API). 
+The **Basic Version** contains a very comprehensive version of the **SusaaS (Sustainable SaaS)** application, which can be deployed to your SAP BTP account using **Free (Tier)** or even **Trial** service plans. 
+
+You can use any SAP BTP account type (including Trial) to deploy this version of the sample application to either a Kyma or Cloud Foundry environment. Furthermore, the Basic Version is the foundation of the Advanced Version and contains essential components of a SAP BTP SaaS solution (including a multitenant API). 
+
 
 **Advanced Version**
 
 The **Advanced** version adds further enterprise features to your SAP BTP SaaS application like 
-- a SAP S/4HANA backend pushing data to the SaaS APIs
-- SAP API Management for managing your SaaS API
-- a central user management in SAP Identity Authentication Service
+- a Central User Management in SAP Identity Authentication Service (SAP IAS)
+- an integration with SAP API Management for managing your SaaS API
+- a sample showcasing how to push data from an SAP S/4HANA backend
+
+
+All services required to complement the Advanced Version of the sample scenario are available in all SAP BTP account types including Trial accounts. The only exception is (for sure) an SAP S/4HANA system, which you either need to bring yourself or you need to set up a [CAL instance](https://cal.sap.com/) which will cost you a few dollars per month (don't forget to stop your system if not in use :).
+
+> **Hint** - If you don't have access to an SAP S/4HANA system, you can also use the HTTP test files provided as part of this tutorial for testing the multitenant API from a SaaS consumer perspective. 
 
-All services required to complement the Advanced Version of the sample scenario are available in all SAP BTP account types including Trial accounts. The only exception is an SAP S/4HANA system, which you either need to bring yourself or you need to set up a [CAL instance](https://cal.sap.com/) which will cost you a few dollars per month (don't forget to stop your system if not in use :). You can also skip the respective part of the sample scenario. 
 
 **Expert Features**
 
-> **Important** - The Expert Features are still Work-in-Progress. The code and documentation are subject to change. 
+> **Important** - The Expert Features are still Work-in-Progress and constantly evolving. The code and documentation are subject to change. 
 
 The **Expert Features** contain a lot of additional expert knowledge for developers implementing SaaS applications on SAP BTP. The different topics of the Expert Features mostly result from experiences of the latest learnings and challenges of a Proof-of-Concept which was conducted with SAP partners. 
 
 The topics include but are not limited to
+ - Local and hybrid testing of multitenant apps
+ - Applying extensions as a SaaS consumers
+ - Exploring feature toggles in a SaaS context
  - Using a custom domain for your SaaS app 
  - Handling Tenant database containers
  - Providing your SaaS application in multiple regions
- - Applying extensions for your SaaS consumers
  - Integrating a customer's Identity Provider
  - Sending e-mails using Microsoft Graph
  - ...
 
 
 ## 2. GitHub Repository 
 
-You can find the code of the sample application in the following sap-samples GitHub repository. You can either clone or fork the repository to your own GitHub account. 
+You can find the code of the sample application in the following SAP-samples GitHub repository. You can either clone or fork the repository to your own GitHub account. 
 
 https://github.com/SAP-samples/btp-cap-multitenant-saas
 
 The repository contains one branch [**main**](https://github.com/SAP-samples/btp-cap-multitenant-saas/tree/main/) for the tutorial documentation, source code and deployment definitions like Helm Charts and MTA Deployment Descriptor files. 
 
+> **Important** - The code-line is kept generic, so that in a few places you are required to provide your environment specific details. Please make sure to carefully read the step-by-step guide in this case, as we provide guidance on how to use the **-private** filename extension. This will ensure that no confidential or environment specific details will be committed to your GitHub repository.
+
 
 ## 3. Tutorial Audience
 
 While the ecosystem of partner-built software for SAP On-Premise solutions has grown very well over the last decades, the available partner offerings and the interest in building solutions on SAP BTP starts to increase. A lot of SAP partners wonder how to port their existing developments to the cloud, to satisfy the demand of their existing customers moving to SAP BTP, or reach out to a much broader market than before. 
 
-For that reason, this tutorial and the related topic of developing multitenant SaaS applications using the **SAP BTP, Cloud Foundry or Kyma Runtime** is of great interest to partners and customers. It is supposed to give all interested stakeholders an introduction to the theoretical basics of Software as a Service on SAP BTP and provides a great codebase that can be used to kickstart your own implementation. 
+For that reason, this tutorial and the related topic of developing multitenant SaaS applications using the **SAP BTP, Cloud Foundry** or **Kyma Runtime** is of great interest to partners and customers. It is supposed to give all interested stakeholders an introduction to the theoretical basics of Software as a Service on SAP BTP and provides a great codebase that can be used to kickstart your own implementation. 
+
+There is no previous development knowledge required for the **Cloud Foundry** sample of this tutorial, so all new but also experienced developers can set up the sample application. Nevertheless, a basic understanding of SAP BTP service offerings will help you grasp the ideas and concepts. Furthermore, you should have a basic idea how to use the SAP BTP Cockpit to assign entitlements, role-collections and similar foundational concepts. 
 
-There is no previous knowledge required for this tutorial, so all new but also experienced developers can set up the sample application. Nevertheless, a basic understanding of SAP BTP service offerings will help you grasp the ideas and concepts. 
+For the **Kyma** track, you will require at least some basic Kubernetes knowledge and ideally have a Kyma Cluster up and running in your environment. Furthermore, you should be familiar connecting to your Cluster using kubectl.
 
 
 ## 4. Focus Topics
@@ -100,6 +125,7 @@ The main topics of the tutorial include:
   - APIs for flexible Subscriber data integration
   - and many more...
 * Expert topics to consider when building SaaS apps like
+  - development efficiency using local and hybrid testing
   - set up a custom domain for your app
   - deploying your app to multiple regions
   - handling Tenant database containers