Merge branch 'master' into consuming-apis-python

Author: jaschmitt

flask-connexion-rest-part-2/version_1/config.py

@@ -12,7 +12,7 @@
 app = connex_app.app
 
 # Build the Sqlite ULR for SqlAlchemy
-sqlite_url = "sqlite:////" + os.path.join(basedir, "people.db")
+sqlite_url = "sqlite:///" + os.path.join(basedir, "people.db")
 
 # Configure the SqlAlchemy part of the app instance
 app.config["SQLALCHEMY_ECHO"] = True

python-bindings/overview_article/cmult.c

@@ -4,7 +4,7 @@
 
 float cmult(int int_param, float float_param) {
     float return_value = int_param * float_param;
-    printf("    In cmult : int: %d float %.1f returning  %.1f\n", int_param,
+    printf("    In cmult : int %d float %.1f returning  %.1f\n", int_param,
             float_param, return_value);
     return return_value;
 }

python-bindings/overview_article/cppmult.cpp

@@ -6,7 +6,7 @@
 float cppmult(int int_param, float float_param) {
     float return_value = int_param * float_param;
     std::cout << std::setprecision(1) << std::fixed
-	          << "    In cppmul: int: " << int_param
+	          << "    In cppmul: int " << int_param
 	          << " float " <<  float_param
 	          << " returning  " << return_value
 	          << std::endl;

python-menus-toolbars/sample-app.py

@@ -199,7 +199,7 @@ def copyContent(self):
 
     def pasteContent(self):
         # Logic for pasting content goes here...
-        self.centralWidget.setText("<b>Edit > Pate</b> clicked")
+        self.centralWidget.setText("<b>Edit > Paste</b> clicked")
 
     def cutContent(self):
         # Logic for cutting content goes here...

python-microservices-with-grpc/README.md

@@ -0,0 +1,4 @@
+# Running the Example
+
+1. Install Docker if you haven't already.
+2. Run `./build_and_run.sh`.

python-microservices-with-grpc/build_and_run.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+./gen_certs.sh
+
+DOCKER_BUILDKIT=1 docker build . -f marketplace/Dockerfile -t marketplace --secret id=ca.key,src=ca.key
+DOCKER_BUILDKIT=1 docker build . -f recommendations/Dockerfile -t recommendations --secret id=ca.key,src=ca.key
+
+docker-compose up

python-microservices-with-grpc/docker-compose.yaml

@@ -0,0 +1,23 @@
+version: "3.8"
+services:
+
+    marketplace:
+        environment:
+            RECOMMENDATIONS_HOST: recommendations
+        # DOCKER_BUILDKIT=1 docker build . -f marketplace/Dockerfile \
+        #                   -t marketplace --secret id=ca.key,src=ca.key
+        image: marketplace
+        networks:
+            - microservices
+        ports:
+            - 5000:5000
+
+    recommendations:
+        # DOCKER_BUILDKIT=1 docker build . -f recommendations/Dockerfile \
+        #                   -t recommendations --secret id=ca.key,src=ca.key
+        image: recommendations
+        networks:
+            - microservices
+
+networks:
+    microservices:

python-microservices-with-grpc/gen_certs.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# Generate CA key and self-signed cert
+openssl req -x509 -nodes -newkey rsa:4096 -keyout ca.key -out ca.pem -subj /O=me
+
+# Generate a private key and certificate signing request for the client and server
+openssl req -nodes -newkey rsa:4096 -keyout client.key -out client.csr -subj /CN=marketplace
+openssl req -nodes -newkey rsa:4096 -keyout server.key -out server.csr -subj /CN=recommendations
+
+# Sign the client and server certs with the CA cert
+openssl x509 -req -in client.csr -CA ca.pem -CAkey ca.key -set_serial 1 -out client.pem
+openssl x509 -req -in server.csr -CA ca.pem -CAkey ca.key -set_serial 1 -out server.pem

python-microservices-with-grpc/integration_tests.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -euo pipefail
+
+docker-compose up -d
+trap "docker-compose down" EXIT
+
+sleep 5  # Give the services time to warm up
+docker-compose exec marketplace pytest

python-microservices-with-grpc/kubernetes.yaml

@@ -0,0 +1,68 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+    name: marketplace
+    labels:
+        app: marketplace
+spec:
+    replicas: 1
+    selector:
+        matchLabels:
+            app: marketplace
+    template:
+        metadata:
+            labels:
+                app: marketplace
+        spec:
+            containers:
+                - name: marketplace
+                  image: hidan/python-microservices-article-marketplace:0.1
+                  env:
+                      - name: RECOMMENDATIONS_HOST
+                        value: recommendations
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+    name: recommendations
+    labels:
+        app: recommendations
+spec:
+    replicas: 1
+    selector:
+        matchLabels:
+            app: recommendations
+    template:
+        metadata:
+            labels:
+                app: recommendations
+        spec:
+            containers:
+                - name: recommendations
+                  image: hidan/python-microservices-article-recommendations:0.1
+---
+apiVersion: v1
+kind: Service
+metadata:
+    name: recommendations
+spec:
+    selector:
+        app: recommendations
+    ports:
+        - protocol: TCP
+          port: 50051
+          targetPort: 50051
+---
+apiVersion: v1
+kind: Service
+metadata:
+    name: marketplace
+spec:
+    type: LoadBalancer
+    selector:
+        app: marketplace
+    ports:
+        - protocol: TCP
+          port: 5000
+          targetPort: 5000