From d2d778c36cf7af34e1abca5749644d1c66eeb00c Mon Sep 17 00:00:00 2001 From: Tanner Heffner Date: Wed, 3 Jan 2024 10:06:06 -0800 Subject: [PATCH 1/2] fix unused vars in code scan alerts --- src/data/queries/event.ts | 1 - src/templates/globals/banners/facilityBanner/index.tsx | 3 ++- src/types/drupal/node.ts | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/data/queries/event.ts b/src/data/queries/event.ts index e08cfd905..326ec9620 100644 --- a/src/data/queries/event.ts +++ b/src/data/queries/event.ts @@ -8,7 +8,6 @@ import { queries } from '.' import { NodeEvent } from '@/types/drupal/node' import { Event } from '@/types/formatted/event' import { GetServerSidePropsContext } from 'next' -import { MediaImage } from '@/types/formatted/media' import { entityBaseFields, fetchSingleEntityOrPreview, diff --git a/src/templates/globals/banners/facilityBanner/index.tsx b/src/templates/globals/banners/facilityBanner/index.tsx index 8be7d179b..ae3ae1858 100644 --- a/src/templates/globals/banners/facilityBanner/index.tsx +++ b/src/templates/globals/banners/facilityBanner/index.tsx @@ -17,7 +17,8 @@ export const FacilityBanner = ({ dismiss, }: FormattedFacilityBanner): JSX.Element => { const [isClicked, setIsClicked] = useState(false) - const [outputStatus, setOutputStatus] = useState(true) + // const [outputStatus, setOutputStatus] = useState(true) + const outputStatus = true const analyticsRef = useRef(null) useEffect(() => { diff --git a/src/types/drupal/node.ts b/src/types/drupal/node.ts index d71a80fa6..927faa646 100644 --- a/src/types/drupal/node.ts +++ b/src/types/drupal/node.ts @@ -36,7 +36,6 @@ import { TaxonomyTermLcCategories, TaxonomyTermHealthCareServiceTaxonomy, } from './taxonomy_term' -import { DrupalJsonApiParams } from 'drupal-jsonapi-params' /** Union of all node types. */ export type NodeTypes = From 393fc9cb697863d2c5d3f50c0c3c2efa2bc0341a Mon Sep 17 00:00:00 2001 From: Tanner Heffner Date: Wed, 3 Jan 2024 12:04:16 -0800 Subject: [PATCH 2/2] clean up cruft from playwright ci stuff --- .../update-launch-template/requirements.txt | 3 - utilities/update-launch-template/update-lt.py | 89 ------------------- 2 files changed, 92 deletions(-) delete mode 100644 utilities/update-launch-template/requirements.txt delete mode 100644 utilities/update-launch-template/update-lt.py diff --git a/utilities/update-launch-template/requirements.txt b/utilities/update-launch-template/requirements.txt deleted file mode 100644 index 31855c95f..000000000 --- a/utilities/update-launch-template/requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -boto3 -botocore -argparse diff --git a/utilities/update-launch-template/update-lt.py b/utilities/update-launch-template/update-lt.py deleted file mode 100644 index f6a322f8f..000000000 --- a/utilities/update-launch-template/update-lt.py +++ /dev/null @@ -1,89 +0,0 @@ -import os -import argparse -import pprint -import boto3 -import botocore -from botocore.config import Config - -boto_config = Config( - region_name='us-gov-west-1', -) - -parser = argparse.ArgumentParser(description='Update Launch Templates.') -parser.add_argument('-n', '--name', required=True) -parser.add_argument('-s', '--asGroup', required=True) -parser.add_argument('-a', '--amiId', required=True) -parser.add_argument('-d', '--dryRun', action="store_true") -parser.add_argument('-m', '--mixedPolicy', action='store_true', help='flag to update asg if using MixedInstancesPolicy') -args = parser.parse_args() - -session = boto3.Session() -ec2 = session.client('ec2', config=boto_config) -try: - launch_template = ec2.describe_launch_templates( - LaunchTemplateNames=[args.name] - ) -except botocore.exceptions.ClientError as error: - print(error) - -print("Updating Launch Template " + args.name + " , Current Version: " + - str(launch_template['LaunchTemplates'][0]['LatestVersionNumber']) + ", ID: " + launch_template['LaunchTemplates'][0]['LaunchTemplateId']) - -try: - create_response = ec2.create_launch_template_version( - LaunchTemplateData={ - 'ImageId': args.amiId, - }, - LaunchTemplateId=launch_template['LaunchTemplates'][0]['LaunchTemplateId'], - SourceVersion=str( - launch_template['LaunchTemplates'][0]['LatestVersionNumber']) - ) -except botocore.exceptions.ClientError as error: - print(error) - -print("New Launch Template version created: " + str(create_response['LaunchTemplateVersion']['VersionNumber']) + - ". Updating default version for " + create_response['LaunchTemplateVersion']['LaunchTemplateId'] + "...") - -try: - update_response = ec2.modify_launch_template( - DefaultVersion=str( - create_response['LaunchTemplateVersion']['VersionNumber']), - LaunchTemplateId=create_response['LaunchTemplateVersion']['LaunchTemplateId'], - ) -except botocore.exceptions.ClientError as error: - print(error) - -pp = pprint.PrettyPrinter(indent=4) -pp.pprint(update_response) - - -autoscaling = session.client('autoscaling', config=boto_config) - -print("Updating Autoscaling Group: " + args.asGroup + ". ") -try: - if args.mixedPolicy is True: - print("updating MixedInstancesPolicy") - update_asg_response = autoscaling.update_auto_scaling_group( - AutoScalingGroupName=args.asGroup, - MixedInstancesPolicy={ - 'LaunchTemplate': { - 'LaunchTemplateSpecification': { - 'LaunchTemplateId': create_response['LaunchTemplateVersion']['LaunchTemplateId'], - 'Version': str(create_response['LaunchTemplateVersion']['VersionNumber']), - } - } - } - ) - else: - print("updating LaunchTemplate") - update_asg_response = autoscaling.update_auto_scaling_group( - AutoScalingGroupName=args.asGroup, - LaunchTemplate={ - 'LaunchTemplateId': create_response['LaunchTemplateVersion']['LaunchTemplateId'], - 'Version': str(create_response['LaunchTemplateVersion']['VersionNumber']), - } - ) -except botocore.exceptions.ClientError as error: - print(error) - -pp.pprint(update_asg_response)