register fix 2

consul/discovery.go

@@ -61,18 +61,28 @@ func (s *Service) GetID() string {
 }
 
 func (s *Service) GetFullAddr() string {
-	return fmt.Sprintf("https://%s:%d/", s.Address, s.port)
+	return fmt.Sprintf("http://%s:%d/", s.domain, s.port)
 }
 
 func (s *Service) Register() error {
 	def := &consul.AgentServiceRegistration{
 		ID:      s.GetID(),
+		Kind:    consul.ServiceKindConnectProxy,
 		Name:    s.Name,
 		Address: s.Address,
 		Port:    s.port,
 		Tags:    s.getTags(),
+		Connect: &consul.AgentServiceConnect{
+			SidecarService: &consul.AgentServiceRegistration{
+				// Port: s.port,
+			},
+		},
+		Proxy: &consul.AgentServiceConnectProxyConfig{
+			DestinationServiceName: s.Name + "dupa",
+		},
 		Check: &consul.AgentServiceCheck{
 			TTL:                            s.ttl.String(),
+			Status:                         "passing",
 			DeregisterCriticalServiceAfter: "10s",
 		},
 	}
@@ -107,8 +117,15 @@ func (s *Service) Unregister() error {
 }
 
 func (s *Service) Connect() (*connect.Service, error) {
-	svc, err := connect.NewService(s.Name, s.client)
+	// srvName := s.Name
+	srvName := s.Name
+	fmt.Printf("CONNECT SERVER: %s\n", srvName)
+	svc, err := connect.NewService(srvName, s.client)
 	s.connect = svc
+	cnf := svc.ServerTLSConfig()
+	for k, c := range cnf.Certificates {
+		fmt.Printf("CONNECT CERT %d: %v", k, c)
+	}
 
 	return svc, err
 }
@@ -127,13 +144,18 @@ func (s *Service) healthCheck() (bool, error) {
 		}
 		req.Header.Set("User-Agent", "service/internal")
 
-		fmt.Printf("Sending HEALTH CHECK request to: %s", healthUrl)
+		fmt.Printf("Sending HEALTH CHECK request to: %s\n", healthUrl)
 		resp, err := client.Do(req)
 		if err != nil {
+			fmt.Printf("Sending HEALTH CHECK request error: %v\n", err)
 			return false
 		}
 		defer resp.Body.Close()
 
+		var body []byte
+		resp.Body.Read(body)
+		fmt.Printf("HEALTH CHECK response to: %v -- %v\n", resp, body)
+
 		return resp.StatusCode == http.StatusOK
 	}()