Harmonize HCLv1 and HCLv2 supported fields

jobspec/parse_service.go

@@ -50,6 +50,7 @@ func parseService(o *ast.ObjectItem) (*api.Service, error) {
 		"task",
 		"meta",
 		"canary_meta",
+		"on_update",
 	}
 	if err := checkHCLKeys(o.Val, valid); err != nil {
 		return nil, err
@@ -226,6 +227,7 @@ func parseGateway(o *ast.ObjectItem) (*api.ConsulGateway, error) {
 		"proxy",
 		"ingress",
 		"terminating",
+		"mesh",
 	}
 
 	if err := checkHCLKeys(o.Val, valid); err != nil {
@@ -241,6 +243,7 @@ func parseGateway(o *ast.ObjectItem) (*api.ConsulGateway, error) {
 	delete(m, "proxy")
 	delete(m, "ingress")
 	delete(m, "terminating")
+	delete(m, "mesh")
 
 	dec, err := mapstructure.NewDecoder(&mapstructure.DecoderConfig{
 		DecodeHook:       mapstructure.StringToTimeDurationHookFunc(),
@@ -274,30 +277,41 @@ func parseGateway(o *ast.ObjectItem) (*api.ConsulGateway, error) {
 	gateway.Proxy = proxy
 
 	// extract and parse the ingress block
-	io := listVal.Filter("ingress")
-	if len(io.Items) == 1 {
+	if io := listVal.Filter("ingress"); len(io.Items) > 0 {
+		if len(io.Items) > 1 {
+			return nil, fmt.Errorf("ingress, %s", "multiple ingress stanzas not allowed")
+		}
+
 		ingress, err := parseIngressConfigEntry(io.Items[0])
 		if err != nil {
 			return nil, fmt.Errorf("ingress, %v", err)
 		}
 		gateway.Ingress = ingress
 	}
 
-	if len(io.Items) > 1 {
-		return nil, fmt.Errorf("ingress, %s", "multiple ingress stanzas not allowed")
-	}
+	if to := listVal.Filter("terminating"); len(to.Items) > 0 {
+		if len(to.Items) > 1 {
+			return nil, fmt.Errorf("terminating, %s", "multiple terminating stanzas not allowed")
+		}
 
-	to := listVal.Filter("terminating")
-	if len(to.Items) == 1 {
 		terminating, err := parseTerminatingConfigEntry(to.Items[0])
 		if err != nil {
 			return nil, fmt.Errorf("terminating, %v", err)
 		}
 		gateway.Terminating = terminating
 	}
 
-	if len(to.Items) > 1 {
-		return nil, fmt.Errorf("terminating, %s", "multiple terminating stanzas not allowed")
+	if mo := listVal.Filter("mesh"); len(mo.Items) > 0 {
+		if len(mo.Items) > 1 {
+			return nil, fmt.Errorf("mesh, %s", "multiple mesh stanzas not allowed")
+		}
+
+		// mesh should have no keys
+		if err := checkHCLKeys(mo.Items[0].Val, []string{}); err != nil {
+			return nil, fmt.Errorf("mesh, %s", err)
+		}
+
+		gateway.Mesh = &api.ConsulMeshConfigEntry{}
 	}
 
 	return &gateway, nil
@@ -891,6 +905,9 @@ func parseUpstream(uo *ast.ObjectItem) (*api.ConsulUpstream, error) {
 	valid := []string{
 		"destination_name",
 		"local_bind_port",
+		"local_bind_address",
+		"datacenter",
+		"mesh_gateway",
 	}
 
 	if err := checkHCLKeys(uo.Val, valid); err != nil {
@@ -903,6 +920,8 @@ func parseUpstream(uo *ast.ObjectItem) (*api.ConsulUpstream, error) {
 		return nil, err
 	}
 
+	delete(m, "mesh_gateway")
+
 	dec, err := mapstructure.NewDecoder(&mapstructure.DecoderConfig{
 		DecodeHook:       mapstructure.StringToTimeDurationHookFunc(),
 		WeaklyTypedInput: true,
@@ -916,9 +935,51 @@ func parseUpstream(uo *ast.ObjectItem) (*api.ConsulUpstream, error) {
 		return nil, err
 	}
 
+	var listVal *ast.ObjectList
+	if ot, ok := uo.Val.(*ast.ObjectType); ok {
+		listVal = ot.List
+	} else {
+		return nil, fmt.Errorf("'%s': should be an object", upstream.DestinationName)
+	}
+
+	if mgO := listVal.Filter("mesh_gateway"); len(mgO.Items) > 0 {
+		if len(mgO.Items) > 1 {
+			return nil, fmt.Errorf("upstream '%s': cannot have more than 1 mesh_gateway", upstream.DestinationName)
+		}
+
+		mgw, err := parseMeshGateway(mgO.Items[0])
+		if err != nil {
+			return nil, multierror.Prefix(err, fmt.Sprintf("'%s',", upstream.DestinationName))
+		}
+
+		upstream.MeshGateway = mgw
+
+	}
 	return &upstream, nil
 }
 
+func parseMeshGateway(gwo *ast.ObjectItem) (*api.ConsulMeshGateway, error) {
+	valid := []string{
+		"mode",
+	}
+
+	if err := checkHCLKeys(gwo.Val, valid); err != nil {
+		return nil, multierror.Prefix(err, "mesh_gateway ->")
+	}
+
+	var m map[string]interface{}
+	if err := hcl.DecodeObject(&m, gwo.Val); err != nil {
+		return nil, err
+	}
+
+	var mgw api.ConsulMeshGateway
+	if err := mapstructure.WeakDecode(m, &mgw); err != nil {
+		return nil, err
+	}
+
+	return &mgw, nil
+}
+
 func parseChecks(service *api.Service, checkObjs *ast.ObjectList) error {
 	service.Checks = make([]api.ServiceCheck, len(checkObjs.Items))
 	for idx, co := range checkObjs.Items {
@@ -945,6 +1006,8 @@ func parseChecks(service *api.Service, checkObjs *ast.ObjectList) error {
 			"task",
 			"success_before_passing",
 			"failures_before_critical",
+			"on_update",
+			"body",
 		}
 		if err := checkHCLKeys(co.Val, valid); err != nil {
 			return multierror.Prefix(err, "check ->")

jobspec/parse_test.go

@@ -134,10 +134,12 @@ func TestParse(t *testing.T) {
 								ExtraKeysHCL: nil,
 							},
 							"bar": {
-								Name:     "bar",
-								Type:     "csi",
-								Source:   "bar-vol",
-								ReadOnly: true,
+								Name:           "bar",
+								Type:           "csi",
+								Source:         "bar-vol",
+								ReadOnly:       true,
+								AccessMode:     "single-mode-writer",
+								AttachmentMode: "file-system",
 								MountOptions: &api.CSIMountOptions{
 									FSType: "ext4",
 								},
@@ -152,6 +154,7 @@ func TestParse(t *testing.T) {
 										"ro",
 									},
 								},
+								PerAlloc:     true,
 								ExtraKeysHCL: nil,
 							},
 						},
@@ -1112,8 +1115,14 @@ func TestParse(t *testing.T) {
 											LocalServicePort: 8080,
 											Upstreams: []*api.ConsulUpstream{
 												{
-													DestinationName: "other-service",
-													LocalBindPort:   4567,
+													DestinationName:  "other-service",
+													LocalBindPort:    4567,
+													LocalBindAddress: "0.0.0.0",
+													Datacenter:       "dc1",
+
+													MeshGateway: &api.ConsulMeshGateway{
+														Mode: "local",
+													},
 												},
 											},
 										},
@@ -1178,6 +1187,7 @@ func TestParse(t *testing.T) {
 							{
 								Name:      "foo-service",
 								PortLabel: "http",
+								OnUpdate:  "ignore",
 								Checks: []api.ServiceCheck{
 									{
 										Name:          "check-name",
@@ -1187,6 +1197,8 @@ func TestParse(t *testing.T) {
 										Timeout:       time.Duration(2 * time.Second),
 										InitialStatus: "passing",
 										TaskName:      "foo",
+										OnUpdate:      "ignore",
+										Body:          "post body",
 									},
 								},
 							},
@@ -1551,6 +1563,7 @@ func TestParse(t *testing.T) {
 										"listener2": {Name: "listener2", Address: "10.0.0.2", Port: 8889},
 									},
 									EnvoyGatewayNoDefaultBind: true,
+									EnvoyDNSDiscoveryType:     "LOGICAL_DNS",
 									Config:                    map[string]interface{}{"foo": "bar"},
 								},
 								Terminating: &api.ConsulTerminatingConfigEntry{
@@ -1571,6 +1584,28 @@ func TestParse(t *testing.T) {
 			},
 			false,
 		},
+		{
+			"tg-service-connect-gateway-mesh.hcl",
+			&api.Job{
+				ID:   stringToPtr("connect_gateway_mesh"),
+				Name: stringToPtr("connect_gateway_mesh"),
+				TaskGroups: []*api.TaskGroup{{
+					Name: stringToPtr("group"),
+					Services: []*api.Service{{
+						Name: "mesh-gateway-service",
+						Connect: &api.ConsulConnect{
+							Gateway: &api.ConsulGateway{
+								Proxy: &api.ConsulGatewayProxy{
+									Config: map[string]interface{}{"foo": "bar"},
+								},
+								Mesh: &api.ConsulMeshConfigEntry{},
+							},
+						},
+					}},
+				}},
+			},
+			false,
+		},
 		{
 			"tg-scaling-policy-minimal.hcl",
 			&api.Job{

jobspec/test-fixtures/basic.hcl

@@ -76,9 +76,11 @@ job "binstore-storagelocker" {
     }
 
     volume "bar" {
-      type      = "csi"
-      source    = "bar-vol"
-      read_only = true
+      type            = "csi"
+      source          = "bar-vol"
+      read_only       = true
+      attachment_mode = "file-system"
+      access_mode     = "single-mode-writer"
 
       mount_options {
         fs_type = "ext4"
@@ -92,6 +94,8 @@ job "binstore-storagelocker" {
       mount_options {
         mount_flags = ["ro"]
       }
+
+      per_alloc = true
     }
 
     restart {

jobspec/test-fixtures/tg-network.hcl

@@ -34,8 +34,14 @@ job "foo" {
             local_service_port = 8080
 
             upstreams {
-              destination_name = "other-service"
-              local_bind_port  = 4567
+              destination_name   = "other-service"
+              local_bind_port    = 4567
+              local_bind_address = "0.0.0.0"
+              datacenter         = "dc1"
+
+              mesh_gateway {
+                mode = "local"
+              }
             }
           }
         }

jobspec/test-fixtures/tg-service-check.hcl

@@ -12,8 +12,9 @@ job "group_service_check_script" {
     }
 
     service {
-      name = "foo-service"
-      port = "http"
+      name      = "foo-service"
+      port      = "http"
+      on_update = "ignore"
 
       check {
         name           = "check-name"
@@ -23,6 +24,8 @@ job "group_service_check_script" {
         timeout        = "2s"
         initial_status = "passing"
         task           = "foo"
+        on_update      = "ignore"
+        body           = "post body"
       }
     }
 

jobspec/test-fixtures/tg-service-connect-gateway-mesh.hcl

@@ -0,0 +1,19 @@
+job "connect_gateway_mesh" {
+  group "group" {
+    service {
+      name = "mesh-gateway-service"
+
+      connect {
+        gateway {
+          proxy {
+            config {
+              foo = "bar"
+            }
+          }
+
+          mesh {}
+        }
+      }
+    }
+  }
+}

jobspec/test-fixtures/tg-service-connect-gateway-terminating.hcl

@@ -20,6 +20,7 @@ job "connect_gateway_terminating" {
             }
 
             envoy_gateway_no_default_bind = true
+            envoy_dns_discovery_type      = "LOGICAL_DNS"
 
             config {
               foo = "bar"