From 57f2fe8c86420c60a2f2873cb912f9b7d5bffaa5 Mon Sep 17 00:00:00 2001
From: Tom Wiesing <tkw01536@gmail.com>
Date: Fri, 18 Nov 2022 08:41:42 +0100
Subject: [PATCH] status: Rename Information => WissKI

---
 internal/dis/component/control/home/public.go        | 4 ++--
 internal/dis/component/control/info/index.go         | 6 +++---
 internal/dis/component/control/info/instance.go      | 2 +-
 internal/status/{information.go => wisski.go}        | 4 ++--
 internal/wisski/ingredient/barrel/build.go           | 2 +-
 internal/wisski/ingredient/barrel/drush/cron.go      | 2 +-
 internal/wisski/ingredient/barrel/drush/update.go    | 2 +-
 internal/wisski/ingredient/barrel/running.go         | 2 +-
 internal/wisski/ingredient/barrel/ssh/ssh.go         | 2 +-
 internal/wisski/ingredient/fetcher.go                | 2 +-
 internal/wisski/ingredient/info/info.go              | 4 ++--
 internal/wisski/ingredient/info/snapshots.go         | 2 +-
 internal/wisski/ingredient/locker/locked.go          | 2 +-
 internal/wisski/ingredient/php/extras/pathbuilder.go | 2 +-
 internal/wisski/ingredient/php/extras/prefixes.go    | 2 +-
 internal/wisski/ingredient/php/extras/stats.go       | 2 +-
 16 files changed, 21 insertions(+), 21 deletions(-)
 rename internal/status/{information.go => wisski.go} (96%)

