chore: fixes to CI (#770)

nhost · Sep 15, 2023 · d12173a · d12173a
1 parent 55fdf79
commit d12173a
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 16 deletions.
diff --git a/dockercompose/graphql.go b/dockercompose/graphql.go
@@ -138,7 +138,7 @@ func console( //nolint:funlen
 		DependsOn: map[string]DependsOn{
 			"graphql": {Condition: "service_healthy"},
 		},
-		EntryPoint: nil,
+		EntryPoint:  nil,
 		Environment: env,
 		ExtraHosts: []string{
 			"host.docker.internal:host-gateway",

diff --git a/dockercompose/graphql_test.go b/dockercompose/graphql_test.go
@@ -164,7 +164,7 @@ func expectedConsole() *Service {
 			"HASURA_GRAPHQL_ENABLE_REMOTE_SCHEMA_PERMISSIONS":          "true",
 			"HASURA_GRAPHQL_ENABLE_TELEMETRY":                          "false",
 			"HASURA_GRAPHQL_EVENTS_HTTP_POOL_SIZE":                     "100",
-			"HASURA_GRAPHQL_JWT_SECRET":                                `{"claims_map":{"x-hasura-allowed-roles":{"path":"$.roles"},"x-hasura-default-role":"viewer","x-hasura-org-id":{"default":"public","path":"$.org"},"x-hasura-user-id":{"path":"$.sub"}},"key":"jwtSecretKey","type":"HS256"}`,
+			"HASURA_GRAPHQL_JWT_SECRET":                                `{"claims_map":{"x-hasura-allowed-roles":{"path":"$.roles"},"x-hasura-default-role":"viewer","x-hasura-org-id":{"default":"public","path":"$.org"},"x-hasura-user-id":{"path":"$.sub"}},"key":"jwtSecretKey","type":"HS256"}`, //nolint:lll
 			"HASURA_GRAPHQL_LIVE_QUERIES_MULTIPLEXED_BATCH_SIZE":       "100",
 			"HASURA_GRAPHQL_LIVE_QUERIES_MULTIPLEXED_REFETCH_INTERVAL": "1000",
 			"HASURA_GRAPHQL_LOG_LEVEL":                                 "info",
@@ -181,7 +181,7 @@ func expectedConsole() *Service {
 			"NHOST_FUNCTIONS_URL":                                      "http://local.functions.nhost.run:1337/v1",
 			"NHOST_GRAPHQL_URL":                                        "http://local.graphql.nhost.run:1337/v1",
 			"NHOST_HASURA_URL":                                         "http://local.hasura.nhost.run:1337",
-			"NHOST_JWT_SECRET":                                         `{"claims_map":{"x-hasura-allowed-roles":{"path":"$.roles"},"x-hasura-default-role":"viewer","x-hasura-org-id":{"default":"public","path":"$.org"},"x-hasura-user-id":{"path":"$.sub"}},"key":"jwtSecretKey","type":"HS256"}`,
+			"NHOST_JWT_SECRET":                                         `{"claims_map":{"x-hasura-allowed-roles":{"path":"$.roles"},"x-hasura-default-role":"viewer","x-hasura-org-id":{"default":"public","path":"$.org"},"x-hasura-user-id":{"path":"$.sub"}},"key":"jwtSecretKey","type":"HS256"}`, //nolint:lll
 			"NHOST_REGION":                                             "",
 			"NHOST_STORAGE_URL":                                        "http://local.storage.nhost.run:1337/v1",
 			"NHOST_SUBDOMAIN":                                          "local",

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -55,6 +55,7 @@
 
         nativeBuildInputs = with pkgs; [
           go
+          clang
         ];
 
         tags = [ ];

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/nhost/cli
 
-go 1.20
+go 1.21
 
 require (
 	github.com/Yamashou/gqlgenc v0.13.5

diff --git a/nix/overlay.nix b/nix/overlay.nix
@@ -1,12 +1,12 @@
 (final: prev: rec {
 
-  go = prev.go_1_20.overrideAttrs
+  go = prev.go_1_21.overrideAttrs
     (finalAttrs: previousAttrs: rec {
-      version = "1.20.7";
+      version = "1.21.1";
 
       src = final.fetchurl {
         url = "https://go.dev/dl/go${version}.src.tar.gz";
-        sha256 = "sha256-LF7pyeweczsNu8K9/tP2IwblHYFyvzj09OVCsnUg9Zc=";
+        sha256 = "sha256-v6Nr916aHpy725q8+dFwfkeb06B4gKiuNWTK7lcRy5k=";
       };
 
     });