Merge branch 'chore/build-push' into feat/deployment

.github/workflows/handle-temporary-contents.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - main
-      - feat/build-push
+      - chore/build-push
     paths:
       - 'backend/complex/handle-temporary-contents/**'
 

.github/workflows/kong-gateway.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - main
-      - feat/build-push
+      - chore/build-push
     paths:
       - 'backend/kong-gateway/**'
 

.github/workflows/notes.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - main
-      - feat/build-push
+      - chore/build-push
     paths:
       - 'backend/simple/notes/**'
 

.github/workflows/process-chunks.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - main
-      - feat/build-push
+      - chore/build-push
     paths:
       - 'backend/complex/process-chunks/**'
 

.github/workflows/upload-notes.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - main
-      - feat/build-push
+      - chore/build-push
     paths:
       - 'backend/complex/upload-notes/**'
 

.github/workflows/view-notes.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - main
-      - feat/build-push
+      - chore/build-push
     paths:
       - 'backend/complex/view-notes/**'
 

backend/complex/handle-temporary-contents/internal/utils/grpc.go

@@ -56,4 +56,4 @@ func VerifyContentType(contentType contentsPb.ContentType, content htcPb.OneOfCo
 	default:
 		return status.Errorf(codes.InvalidArgument, "unsupported content type")
 	}
-}
+}

backend/complex/process-chunks/src/main.py

@@ -197,4 +197,5 @@ def send_content(self, message, generate_type,note_id):
                        .setup_logging()
                        .with_model("gpt-3.5-turbo")
                        .build())
-    content_fetcher.start_consuming()
+    content_fetcher.start_consuming()
+

backend/complex/upload-notes/src/main/java/com/ESD/UploadNotes/UploadNotesApplication.java

@@ -9,4 +9,4 @@ public class UploadNotesApplication {
 	public static void main(String[] args) {
 		SpringApplication.run(UploadNotesApplication.class, args);
 	}
-}
+}

backend/complex/view-notes/src/main.py

@@ -12,5 +12,4 @@ def main():
     dotenv.load_dotenv()
     logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(name)s - %(levelname)s - %(message)s')
 
-    main()
-
+    main()

backend/kong-gateway/kong.deployment.yml

@@ -3,6 +3,7 @@ _transform: true
 
 services:
   - name: health-check-service
+    host: localhost
     routes:
       - name: health-check-route
         paths:

backend/simple/notes/src/server.py

@@ -49,5 +49,4 @@ async def serve():
         logger.error(f'Unexpected error: {e}', exc_info=True)
 
 if __name__ == '__main__':
-    asyncio.run(serve())
-
+    asyncio.run(serve())

client/src/pages/notes/GeneratedContent.tsx

@@ -37,6 +37,7 @@ import {
   getTemporaryContents,
   getTopics,
   updateTemporaryContent,
+  canViewNote,
 } from "~features/api";
 import { useAuth } from "~features/auth";
 

deployment/argocd-eks/complex/handle-temporary-contents-application.yaml

@@ -0,0 +1,18 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: handle-temporary-contents
+  namespace: argocd
+spec:
+  project: default
+  source:
+    repoURL: 'https://github.com/EchoSkorJjj/IS213-Education-Helper-Kube.git'
+    path: kubernetes/complex/handle-temporary-contents
+    targetRevision: HEAD
+  destination:
+    server: 'https://kubernetes.default.svc'
+    namespace: eduhelper
+  syncPolicy:
+    automated:
+      selfHeal: true
+      prune: true

deployment/argocd-eks/complex/make-payment-application.yaml

@@ -0,0 +1,18 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: make-payment
+  namespace: argocd
+spec:
+  project: default
+  source:
+    repoURL: 'https://github.com/EchoSkorJjj/IS213-Education-Helper-Kube.git'
+    path: kubernetes/complex/make-payment
+    targetRevision: HEAD
+  destination:
+    server: 'https://kubernetes.default.svc'
+    namespace: eduhelper
+  syncPolicy:
+    automated:
+      selfHeal: true
+      prune: true

deployment/argocd-eks/complex/process-chunks-application.yaml

@@ -0,0 +1,18 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: process-chunks
+  namespace: argocd
+spec:
+  project: default
+  source:
+    repoURL: 'https://github.com/EchoSkorJjj/IS213-Education-Helper-Kube.git'
+    path: kubernetes/complex/process-chunks
+    targetRevision: HEAD
+  destination:
+    server: 'https://kubernetes.default.svc'
+    namespace: eduhelper
+  syncPolicy:
+    automated:
+      selfHeal: true
+      prune: true

deployment/argocd-eks/complex/save-notes-application.yaml

@@ -0,0 +1,18 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: save-notes
+  namespace: argocd
+spec:
+  project: default
+  source:
+    repoURL: 'https://github.com/EchoSkorJjj/IS213-Education-Helper-Kube.git'
+    path: kubernetes/complex/save-notes
+    targetRevision: HEAD
+  destination:
+    server: 'https://kubernetes.default.svc'
+    namespace: eduhelper
+  syncPolicy:
+    automated:
+      selfHeal: true
+      prune: true

deployment/argocd-eks/complex/upload-notes-application.yaml

@@ -0,0 +1,18 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: upload-notes
+  namespace: argocd
+spec:
+  project: default
+  source:
+    repoURL: 'https://github.com/EchoSkorJjj/IS213-Education-Helper-Kube.git'
+    path: kubernetes/complex/upload-notes
+    targetRevision: HEAD
+  destination:
+    server: 'https://kubernetes.default.svc'
+    namespace: eduhelper
+  syncPolicy:
+    automated:
+      selfHeal: true
+      prune: true

