Compare commits

..

15 Commits

Author SHA1 Message Date
Daniel Kurzynski
7333001683 Use version v28 of the pipeline 2020-05-07 16:45:21 +02:00
Daniel Kurzynski
d6e051fcb8 Update README.md 2020-04-06 18:00:46 +02:00
Daniel Kurzynski
059df03cc1 Update README.md 2020-04-06 17:49:19 +02:00
Daniel Kurzynski
669c5249ff Update pipeline_config.yml 2020-04-06 17:45:33 +02:00
Christian Georgi
1a3fb3ffab Add package-lock.json, fix readme 2020-04-02 16:21:34 +02:00
Daniel Kurzynski
f2c458db7a Update README.md 2020-03-27 16:03:45 +01:00
Daniel Kurzynski
5c7a3e6860 Update README.md 2020-03-27 16:03:04 +01:00
Daniel Kurzynski
ece590be9c Create package-lock.json 2020-03-27 15:45:23 +01:00
Daniel Kurzynski
19ba5c2d9c Update README.md 2020-03-27 15:42:22 +01:00
Daniel Kurzynski
3e6a23e43d Delete package-lock.json 2020-03-27 15:40:05 +01:00
Christian Georgi
2857ab7fa0 Update readme 2020-03-23 17:12:08 +01:00
Daniel Kurzynski
ecd2152be5 Update project 2020-02-07 15:29:53 +01:00
Daniel Kurzynski
ce3094a30d Adapt mta file 2020-01-14 11:12:00 +01:00
Daniel Kurzynski
8f0f032e6c Add mta and pipeline 2020-01-14 11:00:53 +01:00
Daniel Kurzynski
7c52a3b4f2 Adopt repository structure 2020-01-14 10:58:42 +01:00
50 changed files with 544 additions and 1056 deletions

2
.npmrc
View File

@@ -1 +1 @@
registry=https://registry.npmjs.org
@sap:registry=https://npm.sap.com

39
.vscode/launch.json vendored
View File

