Skip to content
This repository has been archived by the owner on Nov 14, 2022. It is now read-only.

port_mapping.name, port_definition.[name|lables], health_check.port a… #65

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

port_mapping.name, port_definition.[name|lables], health_check.port a… #65

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0965486
port_mapping.name, port_definition.[name|lables], health_check.port a…
cihangirbesiktas Aug 2, 2017
e6f27ea
Avoid empty maps
Aug 9, 2017
2df59bb
Instruct marathon to enable external volumes
calvernaz Aug 9, 2017
c656e89
updated the handling of port parameter
cihangirbesiktas Aug 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
## 1.3.0 (unreleased)

- Added support for `container.port_mappings.port_mapping.name`, `port_definitions.port_definition.[name|labels]`, `health_checks.health_check.port`, `volumes.volume.external`
- Added support for `disk`, `gpus`, `max_launch_delay_seconds` and `port_definitions` configuration
- Added support for `unreachable_strategy` configuration
- Added support for `kill_selection` configuration
Expand Down
1 change: 1 addition & 0 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,3 +83,4 @@ marathon:
- MARATHON_DECLINE_OFFER_DURATION=3600000
- MARATHON_MESOS_AUTHENTICATION_PRINCIPAL=marathon
- MARATHON_MESOS_ROLE=public
command: --enable_features external_volumes
99 changes: 97 additions & 2 deletions marathon/resource_marathon_app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,10 @@ func resourceMarathonApp() *schema.Resource {
Type: schema.TypeMap,
Optional: true,
},
"name": &schema.Schema{
Type: schema.TypeString,
Optional: true,
},
},
},
},
Expand Down Expand Up @@ -222,6 +226,26 @@ func resourceMarathonApp() *schema.Resource {
Type: schema.TypeString,
Optional: true,
},
"external": &schema.Schema{
Type: schema.TypeList,
Optional: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"options": &schema.Schema{
Type: schema.TypeMap,
Optional: true,
},
"name": &schema.Schema{
Type: schema.TypeString,
Optional: true,
},
"provider": &schema.Schema{
Type: schema.TypeString,
Optional: true,
},
},
},
},
},
},
},
Expand Down Expand Up @@ -332,6 +356,10 @@ func resourceMarathonApp() *schema.Resource {
Default: 0,
Optional: true,
},
"port": &schema.Schema{
Type: schema.TypeInt,
Optional: true,
},
"timeout_seconds": &schema.Schema{
Type: schema.TypeInt,
Default: 20,
Expand Down Expand Up @@ -425,6 +453,14 @@ func resourceMarathonApp() *schema.Resource {
Default: "tcp",
Optional: true,
},
"name": &schema.Schema{
Type: schema.TypeString,
Optional: true,
},
"labels": &schema.Schema{
Type: schema.TypeMap,
Optional: true,
},
},
},
},
Expand Down Expand Up @@ -475,6 +511,11 @@ func resourceMarathonApp() *schema.Resource {
Default: "YOUNGEST_FIRST",
ForceNew: false,
},
"user": &schema.Schema{
Type: schema.TypeString,
Optional: true,
ForceNew: false,
},
"uris": &schema.Schema{
Type: schema.TypeList,
Optional: true,
Expand Down Expand Up @@ -682,6 +723,7 @@ func setSchemaFieldsForApp(app *marathon.Application, d *schema.ResourceData) {
// pmMap["service_port"] = portMapping.ServicePort
pmMap["protocol"] = portMapping.Protocol
pmMap["labels"] = portMapping.Labels
pmMap["name"] = portMapping.Name
portMappings[idx] = pmMap
}
dockerMap["port_mappings"] = []interface{}{map[string]interface{}{"port_mapping": portMappings}}
Expand All @@ -698,13 +740,13 @@ func setSchemaFieldsForApp(app *marathon.Application, d *schema.ResourceData) {
volumeMap["container_path"] = volume.ContainerPath
volumeMap["host_path"] = volume.HostPath
volumeMap["mode"] = volume.Mode
volumeMap["external"] = volume.External
volumes[idx] = volumeMap
}
containerMap["volumes"] = []interface{}{map[string]interface{}{"volume": volumes}}
} else {
containerMap["volumes"] = make([]interface{}, 0)
containerMap["volumes"] = nil
}

