Skip to content

Events - basic support for infrastructure services, and comment out legacy events on infrastructure services #803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alebellu merged 1 commit into from
Aug 29, 2023
Merged

Events - basic support for infrastructure services, and comment out legacy events on infrastructure services #803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions code/src/sixsq/nuvla/server/resources/common/event_config.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,16 @@


(defmethod event-description :default
[{:keys [success authn-info category content] event-name :name :as _event}]
[{:keys [success authn-info category content] event-name :name :as _event}
& [{:keys [resource] :as _context}]]
(if success
(let [user-name-or-id (or (some-> authn-info :user-id crud/retrieve-by-id-as-admin1 :name)
(:user-id authn-info))
resource-id (-> content :resource :href)
resource-type (u/id->resource-type resource-id)
resource-name (:name (crud/retrieve-by-id-as-admin1 resource-id))
resource (or resource
(crud/retrieve-by-id-as-admin1 resource-id))
resource-name (:name resource)
resource-name-or-id (or resource-name resource-id)]
(case category
("add" "edit" "delete" "action")
Expand All @@ -77,4 +80,3 @@
event-name))
(str event-name " attempt failed.")))


89 changes: 0 additions & 89 deletions code/src/sixsq/nuvla/server/resources/common/event_config.clj.orig
View file
Open in desktop

This file was deleted.

7 changes: 4 additions & 3 deletions code/src/sixsq/nuvla/server/resources/deployment.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,7 @@ a container orchestration engine.
(a/throw-cannot-delete request)
(db/delete request))]
(ectx/add-to-context :acl (:acl deployment))
(ectx/add-to-context :resource deployment)
(utils/delete-all-child-resources deployment-id)
delete-response)
(catch Exception e
Expand Down Expand Up @@ -565,23 +566,23 @@ a container orchestration engine.


(defmethod ec/event-description "deployment.start"
[{:keys [success] {:keys [user-id]} :authn-info :as _event}]
[{:keys [success] {:keys [user-id]} :authn-info :as _event} & _]
(if success
(when-let [user-name (or (some-> user-id crud/retrieve-by-id-as-admin1 :name) user-id)]
(str user-name " started deployment."))
"Deployment start attempt failed."))


(defmethod ec/event-description "deployment.stop"
[{:keys [success] {:keys [user-id]} :authn-info :as _event}]
[{:keys [success] {:keys [user-id]} :authn-info :as _event} & _]
(if success
(when-let [user-name (or (some-> user-id crud/retrieve-by-id-as-admin1 :name) user-id)]
(str user-name " stopped deployment."))
"Deployment stop attempt failed."))


(defmethod ec/event-description "deployment.clone"
[{:keys [success] {:keys [user-id]} :authn-info :as _event}]
[{:keys [success] {:keys [user-id]} :authn-info :as _event} & _]
(if success
(when-let [user-name (or (some-> user-id crud/retrieve-by-id-as-admin1 :name) user-id)]
(str user-name " cloned deployment."))
Expand Down
8 changes: 4 additions & 4 deletions code/src/sixsq/nuvla/server/resources/event/utils.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,16 +121,16 @@


(defn set-description
[event]
(let [event-description (ec/event-description event)]
[event context]
(let [event-description (ec/event-description event context)]
(cond-> event
event-description (assoc :description event-description))))


(defn build-event
[context request response]
(-> {:resource-type event/resource-type
:name (get-event-name context request)
:name (get-event-name context request)
:success (get-success response)
:category (get-category context)
:timestamp (get-timestamp context)
Expand All @@ -139,7 +139,7 @@
:severity (get-severity context)
:content {:resource (get-resource context response)
:linked-identifiers (get-linked-identifiers context)}}
(set-description)))
(set-description context)))


(defn add-event
Expand Down
Loading