Allow --create-log-groups when only some containers use awslogs

PettitWesley · PettitWesley · commit b841c6cdca39 · 2019-01-17T14:30:56.000-08:00
diff --git a/ecs-cli/modules/cli/logs/logs_app.go b/ecs-cli/modules/cli/logs/logs_app.go
@@ -309,6 +309,9 @@ func logConfigMisMatchError(taskDef *ecs.TaskDefinition, fieldName string) error
 // CreateLogGroups creates any needed log groups for the task definition to use CloudWatch Logs
 func CreateLogGroups(taskDef *ecs.TaskDefinition, logClientFactory cwlogsclient.LogClientFactory) error {
 	for _, container := range taskDef.ContainerDefinitions {
+		if container.LogConfiguration == nil || container.LogConfiguration.LogDriver == nil || aws.StringValue(container.LogConfiguration.LogDriver) != "awslogs" {
+			continue
+		}
 		logConfig, err := getContainerLogConfig(container)
 		if err != nil {
 			return err
diff --git a/ecs-cli/modules/cli/logs/logs_app_test.go b/ecs-cli/modules/cli/logs/logs_app_test.go
@@ -438,17 +438,24 @@ func TestCreateLogGroupsTwoContainers(t *testing.T) {
 	assert.NoError(t, err, "Unexpected error in call to CreateLogGroups()")
 }
 
-func TestCreateLogGroupsWrongDriver(t *testing.T) {
+func TestCreateLogGroupsOneContainerWrongDriver(t *testing.T) {
 	taskDef := dummyTaskDef([]*ecs.ContainerDefinition{
-		dummyContainerDef(logRegion1, logGroup1, logPrefix1, "catsanddogslogger", containerName, containerImage),
+		dummyContainerDef(logRegion1, logGroup1, logPrefix1, "awslogs", containerName, containerImage),
+		dummyContainerDef(logRegion2, logGroup2, logPrefix1, "catsanddogslogger", containerName, containerImage),
 	})
 
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 	mockLogFactory := mock_cloudwatchlogs.NewMockLogClientFactory(ctrl)
+	mockLogClient := mock_cloudwatchlogs.NewMockClient(ctrl)
+
+	gomock.InOrder(
+		mockLogFactory.EXPECT().Get(logRegion1).Return(mockLogClient),
+		mockLogClient.EXPECT().CreateLogGroup(gomock.Any()),
+	)
 
 	err := CreateLogGroups(taskDef, mockLogFactory)
-	assert.Error(t, err, "Expected error in call to CreateLogGroups()")
+	assert.NoError(t, err, "Unexpected error in call to CreateLogGroups()")
 }
 
 func TestCreateLogGroupsLogGroupAlreadyExists(t *testing.T) {
