build(deps): update bin (#61)

* build(deps): update bin * test: use status
alexfalkowski · Nov 3, 2023 · 51b6657 · 51b6657
1 parent 443f1e5
commit 51b6657
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 7 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -4,6 +4,11 @@ jobs:
   build:
     docker:
       - image: alexfalkowski/go:1.21-3.2
+      - image: alexfalkowski/status:latest
+        command: server
+        environment:
+          CONFIG_FILE: yaml:CONFIG
+          CONFIG: ZW52aXJvbm1lbnQ6IHByb2R1Y3Rpb24KaGVhbHRoOgogIGR1cmF0aW9uOiAxcwogIHRpbWVvdXQ6IDFzCnRlbGVtZXRyeToKICBsb2dnZXI6CiAgICBsZXZlbDogaW5mbwogIHRyYWNlcjoKICAgIGhvc3Q6IGxvY2FsaG9zdDo0MzE4CiAgICBzZWN1cmU6IGZhbHNlCnRyYW5zcG9ydDoKICBodHRwOgogICAgcG9ydDogNjAwMAogICAgdXNlcl9hZ2VudDogIlN0YXR1cy1zZXJ2ZXIvMS4wIGh0dHAvMS4wIgogICAgcmV0cnk6CiAgICAgIHRpbWVvdXQ6IDJzCiAgICAgIGF0dGVtcHRzOiAzCiAgZ3JwYzoKICAgIGVuYWJsZWQ6IHRydWUKICAgIHBvcnQ6IDYwMDEKICAgIHVzZXJfYWdlbnQ6ICJTdGF0dXMtc2VydmVyLzEuMCBncnBjLzEuMCIKICAgIHJldHJ5OgogICAgICB0aW1lb3V0OiAycwogICAgICBhdHRlbXB0czogMwo=
     steps:
       - checkout
       - run: git submodule sync

diff --git a/Makefile b/Makefile
@@ -1,3 +1,7 @@
 .PHONY: vendor
 
 include bin/build/make/go.mak
+
+# Encode a config.
+encode-config:
+	cat test/$(kind).yml | base64
diff --git a/bin b/bin
diff --git a/server/server_test.go b/server/server_test.go
@@ -133,7 +133,7 @@ func TestInvalidCodeHTTPChecker(t *testing.T) {
 		defer s.Stop()
 
 		name := "httpstat400"
-		checker := checker.NewHTTPChecker("https://httpstat.us/400", &http.Client{Timeout: defaultTimeout()})
+		checker := checker.NewHTTPChecker("http://localhost:6000/v1/status/400", &http.Client{Timeout: defaultTimeout()})
 		r := server.NewRegistration(name, defaultPeriod(), checker)
 
 		s.Register(r)
@@ -158,7 +158,8 @@ func TestTimeoutHTTPChecker(t *testing.T) {
 		defer s.Stop()
 
 		name := "httpstat200"
-		checker := checker.NewHTTPChecker("https://httpstat.us/200?sleep=6000", &http.Client{Timeout: defaultTimeout()})
+		c := &http.Client{Timeout: defaultTimeout()}
+		checker := checker.NewHTTPChecker("http://localhost:6000/v1/status/200?sleep=5s", c)
 		r := server.NewRegistration(name, defaultPeriod(), checker)
 
 		s.Register(r)
@@ -321,7 +322,7 @@ func TestInvalidObserver(t *testing.T) {
 		s := server.NewServer()
 		defer s.Stop()
 
-		cc := checker.NewHTTPChecker("https://httpstat.us/400", &http.Client{Timeout: defaultTimeout()})
+		cc := checker.NewHTTPChecker("http://localhost:6000/v1/status/400", &http.Client{Timeout: defaultTimeout()})
 		hr := server.NewRegistration("http1", defaultPeriod(), cc)
 		tc := checker.NewTCPChecker("httpstat.us:9000", defaultTimeout())
 		tr := server.NewRegistration("tcp1", defaultPeriod(), tc)
@@ -347,7 +348,7 @@ func TestValidObserver(t *testing.T) {
 		s := server.NewServer()
 		defer s.Stop()
 
-		cc := checker.NewHTTPChecker("https://httpstat.us/200", &http.Client{Timeout: defaultTimeout()})
+		cc := checker.NewHTTPChecker("http://localhost:6000/v1/status/200", &http.Client{Timeout: defaultTimeout()})
 		hr := server.NewRegistration("http", defaultPeriod(), cc)
 		tc := checker.NewTCPChecker("httpstat.us:80", defaultTimeout())
 		tr := server.NewRegistration("tcp", defaultPeriod(), tc)
@@ -373,7 +374,7 @@ func TestOneInvalidObserver(t *testing.T) {
 		s := server.NewServer()
 		defer s.Stop()
 
-		cc := checker.NewHTTPChecker("https://httpstat.us/500", &http.Client{Timeout: defaultTimeout()})
+		cc := checker.NewHTTPChecker("http://localhost:6000/v1/status/500", &http.Client{Timeout: defaultTimeout()})
 		hr := server.NewRegistration("http", defaultPeriod(), cc)
 		tc := checker.NewTCPChecker("httpstat.us:80", defaultTimeout())
 		tr := server.NewRegistration("tcp", defaultPeriod(), tc)
@@ -399,7 +400,7 @@ func TestNonExistentObserver(t *testing.T) {
 		s := server.NewServer()
 		defer s.Stop()
 
-		cc := checker.NewHTTPChecker("https://httpstat.us/200", &http.Client{Timeout: defaultTimeout()})
+		cc := checker.NewHTTPChecker("http://localhost:6000/v1/status/200", &http.Client{Timeout: defaultTimeout()})
 		hr := server.NewRegistration("http", defaultPeriod(), cc)
 		tc := checker.NewTCPChecker("httpstat.us:80", defaultTimeout())
 		tr := server.NewRegistration("tcp", defaultPeriod(), tc)

diff --git a/test/status.yml b/test/status.yml
@@ -0,0 +1,24 @@
+environment: production
+health:
+  duration: 1s
+  timeout: 1s
+telemetry:
+  logger:
+    level: info
+  tracer:
+    host: localhost:4318
+    secure: false
+transport:
+  http:
+    port: 6000
+    user_agent: "Status-server/1.0 http/1.0"
+    retry:
+      timeout: 2s
+      attempts: 3
+  grpc:
+    enabled: true
+    port: 6001
+    user_agent: "Status-server/1.0 grpc/1.0"
+    retry:
+      timeout: 2s
+      attempts: 3