Merge pull request #25 from HideyoshiNakazone/adds-storage-service

Fixes MicroService Pathing

deployment/backend/backend.yaml

@@ -157,8 +157,8 @@ spec:
 
                       - name: STORAGE_SERVICE_PATH
                         valueFrom:
-                            configMapKeyRef:
-                                name: storage-config
+                            secretKeyRef:
+                                name: storage-secret
                                 key: storage_url
 
 ---

setup.py

@@ -27,6 +27,7 @@ ENV_VARIABLES = [
     "POSTGRES_PASSWORD",
     "POSTGRES_DB",
     "REDIS_PASSWORD",
+    "STORAGE_URL",
     "STORAGE_TYPE",
     "AWS_ACCESS_KEY_ID",
     "AWS_SECRET_ACCESS_KEY",
@@ -37,7 +38,9 @@ ENV_VARIABLES = [
 
 FORCE_BASE64_FIELD = [
     "OAUTH_GITHUB_CLIENT_ID",
-    "OAUTH_GITHUB_CLIENT_SECRET"
+    "OAUTH_GITHUB_CLIENT_SECRET",
+    "AWS_ACCESS_KEY_ID",
+    "AWS_SECRET_ACCESS_KEY",
 ]
 
 
@@ -66,12 +69,15 @@ def setting_environment(environment: str):
         case "staging":
             DOMAIN="staging.hideyoshi.com.br"
             API_DOMAIN="api.staging.hideyoshi.com.br"
+            STORAGE_API_DOMAIN="storage.staging.hideyoshi.com.br"
         case _:
             DOMAIN="hideyoshi.com.br"
             API_DOMAIN="api.hideyoshi.com.br"
+            STORAGE_API_DOMAIN="storage.hideyoshi.com.br"
 
     os.environ["DOMAIN"] = DOMAIN
     os.environ["API_DOMAIN"] = API_DOMAIN
+    os.environ["STORAGE_API_DOMAIN"] = STORAGE_API_DOMAIN
 
 
 def load_secret_file(file: str):

template/nginx-ingress/nginx-ingress-api.yaml

@@ -16,6 +16,13 @@ spec:
     - host: ${DOMAIN}
       http:
         paths:
+          - path: /api/storage
+            pathType: Prefix
+            backend:
+              service:
+                name: storage-service
+                port:
+                  number: 8000
           - path: /api(/|$)(.*)
             pathType: Prefix
             backend:
@@ -25,6 +32,13 @@ spec:
                   number: 8070
     - http:
         paths:
+          - path: /api/storage
+            pathType: Prefix
+            backend:
+              service:
+                name: storage-service
+                port:
+                  number: 8000
           - path: /api(/|$)(.*)
             pathType: Prefix
             backend:

template/nginx-ingress/nginx-ingress-root.yaml

@@ -12,6 +12,7 @@ spec:
     - hosts:
         - ${DOMAIN}
         - ${API_DOMAIN}
+        - ${STORAGE_API_DOMAIN}
       secretName: letsencrypt-cluster-certificate-tls
   rules:
     - host: ${DOMAIN}
@@ -34,6 +35,16 @@ spec:
                 name: backend-service
                 port:
                   number: 8070
+    - host: ${STORAGE_API_DOMAIN}
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: storage-service
+                port:
+                  number: 8000
     - http:
         paths:
           - path: /

template/storage/storage-secret.template.yaml

@@ -5,6 +5,7 @@ metadata:
     name: storage-secret
 type: Opaque
 data:
+    storage_url: $STORAGE_URL
     storage_type: $STORAGE_TYPE
     aws_access_key_id: $AWS_ACCESS_KEY_ID
     aws_access_access_key: $AWS_SECRET_ACCESS_KEY