@@ -5,45 +5,18 @@
"version": "0.2.0",
"configurations": [
{
"name": "bookshop",
"request": "launch",
"type": "node",
"runtimeExecutable": "npx",
"runtimeArgs": [
"-n"
],
"args": [
"--",
"cds",
"run",
"--in-memory"
],
"name": "bookshop", "request": "launch", "type": "node", "runtimeExecutable": "npx", "runtimeArgs": [ "-n" ],
"args": [ "--", "cds", "run", "--in-memory" ],
"cwd": "${workspaceFolder}/packages/bookshop",
"console": "integratedTerminal",
"skipFiles": [
"<node_internals>/**"
]
"skipFiles": ["<node_internals>/**"]
},
{
"name": "cds run ...",
"request": "launch",
"type": "node",
"runtimeExecutable": "npx",
"runtimeArgs": [
"-n"
],
"args": [
"--",
"cds",
"run",
"--with-mocks",
"--in-memory?"
],
"name": "cds run ...", "request": "launch", "type": "node", "runtimeExecutable": "npx", "runtimeArgs": [ "-n" ],
"args": [ "--", "cds", "run", "--with-mocks", "--in-memory?" ],
"cwd": "${workspaceFolder}/packages/${input:service}",
"console": "integratedTerminal",
"skipFiles": [
"<node_internals>/**"
]
"skipFiles": ["<node_internals>/**"]
}
],
"inputs": [

24
Jenkinsfile vendored Normal file
View File

@@ -0,0 +1,24 @@
#!/usr/bin/env groovy
/*
* This file bootstraps the codified Continuous Delivery pipeline for extensions of SAP solutions, such as SAP S/4HANA.
* The pipeline helps you to deliver software changes quickly and in a reliable manner.
* A suitable Jenkins instance is required to run the pipeline.
* The Jenkins can easily be bootstraped using the life-cycle script located inside the 'cx-server' directory.
*
* More information on getting started with Continuous Delivery can be found in the following places:
* - GitHub repository: https://github.com/SAP/cloud-s4-sdk-pipeline
* - Blog Post: https://blogs.sap.com/2017/09/20/continuous-integration-and-delivery
*/
/*
* Set pipelineVersion to a fixed released version (e.g. "v15") when running in a productive environment.
* To find out about available versions and release notes, visit: https://github.com/SAP/cloud-s4-sdk-pipeline/releases
*/
String pipelineVersion = "v28"
node {
deleteDir()
sh "git clone --depth 1 https://github.com/SAP/cloud-s4-sdk-pipeline.git -b ${pipelineVersion} pipelines"
load './pipelines/s4sdk-pipeline.groovy'
}

105
README.md
View File

@@ -2,6 +2,20 @@
Find here the samples for the openSAP course [Building Applications with the SAP Cloud Application Programming Model](https://open.sap.com/courses/cp7).
## Notes on the Demo in Week 4 Unit 4
To add all pipeline specific file to your project, run the following command:
```sh
cds add pipeline
```
Details on how to start your Jenkins in your own environment can be found in the [Operations Guide](https://github.com/SAP/devops-docker-cx-server/blob/master/docs/operations/cx-server-operations-guide.md).
Please note that other than shown in the video Jenkins now is secured by default with an admin user and password.
After you have started Jenkins with the command `cx-server start`, you can get the initial password by running `./cx-server initial-credentials`.
The pipeline documentation can be found [here](https://sap.github.io/jenkins-library/pipelines/cloud-sdk/introduction/).
## Get Access to SAP Business Application Studio
The recommended environment for the course is SAP Business Application Studio. Watch [unit 2 of week 1](https://open.sap.com/courses/cp7/items/51pzQUzbXHr2kdbOmVs6jI) for how to get access.
@@ -11,8 +25,8 @@ In SAP Business Application Studio, open a terminal.
Then clone the repo with this specific branch:
```sh
git clone https://github.com/sap-samples/cloud-cap-samples projects/cloud-cap-samples -b openSAP-week3-unit5
cd projects/cloud-cap-samples
git clone https://github.com/sap-samples/cloud-cap-samples -b openSAP-week4-unit4
cd cloud-cap-samples
```
In the `cloud-cap-samples` folder run:
@@ -20,93 +34,6 @@ In the `cloud-cap-samples` folder run:
npm install
```
## Run
Now you're ready to run the samples, for example:
```sh
cd packages/bookshop
cds deploy
cds watch
```
After that, watch out for the little popup in the lower right corner of SAP Business Application Studio that asks you to open the application in your browser.
## Hints
- If your demo user logon window does not show up: clear the browsers login data
- If your port is still in use run in your terminal:
```
> pkill node //kill running node proceses
```
## Deploy to Cloud Foundry
Clean-up the CF space in your trial account if you already used it before. Make sure that there are no services or applications deployed.
Generation of the XSUAA service configuration file xs-security.json:
```sh
cds compile srv/ --to xsuaa > xs-security.json
```
In this unit we use [MTA](https://sap.github.io/cloud-mta-build-tool/) to do the deployment to CF
```sh
npm install -g mbt
```
You can generate the MTA.yaml from CDS and do manual modifications or simply use the already generated and adapted mta.yaml in the branch and directly generate the .mtar file
#### BEGIN OPTIONAL PART
If you want to generate the MTA.YAML yourself please do the following:
- Generate the mta.yaml with the HANA dependency
```sh
cds add hana --force
cds add mta
```
- Add the path to the generated xs-security.json in the MTA.YAML
```
parameters:
path: ./xs-security.json
service:xsuaa
service-plan: application
....
```
- Add the application block in the MTA.YAML
```
############## APP #########################
- name: capire-bookshop-app
type: nodejs
path: gen/app
parameters:
memory: 256M
build-parameters:
requires:
- name: capire-bookshop-srv
requires:
- name: capire-bookshop-uaa
- name: srv-binding
group: destinations
properties:
forwardAuthToken: true
name: srv-binding
url: ~{srv-url}
```
- Make sure to use service hanatrial instead of hana in the MTA.YAML
```
parameters:
service: hanatrial
```
#### END OPTIONAL PART
Generate the .mtar file for the deployment and deploy to cloud foundry:
```sh
mbt build -t ./
cf login -a https://api.cf.eu10.hana.ondemand.com
cf deploy sap.capire-bookshop_1.0.0.mtar
```
## Get Support
Check out the cap docs at https://cap.cloud.sap. <br>

View File

@@ -1,12 +0,0 @@
{
"name": "deploy",
"dependencies": {
"@sap/hdi-deploy": "^3.8.2"
},
"engines": {
"node": "^8"
},
"scripts": {
"start": "node node_modules/@sap/hdi-deploy/deploy.js"
}
}

View File

@@ -1 +0,0 @@
{"packages":["packages/*"],"version":"1.0.0"}

View File

@@ -2,6 +2,7 @@
####### appName = capire-bookshop
####### language=nodejs; multiTenant=
####### approuter=
_schema-version: '3.1'
ID: sap.capire-bookshop
version: 1.0.0
@@ -29,7 +30,6 @@ modules:
requires:
#### Resources extracted from CAP configuration ####
- name: capire-bookshop-db
- name: capire-bookshop-uaa
provides:
- name: srv-binding # required by consumers of CAP services (e.g. approuter)
@@ -48,26 +48,8 @@ modules:
requires:
#### Hana and xsuaa resources extracted from CAP configuration ####
- name: capire-bookshop-db
- name: capire-bookshop-uaa
############################################################
############## APP #########################
- name: capire-bookshop-app
type: nodejs
path: gen/app
parameters:
memory: 256M
build-parameters:
requires:
- name: capire-bookshop-srv
requires:
- name: capire-bookshop-uaa
- name: srv-binding
group: destinations
properties:
forwardAuthToken: true
name: srv-binding
url: ~{srv-url}
############## RESOURCES ##################################
resources:
@@ -77,18 +59,6 @@ resources:
type: com.sap.xs.hdi-container
parameters:
service: hanatrial
properties:
hdi-service-name: ${service-name} # required for Java case
- name: capire-bookshop-uaa
type: org.cloudfoundry.managed-service
parameters:
##### Path to xs-security.json to add roles and scopes ####
path: ./xs-security.json
service: xsuaa
service-plan: application
config:
xsappname: capire-bookshop-${space} # name + space dependency
tenant-mode: dedicated
############################################################

876
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -1,25 +1,29 @@
{
"name": "@sap/capire-samples",
"description": "The umbrella project for all samples to easily setup for local development and tests.",
"repository": "https://github.com/SAP-samples/cloud-cap-samples.git",
"author": "daniel.hutzel@sap.com",
"private": true,
"scripts": {
"lerna": "npx --no-install lerna -v > /dev/null || npm i lerna --no-save",
"install": "(npm -s run lerna) && lerna bootstrap --hoist",
"cleanup": "lerna clean -y && rm -fr node_modules",
"bookshop": "cds watch packages/bookshop"
},
"name": "@sap/capire-bookshop",
"version": "1.0.0",
"description": "A simple bookshop application, build in a self-contained all-in-one fashion, i.e. w/o reusing other packages.",
"license": "SAP SAMPLE CODE LICENSE",
"dependencies": {
"@sap/cds": "^4",
"express": "^4"
"@sap/cds": "^3",
"express": "^4",
"@sap/hana-client": "^2.4.182"
},
"devDependencies": {
"sqlite3": "*"
"sqlite3": "^4.1.1"
},
"--add-these-to-devDependencies-for-tests": {
"@types/jest": "*",
"jest": "*"
"scripts": {
"start": "cds run",
"watch": "cds watch"
},
"license": "SAP SAMPLE CODE LICENSE"
"cds": {
"requires": {
"db": {
"kind": "hana",
"model": [
"db",
"srv"
]
}
}
}
}

View File

@@ -1,67 +0,0 @@
{
"odata": {
"version": "v4"
},
"build": {
"target": "gen",
"tasks": [
{
"src": "db",
"for": "hana",
"options": {
"model": [
"db",
"srv"
]
}
},
{
"src": "srv",
"for": "node-cf",
"options": {
"model": [
"db",
"srv",
"app"
]
}
},
{
"src": "app",
"for": "fiori",
"options": {
"model": [
"app"
]
}
}
]
},
"auth": {
"passport": {
"strategy": "mock",
"users": {
"alice": {
"password": "123",
"ID": "alice",
"roles": [
"admin",
"authenticated-user"
],
"xs.user.attributes": {
"currency": [
"USD"
]
}
},
"bob": {
"password": "123",
"ID": "bob",
"roles": [
"authenticated-user"
]
}
}
}
}
}

View File

@@ -1,29 +0,0 @@
{
"version": "0.2.0",
"configurations": [
{
"name": "Run bookshop",
"request": "launch",
"type": "node",
"cwd": "/home/user/projects/cloud-cap-samples/packages/bookshop",
"runtimeExecutable": "npx",
"runtimeArgs": [
"-n"
],
"args": [
"--",
"cds",
"run",
"--in-memory?"
],
"console": "internalConsole",
"internalConsoleOptions": "openOnSessionStart",
"skipFiles": [
"<node_internals>/**"
],
"env": {
"run.config": "{\"handlerId\":\"cap_run_config_handler_id\",\"runnableId\":\"/home/user/projects/cloud-cap-samples/packages/bookshop\"}"
}
}
]
}

View File

@@ -1,11 +0,0 @@
{
"name": "capire-bookshop-approuter",
"version": "0.0.1",
"description": "",
"dependencies": {
"@sap/approuter": "^8"
},
"scripts": {
"start": "node node_modules/@sap/approuter/approuter.js"
}
}

View File

@@ -1,22 +0,0 @@
{
"welcomeFile": "/fiori.html",
"authenticationMethod": "route",
"routes": [
{
"source": "^/.*(html|js)$",
"localDir": "."
},
{
"source": "^/sapui5/.*",
"localDir": "."
},
{
"source": "^/.*/webapp/.*",
"localDir": "."
},
{
"source": "/",
"destination": "srv-binding"
}
]
}

View File

@@ -1,12 +0,0 @@
{
"name": "deploy",
"dependencies": {
"@sap/hdi-deploy": "^3.8.2"
},
"engines": {
"node": "^12"
},
"scripts": {
"start": "node node_modules/@sap/hdi-deploy/deploy.js"
}
}

View File

@@ -1,136 +0,0 @@
{
"file_suffixes": {
"csv": {
"plugin_name": "com.sap.hana.di.tabledata.source"
},
"hdbafllangprocedure": {
"plugin_name": "com.sap.hana.di.afllangprocedure"
},
"hdbanalyticprivilege": {
"plugin_name": "com.sap.hana.di.analyticprivilege"
},
"hdbcalculationview": {
"plugin_name": "com.sap.hana.di.calculationview"
},
"hdbcollection": {
"plugin_name": "com.sap.hana.di.collection"
},
"hdbconstraint": {
"plugin_name": "com.sap.hana.di.constraint"
},
"hdbdropcreatetable": {
"plugin_name": "com.sap.hana.di.dropcreatetable"
},
"hdbflowgraph": {
"plugin_name": "com.sap.hana.di.flowgraph"
},
"hdbfunction": {
"plugin_name": "com.sap.hana.di.function"
},
"hdbgraphworkspace": {
"plugin_name": "com.sap.hana.di.graphworkspace"
},
"hdbhadoopmrjob": {
"plugin_name": "com.sap.hana.di.virtualfunctionpackage.hadoop"
},
"hdbindex": {
"plugin_name": "com.sap.hana.di.index"
},
"hdblibrary": {
"plugin_name": "com.sap.hana.di.library"
},
"hdbmigrationtable": {
"plugin_name": "com.sap.hana.di.table.migration"
},
"hdbprocedure": {
"plugin_name": "com.sap.hana.di.procedure"
},
"hdbprojectionview": {
"plugin_name": "com.sap.hana.di.projectionview"
},
"hdbprojectionviewconfig": {
"plugin_name": "com.sap.hana.di.projectionview.config"
},
"hdbreptask": {
"plugin_name": "com.sap.hana.di.reptask"
},
"hdbresultcache": {
"plugin_name": "com.sap.hana.di.resultcache"
},
"hdbrole": {
"plugin_name": "com.sap.hana.di.role"
},
"hdbroleconfig": {
"plugin_name": "com.sap.hana.di.role.config"
},
"hdbsearchruleset": {
"plugin_name": "com.sap.hana.di.searchruleset"
},
"hdbsequence": {
"plugin_name": "com.sap.hana.di.sequence"
},
"hdbstatistics": {
"plugin_name": "com.sap.hana.di.statistics"
},
"hdbstructuredprivilege": {
"plugin_name": "com.sap.hana.di.structuredprivilege"
},
"hdbsynonym": {
"plugin_name": "com.sap.hana.di.synonym"
},
"hdbsynonymconfig": {
"plugin_name": "com.sap.hana.di.synonym.config"
},
"hdbsystemversioning": {
"plugin_name": "com.sap.hana.di.systemversioning"
},
"hdbtable": {
"plugin_name": "com.sap.hana.di.table"
},
"hdbtabledata": {
"plugin_name": "com.sap.hana.di.tabledata"
},
"hdbtabletype": {
"plugin_name": "com.sap.hana.di.tabletype"
},
"hdbtrigger": {
"plugin_name": "com.sap.hana.di.trigger"
},
"hdbview": {
"plugin_name": "com.sap.hana.di.view"
},
"hdbvirtualfunction": {
"plugin_name": "com.sap.hana.di.virtualfunction"
},
"hdbvirtualfunctionconfig": {
"plugin_name": "com.sap.hana.di.virtualfunction.config"
},
"hdbvirtualpackagehadoop": {
"plugin_name": "com.sap.hana.di.virtualpackage.hadoop"
},
"hdbvirtualpackagesparksql": {
"plugin_name": "com.sap.hana.di.virtualpackage.sparksql"
},
"hdbvirtualprocedure": {
"plugin_name": "com.sap.hana.di.virtualprocedure"
},
"hdbvirtualprocedureconfig": {
"plugin_name": "com.sap.hana.di.virtualprocedure.config"
},
"hdbvirtualtable": {
"plugin_name": "com.sap.hana.di.virtualtable"
},
"hdbvirtualtableconfig": {
"plugin_name": "com.sap.hana.di.virtualtable.config"
},
"properties": {
"plugin_name": "com.sap.hana.di.tabledata.properties"
},
"tags": {
"plugin_name": "com.sap.hana.di.tabledata.properties"
},
"txt": {
"plugin_name": "com.sap.hana.di.copyonly"
}
}
}

View File

@@ -1,29 +0,0 @@
{
"name": "@sap/capire-bookshop",
"version": "1.0.0",
"description": "A simple bookshop application, build in a self-contained all-in-one fashion, i.e. w/o reusing other packages.",
"license": "SAP SAMPLE CODE LICENSE",
"dependencies": {
"@sap/cds": "^4",
"express": "^4",
"hdb": "^0.18.1",
"passport": "^0.4.1"
},
"scripts": {
"start": "cds run --in-memory?",
"watch": "cds watch"
},
"cds": {
"requires": {
"db": {
"kind": "sql",
"[production]": {
"kind": "hana"
}
},
"uaa": {
"kind": "xsuaa"
}
}
}
}

Binary file not shown.

View File

@@ -1,10 +0,0 @@
/** Service implementation for AdminService */
module.exports = cds.service.impl(function() {
this.before ('CREATE', 'Orders', _checkOrderCreateAuth)
})
/** Check authorization */
function _checkOrderCreateAuth (req) {
req.user.currency[0] === req.data.currency_code || req.reject(403)
}

View File

@@ -1,37 +0,0 @@
{
"xsappname": "capire-bookshop",
"tenant-mode": "dedicated",
"scopes": [
{
"name": "$XSAPPNAME.admin",
"description": "admin"
}
],
"attributes": [
{
"name": "currency",
"description": "currency",
"valueType": "s",
"valueRequired": false
}
],
"role-templates": [
{
"name": "admin",
"description": "generated",
"scope-references": [
"$XSAPPNAME.admin"
],
"attribute-references": []
},
{
"name": "userattributes",
"description": "generated",
"default-role-name": "Attributes of a User",
"scope-references": [],
"attribute-references": [
"currency"
]
}
]
}

47
pipeline_config.yml Normal file
View File

@@ -0,0 +1,47 @@
###
# This file configures the SAP Cloud SDK Continuous Delivery pipeline of your project.
# For a reference of the configuration concept and available options, please have a look into its documentation.
#
# The documentation for the most recent pipeline version can always be found at:
# https://github.com/SAP/cloud-s4-sdk-pipeline/blob/master/configuration.md
# If you are using a fixed version of the pipeline, please make sure to view the corresponding version from the tag
# list of GitHub (e.g. "v15" when you configured pipelineVersion = "v15" in the Jenkinsfile).
#
# For general information on how to get started with Continuous Delivery, visit:
# https://blogs.sap.com/2017/09/20/continuous-integration-and-delivery
#
# We aim to keep the pipeline configuration as stable as possible. However, major changes might also imply breaking
# changes in the configuration. Before doing an update, please check the the release notes of all intermediate releases
# and adapt this file if necessary.
#
# This is a YAML-file. YAML is a indentation-sensitive file format. Please make sure to properly indent changes to it.
###
### General project setup
general:
productiveBranch: 'openSAP-week4-unit4'
### Step-specific configuration
steps:
### Stage-specific configuration
stages:
# integrationTests:
# credentials:
# - alias: 'mySystemAlias'
# credentialId: 'mySystemCredentialsId'
# s4SdkQualityChecks:
# nonErpDestinations:
# - 'myCustomDestination'
# productionDeployment:
# cfTargets:
# - org: 'myOrg'
# space: 'mySpace'
# apiEndpoint: 'https://api.cf.eu10.hana.ondemand.com'
# credentialsId: 'cf-deploy-sap'

View File

@@ -14,7 +14,3 @@ annotate AdminService.Orders with @odata.draft.enabled;
extend service AdminService with {
entity OrderItems as select from my.OrderItems;
}
// Restrict access to orders to users with role "admin"
annotate AdminService.Orders with @(restrict: [
{ grant: 'READ', to: 'admin' }
]);

View File

@@ -8,10 +8,6 @@ service CatalogService {
} excluding { createdBy, modifiedBy };
@requires_: 'authenticated-user'
entity Orders as projection on my.Orders;
@insertonly entity Orders as projection on my.Orders;
}
// Example for an instance restriction
annotate CatalogService.Orders with @(restrict: [
{ grant: 'READ', where: 'currency_code = $user.currency' }
]);

View File

@@ -14,20 +14,13 @@ function _addDiscount2 (each,discount) {
/** Reduce stock of ordered books if available stock suffices */
async function _reduceStock (req) {
const { Items: orderItems } = req.data
if (!Array.isArray(orderItems)) return
const all = await cds.transaction(req).run(orderItems.map(item =>
UPDATE(Books)
.set('stock -=', item.amount)
.where('ID =', item.book_ID).and('stock >=', item.amount)
))
all.forEach((affectedRows, i) => {
if (affectedRows === 0) {
req.error(409, `${orderItems[i].amount} exceeds stock for book #${orderItems[i].book_ID}`)
}
})
return all
const { Items: OrderItems } = req.data
return cds.transaction(req) .run (()=> OrderItems.map (order =>
UPDATE (Books) .set ('stock -=', order.amount)
.where ('ID =', order.book_ID) .and ('stock >=', order.amount)
)) .then (all => all.forEach ((affectedRows,i) => {
if (affectedRows === 0) req.error (409,
`${OrderItems[i].amount} exceeds stock for book #${OrderItems[i].book_ID}`
)
}))
}