From 5c0aa515587b6072129f92e8e307ee17fb090ed8 Mon Sep 17 00:00:00 2001 From: linus-sun Date: Mon, 11 Nov 2024 22:36:05 +0000 Subject: [PATCH] rollback split Signed-off-by: linus-sun --- cmd/rekor_monitor/main.go | 4 ---- pkg/notifications/notifications.go | 2 -- pkg/test/rekor_e2e/rekor_monitor_e2e_test.sh | 2 +- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/cmd/rekor_monitor/main.go b/cmd/rekor_monitor/main.go index 77d4ca1b..20503653 100644 --- a/cmd/rekor_monitor/main.go +++ b/cmd/rekor_monitor/main.go @@ -55,7 +55,6 @@ func main() { interval := flag.Duration("interval", 5*time.Minute, "Length of interval between each periodical consistency check") userAgentString := flag.String("user-agent", "", "details to include in the user agent string") flag.Parse() - flag.Parse() if *configFilePath == "" && *configYamlInput == "" { log.Fatalf("empty configuration input") @@ -85,9 +84,6 @@ func main() { } } - if config.ServerURL == "" { - config.ServerURL = publicRekorServerURL - } if config.OutputIdentitiesFile == "" { config.OutputIdentitiesFile = outputIdentitiesFileName } diff --git a/pkg/notifications/notifications.go b/pkg/notifications/notifications.go index e377cc1a..8764690d 100644 --- a/pkg/notifications/notifications.go +++ b/pkg/notifications/notifications.go @@ -69,7 +69,6 @@ type IdentityMonitorConfiguration struct { StartIndex *int `yaml:"startIndex"` EndIndex *int `yaml:"endIndex"` MonitoredValues ConfigMonitoredValues `yaml:"monitoredValues"` - ServerURL string `yaml:"serverURL"` OutputIdentitiesFile string `yaml:"outputIdentities"` LogInfoFile string `yaml:"logInfoFile"` IdentityMetadataFile *string `yaml:"identityMetadataFile"` @@ -77,7 +76,6 @@ type IdentityMonitorConfiguration struct { EmailNotificationSMTP *EmailNotificationInput `yaml:"emailNotificationSMTP"` EmailNotificationMailgun *MailgunNotificationInput `yaml:"emailNotificationMailgun"` EmailNotificationSendGrid *SendGridNotificationInput `yaml:"emailNotificationSendGrid"` - Interval *time.Duration `yaml:"interval"` } func CreateNotificationPool(config IdentityMonitorConfiguration) []NotificationPlatform { diff --git a/pkg/test/rekor_e2e/rekor_monitor_e2e_test.sh b/pkg/test/rekor_e2e/rekor_monitor_e2e_test.sh index f4106a96..35bd126b 100755 --- a/pkg/test/rekor_e2e/rekor_monitor_e2e_test.sh +++ b/pkg/test/rekor_e2e/rekor_monitor_e2e_test.sh @@ -66,4 +66,4 @@ echo echo "running tests" popd -go test -tags=e2e -v -race ./pkg/test/identity_workflow/... \ No newline at end of file +go test -tags=e2e -v -race ./pkg/test/rekor_e2e/... \ No newline at end of file