From 6255456f6140c7d40a222f71be972fdb4c51de94 Mon Sep 17 00:00:00 2001
From: koplas <54645365+koplas@users.noreply.github.com>
Date: Tue, 9 Jul 2024 10:50:30 +0200
Subject: [PATCH] Make models used for configuration public

---
 cmd/csaf_aggregator/config.go            | 4 ++--
 cmd/csaf_checker/config.go               | 4 ++--
 cmd/csaf_checker/report.go               | 2 +-
 cmd/csaf_downloader/config.go            | 4 ++--
 {internal => csaf}/filter/filter.go      | 0
 {internal => csaf}/filter/filter_test.go | 0
 {internal => csaf}/models/models.go      | 0
 {internal => csaf}/models/models_test.go | 0
 lib/downloader/downloader.go             | 2 +-
 9 files changed, 8 insertions(+), 8 deletions(-)
 rename {internal => csaf}/filter/filter.go (100%)
 rename {internal => csaf}/filter/filter_test.go (100%)
 rename {internal => csaf}/models/models.go (100%)
 rename {internal => csaf}/models/models_test.go (100%)

diff --git a/cmd/csaf_aggregator/config.go b/cmd/csaf_aggregator/config.go
index 9808542..c13bbf6 100644
--- a/cmd/csaf_aggregator/config.go
+++ b/cmd/csaf_aggregator/config.go
@@ -12,6 +12,8 @@ import (
 	"crypto/tls"
 	"errors"
 	"fmt"
+	"github.com/csaf-poc/csaf_distribution/v3/csaf/filter"
+	"github.com/csaf-poc/csaf_distribution/v3/csaf/models"
 	"log/slog"
 	"net/http"
 	"os"
@@ -22,8 +24,6 @@ import (
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
 	"github.com/csaf-poc/csaf_distribution/v3/csaf"
 	"github.com/csaf-poc/csaf_distribution/v3/internal/certs"
-	"github.com/csaf-poc/csaf_distribution/v3/internal/filter"
-	"github.com/csaf-poc/csaf_distribution/v3/internal/models"
 	"github.com/csaf-poc/csaf_distribution/v3/internal/options"
 	"github.com/csaf-poc/csaf_distribution/v3/util"
 	"golang.org/x/time/rate"
diff --git a/cmd/csaf_checker/config.go b/cmd/csaf_checker/config.go
index ac9ce62..c7eb8b8 100644
--- a/cmd/csaf_checker/config.go
+++ b/cmd/csaf_checker/config.go
@@ -11,11 +11,11 @@ package main
 import (
 	"crypto/tls"
 	"fmt"
+	"github.com/csaf-poc/csaf_distribution/v3/csaf/filter"
+	"github.com/csaf-poc/csaf_distribution/v3/csaf/models"
 	"net/http"
 
 	"github.com/csaf-poc/csaf_distribution/v3/internal/certs"
-	"github.com/csaf-poc/csaf_distribution/v3/internal/filter"
-	"github.com/csaf-poc/csaf_distribution/v3/internal/models"
 	"github.com/csaf-poc/csaf_distribution/v3/internal/options"
 )
 
diff --git a/cmd/csaf_checker/report.go b/cmd/csaf_checker/report.go
index 9b5251b..8155791 100644
--- a/cmd/csaf_checker/report.go
+++ b/cmd/csaf_checker/report.go
@@ -13,13 +13,13 @@ import (
 	_ "embed" // Used for embedding.
 	"encoding/json"
 	"fmt"
+	"github.com/csaf-poc/csaf_distribution/v3/csaf/models"
 	"html/template"
 	"io"
 	"os"
 	"time"
 
 	"github.com/csaf-poc/csaf_distribution/v3/csaf"
-	"github.com/csaf-poc/csaf_distribution/v3/internal/models"
 )
 
 // MessageType is the kind of the message.
diff --git a/cmd/csaf_downloader/config.go b/cmd/csaf_downloader/config.go
index 10eef12..e3c1bbc 100644
--- a/cmd/csaf_downloader/config.go
+++ b/cmd/csaf_downloader/config.go
@@ -10,6 +10,8 @@ package main
 
 import (
 	"crypto/tls"
+	"github.com/csaf-poc/csaf_distribution/v3/csaf/filter"
+	"github.com/csaf-poc/csaf_distribution/v3/csaf/models"
 	"io"
 	"log"
 	"log/slog"
@@ -19,8 +21,6 @@ import (
 	"time"
 
 	"github.com/csaf-poc/csaf_distribution/v3/internal/certs"
-	"github.com/csaf-poc/csaf_distribution/v3/internal/filter"
-	"github.com/csaf-poc/csaf_distribution/v3/internal/models"
 	"github.com/csaf-poc/csaf_distribution/v3/internal/options"
 	"github.com/csaf-poc/csaf_distribution/v3/lib/downloader"
 )
diff --git a/internal/filter/filter.go b/csaf/filter/filter.go
similarity index 100%
rename from internal/filter/filter.go
rename to csaf/filter/filter.go
diff --git a/internal/filter/filter_test.go b/csaf/filter/filter_test.go
similarity index 100%
rename from internal/filter/filter_test.go
rename to csaf/filter/filter_test.go
diff --git a/internal/models/models.go b/csaf/models/models.go
similarity index 100%
rename from internal/models/models.go
rename to csaf/models/models.go
diff --git a/internal/models/models_test.go b/csaf/models/models_test.go
similarity index 100%
rename from internal/models/models_test.go
rename to csaf/models/models_test.go
diff --git a/lib/downloader/downloader.go b/lib/downloader/downloader.go
index a98a48b..14bcda4 100644
--- a/lib/downloader/downloader.go
+++ b/lib/downloader/downloader.go
@@ -17,7 +17,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/csaf-poc/csaf_distribution/v3/internal/models"
+	"github.com/csaf-poc/csaf_distribution/v3/csaf/models"
 	"hash"
 	"io"
 	"log/slog"