Refactored, added backstage yaml

Author: cliftonc

action.yml

@@ -16,7 +16,9 @@ inputs:
     description: 'Parent database to add to'
     required: true
   repository_type:
-    description: 'Github repository type (e.g. all|private|internal)' 
+    description: 'Github repository type (e.g. all|private|internal), defaults to `all`' 
+  catalog_file:
+    description: 'Catalog file name to look for in the root of repo, defaults to `catalog_file.yaml`' 
 outputs:
   status: 
     description: 'The status of the scan'

catalog-info.yaml

@@ -0,0 +1,16 @@
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: notion-github-catalog
+  description: A githb action to keep a notion database in sync with Github repository info  
+  annotations:
+    segment: general
+    team: all
+  tags:
+    - notion
+    - github
+    - action  
+spec:
+  type: action
+  lifecycle: production
+  owner: opensource  

package-lock.json

@@ -19,7 +19,8 @@
     "@actions/github": "^5.0.0",
     "@notionhq/client": "^0.4.11",
     "@tryfabric/martian": "^1.1.1",
-    "octokit": "^1.7.1"
+    "octokit": "^1.7.1",
+    "yaml": "^1.10.2"
   },
   "devDependencies": {
     "eslint": "^7.32.0",

package.json

@@ -13,10 +13,14 @@ By default integrations cant access any contentm so you you *must* share your da
 This action expects a Notion database with the following properties:
 
   - Name: text
+  - Description: text
   - URL: url
   - Segment: select
   - Team: select
   - Tags: multi_select
+  - Visibility: select
+  - Language: select
+  - Status: select
   - Updated: date
 
 It looks like this after it has run:

readme.md

@@ -1,12 +1,15 @@
 const core = require('@actions/core')
 const { Client, LogLevel } = require('@notionhq/client')
 const { Octokit } = require('octokit')
+const YAML = require('yaml')
+const { markdownToBlocks } = require('@tryfabric/martian')
 
 try {
   const NOTION_TOKEN = core.getInput('notion_token')
   const GITHUB_TOKEN = core.getInput('github_token')
   const database = core.getInput('database')
   const owner = core.getInput('github_owner')
+  const catalogFile = core.getInput('catalog_file') || 'catalog-info.yaml'
   const repositoryType = core.getInput('repository_type') || 'all'
 
   core.debug('Creating notion client ...')
@@ -15,6 +18,8 @@ try {
     logLevel: LogLevel.ERROR
   })
 
+  console.log(database, owner)
+
   const octokit = new Octokit({ auth: GITHUB_TOKEN })
 
   const getRepos = async () => {
@@ -26,37 +31,144 @@ try {
         per_page: 100
       })
     core.info(`Found ${repos.length} github repositories, now getting service data ...`)
-    const repoData = []
-    for (const repo of repos) {
+    const repoData = []        
+    for (const repo of repos) {      
       try {
         const { data } = await octokit.request('GET /repos/{owner}/{repo}/contents/{path}', {
           owner: repo.full_name.split('/')[0],
           repo: repo.name,
-          path: 'service.json'
+          path: catalogFile
         })
         if (data) {
           const base64content = Buffer.from(data.content, 'base64')
-          const serviceJson = JSON.parse(base64content.toString('utf8'))
-          serviceJson._repo = repo
-          repoData.push(serviceJson)
+          const serviceDefintion = YAML.parse(base64content.toString('utf8'))
+          serviceDefintion._repo = repo
+          serviceDefintion.status = 'OK'
+          repoData.push(serviceDefintion)
         }
       } catch (ex) {
         repoData.push({
           segment: 'Unknown',
           team: 'Unknown',
-          status: 'No service.json found',
+          status: `${catalogFile} missing`,
           _repo: repo
         })
       }
     }
     return repoData
   }
 
-  const updateNotion = async (repositories) => {
-    for (const repo of repositories) {
-      // Date to log as updated
-      const date = new Date().toISOString()
+  const updateNotionRow = async (repo, pageId) => {    
+    try {
+      await notion.pages.update({
+        page_id: pageId,
+        properties: {
+          Name: {
+            title: [
+              {
+                text: {
+                  content: repo._repo.name
+                }
+              }
+            ]
+          },
+          Description: {
+            rich_text: [
+              {
+                text: {
+                  content: repo._repo.description || repo._repo.name
+                }
+              }
+            ]
+          },
+          URL: {
+            url: repo._repo.html_url
+          },
+          Segment: {
+            select: {
+              name: repo.segment
+            }
+          },
+          Team: {
+            select: {
+              name: repo.team
+            }
+          },
+          Visibility: {
+            select: {
+              name: repo._repo.visibility
+            }
+          },
+          Language: {
+            select: {
+              name: repo._repo.language || 'Unknown'
+            }
+          },
+          Status: {
+            select: {
+              name: repo.status
+            }
+          },
+          Updated: {
+            date: {
+              start: new Date().toISOString()
+            }
+          }
+        }
+      })
+    } catch(ex) {
+      core.error(`Error updating notion document for ${repo._repo.name}: ${ex.message} ...`);
+    }
+  }
+
+  const createNotionRow = async (repo) => {    
+    try {
+      await notion.pages.create({
+        parent: {
+          database_id: database
+        },
+        properties: {
+          Name: {
+            title: [
+              {
+                text: {
+                  content: repo._repo.name
+                }
+              }
+            ]
+          },
+          URL: {
+            url: repo._repo.html_url
+          },
+          Segment: {
+            select: {
+              name: repo.segment
+            }
+          },
+          Team: {
+            select: {
+              name: repo.team
+            }
+          },
+          Status: {
+            select: {
+              name: repo.status
+            }
+          },
+          Updated: {
+            date: {
+              start: new Date().toISOString()
+            }
+          }
+        }
+      })
+    } catch(ex) {      
+      core.error(`Error creating notion document for ${repo._repo.name}: ${ex.message} ...`);
+    }
+  }
 
+  const updateNotion = async (repositories) => {
+    for (const repo of repositories) {      
       // Lets see if we can find the row
       const search = await notion.databases.query({
         database_id: database,
@@ -73,73 +185,9 @@ try {
       // Lets just update the first one to not make the problem worse
       if (search.results.length > 0) {
         const pageId = search.results[0].id
-        await notion.pages.update({
-          page_id: pageId,
-          properties: {
-            Name: {
-              title: [
-                {
-                  text: {
-                    content: repo._repo.name
-                  }
-                }
-              ]
-            },
-            URL: {
-              url: repo._repo.html_url
-            },
-            Segment: {
-              select: {
-                name: repo.segment
-              }
-            },
-            Team: {
-              select: {
-                name: repo.team
-              }
-            },
-            Updated: {
-              date: {
-                start: date
-              }
-            }
-          }
-        })
+        await updateNotionRow(repo, pageId)
       } else {
-        await notion.pages.create({
-          parent: {
-            database_id: database
-          },
-          properties: {
-            Name: {
-              title: [
-                {
-                  text: {
-                    content: repo._repo.name
-                  }
-                }
-              ]
-            },
-            URL: {
-              url: repo._repo.html_url
-            },
-            Segment: {
-              select: {
-                name: repo.segment
-              }
-            },
-            Team: {
-              select: {
-                name: repo.team
-              }
-            },
-            Updated: {
-              date: {
-                start: date
-              }
-            }
-          }
-        })
+        await createNotionRow(repo)
       }
     }
   }

src/index.js

@@ -17,3 +17,4 @@ test('complete input should succeed with default inputs', () => {
   const result = cp.execSync(`node ${ip}`, options).toString()
   expect(result).toBeDefined()
 })
+s

src/index.test.js

@@ -2,9 +2,11 @@ const { spawn } = require('child_process')
 const path = require('path')
 const process = require('process')
 
-process.env.INPUT_DATABASE = '2b26b4290cc84d95ad3e93c3255277a1'
+process.env.INPUT_DATABASE = 'cecaf0beb15945158d155866ff9acce8' //'2b26b4290cc84d95ad3e93c3255277a1'
 process.env.INPUT_NOTION_TOKEN = process.env.NOTION_TOKEN
 process.env.INPUT_GITHUB_TOKEN = process.env.GITHUB_TOKEN
+process.env.INPUT_REPOSITORY_TYPE = 'public'
+process.env.INPUT_GITHUB_OWNER = 'infinitaslearning'
 
 const ip = path.join(__dirname, 'index.js')
 const options = {