Merge pull request #26 from ba-st/fix_healthcheck_docker_endpoints

Fix healthcheck docker endpoints
ba-st · Feb 18, 2022 · a2b0b29 · a2b0b29
2 parents 880a1ba + b107bdf
commit a2b0b29
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 19 deletions.
diff --git a/compose-test.sh b/compose-test.sh
@@ -7,9 +7,23 @@ if [[ -z "${GITHUB_HEAD_REF##*/}" ]]; then
 else
   echo "BRANCH_NAME=${GITHUB_HEAD_REF##*/}" > .env
 fi
-docker-compose -f api-tests/docker-compose.yml up -d
+echo "Building API"
+docker-compose -f api-tests/docker-compose.yml build api
+echo "Starting Consul Agent"
+docker-compose -f api-tests/docker-compose.yml up -d consul-agent
+sleep 1
+echo "Starting API"
+docker-compose -f api-tests/docker-compose.yml up -d api
 sleep 10
+echo "Testing API"
 curl --fail http://localhost:8080/echo/hello
 curl --fail http://localhost:8500/v1/agent/services
 curl --fail http://localhost:8500/v1/health/checks/echo
+HEALTH_STATUS=$(curl -s http://localhost:8500/v1/health/checks/echo | jq '.[0].Status')
+echo "$HEALTH_STATUS"
+if [ "$HEALTH_STATUS" != '"passing"' ]; then
+  echo "Error: Echo service is unhealthy" >&2
+  docker-compose -f api-tests/docker-compose.yml down
+  exit 1
+fi
 docker-compose -f api-tests/docker-compose.yml down
diff --git a/source/Stargate-Consul-Examples-Tests/StargateConsulExampleTest.class.st b/source/Stargate-Consul-Examples-Tests/StargateConsulExampleTest.class.st
@@ -79,7 +79,7 @@ StargateConsulExampleTest >> testPrintHelpOn [
 	self assert: help equals: ( 'NAME
 		stargate-consul-example [<1s>] - I provide a RESTful API over HTTP
 SYNOPSYS
-		stargate-consul-example --stargate.public-url=%<publicURL%> --stargate.port=%<port%> --stargate.operations-secret=%<operationsSecret%> --stargate.consul-agent-location=%<consulAgentLocation%>
+		stargate-consul-example --stargate.public-url=%<publicURL%> --stargate.port=%<port%> --stargate.operations-secret=%<operationsSecret%> --stargate.consul-agent-location=%<consulAgentLocation%> [--stargate.scheme=%<scheme%>]
 PARAMETERS
 		--stargate.public-url=%<publicURL%>
 			Public URL where the API is deployed. Used to create hypermedia links.
@@ -89,6 +89,8 @@ PARAMETERS
 			Secret key for checking JWT signatures.
 		--stargate.consul-agent-location=%<consulAgentLocation%>
 			Location of the Consul Agent. Leave empty to disable the plugin.
+		--stargate.scheme=%<scheme%>
+			Transport scheme. It''s used to configure Consul HTTP checks. Defaults to http.
 ENVIRONMENT
 		STARGATE__PUBLIC_URL
 			Public URL where the API is deployed. Used to create hypermedia links.
@@ -98,6 +100,8 @@ ENVIRONMENT
 			Secret key for checking JWT signatures.
 		STARGATE__CONSUL_AGENT_LOCATION
 			Location of the Consul Agent. Leave empty to disable the plugin.
+		STARGATE__SCHEME
+			Transport scheme. It''s used to configure Consul HTTP checks. Defaults to http.
 ' expandMacrosWith: StargateConsulExample version )
 ]
 

diff --git a/source/Stargate-Consul/ConsulAwareStargateApplication.class.st b/source/Stargate-Consul/ConsulAwareStargateApplication.class.st
@@ -10,14 +10,21 @@ ConsulAwareStargateApplication class >> isAbstract [
 	^ self = ConsulAwareStargateApplication
 ]
 
-{ #category : #'*Stargate-Consul' }
+{ #category : #private }
 ConsulAwareStargateApplication class >> stargateConfigurationParameters [
 
-	^ super stargateConfigurationParameters , { MandatoryConfigurationParameter
-		    named: 'Consul Agent Location'
-		    describedBy: 'Location of the Consul Agent. Leave empty to disable the plugin'
-		    inside: self sectionsForStargateConfiguration
-		    convertingWith: #asUrl }
+	^ super stargateConfigurationParameters , { 
+		  (MandatoryConfigurationParameter
+			   named: 'Consul Agent Location'
+			   describedBy:
+			   'Location of the Consul Agent. Leave empty to disable the plugin'
+			   inside: self sectionsForStargateConfiguration
+			   convertingWith: #asUrl).
+		  (OptionalConfigurationParameter
+			   named: 'Scheme'
+			   describedBy: 'Transport scheme. It''s used to configure Consul HTTP checks'
+			   inside: self sectionsForStargateConfiguration
+			   defaultingTo: 'http') }
 ]
 
 { #category : #'private - building' }
@@ -91,6 +98,7 @@ ConsulAwareStargateApplication >> healthCheckEndpoint [
 	baseUrl := self
 		           withDockerHostnameDo: [ :hostname | 
 			           ZnUrl new
+				           scheme: self stargateConfiguration scheme;
 				           host: hostname;
 				           port: self stargateConfiguration port;
 				           yourself

diff --git a/source/Stargate-Consul/ConsulAwareStargateApplication.extension.st b/source/Stargate-Consul/ConsulAwareStargateApplication.extension.st