Skip to content

Commit 0fe43ba

Browse files
tommyhahntommyhahn
committed
app/agent.go: remove token from state file
1 parent 200de25 commit 0fe43ba

File tree

6 files changed

+27
-65
lines changed

6 files changed

+27
-65
lines changed

‎CHANGELOG.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Changelog
22

3-
## 1.22.1
3+
## 1.23.0-dev
44
* Bug - Fixed a bug where agent can register container instance back to back and gets
5-
assigned two container instance ARNs [#1579](https://github.com/aws/amazon-ecs-agent/pull/1579)
5+
assigned two container instance ARNs [#1711](https://github.com/aws/amazon-ecs-agent/pull/1711)
66

77
## 1.22.0
88
* Feature - Add support for ECS Secrets integrating with AWS Systems Manager Parameter Store

‎agent/app/agent.go

+6-14
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ type ecsAgent struct {
108108
terminationHandler sighandlers.TerminationHandler
109109
mobyPlugins mobypkgwrapper.Plugins
110110
resourceFields *taskresource.ResourceFields
111-
registrationToken string
112111
availabilityZone string
113112
}
114113

@@ -243,7 +242,7 @@ func (agent *ecsAgent) doStart(containerChangeEventStream *eventstream.EventStre
243242

244243
// Initialize the state manager
245244
stateManager, err := agent.newStateManager(taskEngine,
246-
&agent.cfg.Cluster, &agent.containerInstanceARN, &currentEC2InstanceID, &agent.availabilityZone, &agent.registrationToken)
245+
&agent.cfg.Cluster, &agent.containerInstanceARN, &currentEC2InstanceID, &agent.availabilityZone)
247246
if err != nil {
248247
seelog.Criticalf("Error creating state manager: %v", err)
249248
return exitcodes.ExitTerminal
@@ -325,15 +324,15 @@ func (agent *ecsAgent) newTaskEngine(containerChangeEventStream *eventstream.Eve
325324
}
326325

327326
// We try to set these values by loading the existing state file first
328-
var previousCluster, previousEC2InstanceID, previousContainerInstanceArn, previousAZ, previousRegistrationToken string
327+
var previousCluster, previousEC2InstanceID, previousContainerInstanceArn, previousAZ string
329328
previousTaskEngine := engine.NewTaskEngine(agent.cfg, agent.dockerClient,
330329
credentialsManager, containerChangeEventStream, imageManager, state,
331330
agent.metadataManager, agent.resourceFields)
332331

333332
// previousStateManager is used to verify that our current runtime configuration is
334333
// compatible with our past configuration as reflected by our state-file
335334
previousStateManager, err := agent.newStateManager(previousTaskEngine, &previousCluster,
336-
&previousContainerInstanceArn, &previousEC2InstanceID, &previousAZ, &previousRegistrationToken)
335+
&previousContainerInstanceArn, &previousEC2InstanceID, &previousAZ)
337336
if err != nil {
338337
seelog.Criticalf("Error creating state manager: %v", err)
339338
return nil, "", err
@@ -372,7 +371,6 @@ func (agent *ecsAgent) newTaskEngine(containerChangeEventStream *eventstream.Eve
372371

373372
// Use the values we loaded if there's no issue
374373
agent.containerInstanceARN = previousContainerInstanceArn
375-
agent.registrationToken = previousRegistrationToken
376374

377375
return previousTaskEngine, currentEC2InstanceID, nil
378376
}
@@ -419,7 +417,7 @@ func (agent *ecsAgent) newStateManager(
419417
cluster *string,
420418
containerInstanceArn *string,
421419
savedInstanceID *string,
422-
availabilityZone *string, registrationToken *string) (statemanager.StateManager, error) {
420+
availabilityZone *string) (statemanager.StateManager, error) {
423421

424422
if !agent.cfg.Checkpoint {
425423
return statemanager.NewNoopStateManager(), nil
@@ -434,7 +432,6 @@ func (agent *ecsAgent) newStateManager(
434432
// This is for making testing easier as we can mock this
435433
agent.saveableOptionFactory.AddSaveable("EC2InstanceID", savedInstanceID),
436434
agent.saveableOptionFactory.AddSaveable("availabilityZone", availabilityZone),
437-
agent.saveableOptionFactory.AddSaveable("RegistrationToken", registrationToken),
438435
)
439436
}
440437

@@ -483,18 +480,13 @@ func (agent *ecsAgent) registerContainerInstance(
483480
tags = mergeTags(tags, ec2Tags)
484481
}
485482

486-
if agent.registrationToken == "" {
487-
agent.registrationToken = uuid.New()
488-
stateManager.Save()
489-
}
490-
491483
if agent.containerInstanceARN != "" {
492484
seelog.Infof("Restored from checkpoint file. I am running as '%s' in cluster '%s'", agent.containerInstanceARN, agent.cfg.Cluster)
493-
return agent.reregisterContainerInstance(client, capabilities, tags, agent.registrationToken)
485+
return agent.reregisterContainerInstance(client, capabilities, tags, uuid.New())
494486
}
495487

496488
seelog.Info("Registering Instance with ECS")
497-
containerInstanceArn, availabilityZone, err := client.RegisterContainerInstance("", capabilities, tags, agent.registrationToken)
489+
containerInstanceArn, availabilityZone, err := client.RegisterContainerInstance("", capabilities, tags, uuid.New())
498490
if err != nil {
499491
seelog.Errorf("Error registering: %v", err)
500492
if retriable, ok := err.(apierrors.Retriable); ok && !retriable.Retry() {

‎agent/app/agent_compatibility_linux_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func TestCompatibilityEnabledSuccess(t *testing.T) {
4747

4848
gomock.InOrder(
4949
saveableOptionFactory.EXPECT().AddSaveable(gomock.Any(), gomock.Any()).AnyTimes(),
50-
stateManagerFactory.EXPECT().NewStateManager(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes().Return(stateManager, nil),
50+
stateManagerFactory.EXPECT().NewStateManager(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes().Return(stateManager, nil),
5151
stateManager.EXPECT().Load().AnyTimes(),
5252
state.EXPECT().AllTasks().Return([]*apitask.Task{}),
5353
)
@@ -79,7 +79,7 @@ func TestCompatibilityDefaultEnabledFail(t *testing.T) {
7979
}
8080
gomock.InOrder(
8181
saveableOptionFactory.EXPECT().AddSaveable(gomock.Any(), gomock.Any()).AnyTimes(),
82-
stateManagerFactory.EXPECT().NewStateManager(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes().Return(stateManager, nil),
82+
stateManagerFactory.EXPECT().NewStateManager(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes().Return(stateManager, nil),
8383
stateManager.EXPECT().Load().AnyTimes(),
8484
state.EXPECT().AllTasks().Return(getTaskListWithOneBadTask()),
8585
)
@@ -110,7 +110,7 @@ func TestCompatibilityExplicitlyEnabledFail(t *testing.T) {
110110
}
111111
gomock.InOrder(
112112
saveableOptionFactory.EXPECT().AddSaveable(gomock.Any(), gomock.Any()).AnyTimes(),
113-
stateManagerFactory.EXPECT().NewStateManager(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes().Return(stateManager, nil),
113+
stateManagerFactory.EXPECT().NewStateManager(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes().Return(stateManager, nil),
114114
stateManager.EXPECT().Load().AnyTimes(),
115115
state.EXPECT().AllTasks().Return(getTaskListWithOneBadTask()),
116116
)

‎agent/app/agent_test.go

+13-43
Original file line numberDiff line numberDiff line change
@@ -151,12 +151,11 @@ func TestDoStartNewTaskEngineError(t *testing.T) {
151151
saveableOptionFactory.EXPECT().AddSaveable("Cluster", gomock.Any()).Return(nil),
152152
saveableOptionFactory.EXPECT().AddSaveable("EC2InstanceID", gomock.Any()).Return(nil),
153153
saveableOptionFactory.EXPECT().AddSaveable("availabilityZone", gomock.Any()).Return(nil),
154-
saveableOptionFactory.EXPECT().AddSaveable("RegistrationToken", gomock.Any()).Return(nil),
154+
155155
// An error in creating the state manager should result in an
156156
// error from newTaskEngine as well
157-
stateManagerFactory.EXPECT().NewStateManager(gomock.Any(),
158-
gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(),
159-
).Return(
157+
stateManagerFactory.EXPECT().NewStateManager(gomock.Any(), gomock.Any(), gomock.Any(),
158+
gomock.Any(), gomock.Any(), gomock.Any()).Return(
160159
nil, errors.New("error")),
161160
)
162161

@@ -191,8 +190,7 @@ func TestDoStartNewStateManagerError(t *testing.T) {
191190
saveableOptionFactory.EXPECT().AddSaveable("Cluster", gomock.Any()).Return(nil),
192191
saveableOptionFactory.EXPECT().AddSaveable("EC2InstanceID", gomock.Any()).Return(nil),
193192
saveableOptionFactory.EXPECT().AddSaveable("availabilityZone", gomock.Any()).Return(nil),
194-
saveableOptionFactory.EXPECT().AddSaveable("RegistrationToken", gomock.Any()).Return(nil),
195-
stateManagerFactory.EXPECT().NewStateManager(gomock.Any(), gomock.Any(),
193+
stateManagerFactory.EXPECT().NewStateManager(gomock.Any(),
196194
gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(
197195
statemanager.NewNoopStateManager(), nil),
198196
state.EXPECT().AllTasks().AnyTimes(),
@@ -201,8 +199,7 @@ func TestDoStartNewStateManagerError(t *testing.T) {
201199
saveableOptionFactory.EXPECT().AddSaveable("Cluster", gomock.Any()).Return(nil),
202200
saveableOptionFactory.EXPECT().AddSaveable("EC2InstanceID", gomock.Any()).Return(nil),
203201
saveableOptionFactory.EXPECT().AddSaveable("availabilityZone", gomock.Any()).Return(nil),
204-
saveableOptionFactory.EXPECT().AddSaveable("RegistrationToken", gomock.Any()).Return(nil),
205-
stateManagerFactory.EXPECT().NewStateManager(gomock.Any(), gomock.Any(),
202+
stateManagerFactory.EXPECT().NewStateManager(gomock.Any(),
206203
gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(
207204
nil, errors.New("error")),
208205
)
@@ -385,13 +382,7 @@ func TestNewTaskEngineRestoreFromCheckpointNoEC2InstanceIDToLoadHappyPath(t *tes
385382
saveableOptionFactory.EXPECT().AddSaveable("Cluster", gomock.Any()).Return(nil),
386383
saveableOptionFactory.EXPECT().AddSaveable("EC2InstanceID", gomock.Any()).Return(nil),
387384
saveableOptionFactory.EXPECT().AddSaveable("availabilityZone", gomock.Any()).Return(nil),
388-
saveableOptionFactory.EXPECT().AddSaveable("RegistrationToken", gomock.Any()).Do(
389-
func(name string, saveable statemanager.Saveable) {
390-
previousRegistrationToken, ok := saveable.(*string)
391-
assert.True(t, ok)
392-
*previousRegistrationToken = "prev-reg-token"
393-
}).Return(nil),
394-
stateManagerFactory.EXPECT().NewStateManager(gomock.Any(), gomock.Any(),
385+
stateManagerFactory.EXPECT().NewStateManager(gomock.Any(),
395386
gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(
396387
statemanager.NewNoopStateManager(), nil),
397388
state.EXPECT().AllTasks().AnyTimes(),
@@ -415,7 +406,6 @@ func TestNewTaskEngineRestoreFromCheckpointNoEC2InstanceIDToLoadHappyPath(t *tes
415406
assert.NoError(t, err)
416407
assert.Equal(t, expectedInstanceID, instanceID)
417408
assert.Equal(t, "prev-container-inst", agent.containerInstanceARN)
418-
assert.Equal(t, "prev-reg-token", agent.registrationToken)
419409
}
420410

421411
func TestNewTaskEngineRestoreFromCheckpointPreviousEC2InstanceIDLoadedHappyPath(t *testing.T) {
@@ -448,13 +438,7 @@ func TestNewTaskEngineRestoreFromCheckpointPreviousEC2InstanceIDLoadedHappyPath(
448438
assert.True(t, ok)
449439
*previousAZ = "us-west-2b"
450440
}).Return(nil),
451-
saveableOptionFactory.EXPECT().AddSaveable("RegistrationToken", gomock.Any()).Do(
452-
func(name string, saveable statemanager.Saveable) {
453-
previousRegistrationToken, ok := saveable.(*string)
454-
assert.True(t, ok)
455-
*previousRegistrationToken = "prev-reg-token"
456-
}).Return(nil),
457-
stateManagerFactory.EXPECT().NewStateManager(gomock.Any(), gomock.Any(),
441+
stateManagerFactory.EXPECT().NewStateManager(gomock.Any(),
458442
gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(
459443
statemanager.NewNoopStateManager(), nil),
460444
state.EXPECT().AllTasks().AnyTimes(),
@@ -480,7 +464,6 @@ func TestNewTaskEngineRestoreFromCheckpointPreviousEC2InstanceIDLoadedHappyPath(
480464
assert.Equal(t, expectedInstanceID, instanceID)
481465
assert.NotEqual(t, "prev-container-inst", agent.containerInstanceARN)
482466
assert.NotEqual(t, "us-west-2b", agent.availabilityZone)
483-
assert.NotEqual(t, "prev-reg-token", agent.registrationToken)
484467
}
485468

486469
func TestNewTaskEngineRestoreFromCheckpointClusterIDMismatch(t *testing.T) {
@@ -509,9 +492,8 @@ func TestNewTaskEngineRestoreFromCheckpointClusterIDMismatch(t *testing.T) {
509492
}).Return(nil),
510493
saveableOptionFactory.EXPECT().AddSaveable("EC2InstanceID", gomock.Any()).Return(nil),
511494
saveableOptionFactory.EXPECT().AddSaveable("availabilityZone", gomock.Any()).Return(nil),
512-
saveableOptionFactory.EXPECT().AddSaveable("RegistrationToken", gomock.Any()).Return(nil),
513495

514-
stateManagerFactory.EXPECT().NewStateManager(gomock.Any(), gomock.Any(),
496+
stateManagerFactory.EXPECT().NewStateManager(gomock.Any(),
515497
gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(
516498
statemanager.NewNoopStateManager(), nil),
517499
state.EXPECT().AllTasks().AnyTimes(),
@@ -548,8 +530,7 @@ func TestNewTaskEngineRestoreFromCheckpointNewStateManagerError(t *testing.T) {
548530
saveableOptionFactory.EXPECT().AddSaveable("Cluster", gomock.Any()).Return(nil),
549531
saveableOptionFactory.EXPECT().AddSaveable("EC2InstanceID", gomock.Any()).Return(nil),
550532
saveableOptionFactory.EXPECT().AddSaveable("availabilityZone", gomock.Any()).Return(nil),
551-
saveableOptionFactory.EXPECT().AddSaveable("RegistrationToken", gomock.Any()).Return(nil),
552-
stateManagerFactory.EXPECT().NewStateManager(gomock.Any(), gomock.Any(),
533+
stateManagerFactory.EXPECT().NewStateManager(gomock.Any(),
553534
gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(
554535
nil, errors.New("error")),
555536
)
@@ -584,9 +565,8 @@ func TestNewTaskEngineRestoreFromCheckpointStateLoadError(t *testing.T) {
584565
saveableOptionFactory.EXPECT().AddSaveable("Cluster", gomock.Any()).Return(nil),
585566
saveableOptionFactory.EXPECT().AddSaveable("EC2InstanceID", gomock.Any()).Return(nil),
586567
saveableOptionFactory.EXPECT().AddSaveable("availabilityZone", gomock.Any()).Return(nil),
587-
saveableOptionFactory.EXPECT().AddSaveable("RegistrationToken", gomock.Any()).Return(nil),
588568
stateManagerFactory.EXPECT().NewStateManager(gomock.Any(),
589-
gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(),
569+
gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(),
590570
).Return(stateManager, nil),
591571
stateManager.EXPECT().Load().Return(errors.New("error")),
592572
)
@@ -622,9 +602,8 @@ func TestNewTaskEngineRestoreFromCheckpoint(t *testing.T) {
622602
saveableOptionFactory.EXPECT().AddSaveable("Cluster", gomock.Any()).Return(nil),
623603
saveableOptionFactory.EXPECT().AddSaveable("EC2InstanceID", gomock.Any()).Return(nil),
624604
saveableOptionFactory.EXPECT().AddSaveable("availabilityZone", gomock.Any()).Return(nil),
625-
saveableOptionFactory.EXPECT().AddSaveable("RegistrationToken", gomock.Any()).Return(nil),
626605
stateManagerFactory.EXPECT().NewStateManager(gomock.Any(),
627-
gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(),
606+
gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(),
628607
).Return(statemanager.NewNoopStateManager(), nil),
629608
state.EXPECT().AllTasks().AnyTimes(),
630609
ec2MetadataClient.EXPECT().InstanceID().Return(expectedInstanceID, nil),
@@ -697,9 +676,8 @@ func TestReregisterContainerInstanceHappyPath(t *testing.T) {
697676
mockMobyPlugins.EXPECT().Scan().AnyTimes().Return([]string{""}, nil),
698677
mockDockerClient.EXPECT().ListPluginsWithFilters(gomock.Any(), gomock.Any(),
699678
gomock.Any(), gomock.Any()).AnyTimes().Return([]string{}, nil),
700-
701-
stateManager.EXPECT().Save(),
702-
client.EXPECT().RegisterContainerInstance(containerInstanceARN, gomock.Any(), gomock.Any(), gomock.Any()).Return(containerInstanceARN, availabilityZone, nil),
679+
client.EXPECT().RegisterContainerInstance(containerInstanceARN, gomock.Any(),
680+
gomock.Any(), gomock.Any()).Return(containerInstanceARN, availabilityZone, nil),
703681
)
704682
cfg := getTestConfig()
705683
cfg.Cluster = clusterName
@@ -737,8 +715,6 @@ func TestReregisterContainerInstanceInstanceTypeChanged(t *testing.T) {
737715
mockMobyPlugins.EXPECT().Scan().AnyTimes().Return([]string{""}, nil),
738716
mockDockerClient.EXPECT().ListPluginsWithFilters(gomock.Any(), gomock.Any(),
739717
gomock.Any(), gomock.Any()).AnyTimes().Return([]string{}, nil),
740-
741-
stateManager.EXPECT().Save(),
742718
client.EXPECT().RegisterContainerInstance(containerInstanceARN, gomock.Any(), gomock.Any(), gomock.Any()).Return(
743719
"", "", awserr.New("", apierrors.InstanceTypeChangedErrorMessage, errors.New(""))),
744720
)
@@ -780,7 +756,6 @@ func TestReregisterContainerInstanceAttributeError(t *testing.T) {
780756
mockMobyPlugins.EXPECT().Scan().AnyTimes().Return([]string{}, nil),
781757
mockDockerClient.EXPECT().ListPluginsWithFilters(gomock.Any(), gomock.Any(),
782758
gomock.Any(), gomock.Any()).AnyTimes().Return([]string{}, nil),
783-
stateManager.EXPECT().Save(),
784759
client.EXPECT().RegisterContainerInstance(containerInstanceARN, gomock.Any(), gomock.Any(), gomock.Any()).Return(
785760
"", "", apierrors.NewAttributeError("error")),
786761
)
@@ -822,7 +797,6 @@ func TestReregisterContainerInstanceNonTerminalError(t *testing.T) {
822797
mockMobyPlugins.EXPECT().Scan().AnyTimes().Return([]string{}, nil),
823798
mockDockerClient.EXPECT().ListPluginsWithFilters(gomock.Any(), gomock.Any(),
824799
gomock.Any(), gomock.Any()).AnyTimes().Return([]string{}, nil),
825-
stateManager.EXPECT().Save(),
826800
client.EXPECT().RegisterContainerInstance(containerInstanceARN, gomock.Any(), gomock.Any(), gomock.Any()).Return(
827801
"", "", errors.New("error")),
828802
)
@@ -864,7 +838,6 @@ func TestRegisterContainerInstanceWhenContainerInstanceARNIsNotSetHappyPath(t *t
864838
mockMobyPlugins.EXPECT().Scan().AnyTimes().Return([]string{}, nil),
865839
mockDockerClient.EXPECT().ListPluginsWithFilters(gomock.Any(), gomock.Any(),
866840
gomock.Any(), gomock.Any()).AnyTimes().Return([]string{}, nil),
867-
stateManager.EXPECT().Save(),
868841
client.EXPECT().RegisterContainerInstance("", gomock.Any(), gomock.Any(), gomock.Any()).Return(containerInstanceARN, availabilityZone, nil),
869842
stateManager.EXPECT().Save(),
870843
)
@@ -905,7 +878,6 @@ func TestRegisterContainerInstanceWhenContainerInstanceARNIsNotSetCanRetryError(
905878
mockMobyPlugins.EXPECT().Scan().AnyTimes().Return([]string{}, nil),
906879
mockDockerClient.EXPECT().ListPluginsWithFilters(gomock.Any(), gomock.Any(),
907880
gomock.Any(), gomock.Any()).AnyTimes().Return([]string{}, nil),
908-
stateManager.EXPECT().Save(),
909881
client.EXPECT().RegisterContainerInstance("", gomock.Any(), gomock.Any(), gomock.Any()).Return("", "", retriableError),
910882
)
911883

@@ -945,7 +917,6 @@ func TestRegisterContainerInstanceWhenContainerInstanceARNIsNotSetCannotRetryErr
945917
mockMobyPlugins.EXPECT().Scan().AnyTimes().Return([]string{}, nil),
946918
mockDockerClient.EXPECT().ListPluginsWithFilters(gomock.Any(), gomock.Any(),
947919
gomock.Any(), gomock.Any()).AnyTimes().Return([]string{}, nil),
948-
stateManager.EXPECT().Save(),
949920
client.EXPECT().RegisterContainerInstance("", gomock.Any(), gomock.Any(), gomock.Any()).Return("", "", cannotRetryError),
950921
)
951922

@@ -984,7 +955,6 @@ func TestRegisterContainerInstanceWhenContainerInstanceARNIsNotSetAttributeError
984955
mockMobyPlugins.EXPECT().Scan().AnyTimes().Return([]string{}, nil),
985956
mockDockerClient.EXPECT().ListPluginsWithFilters(gomock.Any(), gomock.Any(),
986957
gomock.Any(), gomock.Any()).AnyTimes().Return([]string{}, nil),
987-
stateManager.EXPECT().Save(),
988958
client.EXPECT().RegisterContainerInstance("", gomock.Any(), gomock.Any(), gomock.Any()).Return(
989959
"", "", apierrors.NewAttributeError("error")),
990960
)

‎agent/app/agent_unix_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ func TestDoStartTaskENIHappyPath(t *testing.T) {
179179
dockerClient.EXPECT().ListPluginsWithFilters(gomock.Any(), gomock.Any(), gomock.Any(),
180180
gomock.Any()).Return([]string{}, nil),
181181
client.EXPECT().RegisterContainerInstance(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Do(
182-
func(x interface{}, attributes []*ecs.Attribute, y interface{}) {
182+
func(x interface{}, attributes []*ecs.Attribute, y interface{}, z interface{}) {
183183
vpcFound := false
184184
subnetFound := false
185185
for _, attribute := range attributes {

‎agent/statemanager/state_manager.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ const (
7171
// a) Add 'secrets' field to 'apicontainer.Container'
7272
// b) Add 'ssmsecret' field to 'resources'
7373
// 18) Add 'AvailabilityZone' field to the TaskResponse struct
74-
// 19) Add 'RegistrationToken'
75-
ECSDataVersion = 19
74+
75+
ECSDataVersion = 18
7676

7777
// ecsDataFile specifies the filename in the ECS_DATADIR
7878
ecsDataFile = "ecs_agent_data.json"

0 commit comments

Comments
 (0)