Skip to content

Commit 98f62bc

Browse files
authored
Merge pull request #3 from JStover95/JStover95/tutorial-revisions
Tutorial Revisions
2 parents 63d800e + ecfe9cb commit 98f62bc

4 files changed

Lines changed: 27 additions & 15 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.venv/

docs/credentials.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
# Creating cloud credentials
22

3-
43
## S3 data server
54

6-
- In general, the credentials you need from your S3 account are the `AccessKey` and the `SecretKey`. These are akin to user names and passwords.
5+
- In general, the credentials you need from your S3 account are the `AccessKey` and the `SecretKey`. These are akin to user names and passwords.
76
- How you obtain these credentials will depend on your provider (e.g. AWS S3, MINIO, OSN - see below)
87
- Paste the access key and the secret key as _Repository secrets_ in your _FaaSr-workflow_ as per the instructions in the [workflow repo] documentation
98

@@ -13,6 +12,7 @@ If you don't already have one, you need to generate a GitHub Personal Access Tok
1312
[Details on how to create a PAT are available here](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens#creating-a-personal-access-token-classic)
1413

1514
In summary:
15+
1616
- In the upper-right corner of any page, click your profile photo, then click Settings.
1717
- In the left sidebar, click Developer settings.
1818
- In the left sidebar, click Personal access tokens.
@@ -29,14 +29,12 @@ In summary:
2929
- Paste the access key and the secret key under the names `AWS_AccessKey` and `AWS_SecretKey`, respectively, as _Repository secrets_ in your _FaaSr-workflow_ as per the instructions in the [workflow repo] documentation
3030
- Paste your ARN as `AWS_ARN` as _Repository secrets_ in your _FaaSr-workflow_
3131

32-
3332
## OpenWhisk
3433

3534
- You need an API key from your provider to configure for use in FaaSr
3635
- How you obtain this will depend on your cloud provider.
3736
- Paste the API key under the name `OW_APIkey` as a _Repository secret_ in your _FaaSr-workflow_ as per the instructions in the [workflow repo] documentation
3837

39-
4038
## Google Cloud Platform
4139

4240
- You need a private secret key to use Google Cloud Platform (GCP) with FaaSr
@@ -54,5 +52,4 @@ TBD
5452
- For researchers in the US, you can [request an allocation](https://www.openstoragenetwork.org/get-involved/get-an-allocation/) of 10+ TB S3 storage.
5553
- If your request is approved, you will be assigned one S3 bucket, and can then copy the access and secret keys provided to you for use with FaaSr
5654

57-
5855
[workflow repo]: workflow_repo.md

docs/tutorial.md

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# Tutorial
22

3-
This document guides you through a simple tutorial that uses GitHub Actions and a free S3 data store (Minio Play). The pre-requisite for this tutorial is a GitHub account.
3+
This document guides you through a simple tutorial that uses GitHub Actions and a free S3 data store (Minio Play).
4+
5+
## Prerequisites
6+
7+
For this tutorial, all you need is a GitHub account. It is also recommended that your refer to the [Setting up the FaaSr-workflow repo](./workflow_repo.md) documentation for details about the FaaSr-workflow repository.
48

59
## Configure your FaaSr-workflow repository
610

@@ -12,13 +16,16 @@ This is a one-time step you go through to set up your [workflow repository] to h
1216

1317
## Configure your GitHub PAT
1418

15-
You need a personal access token in your repository secrets to run this tutorial.
19+
You need a personal access token in your repository secrets to run this tutorial.
1620

17-
Follow the steps outlined in the [credentials] documentation to obtain your PAT. Copy this PAT so you can paste it as a secret in the next step
21+
Follow the steps outlined in the [GitHub Actions credentials] documentation to obtain your PAT. Copy this PAT so you can paste it as a secret in the next step
1822

1923
## Configure your repository secrets
2024

21-
Before you can register and invoke workflows, you need to create secrets storing credentials for the cloud providers you will use. The following assumes that you already have obtained [cloud credentials] for those.
25+
Before you can register and invoke workflows, you need to create secrets storing credentials for the cloud providers you will use.
26+
27+
!!! note "Guest S3 Credentials"
28+
Note that for this tutorial we are using guest credentials for a free S3 data store offered by MinIO. In practice, you will use your own credentials (see the [credentials](./credentials.md) documentation for more information).
2229

2330
- In the _FaaSr-workflow_ repo you just forked, click on the _Settings_ tab (top of the page, to the right)
2431
- Scroll down; on the left pane, click on the pull-down _Secrets and variables_ and select _Actions_
@@ -56,7 +63,13 @@ The tutorial.json file is available in the FaaSr-Functions repository; you will
5663

5764
## Invoke the workflow
5865

59-
- After register, you can [invoke the workflow]
66+
!!! question "What code am I running?"
67+
For this tutorial, function code is sourced from the [FaaSr-Functions](https://github.com/FaaSr/FaaSr-Functions) repository. See [Creating Functions](./functions.md) for more information on how FaaSr runs function code.
68+
69+
!!! warning
70+
Run only [workflows and code that you trust](./security.md#only-reuse-workflowsfunctions-that-you-trust) with FaaSr. Always check that you trust the provenance of the workflow or code that you are running.
71+
72+
- After register, you can [invoke the workflow]
6073
- Click on _Actions_
6174
- Click on `(FAASR INVOKE)` (left)
6275
- Click on the `Run workflow` drop-down; enter `tutorial.json` and click on `Run workflow`
@@ -83,9 +96,8 @@ The tutorial.json workflow is based on two R functions (start, compute_sum). Ano
8396
- `(FAASR REGISTER)` tutorialRpy.json
8497
- `(FAASR INVOKE)` tutorialRpy.json
8598

86-
8799
[workflow repository]: workflow_repo.md
88-
[credentials]: credentials.md
100+
[GitHub Actions credentials]: credentials.md#github-actions
89101
[FaaSr Workflow Builder Web UI]: https://faasr.io/FaaSr-workflow-builder/
90102
[register the workflow]: register_workflow.md
91103
[invoke the workflow]: invoke_workflow.md

mkdocs.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ nav:
1010
- 'Tutorial': 'tutorial.md'
1111
- 'Documentation':
1212
- 'FaaSr workflow model': 'prog_model.md'
13-
- 'Tutorial': 'tutorial.md'
14-
- 'Setting up FaaSr-workflow repo': 'workflow_repo.md'
13+
- 'Setting up the FaaSr-workflow repo': 'workflow_repo.md'
1514
- 'Creating functions': 'functions.md'
1615
- 'Creating and editing workflows': 'workflows.md'
1716
- 'Example workflows and functions': 'functionexamples.md'
@@ -31,4 +30,7 @@ nav:
3130
- 'About': 'about.md'
3231
- 'Community': 'community.md'
3332
- 'Contact': 'contact.md'
34-
33+
markdown_extensions:
34+
- admonition
35+
- pymdownx.details
36+
- pymdownx.superfences

0 commit comments

Comments
 (0)