Skip to content

Commit f117710

Browse files
authored
Merge branch 'master' into master
2 parents 53e23da + 46b1793 commit f117710

File tree

10 files changed

+84
-61
lines changed

10 files changed

+84
-61
lines changed

tutorials/abap-environment-monitoring-calm-health-monitoring/abap-environment-monitoring-calm-health-monitoring.md

Lines changed: 45 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ author_profile: https://github.com/julieplummer20
1818
- Access to the Fiori app **Health Monitoring**
1919

2020
## You will learn
21-
- How to configure outbound communication from your SAP BTP ABAP Environment using the communication arrangement **`SAP_COM_0276`**
22-
- How to configure communication from your SAP BTP ABAP Environment instance to the SAP Cloud ALM service using the communication arrangement **`SAP_COM_0527`**
21+
- How to configure outbound communication from your SAP BTP ABAP Environment using the communication scenario **`SAP_COM_0276`**
22+
- How to configure communication from your SAP BTP ABAP Environment instance to the SAP Cloud ALM service using the communication scenario **`SAP_COM_0527`**
2323
- How to configure the use cases you want for SAP Cloud ALM
2424

2525

@@ -33,8 +33,11 @@ For more information, see SAP Help Portal: [Integration in Central Monitoring an
3333

3434
Throughout this tutorial, objects name include a prefix, such as **`Zxx`** or suffix, such as **`XXX`**. Always replace this with your group number or initials.
3535

36-
<!-- border -->![step0-overview](step0-overview.png)
37-
<!-- border -->![step0-overview2](step0-overview2.png)
36+
<!-- border -->
37+
![step0-overview](step0-overview.png)
38+
39+
<!-- border -->
40+
![step0-overview2](step0-overview2.png)
3841

3942
---
4043

@@ -44,78 +47,95 @@ In the BTP Cockpit, you need to create a destination service in your BTP subacco
4447

4548
1. Navigate to your **Space**, choose **Instances**, then choose **Create**.
4649

47-
<!-- border -->![step1a-navigate-to-space-etc](step1a-navigate-to-space-etc.png)
50+
<!-- border -->
51+
![step1a-navigate-to-space-etc](step1a-navigate-to-space-etc.png)
4852

4953
2. Enter the following, then choose **Create**.
5054

5155
- Service: **Destination**
5256
- Plan: **Lite**
5357
- Instance Name: e.g. **`DST`**
5458

55-
<!-- border -->![step1a-create-destinations-service](step1a-create-destinations-service.png)
59+
<!-- border -->
60+
![step1a-create-destinations-service](step1a-create-destinations-service.png)
61+
62+
3. Create a service key for your SAP Cloud ALM service and download it; you will need it later - that is, the SAP Cloud ALM service mentioned in the prerequisites above.
63+
64+
<!-- border -->
65+
![step1c-calm-service-already-created](step1c-calm-service-already-created.png)
5666

57-
3. Create a service key for your SAP Cloud ALM service and download it; you will need it later.
5867

5968
4. Create a new service key for your SAP BTP ABAP Environment and download it; you will need it later.
6069

61-
<!-- border -->![step1c-create-service-key-for-steampunk](step1c-create-service-key-for-steampunk.png)
70+
<!-- border -->
71+
![step1c-create-service-key-for-steampunk](step1c-create-service-key-for-steampunk.png)
6272

6373

64-
### Set up SAP Cloud ALM service
74+
### Configure destination
6575

6676
In the BTP Cockpit, you need to create a destination to SAP Cloud ALM if you have not already done so.
6777

6878
1. Navigate to your **Subaccount** and choose **Destinations > New Destination**.
6979

70-
<!-- border -->![step1c-navigate-to-destinations](step1c-navigate-to-destinations.png)
80+
<!-- border -->
81+
![step1c-navigate-to-destinations](step1c-navigate-to-destinations.png)
7182

7283
2. Configure the destination to your SAP Cloud ALM service using the credentials in the service key (from step 1.3).
7384

74-
<!-- border -->![step1b-destination-to-calm](step1b-destination-to-calm.png)
75-
76-
3. Choose scenario **`SAP_COM_0276`**, paste the service key of your destination service (from step 1.4), then choose **Create**.
77-
78-
<!-- border -->![step2c-comm-arr-create](step2c-comm-arr-create.png)
79-
85+
<!-- border -->
86+
![step1b-destination-to-calm](step1b-destination-to-calm.png)
8087

8188

8289
### Create Communication Arrangement for Destination Service Integration (SAP_COM_0276)
8390

8491
1. Logon to your SAP BTP ABAP Environment as Administrator and choose the app **Communication Arrangements**.
8592

86-
<!-- border -->![step2a-comm-arr](step2a-comm-arr.png)
93+
<!-- border -->
94+
![step2a-comm-arr](step2a-comm-arr.png)
8795

8896
2. Choose **New**.
8997

90-
<!-- border -->![step2b-comm-arr-new](step2b-comm-arr-new.png)
98+
<!-- border -->
99+
![step2b-comm-arr-new](step2b-comm-arr-new.png)
100+
101+
3. Choose scenario **`SAP_COM_0276`**, paste the service key of your destination service (from step 1.4), then choose **Create**.
102+
103+
<!-- border -->
104+
![step2c-comm-arr-create](step2c-comm-arr-create.png)
91105

92106

93107

94108
### Create Communication Arrangement for Application Monitoring (SAP_COM_0527)
95109

96110
1. Again, choose **New**, then choose **Create**.
97111

98-
<!-- border -->![step3a-comm-arr-create-SAP_COM_0527](step3a-comm-arr-create-SAP_COM_0527.png)
112+
<!-- border -->
113+
![step3a-comm-arr-create-SAP_COM_0527](step3a-comm-arr-create-SAP_COM_0527.png)
99114

100115
2. Create a New **Communication System**.
101116

102-
<!-- border -->![step3b-comm-system-new-cutout](step3b-comm-system-new-cutout.png)
117+
<!-- border -->
118+
![step3b-comm-system-new-cutout](step3b-comm-system-new-cutout.png)
103119

104-
3. From the dropdown list, choose the **Name** for your SAP Cloud ALM service, that you configured in step 1.3 - in this example, **`ABAPK8S_CALM`**.
120+
3. From the dropdown list, choose the **Name** for your SAP Cloud ALM service, that you configured in step 3.2.
105121

106-
<!-- border -->![step3c-comm-system-name](step3c-comm-system-name.png)
122+
<!-- border -->
123+
![step3c-comm-system-name](step3c-comm-system-name.png)
107124

108125
4. Choose the use cases you want to enable.
109126

110-
<!-- border -->![step3d-configure-use-cases](step3d-configure-use-cases.png)
127+
<!-- border -->
128+
![step3d-configure-use-cases](step3d-configure-use-cases.png)
111129

112130
5. Configure the job execution details as follows and choose **Save**, then save the communication arrangement.
113131

114-
<!-- border -->![step3e-configure-job-exec-details](step3e-configure-job-exec-details.png)
132+
<!-- border -->
133+
![step3e-configure-job-exec-details](step3e-configure-job-exec-details.png)
115134

116135
Your SAP BTP ABAP environment is registered in your SAP Cloud ALM instance. However, it could take **up to one hour** before the first monitoring data is pushed to your service.
117136

118-
<!-- border -->![step3e-result-calm-health-monitoring](step3e-result-calm-health-monitoring.png)
137+
<!-- border -->
138+
![step3e-result-calm-health-monitoring](step3e-result-calm-health-monitoring.png)
119139

120140

121141
### Test yourself
Loading
Loading

tutorials/btp-cf-buildpacks-node-create/btp-cf-buildpacks-node-create.md

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ tags: [ tutorial>beginner, software-product>sap-btp--cloud-foundry-environment,
1010
primary_tag: programming-tool>node-js
1111
---
1212

13-
1413
## You will learn
1514
- How to create a simple "Hello World" application in Node.js
1615
- How to create an application router for it
@@ -26,11 +25,7 @@ primary_tag: programming-tool>node-js
2625
## Intro
2726
This tutorial will guide you through creating and setting up a simple Node.js application in cf CLI. You will start by building and deploying a web application that returns simple data – a **Hello World!** message, and then invoking this app through a web microservice (application router). Finally, you will set authentication checks and authorization roles to properly access and manage your web application.
2827

29-
---
30-
3128
### Log on to SAP BTP
32-
33-
3429
First, you need to connect to the SAP BTP, Cloud Foundry environment with your productive subaccount. Your Cloud Foundry URL depends on the region where the API endpoint belongs to. To find out which one is yours, see: [Regions and API Endpoints Available for the CF Environment] (https://help.sap.com/products/BTP/65de2977205c403bbc107264b8eccf4b/f344a57233d34199b2123b9620d0bb41.html?version=Cloud)
3530

3631
In this tutorial, we use `eu20.hana.ondemand.com` as an example.
@@ -58,14 +53,12 @@ In this tutorial, we use `eu20.hana.ondemand.com` as an example.
5853
> This step is skipped if you're using a trial account.
5954
6055
61-
#### RESULT
6256
57+
#### RESULT
6358
Details about your personal SAP BTP subaccount are displayed (API endpoint, user, organization, space).
6459
6560
6661
### Create a Node.js application
67-
68-
6962
You're going to create a simple Node.js application.
7063
7164
1. In your local file system, create a new directory (folder). For example: `node-tutorial`
@@ -183,15 +176,12 @@ You're going to create a simple Node.js application.
183176
That is: `https://node-1234-aaaa-5678.cfapps.eu20.hana.ondemand.com`
184177
185178
#### RESULT
186-
187179
Your Node.js application is successfully deployed and running on the SAP BTP, Cloud Foundry environment. A **Hello World!** message is displayed in the browser.
188180
189181
190182
191183
192184
### Run an Authentication Check
193-
194-
195185
Authentication in the SAP BTP, Cloud Foundry environment is provided by the Authorization and Trust Management (XSUAA) service. In this example, OAuth 2.0 is used as the authentication mechanism. The simplest way to add authentication is to use the Node.js `@sap/approuter` package. To do that, a separate Node.js micro-service will be created, acting as an entry point for the application.
196186
197187
1. In the `node-tutorial` folder, create an `xs-security.json` file for your application with the following content:
@@ -203,7 +193,7 @@ Authentication in the SAP BTP, Cloud Foundry environment is provided by the Auth
203193
}
204194
```
205195
206-
> **NOTE**: For trial accounts, enter the following additional `oauth2-configuration` lines in your `xs-security.json` file:
196+
> **IMPORTANT**: For trial accounts, enter the following additional `oauth2-configuration` lines in your `xs-security.json` file:
207197
208198
209199
```JSON
@@ -386,17 +376,13 @@ Authentication in the SAP BTP, Cloud Foundry environment is provided by the Auth
386376
> Both the `myapp` and `web` applications are bound to the same Authorization and Trust Management (XSUAA) service instance `nodeuaa`. In this scenario, the authentication is handled by XSUAA through the application router.
387377
388378
#### RESULT
389-
390379
- Click the `My Node.js Application` link. The browser window displays **Application user:** `<e-mail>`, showing the email you have used for your Cloud Foundry logon.
391380
392381
- Check that the `myapp` application is not accessible without authentication. To do that, refresh its previously loaded URL in a web browser – you should get a response `401 Unauthorized`.
393382
394383
395384
396-
397385
### Run an Authorization Check
398-
399-
400386
Authorization in the SAP BTP, Cloud Foundry environment is also provided by the XSUAA service. In the previous example, the `@sap/approuter` package was added to provide a central entry point for the business application and to enable authentication. Now to extend the example, authorization will be added through the implementation of a `users` REST service. Different authorization checks will be introduced for the GET and CREATE operations to demonstrate how authorization works. The authorization concept includes elements such as roles, scopes, and attributes provided in the security descriptor file `xs-security.json`. For more information, see: [Application Security Descriptor Configuration Syntax] (https://help.sap.com/docs/BTP/65de2977205c403bbc107264b8eccf4b/517895a9612241259d6941dbf9ad81cb.html?version=Cloud)
401387
402388
1. To introduce application roles, open the `xs-security.json` in the `node-tutorial` folder, and add scopes and role templates as follows:
@@ -516,7 +502,7 @@ Authorization in the SAP BTP, Cloud Foundry environment is also provided by the
516502
});
517503
```
518504
519-
> **NOTE:** Authorization checks are enforced by the `xssec` package in the `@sap` directory. To every request object, using `passport` and `xssec.JWTStrategy`, a security context is attached as an `authInfo` object. The resulting request object is initialized with the incoming JWT token. To check the full list of methods and properties of the security context, see: [Authentication for Node.js Applications] (https://help.sap.com/docs/BTP/65de2977205c403bbc107264b8eccf4b/4902b6e66cbd42648b5d9eaddc6a363d.html?version=Cloud)
505+
> Authorization checks are enforced by the `xssec` package in the `@sap` directory. To every request object, using `passport` and `xssec.JWTStrategy`, a security context is attached as an `authInfo` object. The resulting request object is initialized with the incoming JWT token. To check the full list of methods and properties of the security context, see: [Authentication for Node.js Applications] (https://help.sap.com/docs/BTP/65de2977205c403bbc107264b8eccf4b/4902b6e66cbd42648b5d9eaddc6a363d.html?version=Cloud)
520506
521507
As defined in the `start.js` file, for HTTP GET requests users need the `Display` scope to be authorized. For HTTP POST requests, they need to have the `Update` scope assigned.
522508
@@ -591,16 +577,13 @@ Authorization in the SAP BTP, Cloud Foundry environment is also provided by the
591577
8. Try to access `myapp` again (in a browser) in both ways – directly and through the `web` application router.
592578
593579
#### RESULT
594-
595580
- When you access it directly, you should still get a response `401 Unauthorized`. This is a correct and expected behavior.
596581
- When you access the `web` application and click the `Show users` link, it should result in a `403 Forbidden` response due to missing permissions. The same error is thrown if you try to add a new user.
597582
598583
To get permissions, you need to create a role collection containing the roles `Viewer` and `Manager` and assign these roles to your user. You can do this only from the SAP BTP cockpit.
599584
600585
601586
### Assigning Roles to a User in SAP BTP Cockpit
602-
603-
604587
1. Open the SAP BTP cockpit and go to your subaccount.
605588
606589
2. From the left-side menu, navigate to `Security` > `Role Collections`.
@@ -631,12 +614,8 @@ To get permissions, you need to create a role collection containing the roles `V
631614
632615
633616
#### RESULT
634-
635617
Accessing the `myapp` application results in the following:
636618
637619
- If you try to access it directly, a response `401 Unauthorized` is still displayed due to lack or permissions (roles). This is a correct and expected behavior.
638620
639621
- If you try to access it through the `web` application router, the `Show users` link will show the list of users - **John** and **Paula**. If you enter a new name, it will be successfully recorded in the user database.
640-
641-
642-
---
Binary file not shown.

tutorials/opps-manual-setup/opps-manual-setup.md

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ primary_tag: products>sap-business-technology-platform
1313

1414
## Prerequisites
1515
- You have registered for a trial account on [SAP BTP](hcp-create-trial-account).
16-
- You should be familiar with the SAP BTP trial landscape and terminology (see [Take a Tour of SAP BTP Trial](cp-trial-quick-onboarding)).
16+
- You should be familiar with the SAP BTP trial landscape and terminology (see [Take a Tour of SAP BTP Trial](cp-trial-quick-onboarding)).
1717
- You have a subaccount in the Cloud Foundry environment, with Microsoft Azure as provider and the Singapore region (AP21).
1818

1919

@@ -32,7 +32,7 @@ primary_tag: products>sap-business-technology-platform
3232
### Subscribe to SAP Omnichannel Promotion Pricing trial
3333

3434

35-
1. In the [SAP BTP trial](https://account.hanatrial.ondemand.com), enter your trial account.
35+
1. In the [SAP BTP trial](https://account.hanatrial.ondemand.com), enter your trial account. You trial account must be in the Singapore - Azure region.
3636

3737
2. Navigate to your subaccount. It is usually named `trial`.
3838

@@ -49,15 +49,13 @@ primary_tag: products>sap-business-technology-platform
4949
Once the subscription is finished, you can choose the three dot symbol **°°°** and **Go to Application** in the **Application Plans** section to make configuration settings in the **Configure Omnichannel Promotion Pricing** app. <!-- Using the app is optional and not part of the basic tutorial but is included in our advanced tutorial.-->
5050
<!-- Add link to advanced tutorial once available -->
5151

52-
> If **SAP Omnichannel Promotion Pricing (Trial)** does not appear in the service marketplace, you probably created a new subaccount to an already existing trial account. In this case, you must assign the SaaS app and services to your subaccount in the **Entitlements** section. For more information, see [Configure Entitlements for Subaccounts](https://help.sap.com/viewer/7c87270e23c64c2aa922ce297a6df23d/Cloud/en-US/6fce2cbd9df94d88be99f7662c6b7ed6.html).
53-
5452

5553

5654

5755
### Set up roles and authorizations
5856

5957

60-
In order to use the **Configure Omnichannel Promotion Pricing** app, you must create a role collection and assign users to it. With the configuration app, you can maintain various parameters to influence the behavior of the **Calculation service**. <!-- Using the app is not part of the basic tutorial. -->
58+
In order to use the apps provided with SAP Omnichannel Promotion Pricing, you must create a role collection and assign users to it. With the **Configure Omnichannel Promotion Pricing** app, you can maintain various parameters to influence the behavior of the **Calculation service**. With the **Maintain Promotions** app, you can create promotional rules and define, for example, eligibilities and rewards. Using the apps is not part of the tutorials.
6159

6260
1. Navigate back to your subaccount.
6361

@@ -69,20 +67,18 @@ In order to use the **Configure Omnichannel Promotion Pricing** app, you must cr
6967

7068
5. Select the role collection you've just created from the list and choose **Edit**.
7169

72-
6. Under **Role Name**, select **`Configure_OPPS`** from the dropdown list.
70+
6. Under **Role Name**, select **`Configure_OPPS`** and **`Maintain_OPPS`** from the dropdown list.
7371

7472
7. Assign **User** or **User Groups** to your role collection and choose **Save**.
7573

76-
<!-- Should we explain Step 7 a bit more?
77-
COS has already implemented a role collection for trial, should we do sth similar? -->
7874

7975

8076

8177
### Create service instances
8278

8379

8480
1. Navigate to your subaccount and the **space** in which you want to create the service instances.
85-
> To save some clicks, do the following steps in your space. You can also do this in your subaccount but then you have to provide further information.
81+
> To save you some clicks, do the following steps in your space. You can also do this in your subaccount but then you have to provide further information.
8682
8783
2. In the navigation pane, choose **Services > Service Marketplace**.
8884

@@ -135,6 +131,6 @@ You have now successfully set up your SAP Omnichannel Promotion Pricing trial on
135131
### Additional Information
136132

137133
* Basic Tutorial: [Apply a Simple Promotion with SAP Omnichannel Promotion Pricing](opps-basic-scenario)
138-
* [Official Product Documentation](https://help.sap.com/viewer/product/OPP/Cloud/en-US)
139-
* [Trial Documentation](https://help.sap.com/viewer/0c145d124b784b548b618cda8a5b2aba/Cloud/en-US/31b8aedc8ce14fcd9f6021ad4f6323c9.html)
134+
* [Official Product Documentation](https://help.sap.com/docs/OPP)
135+
* [Trial Documentation](https://help.sap.com/docs/OPP/0c145d124b784b548b618cda8a5b2aba/31b8aedc8ce14fcd9f6021ad4f6323c9.html)
140136
* [Video: SAP Omnichannel Promotion Pricing in a Nutshell](https://www.sap.com/assetdetail/2020/07/9060b3a5-a67d-0010-87a3-c30de2ffd8ff.html)

tutorials/opps-manual-setup/rules.vr

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
[VALIDATE_1]
2+
###Rule
3+
single-choice
4+
5+
###Question
6+
Is it sufficient to subscribe to SAP Omnichannel Promotion Pricing in order to use the complete functionality?
7+
8+
###Match
9+
[ ] Yes, subscribing is sufficient.
10+
[x] No, you must also create service instances for the Promotion Pricing services.
11+
12+
[VALIDATE_1]
13+
14+
15+
[VALIDATE_3]
16+
###Rule
17+
single-choice
18+
19+
###Question
20+
How many service instances do you have to at least create for your trial scenario?
21+
22+
###Match
23+
[ ] 1
24+
[ ] 2
25+
[x] 3
26+
[ ] 4
27+
28+
[VALIDATE_3]

tutorials/secure-multitenant-app-xsuaa-kyma/secure-multitenant-app-xsuaa-kyma.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ app.use(passport.authenticate('JWT', { session: false })); //Authenticate using
181181

182182
Update the `xs-app.json` file:
183183

184-
```JSON[3,8]
184+
```JSON[2,7]
185185
{
186186
"authenticationMethod": "route",
187187
"routes": [{

0 commit comments

Comments
 (0)