✨ Add project key, creator and issue type (#4623)

mondoohq · Sep 2, 2024 · f1e22a0 · f1e22a0
1 parent 2638643
commit f1e22a0
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 1 deletion.
diff --git a/providers/atlassian/resources/atlassian.lr b/providers/atlassian/resources/atlassian.lr
@@ -112,12 +112,18 @@ atlassian.jira.issue @defaults("id createdAt") {
   id string
   // Project
   project string
+  // Project key
+  projectKey string
   // Status
   status string
   // Description
   description string
   // Issue create time in UTC
   createdAt time
+  // Issue creator
+  creator atlassian.jira.user
+  // Issue type name
+  typeName string
 }
 
 // Jira server info

diff --git a/providers/atlassian/resources/atlassian.lr.go b/providers/atlassian/resources/atlassian.lr.go
diff --git a/providers/atlassian/resources/atlassian.lr.manifest.yaml b/providers/atlassian/resources/atlassian.lr.manifest.yaml
@@ -148,10 +148,13 @@ resources:
   atlassian.jira.issue:
     fields:
       createdAt: {}
+      creator: {}
       description: {}
       id: {}
       project: {}
+      projectKey: {}
       status: {}
+      typeName: {}
     min_mondoo_version: 9.0.0
   atlassian.jira.project:
     fields:

diff --git a/providers/atlassian/resources/atlassian_jira.go b/providers/atlassian/resources/atlassian_jira.go
@@ -208,7 +208,7 @@ func (a *mqlAtlassianJira) issues() ([]interface{}, error) {
 	jira := conn.Client()
 	validate := ""
 	jql := "order by created DESC"
-	fields := []string{"created", "status", "project", "description"}
+	fields := []string{"created", "creator", "status", "project", "description", "issuetype"}
 	expands := []string{"changelog", "renderedFields", "names", "schema", "transitions", "operations", "editmeta"}
 
 	res := []interface{}{}
@@ -226,13 +226,28 @@ func (a *mqlAtlassianJira) issues() ([]interface{}, error) {
 				return nil, err
 			}
 
+			creator := issue.Fields.Creator
+			mqlAtlassianJiraUser, err := CreateResource(a.MqlRuntime, "atlassian.jira.user",
+				map[string]*llx.RawData{
+					"id":      llx.StringData(creator.AccountID),
+					"name":    llx.StringData(creator.DisplayName),
+					"type":    llx.StringData(creator.AccountType),
+					"picture": llx.StringData(creator.AvatarUrls.One6X16),
+				})
+			if err != nil {
+				return nil, err
+			}
+
 			mqlAtlassianJiraIssue, err := CreateResource(a.MqlRuntime, "atlassian.jira.issue",
 				map[string]*llx.RawData{
 					"id":          llx.StringData(issue.ID),
 					"project":     llx.StringData(issue.Fields.Project.Name),
+					"projectKey":  llx.StringData(issue.Fields.Project.Key),
 					"status":      llx.StringData(issue.Fields.Status.Name),
 					"description": llx.StringData(issue.Fields.Description),
 					"createdAt":   llx.TimeData(created.UTC()),
+					"creator":     llx.AnyData(mqlAtlassianJiraUser),
+					"typeName":    llx.StringData(issue.Fields.IssueType.Name),
 				})
 			if err != nil {
 				return nil, err