Merge pull request #432 from xmidt-org/ancla

Remove Ancla Dependecies from whole package and Bascule Dependencies from fx portion of app
xmidt-org · Jan 10, 2024 · 49f5e5d · 49f5e5d
2 parents 0c4908d + 5242d5f
commit 49f5e5d
Show file tree

Hide file tree

Showing 14 changed files with 1,290 additions and 1,394 deletions.
diff --git a/anclaHelper.go b/anclaHelper.go
diff --git a/caduceus.yaml b/caduceus.yaml
@@ -290,31 +290,31 @@ authHeader: ["xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=", "dXNlcjpwYXNz"]
 ##############################################################################
 # webhook provides configuration for storing and obtaining webhook
 # information using Argus.
-webhook:
-  # JWTParserType establishes which parser type will be used by the JWT token
-  # acquirer used by Argus. Options include 'simple' and 'raw'.
-  # Simple: parser assumes token payloads have the following structure: https://github.com/xmidt-org/bascule/blob/c011b128d6b95fa8358228535c63d1945347adaa/acquire/bearer.go#L77
-  # Raw: parser assumes all of the token payload == JWT token
-  # (Optional). Defaults to 'simple'.
-  jwtParserType: "raw"
-  basicClientConfig:
-    # listen is the subsection that configures the listening feature of the argus client
-    # (Optional)
-    # listen:
-    #   # pullInterval provides how often the current webhooks list gets refreshed.
-    #   pullInterval: 5s
-
-    # bucket is the partition name where webhooks will be stored.
-    bucket: "webhooks"
-
-    # address is Argus' network location.
-    address: "http://localhost:6600"
-
-    # auth the authentication method for argus.
-    auth:
-      # basic configures basic authentication for argus.
-      # Must be of form: 'Basic xyz=='
-      basic: "Basic dXNlcjpwYXNz"
+# webhook:
+#   # JWTParserType establishes which parser type will be used by the JWT token
+#   # acquirer used by Argus. Options include 'simple' and 'raw'.
+#   # Simple: parser assumes token payloads have the following structure: https://github.com/xmidt-org/bascule/blob/c011b128d6b95fa8358228535c63d1945347adaa/acquire/bearer.go#L77
+#   # Raw: parser assumes all of the token payload == JWT token
+#   # (Optional). Defaults to 'simple'.
+#   jwtParserType: "raw"
+#   basicClientConfig:
+#     # listen is the subsection that configures the listening feature of the argus client
+#     # (Optional)
+#     # listen:
+#     #   # pullInterval provides how often the current webhooks list gets refreshed.
+#     #   pullInterval: 5s
+
+#     # bucket is the partition name where webhooks will be stored.
+#     bucket: "webhooks"
+
+#     # address is Argus' network location.
+#     address: "http://localhost:6600"
+
+#     # auth the authentication method for argus.
+#     auth:
+#       # basic configures basic authentication for argus.
+#       # Must be of form: 'Basic xyz=='
+#       basic: "Basic dXNlcjpwYXNz"
   #
   #    # jwt configures jwt style authentication for argus.
   #    JWT:

diff --git a/caduceus_type.go b/caduceus_type.go
@@ -8,7 +8,6 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/go-kit/kit/metrics"
-	"github.com/xmidt-org/ancla"
 
 	"github.com/xmidt-org/wrp-go/v3"
 )
@@ -21,8 +20,6 @@ type CaduceusConfig struct {
 	JobQueueSize     int
 	Sender           SenderConfig
 	JWTValidators    []JWTValidator
-	Webhook          ancla.Config
-	Listener         ancla.ListenerConfig
 	AllowInsecureTLS bool
 }
 

diff --git a/config.go b/config.go
@@ -9,8 +9,8 @@ import (
 	"time"
 
 	"github.com/goschtalt/goschtalt"
-	"github.com/xmidt-org/ancla"
 	"github.com/xmidt-org/arrange/arrangehttp"
+	"github.com/xmidt-org/arrange/arrangepprof"
 	"github.com/xmidt-org/candlelight"
 	"github.com/xmidt-org/sallust"
 	"github.com/xmidt-org/touchstone"
@@ -20,13 +20,13 @@ import (
 // Config is the top level configuration for the caduceus service.  Everything
 // is contained in this structure or it will intentially cause a failure.
 type Config struct {
-	Logging                sallust.Config
-	Tracing                candlelight.Config
-	Prometheus             touchstone.Config
-	Servers                Servers
-	ArgusClientTimeout     HttpClientTimeout
-	JWTValidator           JWTValidator
-	Webhook                ancla.Config
+	Logging            sallust.Config
+	Tracing            candlelight.Config
+	Prometheus         touchstone.Config
+	Servers            Servers
+	ArgusClientTimeout HttpClientTimeout
+	JWTValidator       JWTValidator
+	// Webhook                ancla.Config //@TODO: need to fix the ancla/argus dependency issue 
 	Sender                 SenderConfig
 	Service                Service
 	AuthHeader             []string
@@ -182,18 +182,21 @@ var defaultConfig = Config{
 				Network: "tcp",
 				Address: ":80",
 			},
+			Path: HealthPath("/"),
 		},
 		Metrics: MetricsServer{
 			HTTP: arrangehttp.ServerConfig{
 				Network: "tcp",
 				Address: "127.0.0.1:9361",
 			},
+			Path: MetricsPath("/metrics"),
 		},
 		Pprof: PprofServer{
 			HTTP: arrangehttp.ServerConfig{
 				Network: "tcp",
 				Address: "127.0.0.1:9999",
 			},
+			Path: arrangepprof.DefaultPathPrefix,
 		},
 		Primary: PrimaryServer{
 			HTTP: arrangehttp.ServerConfig{

diff --git a/go.mod b/go.mod
@@ -7,7 +7,6 @@ toolchain go1.21.1
 require (
 	emperror.dev/emperror v0.33.0
 	github.com/alecthomas/kong v0.8.1
-	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
 	github.com/go-chi/chi/v5 v5.0.10
 	github.com/go-kit/kit v0.13.0
 	github.com/gorilla/mux v1.8.0
@@ -19,7 +18,6 @@ require (
 	github.com/satori/go.uuid v1.2.0
 	github.com/spf13/viper v1.17.0
 	github.com/stretchr/testify v1.8.4
-	github.com/xmidt-org/ancla v0.3.11
 	github.com/xmidt-org/arrange v0.5.1-0.20230914215531-f02b8651b631
 	github.com/xmidt-org/bascule v0.11.7
 	github.com/xmidt-org/candlelight v0.0.19
@@ -41,6 +39,7 @@ require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/go-kit/log v0.2.1 // indirect
@@ -85,7 +84,6 @@ require (
 	github.com/stretchr/objx v0.5.1 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	github.com/ugorji/go/codec v1.2.11 // indirect
-	github.com/xmidt-org/argus v0.9.12 // indirect
 	github.com/xmidt-org/chronon v0.1.1 // indirect
 	go.opentelemetry.io/otel v1.19.0 // indirect
 	go.opentelemetry.io/otel/exporters/jaeger v1.17.0 // indirect