diff --git a/backends/backends.go b/backends/backends.go index 1e058de..9086404 100644 --- a/backends/backends.go +++ b/backends/backends.go @@ -104,7 +104,7 @@ func getExportCapabilities(backend models.Backend) []string { caps := make([]Capability, 0) var name string var found bool - name, found = checkCapability[models.ListenExport](backend, "export") + name, found = checkCapability[models.ListensExport](backend, "export") if found { caps = append(caps, name) } @@ -119,7 +119,7 @@ func getImportCapabilities(backend models.Backend) []Capability { caps := make([]Capability, 0) var name string var found bool - name, found = checkCapability[models.ListenImport](backend, "import") + name, found = checkCapability[models.ListensImport](backend, "import") if found { caps = append(caps, name) } diff --git a/backends/backends_test.go b/backends/backends_test.go index d70ca4f..cffb5b7 100644 --- a/backends/backends_test.go +++ b/backends/backends_test.go @@ -35,7 +35,7 @@ import ( func TestResolveBackend(t *testing.T) { config := viper.New() config.Set("backend", "dump") - backend, err := backends.ResolveBackend[models.ListenImport](config) + backend, err := backends.ResolveBackend[models.ListensImport](config) assert.NoError(t, err) assert.IsType(t, dump.DumpBackend{}, backend) } @@ -43,22 +43,22 @@ func TestResolveBackend(t *testing.T) { func TestResolveBackendUnknown(t *testing.T) { config := viper.New() config.Set("backend", "foo") - _, err := backends.ResolveBackend[models.ListenImport](config) + _, err := backends.ResolveBackend[models.ListensImport](config) assert.EqualError(t, err, "Unknown backend foo") } func TestResolveBackendInvalidInterface(t *testing.T) { config := viper.New() config.Set("backend", "dump") - _, err := backends.ResolveBackend[models.ListenExport](config) - assert.EqualError(t, err, "Backend dump does not implement ListenExport") + _, err := backends.ResolveBackend[models.ListensExport](config) + assert.EqualError(t, err, "Backend dump does not implement ListensExport") } func TestGetBackends(t *testing.T) { backends := backends.GetBackends() for _, info := range backends { if info.Name == "dump" { - assert.Containsf(t, info.ImportCapabilities, "listen", + assert.Containsf(t, info.ImportCapabilities, "listens", "ImportCapabilities for \"dump\" expected to contain \"listens\"") assert.Emptyf(t, info.ExportCapabilities, "ExportCapabilities for \"dump\" expected to be empty") diff --git a/cmd/listens.go b/cmd/listens.go index 9dd3a9b..99c1f41 100644 --- a/cmd/listens.go +++ b/cmd/listens.go @@ -39,9 +39,9 @@ var listensCmd = &cobra.Command{ sourceName, sourceConfig := getConfigFromFlag(cmd, "from") targetName, targetConfig := getConfigFromFlag(cmd, "to") fmt.Printf("Transferring listens from %s to %s...\n", sourceName, targetName) - exportBackend, err := backends.ResolveBackend[models.ListenExport](sourceConfig) + exportBackend, err := backends.ResolveBackend[models.ListensExport](sourceConfig) cobra.CheckErr(err) - importBackend, err := backends.ResolveBackend[models.ListenImport](targetConfig) + importBackend, err := backends.ResolveBackend[models.ListensImport](targetConfig) cobra.CheckErr(err) timestamp := time.Unix(0, 0) listens, err := exportBackend.ExportListens(timestamp) diff --git a/models/interfaces.go b/models/interfaces.go index 95f2892..cd2596f 100644 --- a/models/interfaces.go +++ b/models/interfaces.go @@ -31,11 +31,11 @@ type Backend interface { FromConfig(config *viper.Viper) Backend } -type ListenExport interface { +type ListensExport interface { ExportListens(oldestTimestamp time.Time) ([]Listen, error) } -type ListenImport interface { +type ListensImport interface { ImportListens(listens []Listen, oldestTimestamp time.Time) (ImportResult, error) }