Skip to content

Commit

Permalink
Revert "fix(aws-ecs): broken splunk-logging tag-option in fargate p…
Browse files Browse the repository at this point in the history
…latform version 1.4 (aws#13882)"

This reverts commit e9d9299.

Unfortunately the above commit leads to broken deployments that are
caused by behaviors upstream (i.e. in the ECS backend):

> Resource handler returned message: "Invalid request provided: Create TaskDefinition: Log driver splunk disallows options: splunk-tag (Service: AmazonECS; Status Code: 400; Error Code: ClientException; Request ID: d13abe56-36fa-4e81-b980-bf83789d4d0d; Proxy
: null)" (RequestToken: 546a74e2-a2eb-ef75-43e7-231fe8927096, HandlerErrorCode: InvalidRequest)

This means however, that the buggy behavior mentioned in aws#13881
persists.
  • Loading branch information
bweigel committed Mar 31, 2021
1 parent df5c133 commit eaf293a
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 32 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,6 @@ export class SplunkLogDriver extends LogDriver {
'splunk-verify-connection': this.props.verifyConnection,
'splunk-gzip': this.props.gzip,
'splunk-gzip-level': this.props.gzipLevel,
'splunk-tag': this.props.tag,
...renderCommonLogDriverOptions(this.props),
}),
};
Expand Down
31 changes: 0 additions & 31 deletions packages/@aws-cdk/aws-ecs/test/splunk-log-driver.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -103,35 +103,4 @@ nodeunitShim({

test.done();
},

'create a splunk log driver using splunk-tag property when tag is defined'(test: Test) {
// WHEN
td.addContainer('Container', {
image,
logging: ecs.LogDrivers.splunk({
token: cdk.SecretValue.secretsManager('my-splunk-token'),
url: 'my-splunk-url',
tag: 'abc',
}),
memoryLimitMiB: 128,
});

// THEN
expect(stack).to(haveResourceLike('AWS::ECS::TaskDefinition', {
ContainerDefinitions: [
{
LogConfiguration: {
LogDriver: 'splunk',
Options: {
'splunk-token': '{{resolve:secretsmanager:my-splunk-token:SecretString:::}}',
'splunk-url': 'my-splunk-url',
'splunk-tag': 'abc',
},
},
},
],
}));

test.done();
},
});

0 comments on commit eaf293a

Please sign in to comment.