subpackage 'state' into core

ToeiRei · ToeiRei · commit 6d49b90a9221 · 2026-02-04T21:55:39.000+01:00
diff --git a/internal/core/audit_edge_cases_test.go b/internal/core/audit_edge_cases_test.go
@@ -7,9 +7,9 @@ package core
 import (
 	"testing"
 
+	"github.com/toeirei/keymaster/internal/core/state"
 	"github.com/toeirei/keymaster/internal/i18n"
 	"github.com/toeirei/keymaster/internal/model"
-	"github.com/toeirei/keymaster/internal/state"
 )
 
 // fakeKeyReaderForAudit is a minimal test implementation of KeyReader interface
diff --git a/internal/core/deploy/audit.go b/internal/core/deploy/audit.go
@@ -11,9 +11,9 @@ import (
 
 	"github.com/toeirei/keymaster/internal/core/db"
 	"github.com/toeirei/keymaster/internal/core/sshkey"
+	"github.com/toeirei/keymaster/internal/core/state"
 	"github.com/toeirei/keymaster/internal/i18n"
 	"github.com/toeirei/keymaster/internal/model"
-	"github.com/toeirei/keymaster/internal/state"
 )
 
 // AuditAccountStrict performs a strict audit by comparing the full normalized
diff --git a/internal/core/deploy/decommission.go b/internal/core/deploy/decommission.go
@@ -12,10 +12,10 @@ import (
 	"strings"
 
 	"github.com/toeirei/keymaster/internal/core/db"
+	"github.com/toeirei/keymaster/internal/core/state"
 	"github.com/toeirei/keymaster/internal/logging"
 	"github.com/toeirei/keymaster/internal/model"
 	"github.com/toeirei/keymaster/internal/security"
-	"github.com/toeirei/keymaster/internal/state"
 )
 
 // DecommissionOptions configures how accounts are decommissioned
diff --git a/internal/core/deploy/import.go b/internal/core/deploy/import.go
@@ -17,9 +17,9 @@ import (
 
 	"github.com/toeirei/keymaster/internal/core/db"
 	"github.com/toeirei/keymaster/internal/core/sshkey"
+	"github.com/toeirei/keymaster/internal/core/state"
 	"github.com/toeirei/keymaster/internal/model"
 	"github.com/toeirei/keymaster/internal/security"
-	"github.com/toeirei/keymaster/internal/state"
 )
 
 // ImportRemoteKeys connects to a host, reads its authorized_keys, imports new keys
diff --git a/internal/core/deploy/run.go b/internal/core/deploy/run.go
@@ -12,9 +12,9 @@ import (
 	"time"
 
 	"github.com/toeirei/keymaster/internal/core/db"
+	"github.com/toeirei/keymaster/internal/core/state"
 	"github.com/toeirei/keymaster/internal/i18n"
 	"github.com/toeirei/keymaster/internal/model"
-	"github.com/toeirei/keymaster/internal/state"
 )
 
 // RunDeploymentForAccount handles the deployment logic for a single account.
diff --git a/internal/core/deploy_adapter.go b/internal/core/deploy_adapter.go
@@ -7,9 +7,9 @@ package core
 import (
 	"fmt"
 
+	"github.com/toeirei/keymaster/internal/core/state"
 	"github.com/toeirei/keymaster/internal/model"
 	"github.com/toeirei/keymaster/internal/security"
-	"github.com/toeirei/keymaster/internal/state"
 )
 
 type builtinBootstrapDeployer struct{ d BootstrapDeployer }
diff --git a/internal/core/deploy_audit.go b/internal/core/deploy_audit.go
@@ -11,9 +11,9 @@ import (
 	"strings"
 
 	"github.com/toeirei/keymaster/internal/core/sshkey"
+	"github.com/toeirei/keymaster/internal/core/state"
 	"github.com/toeirei/keymaster/internal/i18n"
 	"github.com/toeirei/keymaster/internal/model"
-	"github.com/toeirei/keymaster/internal/state"
 )
 
 // AuditAccountStrict performs a strict audit by comparing the full normalized
diff --git a/internal/core/deploy_decommission.go b/internal/core/deploy_decommission.go
@@ -8,10 +8,10 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/toeirei/keymaster/internal/core/state"
 	"github.com/toeirei/keymaster/internal/logging"
 	"github.com/toeirei/keymaster/internal/model"
 	"github.com/toeirei/keymaster/internal/security"
-	"github.com/toeirei/keymaster/internal/state"
 )
 
 // DecommissionAccount removes SSH access for an account and deletes it from the database.
diff --git a/internal/core/deploy_import.go b/internal/core/deploy_import.go
@@ -12,9 +12,9 @@ import (
 	"time"
 
 	"github.com/toeirei/keymaster/internal/core/sshkey"
+	"github.com/toeirei/keymaster/internal/core/state"
 	"github.com/toeirei/keymaster/internal/model"
 	"github.com/toeirei/keymaster/internal/security"
-	"github.com/toeirei/keymaster/internal/state"
 )
 
 // ImportRemoteKeys connects to a host, reads its authorized_keys, imports new keys