d.Set("container", &[]interface{}{containerMap})
}
d.SetPartial("container")
Expand Down Expand Up @@ -757,6 +799,7 @@ func setSchemaFieldsForApp(app *marathon.Application, d *schema.ResourceData) {
hMap["max_consecutive_failures"] = healthCheck.MaxConsecutiveFailures
hMap["path"] = healthCheck.Path
hMap["port_index"] = healthCheck.PortIndex
hMap["port"] = healthCheck.Port
hMap["protocol"] = healthCheck.Protocol
hMap["timeout_seconds"] = healthCheck.TimeoutSeconds
healthChecks[idx] = hMap
Expand Down Expand Up @@ -794,6 +837,8 @@ func setSchemaFieldsForApp(app *marathon.Application, d *schema.ResourceData) {
hMap := make(map[string]interface{})
hMap["port"] = portDefinition.Port
hMap["protocol"] = portDefinition.Protocol
hMap["name"] = portDefinition.Name
hMap["labels"] = portDefinition.Labels
portDefinitions[idx] = hMap
}
d.Set("port_definitions", &[]interface{}{map[string]interface{}{"port_definition": portDefinitions}})
Expand Down Expand Up @@ -824,6 +869,9 @@ func setSchemaFieldsForApp(app *marathon.Application, d *schema.ResourceData) {
d.Set("kill_selection", app.KillSelection)
d.SetPartial("kill_selection")

d.Set("user", app.User)
d.SetPartial("user")

d.Set("uris", app.Uris)
d.SetPartial("uris")

Expand Down Expand Up @@ -1029,6 +1077,9 @@ func mutateResourceToApplication(d *schema.ResourceData) *marathon.Application {
if val, ok := pmMap["service_port"]; ok {
portMappings[i].ServicePort = val.(int)
}
if val, ok := pmMap["name"]; ok {
portMappings[i].Name = val.(string)
}

labelsMap := d.Get(fmt.Sprintf("container.0.docker.0.port_mappings.0.port_mapping.%d.labels", i)).(map[string]interface{})
labels := make(map[string]string, len(labelsMap))
Expand Down Expand Up @@ -1061,6 +1112,29 @@ func mutateResourceToApplication(d *schema.ResourceData) *marathon.Application {
if val, ok := volumeMap["mode"]; ok {
volumes[i].Mode = val.(string)
}

if volumeMap["external"] != nil {
externalMap := d.Get(fmt.Sprintf("container.0.volumes.0.volume.%d.external.0", i)).(map[string]interface{})
if len(externalMap) > 0 {
external := new(marathon.ExternalVolume)
if val, ok := externalMap["name"]; ok {
external.Name = val.(string)
}
if val, ok := externalMap["provider"]; ok {
external.Provider = val.(string)
}
if val, ok := externalMap["options"]; ok {
optionsMap := val.(map[string]interface{})
options := make(map[string]string, len(optionsMap))

for key, value := range optionsMap {
options[key] = value.(string)
}
external.Options = &options
}
volumes[i].External = external
}
}
}
container.Volumes = &volumes
}
Expand Down Expand Up @@ -1163,6 +1237,11 @@ func mutateResourceToApplication(d *schema.ResourceData) *marathon.Application {
}
}

if prop, ok := mapStruct["port"]; ok {
prop := prop.(int)
healthCheck.Port = &prop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will always set port to 0, which is wrong in case you're using portIndex.

I'd suggest to add an conditional to check if it's greater than 0.

			if prop, ok := mapStruct["port"]; ok {
				prop := prop.(int)
				if prop > 0 {
					healthCheck.Port = &prop
				}
			}

}

if prop, ok := mapStruct["timeout_seconds"]; ok {
healthCheck.TimeoutSeconds = prop.(int)
}
Expand Down Expand Up @@ -1245,6 +1324,17 @@ func mutateResourceToApplication(d *schema.ResourceData) *marathon.Application {
portDefinition.Protocol = prop.(string)
}

if prop, ok := mapStruct["name"]; ok {
portDefinition.Name = prop.(string)
}

labelsMap := d.Get(fmt.Sprintf("port_definitions.0.port_definition.%d.labels", i)).(map[string]interface{})
labels := make(map[string]string, len(labelsMap))
for key, value := range labelsMap {
labels[key] = value.(string)
}
portDefinition.Labels = &labels

portDefinitions[i] = *portDefinition
}

Expand Down Expand Up @@ -1293,6 +1383,11 @@ func mutateResourceToApplication(d *schema.ResourceData) *marathon.Application {
application.KillSelection = v
}

if v, ok := d.GetOk("user"); ok {
v := v.(string)
application.User = v
}

if v, ok := d.GetOk("uris.#"); ok {
uris := make([]string, v.(int))

Expand Down
9 changes: 8 additions & 1 deletion test/example.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ resource "marathon_app" "app-create-example" {
container_port = 161
host_port = 0
protocol = "udp"
name = "port_161"
}
}
}
Expand All @@ -44,8 +45,14 @@ resource "marathon_app" "app-create-example" {
}
volume {
container_path = "/etc/b"
host_path = "/var/data/b"
mode = "RW"
external {
name = "external-volume"
provider = "dvdi"
options {
"dvdi/driver" = "rexray"
}
}
}
}
}
Expand Down