From 669731ff6346f338cbebe9e29df80e094e3c27de Mon Sep 17 00:00:00 2001 From: Kevin Studer Date: Fri, 19 Jul 2024 11:02:24 +0200 Subject: [PATCH 1/3] Return scheme for undefined docker container --- envs/docker.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/envs/docker.go b/envs/docker.go index e674c96e..aa218943 100644 --- a/envs/docker.go +++ b/envs/docker.go @@ -461,7 +461,7 @@ func (l *Local) dockerServiceToRelationship(client *docker.Client, container typ } else if p.PrivatePort == 443 || p.PrivatePort == 8443 { rels[""]["scheme"] = "https" } else { - return nil + rels[""]["scheme"] = "undefined" } return rels } From b04f734b121a7e16c8eb3389e4b47e053ba65b57 Mon Sep 17 00:00:00 2001 From: Kevin Studer Date: Fri, 19 Jul 2024 11:10:56 +0200 Subject: [PATCH 2/3] Added test for generic container parsing --- envs/envs_test.go | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/envs/envs_test.go b/envs/envs_test.go index d02a62c5..c4d83199 100644 --- a/envs/envs_test.go +++ b/envs/envs_test.go @@ -70,6 +70,27 @@ func (f fakeEnv) Local() bool { return true } +func (s *ScenvSuite) TestGenericContainerExposesHostAndPort(c *C) { + env := fakeEnv{ + Rels: map[string][]map[string]interface{}{ + "container": { + map[string]interface{}{ + "host": "localhost", + "ip": "127.0.0.1", + "port": 9200, + "rel": "simple", + "scheme": "undefined", + }, + }, + }, + } + + rels := extractRelationshipsEnvs(env) + c.Assert(rels["CONTAINER_HOST"], Equals, "localhost") + c.Assert(rels["CONTAINER_PORT"], Equals, "9200") + c.Assert(rels["CONTAINER_IP"], Equals, "127.0.0.1") +} + func (s *ScenvSuite) TestElasticsearchURLEndsWithTrailingSlash(c *C) { env := fakeEnv{ Rels: map[string][]map[string]interface{}{ From 3fbf44885671d05bca5920c87cec16c47151371b Mon Sep 17 00:00:00 2001 From: Kevin Studer Date: Fri, 19 Jul 2024 13:02:32 +0200 Subject: [PATCH 3/3] Renamed scheme to tcp --- envs/docker.go | 2 +- envs/envs_test.go | 21 --------------------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/envs/docker.go b/envs/docker.go index aa218943..2c3fc649 100644 --- a/envs/docker.go +++ b/envs/docker.go @@ -461,7 +461,7 @@ func (l *Local) dockerServiceToRelationship(client *docker.Client, container typ } else if p.PrivatePort == 443 || p.PrivatePort == 8443 { rels[""]["scheme"] = "https" } else { - rels[""]["scheme"] = "undefined" + rels[""]["scheme"] = "tcp" } return rels } diff --git a/envs/envs_test.go b/envs/envs_test.go index c4d83199..d02a62c5 100644 --- a/envs/envs_test.go +++ b/envs/envs_test.go @@ -70,27 +70,6 @@ func (f fakeEnv) Local() bool { return true } -func (s *ScenvSuite) TestGenericContainerExposesHostAndPort(c *C) { - env := fakeEnv{ - Rels: map[string][]map[string]interface{}{ - "container": { - map[string]interface{}{ - "host": "localhost", - "ip": "127.0.0.1", - "port": 9200, - "rel": "simple", - "scheme": "undefined", - }, - }, - }, - } - - rels := extractRelationshipsEnvs(env) - c.Assert(rels["CONTAINER_HOST"], Equals, "localhost") - c.Assert(rels["CONTAINER_PORT"], Equals, "9200") - c.Assert(rels["CONTAINER_IP"], Equals, "127.0.0.1") -} - func (s *ScenvSuite) TestElasticsearchURLEndsWithTrailingSlash(c *C) { env := fakeEnv{ Rels: map[string][]map[string]interface{}{ pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy