trim end slashes of the server URL (#3)

hasura · Mar 29, 2024 · 56bf897 · 56bf897
1 parent 4290fc7
commit 56bf897
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -15,5 +15,7 @@ COPY --from=builder /app/ndc-cli /ndc-cli
 
 ENV HASURA_CONFIGURATION_DIRECTORY /config
 
+ENTRYPOINT ["/ndc-cli"]
+
 # Run the web service on container startup.
-CMD ["/ndc-cli", "serve"]
+CMD ["serve"]
diff --git a/rest/schema.go b/rest/schema.go
@@ -257,7 +257,7 @@ func applyEnvVariablesToSchema(input *rest.NDCRestSchema, logger *slog.Logger) *
 	if input.Settings != nil {
 		input.Settings.Headers = replaceEnvTemplateInHeader(input.Settings.Headers, logger)
 		for i, server := range input.Settings.Servers {
-			server.URL = replaceEnvTemplate(server.URL, logger)
+			server.URL = strings.TrimRight(replaceEnvTemplate(server.URL, logger), "/")
 			input.Settings.Servers[i] = server
 		}
 		for key, ss := range input.Settings.SecuritySchemes {