fix conflict

aws · Jan 23, 2025 · 47db0c7 · 47db0c7
1 parent c146c51
commit 47db0c7
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/agent/app/agent.go b/agent/app/agent.go
@@ -868,7 +868,7 @@ func (agent *ecsAgent) registerContainerInstance(
 			})
 			return terminalError{err}
 		}
-		if utils.IsAWSErrorCodeEqual(err, ecsmodel.ErrCodeClientException) {
+		if utils.IsAWSErrorCodeEqual(err, apierrors.ErrCodeClientException) {
 			logger.Critical("Instance registration attempt with client performing invalid action", logger.Fields{
 				field.Error: err,
 			})
@@ -916,13 +916,13 @@ func (agent *ecsAgent) reregisterContainerInstance(client ecs.ECSClient, capabil
 		seelog.Criticalf(instanceTypeMismatchErrorFormat, err)
 		return terminalError{err}
 	}
-	if utils.IsAWSErrorCodeEqual(err, ecsmodel.ErrCodeInvalidParameterException) {
+	if utils.IsAWSErrorCodeEqual(err, apierrors.ErrCodeInvalidParameterException) {
 		logger.Critical("Instance re-registration attempt with an invalid parameter", logger.Fields{
 			field.Error: err,
 		})
 		return terminalError{err}
 	}
-	if utils.IsAWSErrorCodeEqual(err, ecsmodel.ErrCodeClientException) {
+	if utils.IsAWSErrorCodeEqual(err, apierrors.ErrCodeClientException) {
 		logger.Critical("Instance re-registration attempt with client performing invalid action", logger.Fields{
 			field.Error: err,
 		})