Remove restart strategy field

Author: sjmiller609

cmd/api/api/instances_test.go

@@ -717,7 +717,6 @@ func TestCreateInstance_MapsRestartPolicy(t *testing.T) {
 	svc.InstanceManager = mockMgr
 
 	policy := oapi.OnFailure
-	strategy := oapi.StopStart
 	backoff := "7s"
 	stableAfter := "2m"
 	maxAttempts := 4
@@ -728,7 +727,6 @@ func TestCreateInstance_MapsRestartPolicy(t *testing.T) {
 			Image: "docker.io/library/alpine:latest",
 			RestartPolicy: &oapi.RestartPolicy{
 				Policy:      &policy,
-				Strategy:    &strategy,
 				Backoff:     &backoff,
 				StableAfter: &stableAfter,
 				MaxAttempts: &maxAttempts,
@@ -742,7 +740,6 @@ func TestCreateInstance_MapsRestartPolicy(t *testing.T) {
 	require.NotNil(t, mockMgr.lastReq)
 	require.NotNil(t, mockMgr.lastReq.RestartPolicy)
 	assert.Equal(t, restartpolicy.PolicyOnFailure, mockMgr.lastReq.RestartPolicy.Policy)
-	assert.Equal(t, restartpolicy.StrategyStopStart, mockMgr.lastReq.RestartPolicy.Strategy)
 	assert.Equal(t, "7s", mockMgr.lastReq.RestartPolicy.Backoff)
 	assert.Equal(t, "2m0s", mockMgr.lastReq.RestartPolicy.StableAfter)
 	assert.Equal(t, 4, mockMgr.lastReq.RestartPolicy.MaxAttempts)
@@ -751,8 +748,6 @@ func TestCreateInstance_MapsRestartPolicy(t *testing.T) {
 	require.NotNil(t, instance.RestartPolicy)
 	require.NotNil(t, instance.RestartPolicy.Policy)
 	assert.Equal(t, oapi.OnFailure, *instance.RestartPolicy.Policy)
-	require.NotNil(t, instance.RestartPolicy.Strategy)
-	assert.Equal(t, oapi.StopStart, *instance.RestartPolicy.Strategy)
 }
 
 func TestUpdateInstance_MapsEnvPatch(t *testing.T) {
@@ -950,7 +945,6 @@ func TestUpdateInstance_MapsRestartPolicyPatch(t *testing.T) {
 				HypervisorType: hypervisor.TypeCloudHypervisor,
 				RestartPolicy: &restartpolicy.Policy{
 					Policy:      restartpolicy.PolicyAlways,
-					Strategy:    restartpolicy.StrategyStopStart,
 					Backoff:     "5s",
 					StableAfter: "10m0s",
 				},
@@ -964,7 +958,6 @@ func TestUpdateInstance_MapsRestartPolicyPatch(t *testing.T) {
 	svc.InstanceManager = mockMgr
 
 	policy := oapi.Always
-	strategy := oapi.StopStart
 	resolved := &instances.Instance{
 		StoredMetadata: instances.StoredMetadata{
 			Id:             "inst-update-restart-policy",
@@ -979,7 +972,7 @@ func TestUpdateInstance_MapsRestartPolicyPatch(t *testing.T) {
 	resp, err := svc.UpdateInstance(mw.WithResolvedInstance(ctx(), resolved.Id, resolved), oapi.UpdateInstanceRequestObject{
 		Id: resolved.Id,
 		Body: &oapi.UpdateInstanceRequest{
-			RestartPolicy: &oapi.RestartPolicy{Policy: &policy, Strategy: &strategy},
+			RestartPolicy: &oapi.RestartPolicy{Policy: &policy},
 		},
 	})
 	require.NoError(t, err)
@@ -990,12 +983,9 @@ func TestUpdateInstance_MapsRestartPolicyPatch(t *testing.T) {
 	assert.True(t, mockMgr.lastReq.RestartPolicySet)
 	require.NotNil(t, mockMgr.lastReq.RestartPolicy)
 	assert.Equal(t, restartpolicy.PolicyAlways, mockMgr.lastReq.RestartPolicy.Policy)
-	assert.Equal(t, restartpolicy.StrategyStopStart, mockMgr.lastReq.RestartPolicy.Strategy)
 
 	instance := oapi.Instance(updated)
 	require.NotNil(t, instance.RestartPolicy)
-	require.NotNil(t, instance.RestartPolicy.Strategy)
-	assert.Equal(t, oapi.StopStart, *instance.RestartPolicy.Strategy)
 	require.NotNil(t, instance.RestartStatus)
 	require.NotNil(t, instance.RestartStatus.BlockedReason)
 	assert.Equal(t, oapi.ManualStop, *instance.RestartStatus.BlockedReason)
@@ -1040,46 +1030,6 @@ func TestUpdateInstance_RejectsInvalidRestartPolicy(t *testing.T) {
 	assert.Nil(t, mockMgr.lastReq)
 }
 
-func TestUpdateInstance_RejectsUnsupportedRestartStrategy(t *testing.T) {
-	t.Parallel()
-	svc := newTestService(t)
-
-	origMgr := svc.InstanceManager
-	mockMgr := &captureUpdateManager{Manager: origMgr}
-	svc.InstanceManager = mockMgr
-
-	now := time.Now()
-	resolved := &instances.Instance{
-		StoredMetadata: instances.StoredMetadata{
-			Id:             "inst-update-restart-policy",
-			Name:           "inst-update-restart-policy",
-			Image:          "docker.io/library/alpine:latest",
-			CreatedAt:      now,
-			HypervisorType: hypervisor.TypeCloudHypervisor,
-		},
-		State: instances.StateStopped,
-	}
-	policy := oapi.OnFailure
-	strategy := oapi.DeleteCreate
-
-	resp, err := svc.UpdateInstance(mw.WithResolvedInstance(ctx(), resolved.Id, resolved), oapi.UpdateInstanceRequestObject{
-		Id: resolved.Id,
-		Body: &oapi.UpdateInstanceRequest{
-			RestartPolicy: &oapi.RestartPolicy{
-				Policy:   &policy,
-				Strategy: &strategy,
-			},
-		},
-	})
-	require.NoError(t, err)
-
-	badReq, ok := resp.(oapi.UpdateInstance400JSONResponse)
-	require.True(t, ok, "expected 400 response")
-	assert.Equal(t, "invalid_restart_policy", badReq.Code)
-	assert.Contains(t, badReq.Message, "delete_create is not supported yet")
-	assert.Nil(t, mockMgr.lastReq)
-}
-
 func TestUpdateInstance_RejectsZeroAutoStandbyIgnoreDestinationPort(t *testing.T) {
 	t.Parallel()
 	svc := newTestService(t)

cmd/api/api/restart_policy.go

@@ -15,9 +15,6 @@ func toDomainRestartPolicy(policy *oapi.RestartPolicy) (*restartpolicy.Policy, e
 	if policy.Policy != nil {
 		out.Policy = restartpolicy.PolicyMode(*policy.Policy)
 	}
-	if policy.Strategy != nil {
-		out.Strategy = restartpolicy.Strategy(*policy.Strategy)
-	}
 	if policy.Backoff != nil {
 		out.Backoff = *policy.Backoff
 	}
@@ -43,12 +40,6 @@ func toOAPIRestartPolicy(policy *restartpolicy.Policy) *oapi.RestartPolicy {
 	out := &oapi.RestartPolicy{
 		Policy: &mode,
 	}
-	strategy := policy.Strategy
-	if strategy == "" {
-		strategy = restartpolicy.StrategyStopStart
-	}
-	oapiStrategy := oapi.RestartPolicyStrategy(strategy)
-	out.Strategy = &oapiStrategy
 	if policy.Backoff != "" {
 		out.Backoff = lo.ToPtr(policy.Backoff)
 	}

lib/instances/network_test.go

@@ -263,7 +263,6 @@ func TestCreateInstanceWithNetwork(t *testing.T) {
 		},
 		RestartPolicy: &restartpolicy.Policy{
 			Policy:      restartpolicy.PolicyOnFailure,
-			Strategy:    restartpolicy.StrategyStopStart,
 			Backoff:     "1s",
 			MaxAttempts: 1,
 			StableAfter: "30s",
@@ -273,7 +272,6 @@ func TestCreateInstanceWithNetwork(t *testing.T) {
 	require.NoError(t, err)
 	require.NotNil(t, inst.RestartPolicy)
 	assert.Equal(t, restartpolicy.PolicyOnFailure, inst.RestartPolicy.Policy)
-	assert.Equal(t, restartpolicy.StrategyStopStart, inst.RestartPolicy.Strategy)
 
 	inst, err = waitForRestartPolicyBlocked(ctx, manager, inst.Id, restartpolicy.BlockedReasonMaxAttemptsExceeded, 60*time.Second)
 	require.NoError(t, err)

lib/instances/restart_policy.go

@@ -20,7 +20,6 @@ func cloneRestartPolicy(policy *restartpolicy.Policy) *restartpolicy.Policy {
 	}
 	return &restartpolicy.Policy{
 		Policy:      policy.Policy,
-		Strategy:    policy.Strategy,
 		Backoff:     policy.Backoff,
 		MaxAttempts: policy.MaxAttempts,
 		StableAfter: policy.StableAfter,