[tor-commits] [metrics-cloud/master] cfn: Removes unnecessary !Sub's cf #31414

[irl at torproject.org]

commit dfa2b97cda8c39cd453dd773c907f321231ced29
Author: Iain R. Learmonth <irl at fsfe.org>
Date:   Wed Mar 25 14:22:29 2020 +0000

    cfn: Removes unnecessary !Sub's cf #31414
---
 cloudformation/metrics-monitor.yml | 10 +++++-----
 cloudformation/onionoo-dev.yml     |  8 ++++----
 cloudformation/onionperf-dev.yml   | 10 +++++-----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/cloudformation/metrics-monitor.yml b/cloudformation/metrics-monitor.yml
index e8ed210..a3398f0 100644
--- a/cloudformation/metrics-monitor.yml
+++ b/cloudformation/metrics-monitor.yml
@@ -12,14 +12,14 @@ Resources:
       ImageId: ami-01db78123b2b99496
       InstanceType: t2.micro
       SubnetId:
-        Fn::ImportValue: !Sub 'MetricsSubnet'
+        Fn::ImportValue: 'MetricsSubnet'
       IamInstanceProfile: !Ref AlerterInstanceProfile
       KeyName: "irl yubikey 4"
       SecurityGroupIds:
-        - Fn::ImportValue: !Sub 'MetricsInternetSecurityGroup'
-        - Fn::ImportValue: !Sub 'MetricsPingableSecurityGroup'
-        - Fn::ImportValue: !Sub 'MetricsHTTPSecurityGroup'
-        - Fn::ImportValue: !Sub 'MetricsHTTPSSecurityGroup'
+        - Fn::ImportValue: 'MetricsInternetSecurityGroup'
+        - Fn::ImportValue: 'MetricsPingableSecurityGroup'
+        - Fn::ImportValue: 'MetricsHTTPSecurityGroup'
+        - Fn::ImportValue: 'MetricsHTTPSSecurityGroup'
   AlertContact:
     Type: AWS::SNS::Topic
     Properties:
diff --git a/cloudformation/onionoo-dev.yml b/cloudformation/onionoo-dev.yml
index a635466..d7baa53 100644
--- a/cloudformation/onionoo-dev.yml
+++ b/cloudformation/onionoo-dev.yml
@@ -15,12 +15,12 @@ Resources:
       ImageId: ami-01db78123b2b99496
       InstanceType: t2.large
       SubnetId:
-        Fn::ImportValue: !Sub 'MetricsSubnet'
+        Fn::ImportValue: 'MetricsSubnet'
       KeyName: !Ref myKeyPair
       SecurityGroupIds:
-        - Fn::ImportValue: !Sub 'MetricsInternetSecurityGroup'
-        - Fn::ImportValue: !Sub 'MetricsPingableSecurityGroup'
-        - Fn::ImportValue: !Sub 'MetricsHTTPASecurityGroup'
+        - Fn::ImportValue: 'MetricsInternetSecurityGroup'
+        - Fn::ImportValue: 'MetricsPingableSecurityGroup'
+        - Fn::ImportValue: 'MetricsHTTPASecurityGroup'
   ServiceVolume:
     Type: AWS::EC2::Volume
     Properties: 
diff --git a/cloudformation/onionperf-dev.yml b/cloudformation/onionperf-dev.yml
index 474b8c2..ddaffd2 100644
--- a/cloudformation/onionperf-dev.yml
+++ b/cloudformation/onionperf-dev.yml
@@ -15,14 +15,14 @@ Resources:
       ImageId: ami-01db78123b2b99496
       InstanceType: t2.micro
       SubnetId:
-        Fn::ImportValue: !Sub 'MetricsSubnet'
+        Fn::ImportValue: 'MetricsSubnet'
       KeyName:
         Ref: myKeyPair
       SecurityGroupIds:
-        - Fn::ImportValue: !Sub 'MetricsInternetSecurityGroup'
-        - Fn::ImportValue: !Sub 'MetricsPingableSecurityGroup'
-        - Fn::ImportValue: !Sub 'MetricsHTTPSecurityGroup'
-        - Fn::ImportValue: !Sub 'MetricsHTTPSSecurityGroup'
+        - Fn::ImportValue: 'MetricsInternetSecurityGroup'
+        - Fn::ImportValue: 'MetricsPingableSecurityGroup'
+        - Fn::ImportValue: 'MetricsHTTPSecurityGroup'
+        - Fn::ImportValue: 'MetricsHTTPSSecurityGroup'
   OnionperfDNS:
     Type: AWS::Route53::RecordSet
     Properties: