From 7d372528477055622c6855dc3528aa904ba83d53 Mon Sep 17 00:00:00 2001
From: Arian van Putten <arian.vanputten@gmail.com>
Date: Fri, 19 Apr 2024 15:31:12 +0200
Subject: [PATCH] rename

---
 flake.lock                                          | 6 +++---
 flake.nix                                           | 2 --
 upload-ami/pyproject.toml                           | 6 ++++--
 upload-ami/src/upload_ami/{cli.py => upload_ami.py} | 0
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename upload-ami/src/upload_ami/{cli.py => upload_ami.py} (100%)

diff --git a/flake.lock b/flake.lock
index 4a4c13d..db54019 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1707072648,
-        "narHash": "sha256-aLVIRxLtmGxbpI1ko4xuiRHAqyw5USmu0Op40LcZPe4=",
+        "lastModified": 1713532629,
+        "narHash": "sha256-8iwNoSDOCKFnDF7f8XReiztpESA0GyFieKhWAaG7jrw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "92df389d4f2eb56bf2d4ac3f69ce3e2f59a94004",
+        "rev": "7f62671ffcb37436b3df7d6ae44dfdca9e5a069d",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 260de04..74f952a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -73,7 +73,6 @@
 
       apps = lib.genAttrs self.lib.supportedSystems (system:
         let
-          pkgs = nixpkgs.legacyPackages.${system};
           upload-ami = self.packages.${system}.upload-ami;
           mkApp = name: _: { type = "app"; program = "${upload-ami}/bin/${name}"; };
         in
@@ -116,7 +115,6 @@
           nativeBuildInputs = [
             pkgs.awscli2
             pkgs.opentofu
-            (pkgs.python3.withPackages (p: [ p.boto3 p.botocore ]))
           ];
         };
       });
diff --git a/upload-ami/pyproject.toml b/upload-ami/pyproject.toml
index f97f2c7..78ca3be 100644
--- a/upload-ami/pyproject.toml
+++ b/upload-ami/pyproject.toml
@@ -7,12 +7,14 @@ version = "0.1.0"
 dependencies = [
     "boto3",
     "botocore",
+    "mypy-boto3-ec2",
+    "mypy-boto3-s3",
 ]
 [project.scripts]
-upload-ami = "upload_ami.cli:main"
+upload-ami = "upload_ami.upload_ami:main"
 nuke = "upload_ami.nuke:main"
 smoke-test = "upload_ami.smoke_test:main"
 disable-image-block-public-access = "upload_ami.disable_image_block_public_access:main"
 enable-regions = "upload_ami.enable_regions:main"
 request-public-ami-quota-increase  = "upload_ami.request_public_ami_quota_increase:main"
-describe-images = "upload_ami.describe_images:main"
\ No newline at end of file
+describe-images = "upload_ami.describe_images:main"
diff --git a/upload-ami/src/upload_ami/cli.py b/upload-ami/src/upload_ami/upload_ami.py
similarity index 100%
rename from upload-ami/src/upload_ami/cli.py
rename to upload-ami/src/upload_ami/upload_ami.py