fix conflict after rebase

aws · Jan 23, 2025 · 84b24b0 · 84b24b0
1 parent 292e885
commit 84b24b0
Show file tree

Hide file tree

Showing 4 changed files with 49 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,
 		})

diff --git a/agent/vendor/github.com/aws/amazon-ecs-agent/ecs-agent/api/errors/errors.go b/agent/vendor/github.com/aws/amazon-ecs-agent/ecs-agent/api/errors/errors.go
diff --git a/ecs-agent/api/errors/errors.go b/ecs-agent/api/errors/errors.go
@@ -39,6 +39,8 @@ const (
 	ErrCodeResourceNotFoundException = "ResourceNotFoundException"
 
 	ErrCodeRequestCanceled = "RequestCanceled"
+
+	ErrCodeClientException = "ClientException"
 )
 
 // IsInstanceTypeChangedError returns true if the error when

diff --git a/scripts/amazon-ssm-agent.gpg b/scripts/amazon-ssm-agent.gpg
@@ -92,3 +92,45 @@ n2uX/TP3LCyH/MsrNJrJOQnMYFRLQitciP0E+F+eA3v9CY6mDuyb8JSx5HuGGUsG
 S4bKBOcA8vimEpwPoT8CE7fdsZ3Qkwdu+pw=
 =zr5w
 -----END PGP PUBLIC KEY BLOCK-----
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+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
+E6+O8RI2451Dcg==
+=aDkv
+-----END PGP PUBLIC KEY BLOCK-----