Merge pull request #389 from vegaprotocol/feature/updates-http-server…

…s-configs chore: update configs templates
vegaprotocol · Jul 19, 2023 · bb1593f · bb1593f
2 parents 3480c5d + a7953c6
commit bb1593f
Show file tree

Hide file tree

Showing 19 changed files with 33 additions and 1,504 deletions.
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -16,14 +16,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Setup Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
-          go-version: '1.19.0'
+          go-version: '1.20.0'
       - uses: actions/checkout@v3
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.50.1
+          version: v1.53.2
           args: --config .golangci.yaml --verbose
         env:
-          GO111MODULE: on 
+          GO111MODULE: on 
diff --git a/.github/workflows/release-binaries.yml b/.github/workflows/release-binaries.yml
@@ -25,10 +25,10 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: '1.19'
+          go-version: '1.20'
 
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: ${{ inputs.tag }}
 
@@ -56,4 +56,4 @@ jobs:
           tag_name: ${{ github.ref_name }}
           prerelease: false
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -16,9 +16,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Setup Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
-          go-version: '1.19'
+          go-version: '1.20'
       - uses: actions/checkout@v3
       - name: Build binary
         env:
@@ -27,4 +27,4 @@ jobs:
           go build -o vegacapsule .
       - name: Run unit tests
         run:
-          go test -v ./...
+          go test -v ./...
diff --git a/.github/workflows/start-stop-network-test-configs.yml b/.github/workflows/start-stop-network-test-configs.yml
@@ -20,22 +20,20 @@ jobs:
           - config_file: config_visor_mixed.hcl
             propose_upgrade: true
           - config_file: config_data_node_snapshot.hcl
-
           # TODO: Needs to be fixed. Issue: https://github.com/vegaprotocol/vegacapsule/issues/291
           # - config_visor_only.hcl
     name: ${{ matrix.settings.config_file }}
     runs-on: ubuntu-latest
     steps:
       - name: Setup Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
-          go-version: '1.19'
+          go-version: '1.20'
       - uses: actions/checkout@v3
       - name: Build binary
         env:
-          GO111MODULE: on 
-        run:
-          go build -o vegacapsule .
+          GO111MODULE: on
+        run: go build -o vegacapsule .
       - name: Start nomad
         run: |
           export GOBIN=$(go env GOPATH)/bin

