From 921095c67aa0aa9e1d8fed4532273f8a84b3fbb2 Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Tue, 21 Mar 2023 23:11:09 +0800 Subject: [PATCH] aws/__init__.py: update aws.key_pair() --- infrastructure/__main__.py | 3 +-- infrastructure/aws/__init__.py | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/infrastructure/__main__.py b/infrastructure/__main__.py index 3ec0bccd..91f8ab1d 100644 --- a/infrastructure/__main__.py +++ b/infrastructure/__main__.py @@ -1,5 +1,6 @@ """An AWS Python Pulumi AWS Module""" +import config import pulumi from aws import vpc @@ -10,8 +11,6 @@ from aws import internet_gateway from aws import availability_zones from aws import key_pair -import config - vpc_id = vpc() az_list = availability_zones() sg_id = security_group( vpc_id ) diff --git a/infrastructure/aws/__init__.py b/infrastructure/aws/__init__.py index f78f47f7..f8befa8a 100644 --- a/infrastructure/aws/__init__.py +++ b/infrastructure/aws/__init__.py @@ -22,8 +22,8 @@ def vpc(): return vpc.id #------------------------------------# -def key_pair( name, ssh_public_key ): - keypair = ec2.KeyPair( name, ssh_public_key ) +def key_pair( resource_name: str, public_key: Optional[str] = None): + keypair = ec2.KeyPair( resource_name, public_key ) return keypair.key_name #------------------------------------# def availability_zones():