diff --git a/internal/core/deploy_run.go b/internal/core/deploy_run.go
@@ -11,9 +11,9 @@ import (
 	"strings"
 	"time"
 
+	"github.com/toeirei/keymaster/internal/core/state"
 	"github.com/toeirei/keymaster/internal/i18n"
 	"github.com/toeirei/keymaster/internal/model"
-	"github.com/toeirei/keymaster/internal/state"
 )
 
 // RunDeploymentForAccount handles the deployment logic for a single account.
diff --git a/internal/core/state/cache.go b/internal/core/state/cache.go
diff --git a/internal/core/state/cache_clean_test.go b/internal/core/state/cache_clean_test.go
diff --git a/internal/tui/audit.go b/internal/tui/audit.go
@@ -14,9 +14,9 @@ import (
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
 	"github.com/toeirei/keymaster/internal/core"
+	"github.com/toeirei/keymaster/internal/core/state"
 	"github.com/toeirei/keymaster/internal/i18n"
 	"github.com/toeirei/keymaster/internal/model"
-	"github.com/toeirei/keymaster/internal/state"
 	"github.com/toeirei/keymaster/internal/uiadapters"
 )
 
diff --git a/internal/tui/deploy.go b/internal/tui/deploy.go
@@ -16,9 +16,9 @@ import (
 	"github.com/charmbracelet/lipgloss"
 	"github.com/toeirei/keymaster/internal/core"
 	"github.com/toeirei/keymaster/internal/core/db"
+	"github.com/toeirei/keymaster/internal/core/state"
 	"github.com/toeirei/keymaster/internal/i18n"
 	"github.com/toeirei/keymaster/internal/model"
-	"github.com/toeirei/keymaster/internal/state"
 	"github.com/toeirei/keymaster/internal/tui/adapters"
 	"github.com/toeirei/keymaster/internal/uiadapters"
 	"golang.org/x/term"

Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,9 @@ package core`
`7`	`7`	`import (`
`8`	`8`	`"testing"`
`9`	`9`
	`10`	`+ "github.com/toeirei/keymaster/internal/core/state"`
`10`	`11`	`"github.com/toeirei/keymaster/internal/i18n"`
`11`	`12`	`"github.com/toeirei/keymaster/internal/model"`
`12`		`- "github.com/toeirei/keymaster/internal/state"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`// fakeKeyReaderForAudit is a minimal test implementation of KeyReader interface`
Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,9 @@ import (`
`11`	`11`
`12`	`12`	`"github.com/toeirei/keymaster/internal/core/db"`
`13`	`13`	`"github.com/toeirei/keymaster/internal/core/sshkey"`
	`14`	`+ "github.com/toeirei/keymaster/internal/core/state"`
`14`	`15`	`"github.com/toeirei/keymaster/internal/i18n"`
`15`	`16`	`"github.com/toeirei/keymaster/internal/model"`
`16`		`- "github.com/toeirei/keymaster/internal/state"`
`17`	`17`	`)`
`18`	`18`
`19`	`19`	`// AuditAccountStrict performs a strict audit by comparing the full normalized`
Original file line number	Diff line number	Diff line change
`@@ -17,9 +17,9 @@ import (`
`17`	`17`
`18`	`18`	`"github.com/toeirei/keymaster/internal/core/db"`
`19`	`19`	`"github.com/toeirei/keymaster/internal/core/sshkey"`
	`20`	`+ "github.com/toeirei/keymaster/internal/core/state"`
`20`	`21`	`"github.com/toeirei/keymaster/internal/model"`
`21`	`22`	`"github.com/toeirei/keymaster/internal/security"`
`22`		`- "github.com/toeirei/keymaster/internal/state"`
`23`	`23`	`)`
`24`	`24`
`25`	`25`	`// ImportRemoteKeys connects to a host, reads its authorized_keys, imports new keys`
Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,9 @@ import (`
`12`	`12`	`"time"`
`13`	`13`
`14`	`14`	`"github.com/toeirei/keymaster/internal/core/db"`
	`15`	`+ "github.com/toeirei/keymaster/internal/core/state"`
`15`	`16`	`"github.com/toeirei/keymaster/internal/i18n"`
`16`	`17`	`"github.com/toeirei/keymaster/internal/model"`
`17`		`- "github.com/toeirei/keymaster/internal/state"`
`18`	`18`	`)`
`19`	`19`
`20`	`20`	`// RunDeploymentForAccount handles the deployment logic for a single account.`
Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,9 @@ package core`
`7`	`7`	`import (`
`8`	`8`	`"fmt"`
`9`	`9`
	`10`	`+ "github.com/toeirei/keymaster/internal/core/state"`
`10`	`11`	`"github.com/toeirei/keymaster/internal/model"`
`11`	`12`	`"github.com/toeirei/keymaster/internal/security"`
`12`		`- "github.com/toeirei/keymaster/internal/state"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`type builtinBootstrapDeployer struct{ d BootstrapDeployer }`