Merge pull request #1326 from shin-/compose-json-annotations

Allow marshalling of Compose config to JSON

Author: thaJeztah

cli/command/stack/kubernetes/convert.go

@@ -222,7 +222,7 @@ func fromComposeServiceConfig(s composeTypes.ServiceConfig) v1beta2.ServiceConfi
 		ReadOnly:        s.ReadOnly,
 		Secrets:         fromComposeServiceSecrets(s.Secrets),
 		StdinOpen:       s.StdinOpen,
-		StopGracePeriod: s.StopGracePeriod,
+		StopGracePeriod: composetypes.ConvertDurationPtr(s.StopGracePeriod),
 		Tmpfs:           s.Tmpfs,
 		Tty:             s.Tty,
 		User:            userID,
@@ -285,8 +285,8 @@ func fromComposeHealthcheck(h *composeTypes.HealthCheckConfig) *v1beta2.HealthCh
 	}
 	return &v1beta2.HealthCheckConfig{
 		Test:     h.Test,
-		Timeout:  h.Timeout,
-		Interval: h.Interval,
+		Timeout:  composetypes.ConvertDurationPtr(h.Timeout),
+		Interval: composetypes.ConvertDurationPtr(h.Interval),
 		Retries:  h.Retries,
 	}
 }

cli/command/stack/kubernetes/warnings_test.go

@@ -10,7 +10,7 @@ import (
 )
 
 func TestWarnings(t *testing.T) {
-	duration := 5 * time.Second
+	duration := composetypes.Duration(5 * time.Second)
 	attempts := uint64(3)
 	config := &composetypes.Config{
 		Version: "3.4",
@@ -26,9 +26,9 @@ func TestWarnings(t *testing.T) {
 				DependsOn:      []string{"ignored"},
 				Deploy: composetypes.DeployConfig{
 					UpdateConfig: &composetypes.UpdateConfig{
-						Delay:           5 * time.Second,
+						Delay:           composetypes.Duration(5 * time.Second),
 						FailureAction:   "rollback",
-						Monitor:         10 * time.Second,
+						Monitor:         composetypes.Duration(10 * time.Second),
 						MaxFailureRatio: 0.5,
 					},
 					RestartPolicy: &composetypes.RestartPolicy{

cli/compose/convert/service.go

@@ -141,7 +141,7 @@ func Service(
 				Dir:             service.WorkingDir,
 				User:            service.User,
 				Mounts:          mounts,
-				StopGracePeriod: service.StopGracePeriod,
+				StopGracePeriod: composetypes.ConvertDurationPtr(service.StopGracePeriod),
 				StopSignal:      service.StopSignal,
 				TTY:             service.Tty,
 				OpenStdin:       service.StdinOpen,
@@ -414,13 +414,13 @@ func convertHealthcheck(healthcheck *composetypes.HealthCheckConfig) (*container
 
 	}
 	if healthcheck.Timeout != nil {
-		timeout = *healthcheck.Timeout
+		timeout = time.Duration(*healthcheck.Timeout)
 	}
 	if healthcheck.Interval != nil {
-		interval = *healthcheck.Interval
+		interval = time.Duration(*healthcheck.Interval)
 	}
 	if healthcheck.StartPeriod != nil {
-		startPeriod = *healthcheck.StartPeriod
+		startPeriod = time.Duration(*healthcheck.StartPeriod)
 	}
 	if healthcheck.Retries != nil {
 		retries = int(*healthcheck.Retries)
@@ -458,11 +458,12 @@ func convertRestartPolicy(restart string, source *composetypes.RestartPolicy) (*
 			return nil, errors.Errorf("unknown restart policy: %s", restart)
 		}
 	}
+
 	return &swarm.RestartPolicy{
 		Condition:   swarm.RestartPolicyCondition(source.Condition),
-		Delay:       source.Delay,
+		Delay:       composetypes.ConvertDurationPtr(source.Delay),
 		MaxAttempts: source.MaxAttempts,
-		Window:      source.Window,
+		Window:      composetypes.ConvertDurationPtr(source.Window),
 	}, nil
 }
 
@@ -476,9 +477,9 @@ func convertUpdateConfig(source *composetypes.UpdateConfig) *swarm.UpdateConfig
 	}
 	return &swarm.UpdateConfig{
 		Parallelism:     parallel,
-		Delay:           source.Delay,
+		Delay:           time.Duration(source.Delay),
 		FailureAction:   source.FailureAction,
-		Monitor:         source.Monitor,
+		Monitor:         time.Duration(source.Monitor),
 		MaxFailureRatio: source.MaxFailureRatio,
 		Order:           source.Order,
 	}

cli/compose/convert/service_test.go

@@ -124,8 +124,8 @@ func TestConvertResourcesOnlyMemory(t *testing.T) {
 
 func TestConvertHealthcheck(t *testing.T) {
 	retries := uint64(10)
-	timeout := 30 * time.Second
-	interval := 2 * time.Millisecond
+	timeout := composetypes.Duration(30 * time.Second)
+	interval := composetypes.Duration(2 * time.Millisecond)
 	source := &composetypes.HealthCheckConfig{
 		Test:     []string{"EXEC", "touch", "/foo"},
 		Timeout:  &timeout,
@@ -134,8 +134,8 @@ func TestConvertHealthcheck(t *testing.T) {
 	}
 	expected := &container.HealthConfig{
 		Test:     source.Test,
-		Timeout:  timeout,
-		Interval: interval,
+		Timeout:  time.Duration(timeout),
+		Interval: time.Duration(interval),
 		Retries:  10,
 	}