Fixed for support of actuators

Qarik-Group · Nov 15, 2022 · 47203e2 · 47203e2
1 parent 0a52fcc
commit 47203e2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -39,6 +39,7 @@ $cf create-service config-server default test-service -c "whatever json configur
 
 ## History ##
 
+* v1.0.0 - Full release with support for SR Actuators
 * v0.0.5 - Services as configurable objects
 * v0.0.4 - Now with configurable package names
 * v0.0.3 - Now without package fetching

diff --git a/broker/create_registry_server_instance.go b/broker/create_registry_server_instance.go
@@ -169,7 +169,7 @@ func (broker *SCSBroker) createRegistryServerInstance(serviceId string, instance
 
 		for _, stat := range stats {
 
-			rc.AddPeer(stat.Index, "http", stat.Host, stat.InstancePorts[0].External)
+			rc.AddPeer(stat.Index, fmt.Sprintf("http://%s:%d/eureka", stat.Host, stat.InstancePorts[0].External), serviceId)
 		}
 	} else {
 		rc.Standalone()
@@ -220,7 +220,7 @@ func (broker *SCSBroker) createRegistryServerInstance(serviceId string, instance
 		}
 
 		for _, stat := range stats {
-			rc.AddPeer(stat.Index, "http", stat.Host, stat.InstancePorts[0].External)
+			rc.AddPeer(stat.Index, fmt.Sprintf("http://%s:%d/eureka", stat.Host, stat.InstancePorts[0].External), serviceId)
 		}
 	}
 

diff --git a/broker/update_registry_server_instance.go b/broker/update_registry_server_instance.go
@@ -114,7 +114,7 @@ func (broker *SCSBroker) updateRegistryServerInstance(cxt context.Context, insta
 		}
 
 		for _, stat := range stats {
-			rc.AddPeer(stat.Index, "http", stat.Host, stat.InstancePorts[0].External)
+			rc.AddPeer(stat.Index, fmt.Sprintf("http://%s:%d/eureka", stat.Host, stat.InstancePorts[0].External), details.ServiceID)
 		}
 	}
 

diff --git a/broker/utilities/registry_config.go b/broker/utilities/registry_config.go
@@ -8,19 +8,19 @@ func NewRegistryConfig() *RegistryConfig {
 }
 
 type RegistryPeer struct {
-	Index  int    `json:"index"`
-	Scheme string `json:"scheme"`
-	Host   string `json:"host"`
-	Port   int    `json:"port"`
+	Index             int    `json:"index"`
+	Count             int    `json:"nodeCount"`
+	URI               string `json:"uri"`
+	ServiceInstanceId string `json:"service-instance-id"`
 }
 
 type RegistryConfig struct {
 	Mode  string
 	Peers []*RegistryPeer
 }
 
-func (rc *RegistryConfig) AddPeer(idx int, scheme string, host string, port int) {
-	rc.Peers = append(rc.Peers, &RegistryPeer{Index: idx, Scheme: scheme, Host: host, Port: port})
+func (rc *RegistryConfig) AddPeer(idx int, uri string, serviceinstanceID string) {
+	rc.Peers = append(rc.Peers, &RegistryPeer{Index: idx, Count: idx, URI: uri, ServiceInstanceId: serviceinstanceID})
 }
 
 func (rc *RegistryConfig) Standalone() {
-Original file line number
+Diff line change
@@ Expand Up @@
     		}
     		for _, stat := range stats {
-    			rc.AddPeer(stat.Index, "http", stat.Host, stat.InstancePorts[0].External)
+    			rc.AddPeer(stat.Index, fmt.Sprintf("http://%s:%d/eureka", stat.Host, stat.InstancePorts[0].External), details.ServiceID)
     		}
     	}
@@ Expand Down @@