@@ -774,25 +774,11 @@ describe('AwsMetricAttributeGeneratorTest', () => {
774774 validateRemoteResourceAttributes ( 'AWS::Kinesis::Stream' , 'AWS_KINESIS_STREAM_NAME' ) ;
775775 mockAttribute ( AWS_ATTRIBUTE_KEYS . AWS_KINESIS_STREAM_NAME , undefined ) ;
776776
777- // Validate behaviour of AWS_KINESIS_STREAM_NAME attribute with special chars, then remove it.
778- mockAttribute ( AWS_ATTRIBUTE_KEYS . AWS_KINESIS_STREAM_NAME , 'kinesis-stream|with^chars' ) ;
779- validateRemoteResourceAttributes ( 'AWS::Kinesis::Stream' , 'kinesis-stream^|with^^chars' ) ;
780- mockAttribute ( AWS_ATTRIBUTE_KEYS . AWS_KINESIS_STREAM_NAME , undefined ) ;
781-
782777 // Validate behaviour of AWS_SNS_TOPIC_ARN attribute then remove it.
783778 mockAttribute ( AWS_ATTRIBUTE_KEYS . AWS_SNS_TOPIC_ARN , 'arn:aws:sns:us-east-1:123456789012:testTopic' ) ;
784779 validateRemoteResourceAttributes ( 'AWS::SNS::Topic' , 'testTopic' , 'arn:aws:sns:us-east-1:123456789012:testTopic' ) ;
785780 mockAttribute ( AWS_ATTRIBUTE_KEYS . AWS_SNS_TOPIC_ARN , undefined ) ;
786781
787- // Validate behaviour of AWS_SNS_TOPIC_ARN attribute with special chars, then remove it.
788- mockAttribute ( AWS_ATTRIBUTE_KEYS . AWS_SNS_TOPIC_ARN , 'arn:aws:sns:us-east-1:123456789012:test|Topic^name' ) ;
789- validateRemoteResourceAttributes (
790- 'AWS::SNS::Topic' ,
791- 'test^|Topic^^name' ,
792- 'arn:aws:sns:us-east-1:123456789012:test^|Topic^^name'
793- ) ;
794- mockAttribute ( AWS_ATTRIBUTE_KEYS . AWS_SNS_TOPIC_ARN , undefined ) ;
795-
796782 // Validate behaviour of AWS_SECRETSMANAGER_SECRET_ARN attributes then remove it.
797783 mockAttribute (
798784 AWS_ATTRIBUTE_KEYS . AWS_SECRETSMANAGER_SECRET_ARN ,
@@ -805,18 +791,6 @@ describe('AwsMetricAttributeGeneratorTest', () => {
805791 ) ;
806792 mockAttribute ( AWS_ATTRIBUTE_KEYS . AWS_SECRETSMANAGER_SECRET_ARN , undefined ) ;
807793
808- // Validate behaviour of AWS_SECRETSMANAGER_SECRET_ARN attribute with special chars, then remove it.
809- mockAttribute (
810- AWS_ATTRIBUTE_KEYS . AWS_SECRETSMANAGER_SECRET_ARN ,
811- 'arn:aws:secretsmanager:us-east-1:123456789123:secret:test|Secret^name'
812- ) ;
813- validateRemoteResourceAttributes (
814- 'AWS::SecretsManager::Secret' ,
815- 'test^|Secret^^name' ,
816- 'arn:aws:secretsmanager:us-east-1:123456789123:secret:test^|Secret^^name'
817- ) ;
818- mockAttribute ( AWS_ATTRIBUTE_KEYS . AWS_SECRETSMANAGER_SECRET_ARN , undefined ) ;
819-
820794 // Validate behaviour of AWS_LAMBDA_FUNCTION_NAME and AWS_LAMBDA_FUNCTION_ARN
821795 mockAttribute ( AWS_ATTRIBUTE_KEYS . AWS_LAMBDA_FUNCTION_NAME , 'aws_lambda_function_name' ) ;
822796 mockAttribute (
@@ -831,30 +805,11 @@ describe('AwsMetricAttributeGeneratorTest', () => {
831805 mockAttribute ( AWS_ATTRIBUTE_KEYS . AWS_LAMBDA_FUNCTION_NAME , undefined ) ;
832806 mockAttribute ( AWS_ATTRIBUTE_KEYS . AWS_LAMBDA_FUNCTION_ARN , undefined ) ;
833807
834- // Validate behaviour of AWS_LAMBDA_FUNCTION_NAME with special chars
835- mockAttribute ( AWS_ATTRIBUTE_KEYS . AWS_LAMBDA_FUNCTION_NAME , 'lambda|function^name' ) ;
836- mockAttribute (
837- AWS_ATTRIBUTE_KEYS . AWS_LAMBDA_FUNCTION_ARN ,
838- 'arn:aws:lambda:us-east-1:123456789012:function:lambda|function^name'
839- ) ;
840- validateRemoteResourceAttributes (
841- 'AWS::Lambda::Function' ,
842- 'lambda^|function^^name' ,
843- 'arn:aws:lambda:us-east-1:123456789012:function:lambda^|function^^name'
844- ) ;
845- mockAttribute ( AWS_ATTRIBUTE_KEYS . AWS_LAMBDA_FUNCTION_NAME , undefined ) ;
846- mockAttribute ( AWS_ATTRIBUTE_KEYS . AWS_LAMBDA_FUNCTION_ARN , undefined ) ;
847-
848808 // Validate behaviour of AWS_LAMBDA_RESOURCE_MAPPING_ID attribute then remove it.
849809 mockAttribute ( AWS_ATTRIBUTE_KEYS . AWS_LAMBDA_RESOURCE_MAPPING_ID , 'aws_lambda_resource_mapping_id' ) ;
850810 validateRemoteResourceAttributes ( 'AWS::Lambda::EventSourceMapping' , 'aws_lambda_resource_mapping_id' ) ;
851811 mockAttribute ( AWS_ATTRIBUTE_KEYS . AWS_LAMBDA_RESOURCE_MAPPING_ID , undefined ) ;
852812
853- // Validate behaviour of AWS_LAMBDA_RESOURCE_MAPPING_ID attribute with special chars, then remove it.
854- mockAttribute ( AWS_ATTRIBUTE_KEYS . AWS_LAMBDA_RESOURCE_MAPPING_ID , 'mapping|id^test' ) ;
855- validateRemoteResourceAttributes ( 'AWS::Lambda::EventSourceMapping' , 'mapping^|id^^test' ) ;
856- mockAttribute ( AWS_ATTRIBUTE_KEYS . AWS_LAMBDA_RESOURCE_MAPPING_ID , undefined ) ;
857-
858813 // Validate behaviour of AWS_STEPFUNCTIONS_STATEMACHINE_ARN and AWS_STEPFUNCTIONS_ACTIVITY_ARN attributes then remove them.
859814 mockAttribute (
860815 AWS_ATTRIBUTE_KEYS . AWS_STEPFUNCTIONS_STATEMACHINE_ARN ,
@@ -867,18 +822,6 @@ describe('AwsMetricAttributeGeneratorTest', () => {
867822 ) ;
868823 mockAttribute ( AWS_ATTRIBUTE_KEYS . AWS_STEPFUNCTIONS_STATEMACHINE_ARN , undefined ) ;
869824
870- // Validate behaviour of AWS_STEPFUNCTIONS_STATEMACHINE_ARN attribute with special chars, then remove it.
871- mockAttribute (
872- AWS_ATTRIBUTE_KEYS . AWS_STEPFUNCTIONS_STATEMACHINE_ARN ,
873- 'arn:aws:states:us-east-1:123456789123:stateMachine:test|State^Machine'
874- ) ;
875- validateRemoteResourceAttributes (
876- 'AWS::StepFunctions::StateMachine' ,
877- 'test^|State^^Machine' ,
878- 'arn:aws:states:us-east-1:123456789123:stateMachine:test^|State^^Machine'
879- ) ;
880- mockAttribute ( AWS_ATTRIBUTE_KEYS . AWS_STEPFUNCTIONS_STATEMACHINE_ARN , undefined ) ;
881-
882825 mockAttribute (
883826 AWS_ATTRIBUTE_KEYS . AWS_STEPFUNCTIONS_ACTIVITY_ARN ,
884827 'arn:aws:states:us-east-1:123456789123:activity:testActivity'
@@ -890,18 +833,6 @@ describe('AwsMetricAttributeGeneratorTest', () => {
890833 ) ;
891834 mockAttribute ( AWS_ATTRIBUTE_KEYS . AWS_STEPFUNCTIONS_ACTIVITY_ARN , undefined ) ;
892835
893- // Validate behaviour of AWS_STEPFUNCTIONS_ACTIVITY_ARN attribute with special chars, then remove it.
894- mockAttribute (
895- AWS_ATTRIBUTE_KEYS . AWS_STEPFUNCTIONS_ACTIVITY_ARN ,
896- 'arn:aws:states:us-east-1:123456789123:activity:test|Activity^name'
897- ) ;
898- validateRemoteResourceAttributes (
899- 'AWS::StepFunctions::Activity' ,
900- 'test^|Activity^^name' ,
901- 'arn:aws:states:us-east-1:123456789123:activity:test^|Activity^^name'
902- ) ;
903- mockAttribute ( AWS_ATTRIBUTE_KEYS . AWS_STEPFUNCTIONS_ACTIVITY_ARN , undefined ) ;
904-
905836 // Validate behaviour of AWS_TABLE_NAMES attribute with one table name, then remove it.
906837 mockAttribute ( AWS_ATTRIBUTE_KEYS . AWS_DYNAMODB_TABLE_NAMES , [ 'aws_table_name' ] ) ;
907838 validateRemoteResourceAttributes ( 'AWS::DynamoDB::Table' , 'aws_table_name' ) ;
0 commit comments