BasPH · BasPH · Oct 19, 2020 · Oct 19, 2020
diff --git a/chapters/chapter13/README.md b/chapters/chapter13/README.md
@@ -0,0 +1,17 @@
+# Chapter 13
+
+Code accompanying Chapter 13 (Securing Airflow) of the book [Data Pipelines with Apache Airflow](https://www.manning.com/books/data-pipelines-with-apache-airflow).
+
+## Contents
+
+This folder holds three example Docker Compose examples:
+
+- `ldap`: Example configuration of the webserver, fetching user credentials from OpenLDAP
+- `rbac`: Example running the RBAC interface
+- `secretsbackend`: Example fetching secrets from HashiCorp Vault
+
+Each folder holds a Docker Compose file which can be started with `docker-compose up -d`.
+
+## Usage
+
+Read the `README.md` file in the respective directory.
diff --git a/chapters/chapter14/ldap/Dockerfile → chapters/chapter13/ldap/Dockerfile b/chapters/chapter14/ldap/Dockerfile → chapters/chapter13/ldap/Dockerfile
diff --git a/chapters/chapter14/ldap/README.md → chapters/chapter13/ldap/README.md b/chapters/chapter14/ldap/README.md → chapters/chapter13/ldap/README.md
@@ -8,7 +8,7 @@ Demonstrate RBAC UI + LDAP authentication using OpenLDAP.
 docker-compose up -d
 ```
 
-Login in Airflow with `username=bsmith` and `password=test`.
+Login in Airflow with username `bsmith` and password `test`.
 
 ## Details
 

diff --git a/chapters/chapter14/ldap/bootstrap.ldif → chapters/chapter13/ldap/bootstrap.ldif b/chapters/chapter14/ldap/bootstrap.ldif → chapters/chapter13/ldap/bootstrap.ldif
diff --git a/...ters/chapter14/ldap/dags/hello_airflow.py → ...ters/chapter13/ldap/dags/hello_airflow.py b/...ters/chapter14/ldap/dags/hello_airflow.py → ...ters/chapter13/ldap/dags/hello_airflow.py
diff --git a/chapters/chapter14/ldap/docker-compose.yml → chapters/chapter13/ldap/docker-compose.yml b/chapters/chapter14/ldap/docker-compose.yml → chapters/chapter13/ldap/docker-compose.yml
@@ -10,6 +10,8 @@ x-environment: &airflow_environment
   - AIRFLOW__CORE__STORE_SERIALIZED_DAGS=True
   - AIRFLOW__WEBSERVER__EXPOSE_CONFIG=True
   - AIRFLOW__WEBSERVER__RBAC=True
+
+x-airflow-image: &airflow_image apache/airflow:1.10.12-python3.8
 # ====================================== /AIRFLOW ENVIRONMENT VARIABLES ======================================
 
 services:
@@ -23,7 +25,7 @@ services:
       - "5432:5432"
 
   upgradedb:
-    image: apache/airflow:1.10.11-python3.7
+    image: *airflow_image
     depends_on:
       - postgres
     environment: *airflow_environment
@@ -42,7 +44,7 @@ services:
     command: webserver
 
   scheduler:
-    image: apache/airflow:1.10.11-python3.7
+    image: *airflow_image
     restart: always
     depends_on:
       - postgres

diff --git a/chapters/chapter14/ldap/webserver_config.py → chapters/chapter13/ldap/webserver_config.py b/chapters/chapter14/ldap/webserver_config.py → chapters/chapter13/ldap/webserver_config.py
diff --git a/chapters/chapter14/rbac/README.md → chapters/chapter13/rbac/README.md b/chapters/chapter14/rbac/README.md → chapters/chapter13/rbac/README.md
diff --git a/...ters/chapter14/rbac/dags/hello_airflow.py → ...ters/chapter13/rbac/dags/hello_airflow.py b/...ters/chapter14/rbac/dags/hello_airflow.py → ...ters/chapter13/rbac/dags/hello_airflow.py
diff --git a/chapters/chapter14/rbac/docker-compose.yml → chapters/chapter13/rbac/docker-compose.yml b/chapters/chapter14/rbac/docker-compose.yml → chapters/chapter13/rbac/docker-compose.yml
@@ -12,6 +12,8 @@ x-environment: &airflow_environment
   - AIRFLOW__CORE__STORE_SERIALIZED_DAGS=True
   - AIRFLOW__WEBSERVER__EXPOSE_CONFIG=True
   - AIRFLOW__WEBSERVER__RBAC=True
+
+x-airflow-image: &airflow_image apache/airflow:1.10.12-python3.8
 # ====================================== /AIRFLOW ENVIRONMENT VARIABLES ======================================
 
 services:
@@ -25,7 +27,7 @@ services:
       - "5432:5432"
 
   initdb_adduser:
-    image: apache/airflow:1.10.11-python3.7
+    image: *airflow_image
     depends_on:
       - postgres
     environment: *airflow_environment
@@ -35,7 +37,7 @@ services:
     command: -c 'airflow initdb && sleep 5 && airflow create_user --role Admin --username airflow --password airflow -e [email protected] -f airflow -l airflow'
 
   webserver:
-    image: apache/airflow:1.10.11-python3.7
+    image: *airflow_image
     restart: always
     depends_on:
       - postgres
@@ -47,7 +49,7 @@ services:
     command: webserver
 
   scheduler:
-    image: apache/airflow:1.10.11-python3.7
+    image: *airflow_image
     restart: always
     depends_on:
       - postgres

diff --git a/chapters/chapter13/secretsbackend/Dockerfile b/chapters/chapter13/secretsbackend/Dockerfile
@@ -0,0 +1,2 @@
+FROM apache/airflow:1.10.12-python3.8
+RUN pip install --user hvac~=0.10
diff --git a/chapters/chapter14/secretsbackend/README.md → chapters/chapter13/secretsbackend/README.md b/chapters/chapter14/secretsbackend/README.md → chapters/chapter13/secretsbackend/README.md
diff --git a/chapters/chapter14/secretsbackend/dag.py → chapters/chapter13/secretsbackend/dag.py b/chapters/chapter14/secretsbackend/dag.py → chapters/chapter13/secretsbackend/dag.py
diff --git a/...apter14/secretsbackend/docker-compose.yml → ...apter13/secretsbackend/docker-compose.yml b/...apter14/secretsbackend/docker-compose.yml → ...apter13/secretsbackend/docker-compose.yml
@@ -13,6 +13,8 @@ x-environment: &airflow_environment
   - AIRFLOW__SECRETS__BACKEND_KWARGS={"url":"http://vault:8200","token":"airflow","connections_path":"connections"}
   - AIRFLOW__WEBSERVER__EXPOSE_CONFIG=True
   - AIRFLOW__WEBSERVER__RBAC=True
+
+x-airflow-image: &airflow_image apache/airflow:1.10.12-python3.8
 # ====================================== /AIRFLOW ENVIRONMENT VARIABLES ======================================
 
 services:

diff --git a/...er14/secretsbackend/secure_api/Dockerfile → ...er13/secretsbackend/secure_api/Dockerfile b/...er14/secretsbackend/secure_api/Dockerfile → ...er13/secretsbackend/secure_api/Dockerfile
diff --git a/...hapter14/secretsbackend/secure_api/app.py → ...hapter13/secretsbackend/secure_api/app.py b/...hapter14/secretsbackend/secure_api/app.py → ...hapter13/secretsbackend/secure_api/app.py
diff --git a/...hapter14/secretsbackend/vault-config.json → ...hapter13/secretsbackend/vault-config.json b/...hapter14/secretsbackend/vault-config.json → ...hapter13/secretsbackend/vault-config.json
diff --git a/chapters/chapter14/README.md b/chapters/chapter14/README.md
diff --git a/chapters/chapter14/secretsbackend/Dockerfile b/chapters/chapter14/secretsbackend/Dockerfile
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		FROM apache/airflow:1.10.12-python3.8
		RUN pip install --user hvac~=0.10