feat(coderd): WIP: add sftp to apps

mafredri · mafredri · commit 6f271aaa49cd · 2024-03-19T18:00:14.000+02:00
diff --git a/coderd/insights.go b/coderd/insights.go
@@ -460,6 +460,14 @@ func convertTemplateInsightsApps(usage database.GetTemplateInsightsRow, appUsage
 			Icon:        "/icon/terminal.svg",
 			Seconds:     usage.UsageSshSeconds,
 		},
+		{
+			TemplateIDs: usage.SftpTemplateIds,
+			Type:        codersdk.TemplateAppsTypeBuiltin,
+			DisplayName: codersdk.TemplateBuiltinAppDisplayNameSFTP,
+			Slug:        "sftp",
+			Icon:        "/icon/terminal.svg",
+			Seconds:     usage.UsageSftpSeconds,
+		},
 	}
 
 	// Use a stable sort, similarly to how we would sort in the query, note that
diff --git a/coderd/testdata/insights/template/multiple_users_and_workspaces_three_weeks_second_template.json.golden b/coderd/testdata/insights/template/multiple_users_and_workspaces_three_weeks_second_template.json.golden
@@ -45,6 +45,14 @@
         "icon": "/icon/terminal.svg",
         "seconds": 10800
       },
+      {
+        "template_ids": [],
+        "type": "builtin",
+        "display_name": "SFTP",
+        "slug": "sftp",
+        "icon": "/icon/terminal.svg",
+        "seconds": 0
+      },
       {
         "template_ids": [
           "00000000-0000-0000-0000-000000000002"
diff --git a/coderd/testdata/insights/template/multiple_users_and_workspaces_three_weeks_second_template_only_report.json.golden b/coderd/testdata/insights/template/multiple_users_and_workspaces_three_weeks_second_template_only_report.json.golden
@@ -45,6 +45,14 @@
         "icon": "/icon/terminal.svg",
         "seconds": 10800
       },
+      {
+        "template_ids": [],
+        "type": "builtin",
+        "display_name": "SFTP",
+        "slug": "sftp",
+        "icon": "/icon/terminal.svg",
+        "seconds": 0
+      },
       {
         "template_ids": [
           "00000000-0000-0000-0000-000000000002"
diff --git a/coderd/testdata/insights/template/multiple_users_and_workspaces_week_all_templates.json.golden b/coderd/testdata/insights/template/multiple_users_and_workspaces_week_all_templates.json.golden
@@ -52,6 +52,14 @@
         "icon": "/icon/terminal.svg",
         "seconds": 11520
       },
+      {
+        "template_ids": [],
+        "type": "builtin",
+        "display_name": "SFTP",
+        "slug": "sftp",
+        "icon": "/icon/terminal.svg",
+        "seconds": 0
+      },
       {
         "template_ids": [
           "00000000-0000-0000-0000-000000000001",
diff --git a/coderd/testdata/insights/template/multiple_users_and_workspaces_week_deployment_wide.json.golden b/coderd/testdata/insights/template/multiple_users_and_workspaces_week_deployment_wide.json.golden
@@ -52,6 +52,14 @@
         "icon": "/icon/terminal.svg",
         "seconds": 11520
       },
+      {
+        "template_ids": [],
+        "type": "builtin",
+        "display_name": "SFTP",
+        "slug": "sftp",
+        "icon": "/icon/terminal.svg",
+        "seconds": 0
+      },
       {
         "template_ids": [
           "00000000-0000-0000-0000-000000000001",
diff --git a/coderd/testdata/insights/template/multiple_users_and_workspaces_week_first_template.json.golden b/coderd/testdata/insights/template/multiple_users_and_workspaces_week_first_template.json.golden
@@ -45,6 +45,14 @@
         "icon": "/icon/terminal.svg",
         "seconds": 7920
       },
+      {
+        "template_ids": [],
+        "type": "builtin",
+        "display_name": "SFTP",
+        "slug": "sftp",
+        "icon": "/icon/terminal.svg",
+        "seconds": 0
+      },
       {
         "template_ids": [
           "00000000-0000-0000-0000-000000000001"
diff --git a/coderd/testdata/insights/template/multiple_users_and_workspaces_week_other_timezone_(São_Paulo).json.golden b/coderd/testdata/insights/template/multiple_users_and_workspaces_week_other_timezone_(São_Paulo).json.golden
@@ -47,6 +47,14 @@
         "icon": "/icon/terminal.svg",
         "seconds": 4320
       },
+      {
+        "template_ids": [],
+        "type": "builtin",
+        "display_name": "SFTP",
+        "slug": "sftp",
+        "icon": "/icon/terminal.svg",
+        "seconds": 0
+      },
       {
         "template_ids": [
           "00000000-0000-0000-0000-000000000001",
diff --git a/coderd/testdata/insights/template/multiple_users_and_workspaces_week_second_template.json.golden b/coderd/testdata/insights/template/multiple_users_and_workspaces_week_second_template.json.golden
@@ -43,6 +43,14 @@
         "icon": "/icon/terminal.svg",
         "seconds": 3600
       },
+      {
+        "template_ids": [],
+        "type": "builtin",
+        "display_name": "SFTP",
+        "slug": "sftp",
+        "icon": "/icon/terminal.svg",
+        "seconds": 0
+      },
       {
         "template_ids": [
           "00000000-0000-0000-0000-000000000002"
diff --git a/coderd/testdata/insights/template/multiple_users_and_workspaces_week_third_template.json.golden b/coderd/testdata/insights/template/multiple_users_and_workspaces_week_third_template.json.golden
@@ -43,6 +43,14 @@
         "icon": "/icon/terminal.svg",
         "seconds": 3600
       },
+      {
+        "template_ids": [],
+        "type": "builtin",
+        "display_name": "SFTP",
+        "slug": "sftp",
+        "icon": "/icon/terminal.svg",
+        "seconds": 0
+      },
       {
         "template_ids": [
           "00000000-0000-0000-0000-000000000003"
diff --git a/coderd/testdata/insights/template/multiple_users_and_workspaces_weekly_aggregated_deployment_wide.json.golden b/coderd/testdata/insights/template/multiple_users_and_workspaces_weekly_aggregated_deployment_wide.json.golden
@@ -52,6 +52,14 @@
         "icon": "/icon/terminal.svg",
         "seconds": 15120
       },
+      {
+        "template_ids": [],
+        "type": "builtin",
+        "display_name": "SFTP",
+        "slug": "sftp",
+        "icon": "/icon/terminal.svg",
+        "seconds": 0
+      },
       {
         "template_ids": [
           "00000000-0000-0000-0000-000000000001",
diff --git a/coderd/testdata/insights/template/multiple_users_and_workspaces_weekly_aggregated_first_template.json.golden b/coderd/testdata/insights/template/multiple_users_and_workspaces_weekly_aggregated_first_template.json.golden
@@ -45,6 +45,14 @@
         "icon": "/icon/terminal.svg",
         "seconds": 7920
       },
+      {
+        "template_ids": [],
+        "type": "builtin",
+        "display_name": "SFTP",
+        "slug": "sftp",
+        "icon": "/icon/terminal.svg",
+        "seconds": 0
+      },
       {
         "template_ids": [
           "00000000-0000-0000-0000-000000000001"
diff --git a/coderd/testdata/insights/template/multiple_users_and_workspaces_weekly_aggregated_templates.json.golden b/coderd/testdata/insights/template/multiple_users_and_workspaces_weekly_aggregated_templates.json.golden
@@ -52,6 +52,14 @@
         "icon": "/icon/terminal.svg",
         "seconds": 15120
       },
+      {
+        "template_ids": [],
+        "type": "builtin",
+        "display_name": "SFTP",
+        "slug": "sftp",
+        "icon": "/icon/terminal.svg",
+        "seconds": 0
+      },
       {
         "template_ids": [
           "00000000-0000-0000-0000-000000000001",
diff --git a/coderd/testdata/insights/template/parameters_two_days_ago,_no_data.json.golden b/coderd/testdata/insights/template/parameters_two_days_ago,_no_data.json.golden
@@ -36,6 +36,14 @@
         "slug": "ssh",
         "icon": "/icon/terminal.svg",
         "seconds": 0
+      },
+      {
+        "template_ids": [],
+        "type": "builtin",
+        "display_name": "SFTP",
+        "slug": "sftp",
+        "icon": "/icon/terminal.svg",
+        "seconds": 0
       }
     ],
     "parameters_usage": []
diff --git a/coderd/testdata/insights/template/parameters_yesterday_and_today_deployment_wide.json.golden b/coderd/testdata/insights/template/parameters_yesterday_and_today_deployment_wide.json.golden
@@ -36,6 +36,14 @@
         "slug": "ssh",
         "icon": "/icon/terminal.svg",
         "seconds": 0
+      },
+      {
+        "template_ids": [],
+        "type": "builtin",
+        "display_name": "SFTP",
+        "slug": "sftp",
+        "icon": "/icon/terminal.svg",
+        "seconds": 0
       }
     ],
     "parameters_usage": [
diff --git a/codersdk/insights.go b/codersdk/insights.go
@@ -206,6 +206,7 @@ const (
 	TemplateBuiltinAppDisplayNameJetBrains   string = "JetBrains"
 	TemplateBuiltinAppDisplayNameWebTerminal string = "Web Terminal"
 	TemplateBuiltinAppDisplayNameSSH         string = "SSH"
+	TemplateBuiltinAppDisplayNameSFTP        string = "SFTP"
 )
 
 // TemplateAppUsage shows the usage of an app for one or more templates.

Original file line number	Diff line number	Diff line change
`@@ -206,6 +206,7 @@ const (`
`206`	`206`	`TemplateBuiltinAppDisplayNameJetBrains string = "JetBrains"`
`207`	`207`	`TemplateBuiltinAppDisplayNameWebTerminal string = "Web Terminal"`
`208`	`208`	`TemplateBuiltinAppDisplayNameSSH string = "SSH"`
	`209`	`+ TemplateBuiltinAppDisplayNameSFTP string = "SFTP"`
`209`	`210`	`)`
`210`	`211`
`211`	`212`	`// TemplateAppUsage shows the usage of an app for one or more templates.`