diff --git a/cmd/install_dependencies.go b/cmd/install_dependencies.go
@@ -11,7 +11,7 @@ import (
 )
 
 const (
-	latestReleaseTag = "v0.68.0"
+	latestReleaseTag = "v0.71.6"
 )
 
 var (

diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/net_confs/config_checkpoint.hcl b/net_confs/config_checkpoint.hcl
@@ -438,12 +438,9 @@ GatewayEnabled = true
 
 [Gateway]
   Level = "Info"
+  Port = 30{{.NodeNumber}}8
   [Gateway.Node]
     Port = 30{{.NodeNumber}}7
-  [Gateway.GraphQL]
-    Port = 30{{.NodeNumber}}8
-  [Gateway.REST]
-    Port = 30{{.NodeNumber}}9
 
 [Metrics]
   Level = "Info"

diff --git a/net_confs/config_example.hcl b/net_confs/config_example.hcl
@@ -409,12 +409,9 @@ GatewayEnabled = true
 
 [Gateway]
   Level = "Info"
+  Port = 30{{.NodeNumber}}8
   [Gateway.Node]
     Port = 30{{.NodeNumber}}7
-  [Gateway.GraphQL]
-    Port = 30{{.NodeNumber}}8
-  [Gateway.REST]
-    Port = 30{{.NodeNumber}}9
 
 [Metrics]
   Level = "Info"

diff --git a/net_confs/node_set_templates/default/data_node_full.tmpl b/net_confs/node_set_templates/default/data_node_full.tmpl
@@ -26,12 +26,9 @@ GatewayEnabled = true
 
 [Gateway]
   Level = "Info"
+  Port = {{add 300 .NodeNumber}}8
   [Gateway.Node]
     Port = {{add 300 .NodeNumber}}7
-  [Gateway.GraphQL]
-    Port = {{add 300 .NodeNumber}}8
-  [Gateway.REST]
-    Port = {{add 300 .NodeNumber}}9
 
 [Metrics]
   Level = "Info"

diff --git a/net_confs/node_set_templates/default/data_node_full_external_postgres.tmpl b/net_confs/node_set_templates/default/data_node_full_external_postgres.tmpl
@@ -24,12 +24,9 @@ GatewayEnabled = true
 
 [Gateway]
   Level = "Info"
+  Port = {{add 300 .NodeNumber}}8
   [Gateway.Node]
     Port = {{add 300 .NodeNumber}}7
-  [Gateway.GraphQL]
-    Port = {{add 300 .NodeNumber}}8
-  [Gateway.REST]
-    Port = {{add 300 .NodeNumber}}9
 
 [Metrics]
   Level = "Info"

diff --git a/net_confs/node_set_templates/default/data_node_full_external_postgres_visor.tmpl b/net_confs/node_set_templates/default/data_node_full_external_postgres_visor.tmpl
@@ -25,12 +25,9 @@ GatewayEnabled = true
 
 [Gateway]
   Level = "Info"
+  Port = {{add 300 .NodeNumber}}8
   [Gateway.Node]
     Port = {{add 300 .NodeNumber}}7
-  [Gateway.GraphQL]
-    Port = {{add 300 .NodeNumber}}8
-  [Gateway.REST]
-    Port = {{add 300 .NodeNumber}}9
 
 [Metrics]
   Level = "Info"

diff --git a/net_confs/node_set_templates/default/data_node_full_snapshosts.tmpl b/net_confs/node_set_templates/default/data_node_full_snapshosts.tmpl
@@ -22,12 +22,9 @@ GatewayEnabled = true
 
 [Gateway]
   Level = "Info"
+  Port = {{add 300 .NodeNumber}}8
   [Gateway.Node]
     Port = {{add 300 .NodeNumber}}7
-  [Gateway.GraphQL]
-    Port = {{add 300 .NodeNumber}}8
-  [Gateway.REST]
-    Port = {{add 300 .NodeNumber}}9
 
 [Metrics]
   Level = "Info"

diff --git a/net_confs/node_set_templates/nullchain/data_node.tmpl b/net_confs/node_set_templates/nullchain/data_node.tmpl
@@ -26,12 +26,9 @@ GatewayEnabled = true
 
 [Gateway]
   Level = "Info"
+  Port = {{add 300 .NodeNumber}}8
   [Gateway.Node]
     Port = {{add 300 .NodeNumber}}7
-  [Gateway.GraphQL]
-    Port = {{add 300 .NodeNumber}}8
-  [Gateway.REST]
-    Port = {{add 300 .NodeNumber}}9
 
 [Metrics]
   Level = "Info"
@@ -45,4 +42,4 @@ GatewayEnabled = true
     Port = {{add 300 .NodeNumber}}5
 
 [NetworkHistory]
-  Enabled = false
+  Enabled = false
diff --git a/net_confs/node_set_templates/sentry/data_node_full.tmpl b/net_confs/node_set_templates/sentry/data_node_full.tmpl
@@ -25,13 +25,10 @@ GatewayEnabled = true
 
 [Gateway]
   Level = "Info"
+  Port = 30{{.NodeNumber}}8
   [Gateway.Node]
     Port = 30{{.NodeNumber}}7
-  [Gateway.GraphQL]
-    Port = 30{{.NodeNumber}}8
-  [Gateway.REST]
-    Port = 30{{.NodeNumber}}9
-
+
 [Metrics]
   Level = "Info"
   Timeout = "5s"

diff --git a/net_confs/stagnet_config.hcl b/net_confs/stagnet_config.hcl
@@ -202,12 +202,9 @@ GatewayEnabled = true
 
 [Gateway]
   Level = "Info"
+  Port = 30{{.NodeNumber}}8
   [Gateway.Node]
     Port = 30{{.NodeNumber}}7
-  [Gateway.GraphQL]
-    Port = 30{{.NodeNumber}}8
-  [Gateway.REST]
-    Port = 30{{.NodeNumber}}9
 
 [Metrics]
   Level = "Info"

diff --git a/nomad/client.go b/nomad/client.go
@@ -79,7 +79,7 @@ func (n *Client) waitForDeployment(ctx context.Context, jobID string) error {
 			}
 
 			for _, dep := range deployments {
-				log.Printf("Update for job: %q, jobStatus: %s, deploymentStatus: %q, another: %s", dep.JobID, *job.Status, dep.Status, dep.StatusDescription)
+				log.Printf("Update for job: %q, jobStatus: %s, deploymentStatus: %q, description: %s", dep.JobID, *job.Status, dep.Status, dep.StatusDescription)
 
 				switch dep.Status {
 				case DeploymentStatusCanceled:
@@ -107,7 +107,7 @@ func (n *Client) Run(ctx context.Context, job *api.Job) (bool, error) {
 
 	info, err := n.Info(ctx, *job.ID)
 	if err != nil {
-		//NOTE: Handle 404 status code
+		// NOTE: Handle 404 status code
 		log.Printf("Error getting job info: %+v", err)
 	} else if *info.Status == Running {
 		return true, nil

diff --git a/nomad/runner/binary_installer.go b/nomad/runner/binary_installer.go
@@ -18,7 +18,7 @@ import (
 
 const (
 	nomadBinName       = "nomad"
-	nomadBinaryVersion = "1.3.1"
+	nomadBinaryVersion = "1.3.14"
 )
 
 var (

diff --git a/probes/probe.go b/probes/probe.go
@@ -35,7 +35,7 @@ func probe(ctx context.Context, id, probeType string, call func() error) error {
 }
 
 func Probe(ctx context.Context, id string, probes types.ProbesConfig) error {
-	ctx, cancel := context.WithTimeout(context.Background(), totalProbeTimeout)
+	ctx, cancel := context.WithTimeout(ctx, totalProbeTimeout)
 	defer cancel()
 
 	eg, ctx := errgroup.WithContext(ctx)