Merge branch 'dev-v3' into prod-v3

.github/workflows/build-push-all-branches.yml

@@ -0,0 +1,49 @@
+### Set Up by: Christian Garcia (TACC)
+### Release-* methodology originally authored by Nathan Freeman (TACC) here:
+### https://github.com/tapis-project/tapis-workflows/blob/prod/.github/workflows/ci.yml#L59
+# Description. This Github action runs when there are new commits to dev-v3, prod-v3, or v3-release-*.
+# The action logs into Docker with the Github action environment secrets `DOCKERHUB_USERNAME`
+# and `DOCKERHUB_TOKEN`.
+# The action pulls the repo and builds the abaco/core-v3 image and uses branch name as the
+# docker tag. In instance of `v3-release-1.2.0`, sed will delete `v3-release-`, leaving `1.2.0`.
+# If branch = prod-v3, tag becomes `staging` so staging is also built.
+#
+# NOVEMBER 16th:
+#   DOCKERHUB_USERNAME: username for cgarcia
+#   DOCKERHUB_TOKEN: token for cgarcia
+
+name: Build & Push - All Branches
+on:
+  push:
+    branches: [ dev-v3, prod-v3, v3-release-* ]
+  pull_request:
+    branches: [ dev-v3, prod-v3, v3-release-* ]
+  workflow_dispatch:
+
+jobs:
+  build-and-push-images:
+    runs-on: ubuntu-latest
+    environment: docker
+    steps:
+      - name: Get tag name from branch. SED removes `v3-release-`; replaces `prod-v3` with `staging`.
+        id: get_tag_name
+        shell: bash
+        run: echo "tag_name=$(echo ${GITHUB_REF#refs/heads/} | sed 's/prod-v3/staging/g' | sed 's/v3-release-//g')" >> $GITHUB_OUTPUT
+
+      - name: Checkout repo
+        uses: actions/checkout@v3
+
+      - name: Setup Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Log in to Docker
+        uses: docker/login-action@v2
+        with:
+          username: ${{ vars.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build & push tagged Docker backend image
+        uses: docker/build-push-action@v3
+        with:
+          push: true
+          tags: abaco/core-v3:${{ steps.get_tag_name.outputs.tag_name }}

Makefile

@@ -136,7 +136,7 @@ endif
 #: Build core image
 build: vars
 	@echo "Makefile: $(GREEN)build$(NC)"
-	@echo "  🔨 : Running image build for core-v3, prometheus, and nginx."
+	@echo "  🔨 : Running image build for core-v3 and nginx."
 
 ifeq ($(BACKEND),minikube)
 	$(MAKE) build-minikube
@@ -147,26 +147,23 @@ endif
 
 build-docker: vars
 	@echo "Makefile: $(GREEN)build$(NC)"
-	@echo "  🔨 : Running image build for core-v3, prometheus, and nginx."
+	@echo "  🔨 : Running image build for core-v3 and nginx."
 
 	@echo "  🌎 : Using backend: $(LCYAN)docker$(NC)"
 	@echo ""
 	docker build -t $(SERVICE_NAME)/core-v3:$$TAG ./
 	@echo ""
-	docker build -t $(SERVICE_NAME)/prom:$$TAG images/prometheus/.
-	@echo ""
 	docker build -t $(SERVICE_NAME)/nginx:$$TAG images/nginx/.
 	@echo ""
 
 
 build-minikube: vars
 	@echo "Makefile: $(GREEN)build$(NC)"
-	@echo "  🔨 : Running image build for core-v3, prometheus, and nginx."
+	@echo "  🔨 : Running image build for core-v3 and nginx."
 
 	@echo "  🌎 : Using backend: $(LCYAN)minikube$(NC)"
 	@echo ""
 	minikube image build -t $(SERVICE_NAME)/core-v3:$$TAG ./
-	minikube image build -t $(SERVICE_NAME)/prom:$$TAG images/prometheus/.
 	minikube image build -t $(SERVICE_NAME)/nginx:$$TAG images/nginx/.
 	@echo ""
 

actors/controllers.py

@@ -815,14 +815,27 @@ def get(self):
             result = Search(args_full, 'actors', g.request_tenant_id, g.request_username).search()
             return ok(result=result, msg="Actors search completed successfully.")
         else:
-            actors = []
-            for actor_info in actors_store[site()].items():
-                if actor_info['tenant'] == g.request_tenant_id:
-                    actor = Actor.from_db(actor_info)
-                    if check_permissions(g.request_username, actor.db_id, READ):
-                        actors.append(actor.display())
+            # Pipeline puts permissions.user = "level" on actor obj.
+            # Ensure users permissions and proper tenant in one step.
+            # Previously a for loop, really slow. This should be db speed no matter db size.
+            pipeline = [
+                {'$match': {'tenant': g.request_tenant_id}},
+                {'$lookup':
+                    {'from' : 'permissions_store',
+                    'localField' : '_id',
+                    'foreignField' : '_id',
+                    'as' : 'permissions'}},
+                {'$unwind': '$permissions'},
+                {'$match': {'permissions.' + g.request_username: {'$in': ["EXECUTE", "UPDATE", "READ"]}}}
+            ]
+            actors = list(actors_store[site()].aggregate(pipeline))
+            # We now need to run actor objects through .display()
+            display_ready_actors = []
+            for actor in actors:
+                actor = Actor.from_db(actor)
+                display_ready_actors.append(actor.display())
             logger.info("actors retrieved.")
-            return ok(result=actors, msg="Actors retrieved successfully.")
+            return ok(result=display_ready_actors, msg="Actors retrieved successfully.")
 
     def validate_post(self):
         logger.debug("top of validate post in /actors")

docker-compose.yml

@@ -234,42 +234,3 @@ services:
         depends_on:
             - mongo
             - reg
-#            - prometheus
-
-    # prometheus:
-    #     # build: ./images/prometheus
-    #     image: abaco/prom:$TAG
-    #     volumes:
-    #         - ./images/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml
-    #         - ./images/prometheus/alert.rules.yml:/etc/prometheus/alert.rules.yml
-    #     command:
-    #       - '--config.file=/etc/prometheus/prometheus.yml'
-    #     #   - '-storage.local.path=/prometheus'
-    #     ports:
-    #         - 9090:9090
-    #     networks:
-    #         - abaco
-    #     depends_on:
-    #         - mongo
-    #         - reg
-
-    # grafana:
-    #     image: grafana/grafana
-    #     user: "104"
-    #     depends_on:
-    #         - prometheus
-    #         - mongo
-    #         - reg
-    #     ports:
-    #         - 3000:3000
-    #     volumes:
-    #         - grafana_data:/var/lib/grafana
-    #         - ./images/prometheus/grafana/provisioning/:/etc/grafana/provisioning/
-    #     env_file:
-    #         - ./images/prometheus/grafana/config.monitoring
-    #     networks:
-    #         - abaco
-    #     restart: always
-
-# volumes:
-#     grafana_data: {}

kube-template/burndown

@@ -3,16 +3,13 @@
 # config
 kubectl delete configmap actors-config 
 kubectl delete -f nginx-config.yml
-kubectl delete -f prometheus-config.yml
 kubectl delete -f configmap.yml
 
 # apps
 kubectl delete -f reg.yml
 kubectl delete -f mes.yml
 kubectl delete -f admin.yml
 kubectl delete -f events.yml
-kubectl delete -f prometheus.yml
-kubectl delete -f grafana.yml
 kubectl delete -f metrics.yml
 kubectl delete -f nginx.yml
 kubectl delete -f spawner.yml

kube-template/burnup

@@ -7,7 +7,6 @@ kubectl apply -f security.yml
 # config files
 kubectl create configmap actors-config --from-file=config.json
 kubectl apply -f nginx-config.yml
-kubectl apply -f prometheus-config.yml
 kubectl apply -f configmap.yml
 
 # services files
@@ -23,8 +22,6 @@ kubectl apply -f reg.yml
 kubectl apply -f mes.yml
 kubectl apply -f admin.yml
 #kubectl apply -f events.yml 
-kubectl apply -f prometheus.yml
-#kubectl apply -f grafana.yml
 kubectl apply -f metrics.yml
 kubectl apply -f spawner.yml
 kubectl apply -f health.yml