From af1baab5b6a69eb8a010a3f353f330bb1b3c5074 Mon Sep 17 00:00:00 2001 From: John Draper Date: Wed, 22 Feb 2023 20:45:59 -0500 Subject: [PATCH 1/4] Update SimpleExampleNoTags.yaml --- 01 Introduction to CloudFormation/SimpleExampleNoTags.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/01 Introduction to CloudFormation/SimpleExampleNoTags.yaml b/01 Introduction to CloudFormation/SimpleExampleNoTags.yaml index 2e6cbe1..a474147 100644 --- a/01 Introduction to CloudFormation/SimpleExampleNoTags.yaml +++ b/01 Introduction to CloudFormation/SimpleExampleNoTags.yaml @@ -4,3 +4,10 @@ Resources: Properties: InstanceType: t2.micro ImageId: ami-467ca739 # Amazon Linux AMI in N.Virginia +<<<<<<< Updated upstream +======= + Tags: + - key: Name + Value: A simple example + ### Quick update to test automation +>>>>>>> Stashed changes From 64548023eb23ddaf2165547e60326e31465c51eb Mon Sep 17 00:00:00 2001 From: John Draper Date: Wed, 22 Feb 2023 20:55:54 -0500 Subject: [PATCH 2/4] changes to CF --- 01 Introduction to CloudFormation/SimpleExample.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/01 Introduction to CloudFormation/SimpleExample.yaml b/01 Introduction to CloudFormation/SimpleExample.yaml index 6b1ae00..ec96499 100644 --- a/01 Introduction to CloudFormation/SimpleExample.yaml +++ b/01 Introduction to CloudFormation/SimpleExample.yaml @@ -7,3 +7,4 @@ Resources: Tags: - Key: Name Value: A simple example +#### this is a test of the CF automation. \ No newline at end of file From ca0eef2ff31d3327d822d0c755a619a16e288379 Mon Sep 17 00:00:00 2001 From: John Draper Date: Wed, 22 Feb 2023 21:08:47 -0500 Subject: [PATCH 3/4] commit example --- 01 Introduction to CloudFormation/SimpleExample.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/01 Introduction to CloudFormation/SimpleExample.yaml b/01 Introduction to CloudFormation/SimpleExample.yaml index ec96499..6b5fb8d 100644 --- a/01 Introduction to CloudFormation/SimpleExample.yaml +++ b/01 Introduction to CloudFormation/SimpleExample.yaml @@ -6,5 +6,5 @@ Resources: ImageId: ami-467ca739 # Amazon Linux AMI in N.Virginia Tags: - Key: Name - Value: A simple example -#### this is a test of the CF automation. \ No newline at end of file + Value: A simple change bro! +#### this is a test of the CF automation \ No newline at end of file From b5157d11db477a97bc24b1dbc6c1d545a43034fe Mon Sep 17 00:00:00 2001 From: John Draper Date: Mon, 6 Mar 2023 23:50:37 -0500 Subject: [PATCH 4/4] intrinsic functions update test --- 01 Introduction to CloudFormation/SimpleExample.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/01 Introduction to CloudFormation/SimpleExample.yaml b/01 Introduction to CloudFormation/SimpleExample.yaml index 6b5fb8d..ca3fd71 100644 --- a/01 Introduction to CloudFormation/SimpleExample.yaml +++ b/01 Introduction to CloudFormation/SimpleExample.yaml @@ -6,5 +6,5 @@ Resources: ImageId: ami-467ca739 # Amazon Linux AMI in N.Virginia Tags: - Key: Name - Value: A simple change bro! + Value: !Join [ " ", [ I, love, big, Drape ] ] #### this is a test of the CF automation \ No newline at end of file