From 07e17c95256586367820e09fb9fbca2b6424291e Mon Sep 17 00:00:00 2001 From: Loren Gordon Date: Tue, 30 Jul 2019 12:15:42 -0400 Subject: [PATCH 1/3] Updates log stream names to more standardized pattern --- ...cb_fileserver_standalone.template.cfn.yaml | 30 +++++++++++-------- ...rdgw_autoscale_public_lb.template.cfn.yaml | 20 ++++++++----- ...sh_autoscale_internal_lb.template.cfn.yaml | 22 +++++++++----- 3 files changed, 45 insertions(+), 27 deletions(-) diff --git a/templates/ra_rdcb_fileserver_standalone.template.cfn.yaml b/templates/ra_rdcb_fileserver_standalone.template.cfn.yaml index d253d637..b630eff8 100644 --- a/templates/ra_rdcb_fileserver_standalone.template.cfn.yaml +++ b/templates/ra_rdcb_fileserver_standalone.template.cfn.yaml @@ -563,13 +563,19 @@ Resources: { "file_path": "c:\\ProgramData\\Amazon\\AmazonCloudWatchAgent\\Logs\\amazon-cloudwatch-agent.log", "log_group_name": "${local_InstanceLogGroup}", - "log_stream_name": "cloudwatch_agent_logs_{instance_id}", + "log_stream_name": "{instance_id}//c/ProgramData/Amazon/AmazonCloudWatchAgent/Logs/amazon-cloudwatch-agent.log", "timestamp_format": "%H:%M:%S %y %b %-d" }, { "file_path": "c:\\cfn\\log\\cfn-init.log", "log_group_name": "${local_InstanceLogGroup}", - "log_stream_name": "cloudformation_init_logs_{instance_id}", + "log_stream_name": "{instance_id}//c/cfn/log/cfn-init.log", + "timestamp_format": "%H:%M:%S %y %b %-d" + }, + { + "file_path": "c:\\cfn\\log\\cfn-init-cmd.log", + "log_group_name": "${local_InstanceLogGroup}", + "log_stream_name": "{instance_id}//c/cfn/log/cfn-init-cmd.log", "timestamp_format": "%H:%M:%S %y %b %-d" } ] @@ -578,37 +584,37 @@ Resources: "collect_list" : [ { "event_name": "System", - "event_levels": ["WARNING","ERROR"], + "event_levels": ["WARNING", "ERROR", "INFORMATION"], "log_group_name": "${local_InstanceLogGroup}", - "log_stream_name": "Windows_System_{instance_id}", + "log_stream_name": "{instance_id}//EventLog/System", "event_format": "text" }, { "event_name": "Application", - "event_levels": ["WARNING","ERROR"], + "event_levels": ["WARNING", "ERROR", "INFORMATION"], "log_group_name": "${local_InstanceLogGroup}", - "log_stream_name": "Windows_Application_{instance_id}", + "log_stream_name": "{instance_id}//EventLog/Application", "event_format": "text" }, { "event_name": "Microsoft-Rdms-UI/Operational", - "event_levels": ["WARNING","ERROR", "INFORMATION"], + "event_levels": ["WARNING", "ERROR", "INFORMATION"], "log_group_name": "${local_InstanceLogGroup}", - "log_stream_name": "MS-Rdms-UI/Oper_{instance_id}", + "log_stream_name": "{instance_id}//EventLog/MS-Rdms-UI/Operational", "event_format": "text" }, { "event_name": "Microsoft-Windows-TerminalServices-SessionBroker/Operational", - "event_levels": ["WARNING","ERROR", "INFORMATION"], + "event_levels": ["WARNING", "ERROR", "INFORMATION"], "log_group_name": "${local_InstanceLogGroup}", - "log_stream_name": "Microsoft-Windows-TerminalServices-SessionBroker/Operational_{instance_id}", + "log_stream_name": "{instance_id}//EventLog/Microsoft-Windows-TerminalServices-SessionBroker/Operational", "event_format": "text" }, { "event_name": "Microsoft-Rdms-UI/Admin", - "event_levels": ["WARNING","ERROR", "INFORMATION"], + "event_levels": ["WARNING", "ERROR", "INFORMATION"], "log_group_name": "${local_InstanceLogGroup}", - "log_stream_name": "MS-Rdms-UI/Admin_{instance_id}", + "log_stream_name": "{instance_id}//EventLog/MS-Rdms-UI/Admin", "event_format": "text" } ] diff --git a/templates/ra_rdgw_autoscale_public_lb.template.cfn.yaml b/templates/ra_rdgw_autoscale_public_lb.template.cfn.yaml index 41ea925a..e288ba5c 100644 --- a/templates/ra_rdgw_autoscale_public_lb.template.cfn.yaml +++ b/templates/ra_rdgw_autoscale_public_lb.template.cfn.yaml @@ -431,13 +431,19 @@ Resources: { "file_path": "c:\\ProgramData\\Amazon\\AmazonCloudWatchAgent\\Logs\\amazon-cloudwatch-agent.log", "log_group_name": "${local_InstanceLogGroup}", - "log_stream_name": "cloudwatch_agent_logs_{instance_id}", + "log_stream_name": "{instance_id}//c/ProgramData/Amazon/AmazonCloudWatchAgent/Logs/amazon-cloudwatch-agent.log", "timestamp_format": "%H:%M:%S %y %b %-d" }, { "file_path": "c:\\cfn\\log\\cfn-init.log", "log_group_name": "${local_InstanceLogGroup}", - "log_stream_name": "cloudformation_init_logs_{instance_id}", + "log_stream_name": "{instance_id}//c/cfn/log/cfn-init.log", + "timestamp_format": "%H:%M:%S %y %b %-d" + }, + { + "file_path": "c:\\cfn\\log\\cfn-init-cmd.log", + "log_group_name": "${local_InstanceLogGroup}", + "log_stream_name": "{instance_id}//c/cfn/log/cfn-init-cmd.log", "timestamp_format": "%H:%M:%S %y %b %-d" } ] @@ -446,23 +452,23 @@ Resources: "collect_list" : [ { "event_name": "System", - "event_levels": ["WARNING","ERROR"], + "event_levels": ["WARNING", "ERROR", "INFORMATION"], "log_group_name": "${local_InstanceLogGroup}", - "log_stream_name": "Windows_System_{instance_id}", + "log_stream_name": "{instance_id}//EventLog/System", "event_format": "text" }, { "event_name": "Application", - "event_levels": ["WARNING","ERROR"], + "event_levels": ["WARNING", "ERROR", "INFORMATION"], "log_group_name": "${local_InstanceLogGroup}", - "log_stream_name": "Windows_Application_{instance_id}", + "log_stream_name": "{instance_id}//EventLog/Application", "event_format": "text" }, { "event_name": "Microsoft-Windows-TerminalServices-Gateway/Operational", "event_levels": ["WARNING","ERROR", "INFORMATION"], "log_group_name": "${local_InstanceLogGroup}", - "log_stream_name": "RDGW_Connections_{instance_id}", + "log_stream_name": "{instance_id}//EventLog/Microsoft-Windows-TerminalServices-Gateway/Operational", "event_format": "text" } ] diff --git a/templates/ra_rdsh_autoscale_internal_lb.template.cfn.yaml b/templates/ra_rdsh_autoscale_internal_lb.template.cfn.yaml index d229ab56..9589f359 100644 --- a/templates/ra_rdsh_autoscale_internal_lb.template.cfn.yaml +++ b/templates/ra_rdsh_autoscale_internal_lb.template.cfn.yaml @@ -492,13 +492,19 @@ Resources: { "file_path": "c:\\ProgramData\\Amazon\\AmazonCloudWatchAgent\\Logs\\amazon-cloudwatch-agent.log", "log_group_name": "${local_InstanceLogGroup}", - "log_stream_name": "cloudwatch_agent_logs_{instance_id}", + "log_stream_name": "{instance_id}//c/ProgramData/Amazon/AmazonCloudWatchAgent/Logs/amazon-cloudwatch-agent.log", "timestamp_format": "%H:%M:%S %y %b %-d" }, { "file_path": "c:\\cfn\\log\\cfn-init.log", "log_group_name": "${local_InstanceLogGroup}", - "log_stream_name": "cloudformation_init_logs_{instance_id}", + "log_stream_name": "{instance_id}//c/cfn/log/cfn-init.log", + "timestamp_format": "%H:%M:%S %y %b %-d" + }, + { + "file_path": "c:\\cfn\\log\\cfn-init-cmd.log", + "log_group_name": "${local_InstanceLogGroup}", + "log_stream_name": "{instance_id}//c/cfn/log/cfn-init-cmd.log", "timestamp_format": "%H:%M:%S %y %b %-d" } ] @@ -507,23 +513,23 @@ Resources: "collect_list" : [ { "event_name": "System", - "event_levels": ["WARNING","ERROR"], + "event_levels": ["WARNING", "ERROR", "INFORMATION"], "log_group_name": "${local_InstanceLogGroup}", - "log_stream_name": "Windows_System_{instance_id}", + "log_stream_name": "{instance_id}//EventLog/System", "event_format": "text" }, { "event_name": "Application", - "event_levels": ["WARNING","ERROR"], + "event_levels": ["WARNING", "ERROR", "INFORMATION"], "log_group_name": "${local_InstanceLogGroup}", - "log_stream_name": "Windows_Application_{instance_id}", + "log_stream_name": "{instance_id}//EventLog/Application", "event_format": "text" }, { "event_name": "Microsoft-Windows-TerminalServices-SessionBroker-Client/Operational", - "event_levels": ["WARNING","ERROR", "INFORMATION"], + "event_levels": ["WARNING", "ERROR", "INFORMATION"], "log_group_name": "${local_InstanceLogGroup}", - "log_stream_name": "RDSH_Connections_{instance_id}", + "log_stream_name": "{instance_id}//EventLog/Microsoft-Windows-TerminalServices-SessionBroker-Client/Operational", "event_format": "text" } ] From 5ac92841e855973755cc9ed3ae4d213517c49f69 Mon Sep 17 00:00:00 2001 From: Loren Gordon Date: Tue, 30 Jul 2019 12:16:42 -0400 Subject: [PATCH 2/3] Bumps version to 0.3.4 --- .bumpversion.cfg | 2 +- templates/db_mssql_alwayson.template.cfn.json | 2 +- templates/db_rds_mysql_audit_plugin.element.template.cfn.json | 2 +- templates/ds_ad_primary_dc.element.template.cfn.json | 2 +- templates/ds_ad_private_hosted_zone.element.template.cfn.json | 2 +- templates/ds_ad_replica_dc.element.template.cfn.json | 2 +- templates/ds_ad_security_groups.element.template.cfn.json | 2 +- templates/ds_dhcp_options.element.template.cfn.json | 2 +- templates/ds_singleaz_ad.compound.template.cfn.json | 2 +- templates/es_service_domain.element.template.cfn.json | 2 +- templates/nw_create_peer_role.element.template.cfn.json | 2 +- .../nw_dualaz_multitier_nat_with_eni.compound.template.cfn.json | 2 +- .../nw_dualaz_multitier_natgateway.compound.template.cfn.json | 2 +- templates/nw_nat_gateway.element.template.cfn.json | 2 +- templates/nw_nat_with_eni.element.template.cfn.json | 2 +- templates/nw_peered_sg.element.template.cfn.json | 2 +- templates/nw_private_subnet.element.template.cfn.json | 2 +- templates/nw_public_subnet.element.template.cfn.json | 2 +- templates/nw_r53_peered_domain.element.template.cfn.json | 2 +- ...w_singleaz_multitier_nat_with_eni.compound.template.cfn.json | 2 +- .../nw_singleaz_multitier_natgateway.compound.template.cfn.json | 2 +- ...w_tripleaz_multitier_nat_with_eni.compound.template.cfn.json | 2 +- .../nw_tripleaz_multitier_natgateway.compound.template.cfn.json | 2 +- templates/nw_vpc_peering_connection.element.template.cfn.json | 2 +- templates/nw_vpc_with_igw.element.template.cfn.json | 2 +- templates/ra_guac_autoscale_public_alb.template.cfn.yaml | 2 +- templates/ra_rdcb_fileserver_ha.template.cfn.json | 2 +- templates/ra_rdcb_fileserver_standalone.template.cfn.yaml | 2 +- templates/ra_rdgw_autoscale_public_lb.template.cfn.yaml | 2 +- templates/ra_rdsh_autoscale_internal_lb.template.cfn.yaml | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 197fc20e..58b05a2c 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.3.3 +current_version = 0.3.4 commit = True message = Bumps version to {new_version} tag = False diff --git a/templates/db_mssql_alwayson.template.cfn.json b/templates/db_mssql_alwayson.template.cfn.json index d07c1887..935d1e8a 100644 --- a/templates/db_mssql_alwayson.template.cfn.json +++ b/templates/db_mssql_alwayson.template.cfn.json @@ -298,7 +298,7 @@ } } }, - "Version": "0.3.3" + "Version": "0.3.4" }, "Outputs": { "MssqlNode1InstanceId": { diff --git a/templates/db_rds_mysql_audit_plugin.element.template.cfn.json b/templates/db_rds_mysql_audit_plugin.element.template.cfn.json index 711dacea..c730dd20 100644 --- a/templates/db_rds_mysql_audit_plugin.element.template.cfn.json +++ b/templates/db_rds_mysql_audit_plugin.element.template.cfn.json @@ -2,7 +2,7 @@ "AWSTemplateFormatVersion": "2010-09-09", "Description": "This template deploys a MySQL RDS instance", "Metadata": { - "Version": "0.3.3" + "Version": "0.3.4" }, "Outputs": { "JDBCConnectionString": { diff --git a/templates/ds_ad_primary_dc.element.template.cfn.json b/templates/ds_ad_primary_dc.element.template.cfn.json index feb0fe0d..cee4dd41 100644 --- a/templates/ds_ad_primary_dc.element.template.cfn.json +++ b/templates/ds_ad_primary_dc.element.template.cfn.json @@ -56,7 +56,7 @@ } }, "Metadata": { - "Version": "0.3.3" + "Version": "0.3.4" }, "Outputs": { "DomainAdmin": { diff --git a/templates/ds_ad_private_hosted_zone.element.template.cfn.json b/templates/ds_ad_private_hosted_zone.element.template.cfn.json index bd655b17..fcee60ce 100644 --- a/templates/ds_ad_private_hosted_zone.element.template.cfn.json +++ b/templates/ds_ad_private_hosted_zone.element.template.cfn.json @@ -2,7 +2,7 @@ "AWSTemplateFormatVersion": "2010-09-09", "Description": "This element creates a Route53 private hosted zone, to resolve the domain to the AD Domain Controllers via DHCP.", "Metadata": { - "Version": "0.3.3" + "Version": "0.3.4" }, "Outputs": { "HostedZoneId": { diff --git a/templates/ds_ad_replica_dc.element.template.cfn.json b/templates/ds_ad_replica_dc.element.template.cfn.json index 46630366..18c297aa 100644 --- a/templates/ds_ad_replica_dc.element.template.cfn.json +++ b/templates/ds_ad_replica_dc.element.template.cfn.json @@ -56,7 +56,7 @@ } }, "Metadata": { - "Version": "0.3.3" + "Version": "0.3.4" }, "Outputs": { "DomainControllerID": { diff --git a/templates/ds_ad_security_groups.element.template.cfn.json b/templates/ds_ad_security_groups.element.template.cfn.json index 3d17ad89..07eecda8 100644 --- a/templates/ds_ad_security_groups.element.template.cfn.json +++ b/templates/ds_ad_security_groups.element.template.cfn.json @@ -2,7 +2,7 @@ "AWSTemplateFormatVersion": "2010-09-09", "Description": "This element creates 2 security groups for an Active Directory domain -- one for Domain Controllers and one for Domain Members.", "Metadata": { - "Version": "0.3.3" + "Version": "0.3.4" }, "Outputs": { "DomainControllerSGID": { diff --git a/templates/ds_dhcp_options.element.template.cfn.json b/templates/ds_dhcp_options.element.template.cfn.json index e1df317c..d0d9377e 100644 --- a/templates/ds_dhcp_options.element.template.cfn.json +++ b/templates/ds_dhcp_options.element.template.cfn.json @@ -2,7 +2,7 @@ "AWSTemplateFormatVersion": "2010-09-09", "Description": "This element creates an Active Directory domain with a single domain controller. The default Domain Administrator password will be the one retrieved from the instance.", "Metadata": { - "Version": "0.3.3" + "Version": "0.3.4" }, "Parameters": { "DomainControllerIPs": { diff --git a/templates/ds_singleaz_ad.compound.template.cfn.json b/templates/ds_singleaz_ad.compound.template.cfn.json index 04fa8a52..00dd9501 100644 --- a/templates/ds_singleaz_ad.compound.template.cfn.json +++ b/templates/ds_singleaz_ad.compound.template.cfn.json @@ -2,7 +2,7 @@ "AWSTemplateFormatVersion": "2010-09-09", "Description": "This template creates an Active Directory infrastructure in a Single AZ.", "Metadata": { - "Version": "0.3.3" + "Version": "0.3.4" }, "Outputs": { "DomainAdmin": { diff --git a/templates/es_service_domain.element.template.cfn.json b/templates/es_service_domain.element.template.cfn.json index b2206816..b69fd374 100644 --- a/templates/es_service_domain.element.template.cfn.json +++ b/templates/es_service_domain.element.template.cfn.json @@ -39,7 +39,7 @@ } ] }, - "Version": "0.3.3" + "Version": "0.3.4" }, "Outputs": { "DedicatedMasterCount": { diff --git a/templates/nw_create_peer_role.element.template.cfn.json b/templates/nw_create_peer_role.element.template.cfn.json index f720d6ad..d0ed739b 100644 --- a/templates/nw_create_peer_role.element.template.cfn.json +++ b/templates/nw_create_peer_role.element.template.cfn.json @@ -2,7 +2,7 @@ "AWSTemplateFormatVersion": "2010-09-09", "Description": "This template creates an assumable role for cross account VPC peering.", "Metadata": { - "Version": "0.3.3" + "Version": "0.3.4" }, "Outputs": { "RoleARN": { diff --git a/templates/nw_dualaz_multitier_nat_with_eni.compound.template.cfn.json b/templates/nw_dualaz_multitier_nat_with_eni.compound.template.cfn.json index cfb8676f..5cdbe408 100644 --- a/templates/nw_dualaz_multitier_nat_with_eni.compound.template.cfn.json +++ b/templates/nw_dualaz_multitier_nat_with_eni.compound.template.cfn.json @@ -104,7 +104,7 @@ } ] }, - "Version": "0.3.3" + "Version": "0.3.4" }, "Outputs": { "InternetGatewayId": { diff --git a/templates/nw_dualaz_multitier_natgateway.compound.template.cfn.json b/templates/nw_dualaz_multitier_natgateway.compound.template.cfn.json index 71b73337..a282048d 100644 --- a/templates/nw_dualaz_multitier_natgateway.compound.template.cfn.json +++ b/templates/nw_dualaz_multitier_natgateway.compound.template.cfn.json @@ -94,7 +94,7 @@ } ] }, - "Version": "0.3.3" + "Version": "0.3.4" }, "Outputs": { "InternetGatewayId": { diff --git a/templates/nw_nat_gateway.element.template.cfn.json b/templates/nw_nat_gateway.element.template.cfn.json index dc3cbb35..065e8596 100644 --- a/templates/nw_nat_gateway.element.template.cfn.json +++ b/templates/nw_nat_gateway.element.template.cfn.json @@ -2,7 +2,7 @@ "AWSTemplateFormatVersion": "2010-09-09", "Description": "This element creates a NAT Gateway with an Elastic IP, Private route table with route to the NAT Gateway.", "Metadata": { - "Version": "0.3.3" + "Version": "0.3.4" }, "Outputs": { "NATGatewayElasticIP": { diff --git a/templates/nw_nat_with_eni.element.template.cfn.json b/templates/nw_nat_with_eni.element.template.cfn.json index 80a0460c..447df6fb 100644 --- a/templates/nw_nat_with_eni.element.template.cfn.json +++ b/templates/nw_nat_with_eni.element.template.cfn.json @@ -56,7 +56,7 @@ } }, "Metadata": { - "Version": "0.3.3" + "Version": "0.3.4" }, "Outputs": { "NATElasticNetworkInterfaceId": { diff --git a/templates/nw_peered_sg.element.template.cfn.json b/templates/nw_peered_sg.element.template.cfn.json index ac561fc0..3ddbbe7f 100644 --- a/templates/nw_peered_sg.element.template.cfn.json +++ b/templates/nw_peered_sg.element.template.cfn.json @@ -2,7 +2,7 @@ "AWSTemplateFormatVersion": "2010-09-09", "Description": "This element creates a Security Group to allow remote access from instances in the specified security group within the peered account.", "Metadata": { - "Version": "0.3.3" + "Version": "0.3.4" }, "Outputs": { "VpcPeerSecurityGroupId": { diff --git a/templates/nw_private_subnet.element.template.cfn.json b/templates/nw_private_subnet.element.template.cfn.json index 1cd3708d..fc4b3b2d 100644 --- a/templates/nw_private_subnet.element.template.cfn.json +++ b/templates/nw_private_subnet.element.template.cfn.json @@ -2,7 +2,7 @@ "AWSTemplateFormatVersion": "2010-09-09", "Description": "This element creates a Private Subnet and associates it with a given Route Table.", "Metadata": { - "Version": "0.3.3" + "Version": "0.3.4" }, "Outputs": { "AvailabilityZoneName": { diff --git a/templates/nw_public_subnet.element.template.cfn.json b/templates/nw_public_subnet.element.template.cfn.json index 767950b9..19938e91 100644 --- a/templates/nw_public_subnet.element.template.cfn.json +++ b/templates/nw_public_subnet.element.template.cfn.json @@ -2,7 +2,7 @@ "AWSTemplateFormatVersion": "2010-09-09", "Description": "This element creates a Public Subnet and associates it with a given Route Table.", "Metadata": { - "Version": "0.3.3" + "Version": "0.3.4" }, "Outputs": { "AvailabilityZoneName": { diff --git a/templates/nw_r53_peered_domain.element.template.cfn.json b/templates/nw_r53_peered_domain.element.template.cfn.json index 01a77c3c..712ace84 100644 --- a/templates/nw_r53_peered_domain.element.template.cfn.json +++ b/templates/nw_r53_peered_domain.element.template.cfn.json @@ -2,7 +2,7 @@ "AWSTemplateFormatVersion": "2010-09-09", "Description": "This element creates a Route53 Private Hosted Zone and the associated resource records for a peered domain.", "Metadata": { - "Version": "0.3.3" + "Version": "0.3.4" }, "Outputs": { "PrivateHostedZoneId": { diff --git a/templates/nw_singleaz_multitier_nat_with_eni.compound.template.cfn.json b/templates/nw_singleaz_multitier_nat_with_eni.compound.template.cfn.json index 785fdd39..16f02c8e 100644 --- a/templates/nw_singleaz_multitier_nat_with_eni.compound.template.cfn.json +++ b/templates/nw_singleaz_multitier_nat_with_eni.compound.template.cfn.json @@ -101,7 +101,7 @@ } ] }, - "Version": "0.3.3" + "Version": "0.3.4" }, "Outputs": { "InternetGatewayId": { diff --git a/templates/nw_singleaz_multitier_natgateway.compound.template.cfn.json b/templates/nw_singleaz_multitier_natgateway.compound.template.cfn.json index bebff691..62157a55 100644 --- a/templates/nw_singleaz_multitier_natgateway.compound.template.cfn.json +++ b/templates/nw_singleaz_multitier_natgateway.compound.template.cfn.json @@ -92,7 +92,7 @@ } ] }, - "Version": "0.3.3" + "Version": "0.3.4" }, "Outputs": { "InternetGatewayId": { diff --git a/templates/nw_tripleaz_multitier_nat_with_eni.compound.template.cfn.json b/templates/nw_tripleaz_multitier_nat_with_eni.compound.template.cfn.json index af16a1eb..fea60433 100644 --- a/templates/nw_tripleaz_multitier_nat_with_eni.compound.template.cfn.json +++ b/templates/nw_tripleaz_multitier_nat_with_eni.compound.template.cfn.json @@ -108,7 +108,7 @@ } ] }, - "Version": "0.3.3" + "Version": "0.3.4" }, "Outputs": { "InternetGatewayId": { diff --git a/templates/nw_tripleaz_multitier_natgateway.compound.template.cfn.json b/templates/nw_tripleaz_multitier_natgateway.compound.template.cfn.json index 6decfa46..cd2dacc4 100644 --- a/templates/nw_tripleaz_multitier_natgateway.compound.template.cfn.json +++ b/templates/nw_tripleaz_multitier_natgateway.compound.template.cfn.json @@ -96,7 +96,7 @@ } ] }, - "Version": "0.3.3" + "Version": "0.3.4" }, "Outputs": { "InternetGatewayId": { diff --git a/templates/nw_vpc_peering_connection.element.template.cfn.json b/templates/nw_vpc_peering_connection.element.template.cfn.json index 3e3312d9..1f21cf1b 100644 --- a/templates/nw_vpc_peering_connection.element.template.cfn.json +++ b/templates/nw_vpc_peering_connection.element.template.cfn.json @@ -52,7 +52,7 @@ }, "Description": "This element creates a VPC peering connection and adds the necessary route to specified route tables.", "Metadata": { - "Version": "0.3.3" + "Version": "0.3.4" }, "Outputs": { "VpcPeeringConnection": { diff --git a/templates/nw_vpc_with_igw.element.template.cfn.json b/templates/nw_vpc_with_igw.element.template.cfn.json index 5ed12ecc..fcd8852e 100644 --- a/templates/nw_vpc_with_igw.element.template.cfn.json +++ b/templates/nw_vpc_with_igw.element.template.cfn.json @@ -2,7 +2,7 @@ "AWSTemplateFormatVersion": "2010-09-09", "Description": "This element creates a VPC network with an Internet Gateway.", "Metadata": { - "Version": "0.3.3" + "Version": "0.3.4" }, "Outputs": { "InternetGatewayId": { diff --git a/templates/ra_guac_autoscale_public_alb.template.cfn.yaml b/templates/ra_guac_autoscale_public_alb.template.cfn.yaml index cbd437e3..3663c330 100644 --- a/templates/ra_guac_autoscale_public_alb.template.cfn.yaml +++ b/templates/ra_guac_autoscale_public_alb.template.cfn.yaml @@ -54,7 +54,7 @@ Mappings: Parameters: Location: 's3://app-chemistry/snippets/instance_type_map.snippet.cfn.yaml' Metadata: - Version: 0.3.3 + Version: 0.3.4 cfn-lint: config: ignore_checks: diff --git a/templates/ra_rdcb_fileserver_ha.template.cfn.json b/templates/ra_rdcb_fileserver_ha.template.cfn.json index 89acb185..7d35a4e4 100644 --- a/templates/ra_rdcb_fileserver_ha.template.cfn.json +++ b/templates/ra_rdcb_fileserver_ha.template.cfn.json @@ -207,7 +207,7 @@ } } }, - "Version": "0.3.3" + "Version": "0.3.4" }, "Outputs": { "RdcbEc2InstanceId": { diff --git a/templates/ra_rdcb_fileserver_standalone.template.cfn.yaml b/templates/ra_rdcb_fileserver_standalone.template.cfn.yaml index b630eff8..a78f1ca4 100644 --- a/templates/ra_rdcb_fileserver_standalone.template.cfn.yaml +++ b/templates/ra_rdcb_fileserver_standalone.template.cfn.yaml @@ -71,7 +71,7 @@ Metadata: ParameterLabels: AmiNameSearchString: default: AMI Name Search Pattern - Version: 0.3.3 + Version: 0.3.4 cfn-lint: config: ignore_checks: diff --git a/templates/ra_rdgw_autoscale_public_lb.template.cfn.yaml b/templates/ra_rdgw_autoscale_public_lb.template.cfn.yaml index e288ba5c..7217352a 100644 --- a/templates/ra_rdgw_autoscale_public_lb.template.cfn.yaml +++ b/templates/ra_rdgw_autoscale_public_lb.template.cfn.yaml @@ -83,7 +83,7 @@ Metadata: default: AMI Name Search Pattern ScaleDownDesiredCapacity: default: Scale Down Desired Capacity - Version: 0.3.3 + Version: 0.3.4 cfn-lint: config: ignore_checks: diff --git a/templates/ra_rdsh_autoscale_internal_lb.template.cfn.yaml b/templates/ra_rdsh_autoscale_internal_lb.template.cfn.yaml index 9589f359..37cb5d9e 100644 --- a/templates/ra_rdsh_autoscale_internal_lb.template.cfn.yaml +++ b/templates/ra_rdsh_autoscale_internal_lb.template.cfn.yaml @@ -89,7 +89,7 @@ Metadata: default: AMI Name Search Pattern ScaleDownDesiredCapacity: default: Scale Down Desired Capacity - Version: 0.3.3 + Version: 0.3.4 cfn-lint: config: ignore_checks: From e0969c1d198fc2585174bb396d19545c0d92ef84 Mon Sep 17 00:00:00 2001 From: Loren Gordon Date: Tue, 30 Jul 2019 12:35:40 -0400 Subject: [PATCH 3/3] Addresses shellcheck findings --- scripts/make-guac.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/make-guac.sh b/scripts/make-guac.sh index d6962195..ce067926 100644 --- a/scripts/make-guac.sh +++ b/scripts/make-guac.sh @@ -154,7 +154,7 @@ write_manifest() printf "\"translations\" : [ \"translations/en.json\" ]\n" printf "}\n" ) > "${guac_manifest}" - if ! ( [[ -n "${URL_1}" ]] || [[ -n "${URL_2}" ]] ) + if ! { [[ -n "${URL_1}" ]] || [[ -n "${URL_2}" ]]; } then sed -i '/html/d' "${guac_manifest}" fi @@ -426,7 +426,7 @@ log "Setting up the custom branding extension" write_manifest "${GUAC_EXT}" write_brand "${GUAC_EXT}" -if ( [[ -n "${URL_1}" ]] || [[ -n "${URL_2}" ]] ) +if [[ -n "${URL_1}" ]] || [[ -n "${URL_2}" ]] then # Add custom URLs to Guacamole login page using Guac extensions. write_links "${GUAC_EXT}"