Rename service to proxy in dataplane config json (#177)

hashicorp · Sep 26, 2023 · f3dd594 · f3dd594
1 parent 57ac41e
commit f3dd594
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 21 deletions.
diff --git a/internal/dataplane/dataplane_config.go b/internal/dataplane/dataplane_config.go
@@ -45,11 +45,11 @@ func (i *GetDataplaneConfigJSONInput) GetDataplaneConfigJSON() ([]byte, error) {
 			GRPCPort:        i.ConsulServerConfig.GRPC.Port,
 			SkipServerWatch: i.ConsulServerConfig.SkipServerWatch,
 		},
-		Service: ServiceConfig{
-			NodeName:       i.ProxyRegistration.Node,
-			ProxyServiceID: i.ProxyRegistration.Service.ID,
-			Namespace:      i.ProxyRegistration.Service.Namespace,
-			Partition:      i.ProxyRegistration.Service.Partition,
+		Proxy: ProxyConfig{
+			NodeName:  i.ProxyRegistration.Node,
+			ID:        i.ProxyRegistration.Service.ID,
+			Namespace: i.ProxyRegistration.Service.Namespace,
+			Partition: i.ProxyRegistration.Service.Partition,
 		},
 		XDSServer: XDSServerConfig{
 			Address: localhostAddr,

diff --git a/internal/dataplane/dataplane_config_test.go b/internal/dataplane/dataplane_config_test.go
@@ -47,9 +47,9 @@ func TestGetDataplaneConfigJSON(t *testing.T) {
 					"disabled": true
 				  }
 				},
-				"service": {
+				"proxy": {
 				  "nodeName": "test-node-name",
-				  "serviceID": "test-side-car-123",
+				  "id": "test-side-car-123",
 				  "namespace": "%s",
 				  "partition": "%s"
 				},
@@ -100,9 +100,9 @@ func TestGetDataplaneConfigJSON(t *testing.T) {
 					"tlsServerName": "consul.dc1"
 				  }
 				},
-				"service": {
+				"proxy": {
 				  "nodeName": "test-node-name",
-				  "serviceID": "test-side-car-123",
+				  "id": "test-side-car-123",
 				  "namespace": "%s",
 				  "partition": "%s"
 				},
@@ -155,9 +155,9 @@ func TestGetDataplaneConfigJSON(t *testing.T) {
 					}
 				  }
 				},
-				"service": {
+				"proxy": {
 				  "nodeName": "test-node-name",
-				  "serviceID": "test-side-car-123",
+				  "id": "test-side-car-123",
 				  "namespace": "%s",
 				  "partition": "%s"
 				},
@@ -215,9 +215,9 @@ func TestGetDataplaneConfigJSON(t *testing.T) {
 					}
 				  }
 				},
-				"service": {
+				"proxy": {
 				  "nodeName": "test-node-name",
-				  "serviceID": "test-side-car-123",
+				  "id": "test-side-car-123",
 				  "namespace": "%s",
 				  "partition": "%s"
 				},

diff --git a/internal/dataplane/dataplane_json.go b/internal/dataplane/dataplane_json.go
@@ -9,7 +9,7 @@ import (
 
 type dataplaneConfig struct {
 	Consul    ConsulConfig    `json:"consul"`
-	Service   ServiceConfig   `json:"service"`
+	Proxy     ProxyConfig     `json:"proxy"`
 	XDSServer XDSServerConfig `json:"xdsServer"`
 	Envoy     EnvoyConfig     `json:"envoy"`
 	Logging   LoggingConfig   `json:"logging"`
@@ -38,11 +38,11 @@ type StaticCredentialConfig struct {
 	Token string `json:"token"`
 }
 
-type ServiceConfig struct {
-	NodeName       string `json:"nodeName"`
-	ProxyServiceID string `json:"serviceID"`
-	Namespace      string `json:"namespace"`
-	Partition      string `json:"partition"`
+type ProxyConfig struct {
+	NodeName  string `json:"nodeName"`
+	ID        string `json:"id"`
+	Namespace string `json:"namespace"`
+	Partition string `json:"partition"`
 }
 
 type XDSServerConfig struct {

diff --git a/subcommand/control-plane/command_test.go b/subcommand/control-plane/command_test.go
@@ -1193,9 +1193,9 @@ func getExpectedDataplaneCfgJSON() string {
 		"disabled": true
 	   }%s
 	},
-	"service": {
+	"proxy": {
 	  "nodeName": "arn:aws:ecs:us-east-1:123456789:cluster/test",
-	  "serviceID": "%s",
+	  "id": "%s",
 	  "namespace": "%s",
 	  "partition": "%s"
 	},