ContainerRestartPolicy ACS and TCS models, TMDS updates (#4158)

* ACS model update * go mod vendor agent dir * Add RestartStatSet to tcs model * go mod vendor in agent dir * Update TMDS v4 response * go mod vendor in tmds v4 changes
aws · Apr 25, 2024 · 52e85d5 · 52e85d5
1 parent 960b7ed
commit 52e85d5
Show file tree

Hide file tree

Showing 8 changed files with 142 additions and 6 deletions.
diff --git a/agent/vendor/github.com/aws/amazon-ecs-agent/ecs-agent/acs/model/ecsacs/api.go b/agent/vendor/github.com/aws/amazon-ecs-agent/ecs-agent/acs/model/ecsacs/api.go
diff --git a/agent/vendor/github.com/aws/amazon-ecs-agent/ecs-agent/tcs/model/ecstcs/api.go b/agent/vendor/github.com/aws/amazon-ecs-agent/ecs-agent/tcs/model/ecstcs/api.go
diff --git a/agent/vendor/github.com/aws/amazon-ecs-agent/ecs-agent/tmds/handlers/v4/state/response.go b/agent/vendor/github.com/aws/amazon-ecs-agent/ecs-agent/tmds/handlers/v4/state/response.go
diff --git a/ecs-agent/acs/model/api/api-2.json b/ecs-agent/acs/model/api/api-2.json
@@ -311,9 +311,22 @@
         "startTimeout":{"shape":"Integer"},
         "stopTimeout":{"shape":"Integer"},
         "firelensConfiguration":{"shape":"FirelensConfiguration"},
-        "containerArn":{"shape":"String"}
+        "containerArn":{"shape":"String"},
+        "containerRestartPolicy":{"shape":"ContainerRestartPolicy"}
       }
     },
+    "ContainerRestartPolicy":{
+      "type":"structure",
+      "members":{
+        "enabled":{"shape":"Boolean"},
+        "ignoredExitCodes":{"shape":"IntegerList"},
+        "restartAttemptPeriod":{"shape":"Integer"}
+      }
+    },
+    "IntegerList":{
+      "type":"list",
+      "member":{"shape":"Integer"}
+    },
     "ContainerCondition":{
       "type":"string",
       "enum":[

diff --git a/ecs-agent/acs/model/ecsacs/api.go b/ecs-agent/acs/model/ecsacs/api.go
diff --git a/ecs-agent/tcs/model/api/api-2.json b/ecs-agent/tcs/model/api/api-2.json
@@ -135,7 +135,14 @@
         "cpuStatsSet":{"shape":"CWStatsSet"},
         "memoryStatsSet":{"shape":"CWStatsSet"},
         "networkStatsSet":{"shape":"NetworkStatsSet"},
-        "storageStatsSet":{"shape":"StorageStatsSet"}
+        "storageStatsSet":{"shape":"StorageStatsSet"},
+        "restartStatsSet":{"shape":"RestartStatsSet"}
+      }
+    },
+    "RestartStatsSet":{
+      "type":"structure",
+	  "members":{
+        "restartCount":{"shape":"UInteger"}
       }
     },
     "ContainerMetrics":{

diff --git a/ecs-agent/tcs/model/ecstcs/api.go b/ecs-agent/tcs/model/ecstcs/api.go
diff --git a/ecs-agent/tmds/handlers/v4/state/response.go b/ecs-agent/tmds/handlers/v4/state/response.go
@@ -57,8 +57,10 @@ type EphemeralStorageMetrics struct {
 // with the v2 container response object.
 type ContainerResponse struct {
 	*v2.ContainerResponse
-	Networks    []Network `json:"Networks,omitempty"`
-	Snapshotter string    `json:"Snapshotter,omitempty"`
+	Networks      []Network `json:"Networks,omitempty"`
+	Snapshotter   string    `json:"Snapshotter,omitempty"`
+	RestartCount  int       `json:"RestartCount,omitempty"`
+	LastRestartAt time.Time `json:"LastRestartAt,omitempty"`
 }
 
 // Network is the v4 Network response. It adds a bunch of information about network