Shorten upstream variables.

LINCKODE · LINCKODE · commit a7b963ac9357 · 2026-03-05T19:15:14.000+02:00
diff --git a/.github/workflows/push-docker-general-service.yaml b/.github/workflows/push-docker-general-service.yaml
@@ -58,4 +58,4 @@ jobs:
           context: ./general-service
           file: ./general-service/Dockerfile
           push: true
-          tags: ghcr.io/qubic/qubic-aggregation-general-service:${{ steps.extract.outputs.version }}
+          tags: ghcr.io/qubic/qubic-aggregation-service:${{ steps.extract.outputs.version }}
diff --git a/general-service/cmd/general-service/main.go b/general-service/cmd/general-service/main.go
@@ -34,7 +34,7 @@ func main() {
 	}
 }
 
-const confPrefix = "QUBIC_AGGREGATION_GENERAL_SERVICE"
+const confPrefix = "QUBIC_AGGREGATION_SERVICE"
 
 func run(logger *zap.SugaredLogger) error {
 
@@ -59,21 +59,21 @@ func run(logger *zap.SugaredLogger) error {
 
 	fmt.Println(conf.String(&cfg))
 
-	liveServiceGrpcConn, err := grpcclient.NewConnection(cfg.Upstream.QubicHttpHost)
+	liveServiceGrpcConn, err := grpcclient.NewConnection(cfg.Upstream.QubicHttpUrl)
 	if err != nil {
 		return fmt.Errorf("creating live service client connection: %w", err)
 	}
 	defer liveServiceGrpcConn.Close()
 	liveClient := clients.NewLiveServiceClient(liveServiceGrpcConn, logger.Named("live-service"))
 
-	queryServiceGrpcConn, err := grpcclient.NewConnection(cfg.Upstream.ArchiveQueryServiceHost)
+	queryServiceGrpcConn, err := grpcclient.NewConnection(cfg.Upstream.QueryServiceUrl)
 	if err != nil {
 		return fmt.Errorf("creating query service client connection: %w", err)
 	}
 	defer queryServiceGrpcConn.Close()
 	queryClient := clients.NewQueryServiceClient(queryServiceGrpcConn, logger.Named("query-service"))
 
-	statusServiceGrpcConn, err := grpcclient.NewConnection(cfg.Upstream.StatusServiceHost)
+	statusServiceGrpcConn, err := grpcclient.NewConnection(cfg.Upstream.StatusServiceUrl)
 	if err != nil {
 		return fmt.Errorf("creating status service client connection: %w", err)
 	}
diff --git a/general-service/go.mod b/general-service/go.mod
@@ -11,11 +11,12 @@ require (
 	github.com/qubic/archive-query-service/v2 v2.0.0-20260218114203-dee9e270b172
 	github.com/qubic/go-data-publisher/status-service v1.3.3
 	github.com/qubic/go-node-connector v0.17.0
-	github.com/qubic/qubic-aggregation/shared v0.1.0
+	github.com/qubic/qubic-aggregation/shared v0.1.1
 	github.com/qubic/qubic-http v0.9.1
 	github.com/stretchr/testify v1.11.1
 	go.uber.org/mock v0.6.0
 	go.uber.org/zap v1.27.1
+	golang.org/x/sync v0.19.0
 	google.golang.org/genproto/googleapis/api v0.0.0-20260223185530-2f722ef697dc
 	google.golang.org/grpc v1.79.1
 	google.golang.org/protobuf v1.36.11
@@ -44,7 +45,6 @@ require (
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
 	golang.org/x/crypto v0.47.0 // indirect
 	golang.org/x/net v0.49.0 // indirect
-	golang.org/x/sync v0.19.0 // indirect
 	golang.org/x/sys v0.40.0 // indirect
 	golang.org/x/text v0.34.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20260217215200-42d3e9bedb6d // indirect
diff --git a/general-service/go.sum b/general-service/go.sum
@@ -70,8 +70,8 @@ github.com/qubic/go-node-connector v0.17.0 h1:ifsqODfO3vw16av0GGQBcq8qgcQXfYD1Y4
 github.com/qubic/go-node-connector v0.17.0/go.mod h1:GOQGJ6IKhm3CU62bfLJJbBerjYmt6NNhDKzxC1i7HhU=
 github.com/qubic/go-schnorrq v1.0.1 h1:F0R/BQVf+O7Bp57NGJmc3uXlqsaIzerg/1bmU4jMLLE=
 github.com/qubic/go-schnorrq v1.0.1/go.mod h1:j2qw/zHiyjH9GAScAAETWpZk6iELbjYnzIg7CQwc5wM=
-github.com/qubic/qubic-aggregation/shared v0.1.0 h1:D0qz928JyAQZhqpZJm+4xyocFb62zivOA6A/trYVELU=
-github.com/qubic/qubic-aggregation/shared v0.1.0/go.mod h1:M4YnGXPEvT2+K7c21nIYdpSUm8uEtdc2cJaQvUaEF+U=
+github.com/qubic/qubic-aggregation/shared v0.1.1 h1:t5eLjPvmY/2eW0tgDBV9O/ZQ2+YkdhFdS7hIS5pMvkM=
+github.com/qubic/qubic-aggregation/shared v0.1.1/go.mod h1:M4YnGXPEvT2+K7c21nIYdpSUm8uEtdc2cJaQvUaEF+U=
 github.com/qubic/qubic-http v0.9.1 h1:B45EQFAHASrzsTHU98KgmqqVh+cEhfiSAwUP7BmnNCI=
 github.com/qubic/qubic-http v0.9.1/go.mod h1:d+vpgJACx4OLDLmQOXY0J0ObBwDjLNs9hU0+QR5cW/k=
 github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ func main() {`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`
`37`		`-const confPrefix = "QUBIC_AGGREGATION_GENERAL_SERVICE"`
	`37`	`+const confPrefix = "QUBIC_AGGREGATION_SERVICE"`
`38`	`38`
`39`	`39`	`func run(logger *zap.SugaredLogger) error {`
`40`	`40`
`@@ -59,21 +59,21 @@ func run(logger *zap.SugaredLogger) error {`
`59`	`59`
`60`	`60`	`fmt.Println(conf.String(&cfg))`
`61`	`61`
`62`		`- liveServiceGrpcConn, err := grpcclient.NewConnection(cfg.Upstream.QubicHttpHost)`
	`62`	`+ liveServiceGrpcConn, err := grpcclient.NewConnection(cfg.Upstream.QubicHttpUrl)`
`63`	`63`	`if err != nil {`
`64`	`64`	`return fmt.Errorf("creating live service client connection: %w", err)`
`65`	`65`	`}`
`66`	`66`	`defer liveServiceGrpcConn.Close()`
`67`	`67`	`liveClient := clients.NewLiveServiceClient(liveServiceGrpcConn, logger.Named("live-service"))`
`68`	`68`
`69`		`- queryServiceGrpcConn, err := grpcclient.NewConnection(cfg.Upstream.ArchiveQueryServiceHost)`
	`69`	`+ queryServiceGrpcConn, err := grpcclient.NewConnection(cfg.Upstream.QueryServiceUrl)`
`70`	`70`	`if err != nil {`
`71`	`71`	`return fmt.Errorf("creating query service client connection: %w", err)`
`72`	`72`	`}`
`73`	`73`	`defer queryServiceGrpcConn.Close()`
`74`	`74`	`queryClient := clients.NewQueryServiceClient(queryServiceGrpcConn, logger.Named("query-service"))`
`75`	`75`
`76`		`- statusServiceGrpcConn, err := grpcclient.NewConnection(cfg.Upstream.StatusServiceHost)`
	`76`	`+ statusServiceGrpcConn, err := grpcclient.NewConnection(cfg.Upstream.StatusServiceUrl)`
`77`	`77`	`if err != nil {`
`78`	`78`	`return fmt.Errorf("creating status service client connection: %w", err)`
`79`	`79`	`}`