deployment/argocd-eks/complex/verify-user-application.yaml

@@ -0,0 +1,18 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: verify-user
+  namespace: argocd
+spec:
+  project: default
+  source:
+    repoURL: 'https://github.com/EchoSkorJjj/IS213-Education-Helper-Kube.git'
+    path: kubernetes/complex/verify-user
+    targetRevision: HEAD
+  destination:
+    server: 'https://kubernetes.default.svc'
+    namespace: eduhelper
+  syncPolicy:
+    automated:
+      selfHeal: true
+      prune: true

deployment/argocd-eks/complex/view-notes-application.yaml

@@ -0,0 +1,18 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: view-notes
+  namespace: argocd
+spec:
+  project: default
+  source:
+    repoURL: 'https://github.com/EchoSkorJjj/IS213-Education-Helper-Kube.git'
+    path: kubernetes/complex/view-notes
+    targetRevision: HEAD
+  destination:
+    server: 'https://kubernetes.default.svc'
+    namespace: eduhelper
+  syncPolicy:
+    automated:
+      selfHeal: true
+      prune: true

deployment/argocd-eks/ingress/ingress-application.yaml

@@ -0,0 +1,18 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: k8s-alb-ingress
+  namespace: argocd
+spec:
+  project: default
+  source:
+    repoURL: 'https://github.com/EchoSkorJjj/IS213-Education-Helper-Kube.git'
+    path: kubernetes/ingress/
+    targetRevision: HEAD
+  destination:
+    server: 'https://kubernetes.default.svc'
+    namespace: eduhelper
+  syncPolicy:
+    automated:
+      selfHeal: true
+      prune: true

deployment/argocd-eks/kong-gateway/kong-gateway-application.yaml

@@ -0,0 +1,18 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: kong-gateway
+  namespace: argocd
+spec:
+  project: default
+  source:
+    repoURL: 'https://github.com/EchoSkorJjj/IS213-Education-Helper-Kube.git'
+    path: kubernetes/kong-gateway
+    targetRevision: HEAD
+  destination:
+    server: 'https://kubernetes.default.svc'
+    namespace: eduhelper
+  syncPolicy:
+    automated:
+      selfHeal: true
+      prune: true

deployment/argocd-eks/simple/contents-application.yaml

@@ -0,0 +1,18 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: contents
+  namespace: argocd
+spec:
+  project: default
+  source:
+    repoURL: 'https://github.com/EchoSkorJjj/IS213-Education-Helper-Kube.git'
+    path: kubernetes/simple/contents
+    targetRevision: HEAD
+  destination:
+    server: 'https://kubernetes.default.svc'
+    namespace: eduhelper
+  syncPolicy:
+    automated:
+      selfHeal: true
+      prune: true

deployment/argocd-eks/simple/fileprocessor-application.yaml

@@ -0,0 +1,18 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: fileprocessor
+  namespace: argocd
+spec:
+  project: default
+  source:
+    repoURL: 'https://github.com/EchoSkorJjj/IS213-Education-Helper-Kube.git'
+    path: kubernetes/simple/fileprocessor
+    targetRevision: HEAD
+  destination:
+    server: 'https://kubernetes.default.svc'
+    namespace: eduhelper
+  syncPolicy:
+    automated:
+      selfHeal: true
+      prune: true

deployment/argocd-eks/simple/notes-application.yaml

@@ -0,0 +1,18 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: notes
+  namespace: argocd
+spec:
+  project: default
+  source:
+    repoURL: 'https://github.com/EchoSkorJjj/IS213-Education-Helper-Kube.git'
+    path: kubernetes/simple/notes
+    targetRevision: HEAD
+  destination:
+    server: 'https://kubernetes.default.svc'
+    namespace: eduhelper
+  syncPolicy:
+    automated:
+      selfHeal: true
+      prune: true

deployment/argocd-eks/simple/payment-application.yaml

@@ -0,0 +1,18 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: payment
+  namespace: argocd
+spec:
+  project: default
+  source:
+    repoURL: 'https://github.com/EchoSkorJjj/IS213-Education-Helper-Kube.git'
+    path: kubernetes/simple/payment
+    targetRevision: HEAD
+  destination:
+    server: 'https://kubernetes.default.svc'
+    namespace: eduhelper
+  syncPolicy:
+    automated:
+      selfHeal: true
+      prune: true

deployment/argocd-eks/simple/subscriptions-application.yaml

@@ -0,0 +1,18 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: subscriptions
+  namespace: argocd
+spec:
+  project: default
+  source:
+    repoURL: 'https://github.com/EchoSkorJjj/IS213-Education-Helper-Kube.git'
+    path: kubernetes/simple/subscriptions
+    targetRevision: HEAD
+  destination:
+    server: 'https://kubernetes.default.svc'
+    namespace: eduhelper
+  syncPolicy:
+    automated:
+      selfHeal: true
+      prune: true

deployment/argocd-eks/simple/user-storage-application.yaml

@@ -0,0 +1,18 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: user-storage
+  namespace: argocd
+spec:
+  project: default
+  source:
+    repoURL: 'https://github.com/EchoSkorJjj/IS213-Education-Helper-Kube.git'
+    path: kubernetes/simple/user-storage
+    targetRevision: HEAD
+  destination:
+    server: 'https://kubernetes.default.svc'
+    namespace: eduhelper
+  syncPolicy:
+    automated:
+      selfHeal: true
+      prune: true