diff --git a/internal/dis/component/control/home/public.go b/internal/dis/component/control/home/public.go
index 2e85625..e1186bc 100644
--- a/internal/dis/component/control/home/public.go
+++ b/internal/dis/component/control/home/public.go
@@ -65,7 +65,7 @@ func (home *Home) homeRender() ([]byte, error) {
 	if err != nil {
 		return nil, err
 	}
-	context.Instances = make([]status.Information, len(wissKIs))
+	context.Instances = make([]status.WissKI, len(wissKIs))
 
 	// determine their infos
 	var eg errgroup.Group
@@ -86,7 +86,7 @@ func (home *Home) homeRender() ([]byte, error) {
 }
 
 type HomeContext struct {
-	Instances []status.Information
+	Instances []status.WissKI
 
 	Time time.Time
 
diff --git a/internal/dis/component/control/info/index.go b/internal/dis/component/control/info/index.go
index 8bf9200..c65e6ad 100644
--- a/internal/dis/component/control/info/index.go
+++ b/internal/dis/component/control/info/index.go
@@ -21,7 +21,7 @@ var indexTemplate = static.AssetsControlIndex.MustParseShared(
 
 type indexContext struct {
 	status.Distillery
-	Instances []status.Information
+	Instances []status.WissKI
 }
 
 func (info *Info) index(r *http.Request) (idx indexContext, err error) {
@@ -31,7 +31,7 @@ func (info *Info) index(r *http.Request) (idx indexContext, err error) {
 
 // Status produces a new observation of the distillery, and a new information of all instances
 // The information on all instances is passed the given quick flag.
-func (info *Info) Status(QuickInformation bool) (target status.Distillery, information []status.Information, err error) {
+func (info *Info) Status(QuickInformation bool) (target status.Distillery, information []status.WissKI, err error) {
 	var group errgroup.Group
 
 	group.Go(func() error {
@@ -42,7 +42,7 @@ func (info *Info) Status(QuickInformation bool) (target status.Distillery, infor
 		}
 
 		// get all of their info!
-		information = make([]status.Information, len(all))
+		information = make([]status.WissKI, len(all))
 		for i, instance := range all {
 			{
 				i := i
diff --git a/internal/dis/component/control/info/instance.go b/internal/dis/component/control/info/instance.go
index c3e1541..673c1e8 100644
--- a/internal/dis/component/control/info/instance.go
+++ b/internal/dis/component/control/info/instance.go
@@ -24,7 +24,7 @@ type instanceContext struct {
 	Time time.Time
 
 	Instance models.Instance
-	Info     status.Information
+	Info     status.WissKI
 }
 
 func (info *Info) instance(r *http.Request) (is instanceContext, err error) {
diff --git a/internal/status/information.go b/internal/status/wisski.go
similarity index 96%
rename from internal/status/information.go
rename to internal/status/wisski.go
index e0a0da4..d979a1e 100644
--- a/internal/status/information.go
+++ b/internal/status/wisski.go
@@ -8,8 +8,8 @@ import (
 	"github.com/FAU-CDI/wisski-distillery/internal/phpx"
 )
 
-// Information provides information about a single WissKI
-type Information struct {
+// WissKI provides information about a single WissKI
+type WissKI struct {
 	Time time.Time // Time this info was built
 
 	Slug string // slug
diff --git a/internal/wisski/ingredient/barrel/build.go b/internal/wisski/ingredient/barrel/build.go
index f0a6609..e9d1668 100644
--- a/internal/wisski/ingredient/barrel/build.go
+++ b/internal/wisski/ingredient/barrel/build.go
@@ -70,7 +70,7 @@ type LastRebuildFetcher struct {
 	Barrel *Barrel
 }
 
-func (lbr *LastRebuildFetcher) Fetch(flags ingredient.FetcherFlags, info *status.Information) (err error) {
+func (lbr *LastRebuildFetcher) Fetch(flags ingredient.FetcherFlags, info *status.WissKI) (err error) {
 	info.LastRebuild, _ = lbr.Barrel.LastRebuild()
 	return
 }
diff --git a/internal/wisski/ingredient/barrel/drush/cron.go b/internal/wisski/ingredient/barrel/drush/cron.go
index 738058b..0aa816a 100644
--- a/internal/wisski/ingredient/barrel/drush/cron.go
+++ b/internal/wisski/ingredient/barrel/drush/cron.go
@@ -44,7 +44,7 @@ type LastCronFetcher struct {
 	Drush *Drush
 }
 
-func (lbr *LastCronFetcher) Fetch(flags ingredient.FetcherFlags, info *status.Information) (err error) {
+func (lbr *LastCronFetcher) Fetch(flags ingredient.FetcherFlags, info *status.WissKI) (err error) {
 	if flags.Quick {
 		return
 	}
diff --git a/internal/wisski/ingredient/barrel/drush/update.go b/internal/wisski/ingredient/barrel/drush/update.go
index 6a62128..bd5aea0 100644
--- a/internal/wisski/ingredient/barrel/drush/update.go
+++ b/internal/wisski/ingredient/barrel/drush/update.go
@@ -55,7 +55,7 @@ type LastUpdateFetcher struct {
 	Drush *Drush
 }
 
-func (lbr *LastUpdateFetcher) Fetch(flags ingredient.FetcherFlags, info *status.Information) (err error) {
+func (lbr *LastUpdateFetcher) Fetch(flags ingredient.FetcherFlags, info *status.WissKI) (err error) {
 	info.LastUpdate, err = lbr.Drush.LastUpdate()
 	return
 }
diff --git a/internal/wisski/ingredient/barrel/running.go b/internal/wisski/ingredient/barrel/running.go
index bcfd107..95b0de9 100644
--- a/internal/wisski/ingredient/barrel/running.go
+++ b/internal/wisski/ingredient/barrel/running.go
@@ -21,7 +21,7 @@ type RunningFetcher struct {
 	Barrel *Barrel
 }
 
-func (rf *RunningFetcher) Fetch(flags ingredient.FetcherFlags, info *status.Information) (err error) {
+func (rf *RunningFetcher) Fetch(flags ingredient.FetcherFlags, info *status.WissKI) (err error) {
 	info.Running, err = rf.Barrel.Running()
 	return
 }
diff --git a/internal/wisski/ingredient/barrel/ssh/ssh.go b/internal/wisski/ingredient/barrel/ssh/ssh.go
index bd553b0..1770865 100644
--- a/internal/wisski/ingredient/barrel/ssh/ssh.go
+++ b/internal/wisski/ingredient/barrel/ssh/ssh.go
@@ -33,7 +33,7 @@ func (ssh *SSH) Keys() ([]ssh.PublicKey, error) {
 	return sshx.ParseAllKeys(bytes), nil
 }
 
-func (sshx *SSH) Fetch(flags ingredient.FetcherFlags, info *status.Information) error {
+func (sshx *SSH) Fetch(flags ingredient.FetcherFlags, info *status.WissKI) error {
 	if flags.Quick {
 		return nil
 	}
diff --git a/internal/wisski/ingredient/fetcher.go b/internal/wisski/ingredient/fetcher.go
index f0b901c..92e9c37 100644
--- a/internal/wisski/ingredient/fetcher.go
+++ b/internal/wisski/ingredient/fetcher.go
@@ -10,7 +10,7 @@ type WissKIFetcher interface {
 
 	// Fetch fetches information from this ingredient and writes it into target.
 	// Distinct WissKIFetchers must write into distinct fields.
-	Fetch(flags FetcherFlags, target *status.Information) error
+	Fetch(flags FetcherFlags, target *status.WissKI) error
 }
 
 // FetcherFlags describes options for a WissKIFetcher
diff --git a/internal/wisski/ingredient/info/info.go b/internal/wisski/ingredient/info/info.go
index 273a270..3774766 100644
--- a/internal/wisski/ingredient/info/info.go
+++ b/internal/wisski/ingredient/info/info.go
@@ -21,7 +21,7 @@ type Info struct {
 
 // Information fetches information about this WissKI.
 // TODO: Rework this to be able to determine what kind of information is available.
-func (wisski *Info) Information(quick bool) (info status.Information, err error) {
+func (wisski *Info) Information(quick bool) (info status.WissKI, err error) {
 	// setup flags
 	flags := ingredient.FetcherFlags{
 		Quick: quick,
@@ -48,7 +48,7 @@ func (wisski *Info) Information(quick bool) (info status.Information, err error)
 	return
 }
 
-func (wisski *Info) Fetch(flags ingredient.FetcherFlags, info *status.Information) error {
+func (wisski *Info) Fetch(flags ingredient.FetcherFlags, info *status.WissKI) error {
 	info.Time = time.Now().UTC()
 	info.Slug = wisski.Slug
 	info.URL = wisski.URL().String()
diff --git a/internal/wisski/ingredient/info/snapshots.go b/internal/wisski/ingredient/info/snapshots.go
index 4db62d7..91d8506 100644
--- a/internal/wisski/ingredient/info/snapshots.go
+++ b/internal/wisski/ingredient/info/snapshots.go
@@ -11,7 +11,7 @@ type SnapshotsFetcher struct {
 	Info *Info
 }
 
-func (lbr *SnapshotsFetcher) Fetch(flags ingredient.FetcherFlags, info *status.Information) (err error) {
+func (lbr *SnapshotsFetcher) Fetch(flags ingredient.FetcherFlags, info *status.WissKI) (err error) {
 	if flags.Quick {
 		return
 	}
diff --git a/internal/wisski/ingredient/locker/locked.go b/internal/wisski/ingredient/locker/locked.go
index dcc234b..c485f26 100644
--- a/internal/wisski/ingredient/locker/locked.go
+++ b/internal/wisski/ingredient/locker/locked.go
@@ -18,7 +18,7 @@ func (lock *Locker) Locked() (locked bool) {
 	return
 }
 
-func (locker *Locker) Fetch(flags ingredient.FetcherFlags, info *status.Information) (err error) {
+func (locker *Locker) Fetch(flags ingredient.FetcherFlags, info *status.WissKI) (err error) {
 	info.Locked = locker.Locked()
 	return
 }
diff --git a/internal/wisski/ingredient/php/extras/pathbuilder.go b/internal/wisski/ingredient/php/extras/pathbuilder.go
index afe0a35..e160ade 100644
--- a/internal/wisski/ingredient/php/extras/pathbuilder.go
+++ b/internal/wisski/ingredient/php/extras/pathbuilder.go
@@ -45,7 +45,7 @@ func (pathbuilder *Pathbuilder) GetAll(server *phpx.Server) (pathbuilders map[st
 	return
 }
 
-func (pathbuilder *Pathbuilder) Fetch(flags ingredient.FetcherFlags, info *status.Information) (err error) {
+func (pathbuilder *Pathbuilder) Fetch(flags ingredient.FetcherFlags, info *status.WissKI) (err error) {
 	if flags.Quick {
 		return
 	}
diff --git a/internal/wisski/ingredient/php/extras/prefixes.go b/internal/wisski/ingredient/php/extras/prefixes.go
index 9705d4a..0c0db5c 100644
--- a/internal/wisski/ingredient/php/extras/prefixes.go
+++ b/internal/wisski/ingredient/php/extras/prefixes.go
@@ -156,7 +156,7 @@ func (wisski *Prefixes) Update() error {
 	return prefix.SetAll(wisski.MStore, prefixes...)
 }
 
-func (prefixes *Prefixes) Fetch(flags ingredient.FetcherFlags, info *status.Information) (err error) {
+func (prefixes *Prefixes) Fetch(flags ingredient.FetcherFlags, info *status.WissKI) (err error) {
 	info.NoPrefixes = prefixes.NoPrefix()
 	if flags.Quick {
 		// quick mode: grab only the cached prefixes
diff --git a/internal/wisski/ingredient/php/extras/stats.go b/internal/wisski/ingredient/php/extras/stats.go
index 13e2598..cddf312 100644
--- a/internal/wisski/ingredient/php/extras/stats.go
+++ b/internal/wisski/ingredient/php/extras/stats.go
@@ -28,7 +28,7 @@ func (stats *Stats) Get(server *phpx.Server) (data status.Statistics, err error)
 	return
 }
 
-func (stats *Stats) Fetch(flags ingredient.FetcherFlags, info *status.Information) (err error) {
+func (stats *Stats) Fetch(flags ingredient.FetcherFlags, info *status.WissKI) (err error) {
 	if flags.Quick {
 		return
 	}