From a8c0a70ec5445c2eec8270be69657308f6db43a2 Mon Sep 17 00:00:00 2001 From: Frederic Mbea <117131783+mbfreder@users.noreply.github.com> Date: Thu, 9 Jan 2025 15:54:53 -0800 Subject: [PATCH] update conditions in tests to fix lint failures (#3705) --- tests/translator/input/basic_application.yaml | 4 ++-- .../input/definition_body_intrinsics_support.yaml | 4 ++-- ...tion_with_deployment_preference_alarms_intrinsic_if.yaml | 4 ++-- tests/translator/input/s3_with_condition.yaml | 4 ++-- tests/translator/input/sns_intrinsics.yaml | 4 ++-- tests/translator/output/aws-cn/basic_application.json | 6 ++++-- .../output/aws-cn/definition_body_intrinsics_support.json | 6 ++++-- ...tion_with_deployment_preference_alarms_intrinsic_if.json | 6 ++++-- tests/translator/output/aws-cn/s3_with_condition.json | 6 ++++-- tests/translator/output/aws-cn/sns_intrinsics.json | 6 ++++-- tests/translator/output/aws-us-gov/basic_application.json | 6 ++++-- .../aws-us-gov/definition_body_intrinsics_support.json | 6 ++++-- ...tion_with_deployment_preference_alarms_intrinsic_if.json | 6 ++++-- tests/translator/output/aws-us-gov/s3_with_condition.json | 6 ++++-- tests/translator/output/aws-us-gov/sns_intrinsics.json | 6 ++++-- tests/translator/output/basic_application.json | 6 ++++-- .../output/definition_body_intrinsics_support.json | 6 ++++-- ...tion_with_deployment_preference_alarms_intrinsic_if.json | 6 ++++-- tests/translator/output/s3_with_condition.json | 6 ++++-- tests/translator/output/sns_intrinsics.json | 6 ++++-- 20 files changed, 70 insertions(+), 40 deletions(-) diff --git a/tests/translator/input/basic_application.yaml b/tests/translator/input/basic_application.yaml index e4b6a57c6..df773c7ad 100644 --- a/tests/translator/input/basic_application.yaml +++ b/tests/translator/input/basic_application.yaml @@ -1,8 +1,8 @@ Conditions: TestCondition: Fn::Equals: - - true - - false + - !Ref AWS::AccountId + - myAccountId Resources: BasicApplication: Type: AWS::Serverless::Application diff --git a/tests/translator/input/definition_body_intrinsics_support.yaml b/tests/translator/input/definition_body_intrinsics_support.yaml index d9f861483..5398c789c 100644 --- a/tests/translator/input/definition_body_intrinsics_support.yaml +++ b/tests/translator/input/definition_body_intrinsics_support.yaml @@ -13,8 +13,8 @@ Description: > Conditions: FalseCondition: Fn::Equals: - - true - - false + - !Ref AWS::AccountId + - myAccountId Resources: # Rest Api with DefinitionBody under If intrinsic, SwaggerEditor not used diff --git a/tests/translator/input/function_with_deployment_preference_alarms_intrinsic_if.yaml b/tests/translator/input/function_with_deployment_preference_alarms_intrinsic_if.yaml index 0519c75be..54204f7d9 100644 --- a/tests/translator/input/function_with_deployment_preference_alarms_intrinsic_if.yaml +++ b/tests/translator/input/function_with_deployment_preference_alarms_intrinsic_if.yaml @@ -1,8 +1,8 @@ Conditions: MyCondition: Fn::Equals: - - true - - false + - !Ref AWS::AccountId + - myAccountId Resources: MinimalFunction: Type: AWS::Serverless::Function diff --git a/tests/translator/input/s3_with_condition.yaml b/tests/translator/input/s3_with_condition.yaml index 648dab577..def3b0516 100644 --- a/tests/translator/input/s3_with_condition.yaml +++ b/tests/translator/input/s3_with_condition.yaml @@ -1,8 +1,8 @@ Conditions: MyCondition: Fn::Equals: - - true - - false + - !Ref AWS::AccountId + - myAccountId Resources: ThumbnailFunction: Type: AWS::Serverless::Function diff --git a/tests/translator/input/sns_intrinsics.yaml b/tests/translator/input/sns_intrinsics.yaml index 1b04eac6f..c1985ea21 100644 --- a/tests/translator/input/sns_intrinsics.yaml +++ b/tests/translator/input/sns_intrinsics.yaml @@ -6,8 +6,8 @@ Parameters: Conditions: MyCondition: Fn::Equals: - - true - - false + - !Ref AWS::AccountId + - myAccountId Resources: SaveNotificationFunction: diff --git a/tests/translator/output/aws-cn/basic_application.json b/tests/translator/output/aws-cn/basic_application.json index 96a827f8e..9a6715a06 100644 --- a/tests/translator/output/aws-cn/basic_application.json +++ b/tests/translator/output/aws-cn/basic_application.json @@ -2,8 +2,10 @@ "Conditions": { "TestCondition": { "Fn::Equals": [ - true, - false + { + "Ref": "AWS::AccountId" + }, + "myAccountId" ] } }, diff --git a/tests/translator/output/aws-cn/definition_body_intrinsics_support.json b/tests/translator/output/aws-cn/definition_body_intrinsics_support.json index 31d11e671..815040996 100644 --- a/tests/translator/output/aws-cn/definition_body_intrinsics_support.json +++ b/tests/translator/output/aws-cn/definition_body_intrinsics_support.json @@ -3,8 +3,10 @@ "Conditions": { "FalseCondition": { "Fn::Equals": [ - true, - false + { + "Ref": "AWS::AccountId" + }, + "myAccountId" ] } }, diff --git a/tests/translator/output/aws-cn/function_with_deployment_preference_alarms_intrinsic_if.json b/tests/translator/output/aws-cn/function_with_deployment_preference_alarms_intrinsic_if.json index 0ac77fded..06ebc8c74 100644 --- a/tests/translator/output/aws-cn/function_with_deployment_preference_alarms_intrinsic_if.json +++ b/tests/translator/output/aws-cn/function_with_deployment_preference_alarms_intrinsic_if.json @@ -2,8 +2,10 @@ "Conditions": { "MyCondition": { "Fn::Equals": [ - true, - false + { + "Ref": "AWS::AccountId" + }, + "myAccountId" ] } }, diff --git a/tests/translator/output/aws-cn/s3_with_condition.json b/tests/translator/output/aws-cn/s3_with_condition.json index ef09e27f2..07668fd62 100644 --- a/tests/translator/output/aws-cn/s3_with_condition.json +++ b/tests/translator/output/aws-cn/s3_with_condition.json @@ -2,8 +2,10 @@ "Conditions": { "MyCondition": { "Fn::Equals": [ - true, - false + { + "Ref": "AWS::AccountId" + }, + "myAccountId" ] } }, diff --git a/tests/translator/output/aws-cn/sns_intrinsics.json b/tests/translator/output/aws-cn/sns_intrinsics.json index 339eeabb0..b7a5bf1f9 100644 --- a/tests/translator/output/aws-cn/sns_intrinsics.json +++ b/tests/translator/output/aws-cn/sns_intrinsics.json @@ -2,8 +2,10 @@ "Conditions": { "MyCondition": { "Fn::Equals": [ - true, - false + { + "Ref": "AWS::AccountId" + }, + "myAccountId" ] } }, diff --git a/tests/translator/output/aws-us-gov/basic_application.json b/tests/translator/output/aws-us-gov/basic_application.json index 96a827f8e..9a6715a06 100644 --- a/tests/translator/output/aws-us-gov/basic_application.json +++ b/tests/translator/output/aws-us-gov/basic_application.json @@ -2,8 +2,10 @@ "Conditions": { "TestCondition": { "Fn::Equals": [ - true, - false + { + "Ref": "AWS::AccountId" + }, + "myAccountId" ] } }, diff --git a/tests/translator/output/aws-us-gov/definition_body_intrinsics_support.json b/tests/translator/output/aws-us-gov/definition_body_intrinsics_support.json index 31d11e671..815040996 100644 --- a/tests/translator/output/aws-us-gov/definition_body_intrinsics_support.json +++ b/tests/translator/output/aws-us-gov/definition_body_intrinsics_support.json @@ -3,8 +3,10 @@ "Conditions": { "FalseCondition": { "Fn::Equals": [ - true, - false + { + "Ref": "AWS::AccountId" + }, + "myAccountId" ] } }, diff --git a/tests/translator/output/aws-us-gov/function_with_deployment_preference_alarms_intrinsic_if.json b/tests/translator/output/aws-us-gov/function_with_deployment_preference_alarms_intrinsic_if.json index 78fd0079b..3df558e7c 100644 --- a/tests/translator/output/aws-us-gov/function_with_deployment_preference_alarms_intrinsic_if.json +++ b/tests/translator/output/aws-us-gov/function_with_deployment_preference_alarms_intrinsic_if.json @@ -2,8 +2,10 @@ "Conditions": { "MyCondition": { "Fn::Equals": [ - true, - false + { + "Ref": "AWS::AccountId" + }, + "myAccountId" ] } }, diff --git a/tests/translator/output/aws-us-gov/s3_with_condition.json b/tests/translator/output/aws-us-gov/s3_with_condition.json index 131966c88..26f07f157 100644 --- a/tests/translator/output/aws-us-gov/s3_with_condition.json +++ b/tests/translator/output/aws-us-gov/s3_with_condition.json @@ -2,8 +2,10 @@ "Conditions": { "MyCondition": { "Fn::Equals": [ - true, - false + { + "Ref": "AWS::AccountId" + }, + "myAccountId" ] } }, diff --git a/tests/translator/output/aws-us-gov/sns_intrinsics.json b/tests/translator/output/aws-us-gov/sns_intrinsics.json index c62f5064b..bb113418d 100644 --- a/tests/translator/output/aws-us-gov/sns_intrinsics.json +++ b/tests/translator/output/aws-us-gov/sns_intrinsics.json @@ -2,8 +2,10 @@ "Conditions": { "MyCondition": { "Fn::Equals": [ - true, - false + { + "Ref": "AWS::AccountId" + }, + "myAccountId" ] } }, diff --git a/tests/translator/output/basic_application.json b/tests/translator/output/basic_application.json index 96a827f8e..9a6715a06 100644 --- a/tests/translator/output/basic_application.json +++ b/tests/translator/output/basic_application.json @@ -2,8 +2,10 @@ "Conditions": { "TestCondition": { "Fn::Equals": [ - true, - false + { + "Ref": "AWS::AccountId" + }, + "myAccountId" ] } }, diff --git a/tests/translator/output/definition_body_intrinsics_support.json b/tests/translator/output/definition_body_intrinsics_support.json index 62d3e1d5e..a9f61fa1e 100644 --- a/tests/translator/output/definition_body_intrinsics_support.json +++ b/tests/translator/output/definition_body_intrinsics_support.json @@ -3,8 +3,10 @@ "Conditions": { "FalseCondition": { "Fn::Equals": [ - true, - false + { + "Ref": "AWS::AccountId" + }, + "myAccountId" ] } }, diff --git a/tests/translator/output/function_with_deployment_preference_alarms_intrinsic_if.json b/tests/translator/output/function_with_deployment_preference_alarms_intrinsic_if.json index ce1a33ffc..aef366be8 100644 --- a/tests/translator/output/function_with_deployment_preference_alarms_intrinsic_if.json +++ b/tests/translator/output/function_with_deployment_preference_alarms_intrinsic_if.json @@ -2,8 +2,10 @@ "Conditions": { "MyCondition": { "Fn::Equals": [ - true, - false + { + "Ref": "AWS::AccountId" + }, + "myAccountId" ] } }, diff --git a/tests/translator/output/s3_with_condition.json b/tests/translator/output/s3_with_condition.json index 7b0e41b0b..ec33d8cef 100644 --- a/tests/translator/output/s3_with_condition.json +++ b/tests/translator/output/s3_with_condition.json @@ -2,8 +2,10 @@ "Conditions": { "MyCondition": { "Fn::Equals": [ - true, - false + { + "Ref": "AWS::AccountId" + }, + "myAccountId" ] } }, diff --git a/tests/translator/output/sns_intrinsics.json b/tests/translator/output/sns_intrinsics.json index d4755e7d3..0c66b7991 100644 --- a/tests/translator/output/sns_intrinsics.json +++ b/tests/translator/output/sns_intrinsics.json @@ -2,8 +2,10 @@ "Conditions": { "MyCondition": { "Fn::Equals": [ - true, - false + { + "Ref": "AWS::AccountId" + }, + "myAccountId" ] } },