cli/compose: memswap_limit -> memory_swap, mem_swappiness -> memory_swappiness

Align the names in the compose / stack schema with the command-line flags, instead
of aligning with the existing options in the compose-schema (which I think originated
from v1);
https://github.com/compose-spec/compose-spec/blob/a08f8d51631b7127ddac3d2c65537db429d0f1d0/spec.md?plain=1#L1440-L1461

Signed-off-by: Sebastiaan van Stijn <[email protected]>

Author: thaJeztah

cli/compose/loader/full-example.yml

@@ -79,8 +79,8 @@ services:
             - discrete_resource_spec:
                 kind: 'ssd'
                 value: 1
-        memswap_limit: 86000
-        mem_swappiness: 27
+        memory_swap: 86000
+        memory_swappiness: 27
       restart_policy:
         condition: on-failure
         delay: 5s

cli/compose/loader/testdata/full-example.json.golden

@@ -182,8 +182,8 @@
               }
             ]
           },
-          "memswap_limit": 86000,
-          "mem_swappiness": 27
+          "memory_swap": 86000,
+          "memory_swappiness": 27
         },
         "restart_policy": {
           "condition": "on-failure",

cli/compose/loader/testdata/full-example.yaml.golden

@@ -73,8 +73,8 @@ services:
             - discrete_resource_spec:
                 kind: ssd
                 value: 1
-        memswap_limit: 86000
-        mem_swappiness: 27
+        memory_swap: 86000
+        memory_swappiness: 27
       restart_policy:
         condition: on-failure
         delay: 5s

cli/compose/schema/data/config_schema_v3.14.json

@@ -414,10 +414,10 @@
               },
               "additionalProperties": false
             },
-            "memswap_limit": {
+            "memory_swap": {
               "type": "integer"
             },
-            "mem_swappiness": {
+            "memory_swappiness": {
               "type": "integer"
             }
           },

cli/compose/types/types.go

@@ -49,7 +49,7 @@ var ForbiddenProperties = map[string]string{
 	"cpu_shares":    "Set resource limits using deploy.resources",
 	"cpuset":        "Set resource limits using deploy.resources",
 	"mem_limit":     "Set resource limits using deploy.resources",
-	"memswap_limit": "Set resource limits using deploy.resources",
+	"memory_swap":   "Set resource limits using deploy.resources",
 }
 
 // ConfigFile is a filename and the contents of the file as a Dict
@@ -309,8 +309,8 @@ type UpdateConfig struct {
 type Resources struct {
 	Limits        *ResourceLimit `yaml:",omitempty" json:"limits,omitempty"`
 	Reservations  *Resource      `yaml:",omitempty" json:"reservations,omitempty"`
-	MemswapLimit  *int64         `mapstructure:"memswap_limit" yaml:"memswap_limit,omitempty" json:"memswap_limit,omitempty"`
-	MemSwappiness *int64         `mapstructure:"mem_swappiness" yaml:"mem_swappiness,omitempty" json:"mem_swappiness,omitempty"`
+	MemswapLimit  *int64         `mapstructure:"memory_swap" yaml:"memory_swap,omitempty" json:"memory_swap,omitempty"`
+	MemSwappiness *int64         `mapstructure:"memory_swappiness" yaml:"memory_swappiness,omitempty" json:"memory_swappiness,omitempty"`
 }
 
 // ResourceLimit is a resource to be limited