functional tests for volume metadata in introspection endpoints

aws · Aug 21, 2018 · f7df7f4 · f7df7f4
1 parent 6315a3c
commit f7df7f4
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 14 deletions.
diff --git a/...ctional_tests/testdata/taskdefinitions/agent-introspection-validator/task-definition.json b/...ctional_tests/testdata/taskdefinitions/agent-introspection-validator/task-definition.json
@@ -12,6 +12,21 @@
             "awslogs-region":"$$$TEST_REGION$$$",
             "awslogs-stream-prefix":"ecs-functional-tests-agent-introspection-validator"
         }
-    }
-  }]
+    },
+    "mountPoints": [
+        {
+          "sourceVolume": "task-local",
+          "containerPath": "/ecs/"
+        }
+    ]
+    }],
+    "volumes":[
+        {
+            "name": "task-local",
+            "dockerVolumeConfiguration" :{
+                "scope": "task",
+                "driver": "local"
+            }
+        }
+    ]
 }
diff --git a/...ctional_tests/testdata/taskdefinitions/taskmetadata-validator-awsvpc/task-definition.json b/...ctional_tests/testdata/taskdefinitions/taskmetadata-validator-awsvpc/task-definition.json
@@ -19,6 +19,21 @@
             "awslogs-region":"$$$TEST_REGION$$$",
             "awslogs-stream-prefix":"ecs-functional-tests-taskmetadata-validator"
         }
-    }
-  }]
+    },
+    "mountPoints": [
+        {
+          "sourceVolume": "task-local",
+          "containerPath": "/ecs/"
+        }
+    ]
+  }],
+  "volumes":[
+      {
+          "name": "task-local",
+          "dockerVolumeConfiguration" :{
+              "scope": "task",
+              "driver": "local"
+          }
+      }
+  ]
 }
diff --git a/agent/functional_tests/tests/functionaltests_unix_test.go b/agent/functional_tests/tests/functionaltests_unix_test.go
@@ -627,7 +627,7 @@ func TestAgentIntrospectionValidator(t *testing.T) {
 	defer agent.Cleanup()
 	// The Agent version was 1.14.2 when we added changes to agent introspection
 	// endpoint feature for the last time.
-	agent.RequireVersion(">1.14.1")
+	agent.RequireVersion(">1.20.1")
 
 	tdOverrides := make(map[string]string)
 	tdOverrides["$$$TEST_REGION$$$"] = *ECS.Config.Region
@@ -663,7 +663,7 @@ func TestTaskMetadataValidator(t *testing.T) {
 		},
 	})
 	defer agent.Cleanup()
-	agent.RequireVersion(">1.16.2")
+	agent.RequireVersion(">1.20.1")
 
 	tdOverrides := make(map[string]string)
 	tdOverrides["$$$TEST_REGION$$$"] = *ECS.Config.Region

diff --git a/misc/agent-introspection-validator/agent-introspection-validator.go b/misc/agent-introspection-validator/agent-introspection-validator.go
@@ -50,11 +50,12 @@ type TasksResponse struct {
 
 // ContainerResponse is the schema for the container response JSON object
 type ContainerResponse struct {
-	DockerID   string         `json:"DockerId"`
-	DockerName string         `json:"DockerName"`
-	Name       string         `json:"Name"`
-	Ports      []PortResponse `json:"Ports,omitempty"`
-	Networks   Network        `json:"Networks,omitempty"`
+	DockerID   string           `json:"DockerId"`
+	DockerName string           `json:"DockerName"`
+	Name       string           `json:"Name"`
+	Ports      []PortResponse   `json:"Ports,omitempty"`
+	Networks   Network          `json:"Networks,omitempty"`
+	Volumes    []VolumeResponse `json:"Volumes,omitempty"`
 }
 
 // PortResponse defines the schema for portmapping response JSON
@@ -72,6 +73,13 @@ type Network struct {
 	IPv6Addresses []string `json:"IPv6Addresses,omitempty"`
 }
 
+// VolumeResponse is the schema for the volume response JSON object
+type VolumeResponse struct {
+	DockerName  string `json:"DockerName,omitempty"`
+	Source      string `json:"Source,omitempty"`
+	Destination string `json:"Destination,omitempty"`
+}
+
 func getTasksMetadata(client *http.Client, path string) (*TasksResponse, error) {
 	body, err := metadataResponse(client, path, tasksMetadataRespType)
 	if err != nil {
@@ -188,7 +196,7 @@ func verifyContainerMetadata(containerMetadataRawMsg json.RawMessage) error {
 	}
 
 	var actualContainerName string
-	json.Unmarshal(containerMetadataMap["Name"] ,&actualContainerName)
+	json.Unmarshal(containerMetadataMap["Name"], &actualContainerName)
 
 	if actualContainerName != containerName {
 		return fmt.Errorf("incorrect container name, expected %s, received %s",
@@ -203,6 +211,10 @@ func verifyContainerMetadata(containerMetadataRawMsg json.RawMessage) error {
 		return notEmptyErrMsg("DockerName")
 	}
 
+	if containerMetadataMap["Volumes"] == nil {
+		return notEmptyErrMsg("Volumes")
+	}
+
 	return nil
 }
 

diff --git a/misc/taskmetadata-validator/taskmetadata-validator.go b/misc/taskmetadata-validator/taskmetadata-validator.go
@@ -61,8 +61,9 @@ type ContainerResponse struct {
 	StartedAt     *time.Time `json:",omitempty"`
 	FinishedAt    *time.Time `json:",omitempty"`
 	Type          string
-	Health        HealthStatus `json:"health,omitempty"`
-	Networks      []Network    `json:",omitempty"`
+	Health        HealthStatus     `json:"health,omitempty"`
+	Networks      []Network        `json:",omitempty"`
+	Volumes       []VolumeResponse `json:"Volumes,omitempty"`
 }
 
 type HealthStatus struct {
@@ -94,6 +95,13 @@ type Network struct {
 	IPv6Addresses []string `json:"IPv6Addresses,omitempty"`
 }
 
+// VolumeResponse is the schema for the volume response JSON object
+type VolumeResponse struct {
+	DockerName  string `json:"DockerName,omitempty"`
+	Source      string `json:"Source,omitempty"`
+	Destination string `json:"Destination,omitempty"`
+}
+
 func taskMetadata(client *http.Client) (*TaskResponse, error) {
 	body, err := metadataResponse(client, v2MetadataEndpoint, "task metadata")
 	if err != nil {
@@ -243,6 +251,11 @@ func main() {
 		}
 	}
 
+	if containerMetadata.Volumes == nil {
+		fmt.Fprintf(os.Stderr, "Expected container volume metadata to be non-empty")
+		os.Exit(1)
+	}
+
 	_, err = taskStats(client)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Unable to get task stats: %v", err)