From 8ad8cf7994e74c8ad00ab679c55d6d1cfec1d48d Mon Sep 17 00:00:00 2001 From: Tom Wiesing Date: Mon, 8 Apr 2024 22:57:25 +0200 Subject: [PATCH] Remove unuused parameters This commit removes names for unusued parameters where they are no longer needed. --- internal/dis/component/auth/panel/password.go | 2 +- internal/dis/component/auth/panel/ssh.go | 4 ++-- internal/dis/component/auth/panel/tokens.go | 4 ++-- internal/dis/component/auth/panel/totp.go | 6 +++--- internal/dis/component/auth/panel/user.go | 2 +- internal/dis/component/auth/session.go | 2 +- internal/dis/component/exporter/snapshot.go | 2 +- internal/dis/component/server/admin/index.go | 4 ++-- internal/dis/component/server/admin/instance.go | 2 +- internal/dis/component/server/admin/instance_data.go | 2 +- internal/dis/component/server/admin/instance_drupal.go | 2 +- internal/dis/component/server/admin/instance_provision.go | 2 +- internal/dis/component/server/admin/instance_purge.go | 2 +- internal/dis/component/server/admin/instance_rebuild.go | 2 +- internal/dis/component/server/admin/instance_snapshots.go | 2 +- internal/dis/component/server/admin/instance_ssh.go | 2 +- internal/dis/component/server/admin/instance_stats.go | 2 +- internal/dis/component/server/admin/instance_triplestore.go | 2 +- internal/dis/component/server/admin/instance_users.go | 2 +- internal/dis/component/server/admin/users.go | 4 ++-- internal/dis/component/server/home/home.go | 2 +- internal/dis/component/server/home/public.go | 2 +- internal/dis/component/server/home/redirect.go | 2 +- internal/dis/component/ssh2/server_hostkeys.go | 2 +- 24 files changed, 30 insertions(+), 30 deletions(-) diff --git a/internal/dis/component/auth/panel/password.go b/internal/dis/component/auth/panel/password.go index 1863877..46c5a3e 100644 --- a/internal/dis/component/auth/panel/password.go +++ b/internal/dis/component/auth/panel/password.go @@ -31,7 +31,7 @@ var ( errPasswordSet = errors.New("password was updated") ) -func (panel *UserPanel) routePassword(ctx context.Context) http.Handler { +func (panel *UserPanel) routePassword(context.Context) http.Handler { tpl := passwordTemplate.Prepare(panel.dependencies.Templating) return &form.Form[struct{}]{ diff --git a/internal/dis/component/auth/panel/ssh.go b/internal/dis/component/auth/panel/ssh.go index 455f26f..79880d4 100644 --- a/internal/dis/component/auth/panel/ssh.go +++ b/internal/dis/component/auth/panel/ssh.go @@ -47,7 +47,7 @@ type SSHTemplateContext struct { Services []ssh2.Intercept } -func (panel *UserPanel) sshRoute(ctx context.Context) http.Handler { +func (panel *UserPanel) sshRoute(context.Context) http.Handler { tpl := sshTemplate.Prepare( panel.dependencies.Templating, templating.Crumbs( @@ -143,7 +143,7 @@ type addKeyResult struct { Key ssh.PublicKey } -func (panel *UserPanel) sshAddRoute(ctx context.Context) http.Handler { +func (panel *UserPanel) sshAddRoute(context.Context) http.Handler { tpl := sshAddTemplate.Prepare( panel.dependencies.Templating, templating.Crumbs( diff --git a/internal/dis/component/auth/panel/tokens.go b/internal/dis/component/auth/panel/tokens.go index 904a0d2..e893809 100644 --- a/internal/dis/component/auth/panel/tokens.go +++ b/internal/dis/component/auth/panel/tokens.go @@ -34,7 +34,7 @@ type TokenTemplateContext struct { Tokens []models.Token } -func (panel *UserPanel) tokensRoute(ctx context.Context) http.Handler { +func (panel *UserPanel) tokensRoute(context.Context) http.Handler { tpl := tokensTemplate.Prepare( panel.dependencies.Templating, templating.Crumbs( @@ -122,7 +122,7 @@ type TokenCreateContext struct { Token *models.Token } -func (panel *UserPanel) tokensAddRoute(ctx context.Context) http.Handler { +func (panel *UserPanel) tokensAddRoute(context.Context) http.Handler { tplForm := tokensAddTemplate.Prepare( panel.dependencies.Templating, templating.Crumbs( diff --git a/internal/dis/component/auth/panel/totp.go b/internal/dis/component/auth/panel/totp.go index aac14ed..63477e7 100644 --- a/internal/dis/component/auth/panel/totp.go +++ b/internal/dis/component/auth/panel/totp.go @@ -23,7 +23,7 @@ var totpEnable = templating.Parse[userFormContext]( templating.Assets(assets.AssetsUser), ) -func (panel *UserPanel) routeTOTPEnable(ctx context.Context) http.Handler { +func (panel *UserPanel) routeTOTPEnable(context.Context) http.Handler { tpl := totpEnable.Prepare(panel.dependencies.Templating) return &form.Form[struct{}]{ @@ -88,7 +88,7 @@ type totpEnrollContext struct { TOTPURL template.URL } -func (panel *UserPanel) routeTOTPEnroll(ctx context.Context) http.Handler { +func (panel *UserPanel) routeTOTPEnroll(context.Context) http.Handler { tpl := totpEnrollTemplate.Prepare( panel.dependencies.Templating, templating.Crumbs( @@ -174,7 +174,7 @@ var totpDisableTemplate = templating.Parse[userFormContext]( templating.Assets(assets.AssetsUser), ) -func (panel *UserPanel) routeTOTPDisable(ctx context.Context) http.Handler { +func (panel *UserPanel) routeTOTPDisable(context.Context) http.Handler { tpl := totpDisableTemplate.Prepare(panel.dependencies.Templating) return &form.Form[struct{}]{ diff --git a/internal/dis/component/auth/panel/user.go b/internal/dis/component/auth/panel/user.go index c94e1f9..ab1e6ea 100644 --- a/internal/dis/component/auth/panel/user.go +++ b/internal/dis/component/auth/panel/user.go @@ -40,7 +40,7 @@ func (g GrantWithURL) AdminURL() template.URL { return template.URL("/admin/instance/" + g.Slug) } -func (panel *UserPanel) routeUser(ctx context.Context) http.Handler { +func (panel *UserPanel) routeUser(context.Context) http.Handler { actions := []component.MenuItem{ menuChangePassword, menuTOTPAction, diff --git a/internal/dis/component/auth/session.go b/internal/dis/component/auth/session.go index 773b1be..9636512 100644 --- a/internal/dis/component/auth/session.go +++ b/internal/dis/component/auth/session.go @@ -240,7 +240,7 @@ func (auth *Auth) authLogin(ctx context.Context) http.Handler { } // authLogout implements the authLogout view to logout a user -func (auth *Auth) authLogout(ctx context.Context) http.Handler { +func (auth *Auth) authLogout(context.Context) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { // do the logout auth.Logout(w, r) diff --git a/internal/dis/component/exporter/snapshot.go b/internal/dis/component/exporter/snapshot.go index 4f53435..10ea2a9 100644 --- a/internal/dis/component/exporter/snapshot.go +++ b/internal/dis/component/exporter/snapshot.go @@ -155,7 +155,7 @@ func (snapshots *Exporter) resolveParts(ctx context.Context, parts []string, sna } } -func (snapshot *Snapshot) makeParts(ctx context.Context, progress io.Writer, snapshots *Exporter, instance *wisski.WissKI, needsRunning bool) (errmap map[string]error, logmap map[string]string) { +func (snapshot *Snapshot) makeParts(ctx context.Context, progress io.Writer, _ *Exporter, instance *wisski.WissKI, needsRunning bool) (errmap map[string]error, logmap map[string]string) { if !needsRunning && !snapshot.Description.Keepalive { stack := instance.Barrel().Stack() diff --git a/internal/dis/component/server/admin/index.go b/internal/dis/component/server/admin/index.go index 478deac..e80a26c 100644 --- a/internal/dis/component/server/admin/index.go +++ b/internal/dis/component/server/admin/index.go @@ -111,7 +111,7 @@ type indexContext struct { Instances []status.WissKI } -func (admin *Admin) index(ctx context.Context) http.Handler { +func (admin *Admin) index(context.Context) http.Handler { tpl := indexTemplate.Prepare( admin.dependencies.Templating, templating.Actions( @@ -126,7 +126,7 @@ func (admin *Admin) index(ctx context.Context) http.Handler { }) } -func (admin *Admin) instances(ctx context.Context) http.Handler { +func (admin *Admin) instances(context.Context) http.Handler { tpl := instancesTemplate.Prepare( admin.dependencies.Templating, templating.Crumbs( diff --git a/internal/dis/component/server/admin/instance.go b/internal/dis/component/server/admin/instance.go index fd0fca3..9fc703c 100644 --- a/internal/dis/component/server/admin/instance.go +++ b/internal/dis/component/server/admin/instance.go @@ -32,7 +32,7 @@ type instanceContext struct { Info status.WissKI } -func (admin *Admin) instance(ctx context.Context) http.Handler { +func (admin *Admin) instance(context.Context) http.Handler { tpl := instanceTemplate.Prepare( admin.dependencies.Templating, templating.Crumbs( diff --git a/internal/dis/component/server/admin/instance_data.go b/internal/dis/component/server/admin/instance_data.go index 5008e6b..cc43d30 100644 --- a/internal/dis/component/server/admin/instance_data.go +++ b/internal/dis/component/server/admin/instance_data.go @@ -32,7 +32,7 @@ type instanceDataContext struct { Prefixes []string } -func (admin *Admin) instanceData(ctx context.Context) http.Handler { +func (admin *Admin) instanceData(context.Context) http.Handler { tpl := instanceDataTemplate.Prepare( admin.dependencies.Templating, templating.Crumbs( diff --git a/internal/dis/component/server/admin/instance_drupal.go b/internal/dis/component/server/admin/instance_drupal.go index 3dc32b8..e063c44 100644 --- a/internal/dis/component/server/admin/instance_drupal.go +++ b/internal/dis/component/server/admin/instance_drupal.go @@ -39,7 +39,7 @@ type instanceDrupalContext struct { LastCron time.Time } -func (admin *Admin) instanceDrupal(ctx context.Context) http.Handler { +func (admin *Admin) instanceDrupal(context.Context) http.Handler { tpl := instanceDrupalTemplate.Prepare( admin.dependencies.Templating, templating.Crumbs( diff --git a/internal/dis/component/server/admin/instance_provision.go b/internal/dis/component/server/admin/instance_provision.go index 57a910e..787090b 100644 --- a/internal/dis/component/server/admin/instance_provision.go +++ b/internal/dis/component/server/admin/instance_provision.go @@ -12,7 +12,7 @@ import ( _ "embed" ) -func (admin *Admin) instanceProvision(ctx context.Context) http.Handler { +func (admin *Admin) instanceProvision(context.Context) http.Handler { tpl := instanceSystemTemplate.Prepare( admin.dependencies.Templating, diff --git a/internal/dis/component/server/admin/instance_purge.go b/internal/dis/component/server/admin/instance_purge.go index 083c5b3..409617e 100644 --- a/internal/dis/component/server/admin/instance_purge.go +++ b/internal/dis/component/server/admin/instance_purge.go @@ -29,7 +29,7 @@ type instancePurgeContext struct { Instance *wisski.WissKI } -func (admin *Admin) instancePurge(ctx context.Context) http.Handler { +func (admin *Admin) instancePurge(context.Context) http.Handler { tpl := instancePurgeTemplate.Prepare( admin.dependencies.Templating, templating.Crumbs( diff --git a/internal/dis/component/server/admin/instance_rebuild.go b/internal/dis/component/server/admin/instance_rebuild.go index fd78f1d..df2e3eb 100644 --- a/internal/dis/component/server/admin/instance_rebuild.go +++ b/internal/dis/component/server/admin/instance_rebuild.go @@ -50,7 +50,7 @@ func (isc *instanceSystemContext) prepare(rebuild bool) { isc.DefaultPHPVersion = models.DefaultPHPVersion } -func (admin *Admin) instanceRebuild(ctx context.Context) http.Handler { +func (admin *Admin) instanceRebuild(context.Context) http.Handler { tpl := instanceSystemTemplate.Prepare( admin.dependencies.Templating, diff --git a/internal/dis/component/server/admin/instance_snapshots.go b/internal/dis/component/server/admin/instance_snapshots.go index 2d14623..2d2c695 100644 --- a/internal/dis/component/server/admin/instance_snapshots.go +++ b/internal/dis/component/server/admin/instance_snapshots.go @@ -31,7 +31,7 @@ type instanceSnapshotsContext struct { Snapshots []models.Export } -func (admin *Admin) instanceSnapshots(ctx context.Context) http.Handler { +func (admin *Admin) instanceSnapshots(context.Context) http.Handler { tpl := instanceSnapshotsTemplate.Prepare( admin.dependencies.Templating, templating.Crumbs( diff --git a/internal/dis/component/server/admin/instance_ssh.go b/internal/dis/component/server/admin/instance_ssh.go index becca5f..c6a28d6 100644 --- a/internal/dis/component/server/admin/instance_ssh.go +++ b/internal/dis/component/server/admin/instance_ssh.go @@ -36,7 +36,7 @@ type instanceSSHContext struct { Port uint16 } -func (admin *Admin) instanceSSH(ctx context.Context) http.Handler { +func (admin *Admin) instanceSSH(context.Context) http.Handler { tpl := instanceSSHTemplate.Prepare( admin.dependencies.Templating, templating.Crumbs( diff --git a/internal/dis/component/server/admin/instance_stats.go b/internal/dis/component/server/admin/instance_stats.go index 1ccaeb1..e294a2b 100644 --- a/internal/dis/component/server/admin/instance_stats.go +++ b/internal/dis/component/server/admin/instance_stats.go @@ -31,7 +31,7 @@ type instanceStatsContext struct { Statistics status.Statistics } -func (admin *Admin) instanceStats(ctx context.Context) http.Handler { +func (admin *Admin) instanceStats(context.Context) http.Handler { tpl := instanceStatsTemplate.Prepare( admin.dependencies.Templating, templating.Crumbs( diff --git a/internal/dis/component/server/admin/instance_triplestore.go b/internal/dis/component/server/admin/instance_triplestore.go index 96ed74c..ba57370 100644 --- a/internal/dis/component/server/admin/instance_triplestore.go +++ b/internal/dis/component/server/admin/instance_triplestore.go @@ -29,7 +29,7 @@ type instanceTriplestoreContext struct { Instance *wisski.WissKI } -func (admin *Admin) instanceTS(ctx context.Context) http.Handler { +func (admin *Admin) instanceTS(context.Context) http.Handler { tpl := instanceTriplestoreTemplate.Prepare( admin.dependencies.Templating, templating.Crumbs( diff --git a/internal/dis/component/server/admin/instance_users.go b/internal/dis/component/server/admin/instance_users.go index 163e70c..9cedb9a 100644 --- a/internal/dis/component/server/admin/instance_users.go +++ b/internal/dis/component/server/admin/instance_users.go @@ -44,7 +44,7 @@ type instanceUsersContext struct { Grants []models.Grant // grants that exist for the user } -func (admin *Admin) instanceUsers(ctx context.Context) http.Handler { +func (admin *Admin) instanceUsers(context.Context) http.Handler { tpl := instanceUsersTemplate.Prepare( admin.dependencies.Templating, templating.Crumbs( diff --git a/internal/dis/component/server/admin/users.go b/internal/dis/component/server/admin/users.go index d4e1e0b..fb690fb 100644 --- a/internal/dis/component/server/admin/users.go +++ b/internal/dis/component/server/admin/users.go @@ -32,7 +32,7 @@ type usersContext struct { Users []*auth.AuthUser } -func (admin *Admin) users(ctx context.Context) http.Handler { +func (admin *Admin) users(context.Context) http.Handler { tpl := usersTemplate.Prepare( admin.dependencies.Templating, templating.Crumbs( @@ -71,7 +71,7 @@ type createUserResult struct { Admin bool } -func (admin *Admin) createUser(ctx context.Context) http.Handler { +func (admin *Admin) createUser(context.Context) http.Handler { tpl := userCreateTemplate.Prepare( admin.dependencies.Templating, templating.Crumbs( diff --git a/internal/dis/component/server/home/home.go b/internal/dis/component/server/home/home.go index d8d8c8d..cefd16f 100644 --- a/internal/dis/component/server/home/home.go +++ b/internal/dis/component/server/home/home.go @@ -57,7 +57,7 @@ func (home *Home) HandleRoute(ctx context.Context, route string) (http.Handler, }), nil } -func (home *Home) serveWissKI(w http.ResponseWriter, slug string, r *http.Request) { +func (home *Home) serveWissKI(w http.ResponseWriter, slug string, _ *http.Request) { if _, ok := home.dependencies.ListInstances.Names()[slug]; !ok { // Get(nil) guaranteed to work by precondition w.WriteHeader(http.StatusNotFound) diff --git a/internal/dis/component/server/home/public.go b/internal/dis/component/server/home/public.go index 4692ec5..e5830b5 100644 --- a/internal/dis/component/server/home/public.go +++ b/internal/dis/component/server/home/public.go @@ -47,7 +47,7 @@ type publicContext struct { const logoHTML = template.HTML(``) -func (home *Home) publicHandler(ctx context.Context) http.Handler { +func (home *Home) publicHandler(context.Context) http.Handler { config := component.GetStill(home).Config.Home tpl := publicTemplate.Prepare( diff --git a/internal/dis/component/server/home/redirect.go b/internal/dis/component/server/home/redirect.go index 8633a11..4460a5b 100644 --- a/internal/dis/component/server/home/redirect.go +++ b/internal/dis/component/server/home/redirect.go @@ -10,7 +10,7 @@ import ( "github.com/FAU-CDI/wisski-distillery/internal/dis/component" ) -func (home *Home) loadRedirect(ctx context.Context) (redirect Redirect, err error) { +func (home *Home) loadRedirect(context.Context) (redirect Redirect, err error) { if redirect.Overrides == nil { redirect.Overrides = make(map[string]string) } diff --git a/internal/dis/component/ssh2/server_hostkeys.go b/internal/dis/component/ssh2/server_hostkeys.go index 8b9296e..b2b34bb 100644 --- a/internal/dis/component/ssh2/server_hostkeys.go +++ b/internal/dis/component/ssh2/server_hostkeys.go @@ -81,7 +81,7 @@ func (ssh2 *SSH2) ReadOrMakeHostKey(progress io.Writer, ctx context.Context, pri } // loadHostKey loadsa host key -func (ssh2 *SSH2) loadHostKey(progress io.Writer, ctx context.Context, key HostKey, path string) (err error) { +func (ssh2 *SSH2) loadHostKey(progress io.Writer, _ context.Context, key HostKey, path string) (err error) { fmt.Fprintf(progress, "Loading hostkey (algorithm %s) from %q\n", key.Algorithm(), path) // read all the bytes from the file