From d85c6316c9df48b636dc1674f277006687b7660d Mon Sep 17 00:00:00 2001
From: Josh Wolf <josh@wolfs.io>
Date: Fri, 18 Aug 2023 14:57:31 -0400
Subject: [PATCH] add aws-cli-v2, rename aws-cli -> aws-cli-v1

Signed-off-by: Josh Wolf <josh@wolfs.io>
---
 aws-c-s3.yaml                   |  4 +-
 aws-cli.yaml => aws-cli-v1.yaml |  8 ++--
 aws-cli-v2.yaml                 | 80 +++++++++++++++++++++++++++++++++
 3 files changed, 87 insertions(+), 5 deletions(-)
 rename aws-cli.yaml => aws-cli-v1.yaml (91%)
 create mode 100644 aws-cli-v2.yaml

diff --git a/aws-c-s3.yaml b/aws-c-s3.yaml
index f52446197198..598ae7dd0673 100644
--- a/aws-c-s3.yaml
+++ b/aws-c-s3.yaml
@@ -1,7 +1,7 @@
 package:
   name: aws-c-s3
   version: 0.3.14
-  epoch: 0
+  epoch: 1
   description: "AWS C99 library implementation for communicating with the S3 service"
   copyright:
     - license: Apache-2.0
@@ -65,7 +65,7 @@ subpackages:
       - uses: split/dev
       - runs: |
           mkdir -p "${{targets.subpkgdir}}"/usr/lib
-          mv "${{targets.destdir}}"/usr/lib/aws-c-s3 "${{targets.subpkgdir}}"/usr/lib/
+          mv "${{targets.destdir}}"/usr/lib/* "${{targets.subpkgdir}}"/usr/lib/
     dependencies:
       runtime:
         - aws-c-s3
diff --git a/aws-cli.yaml b/aws-cli-v1.yaml
similarity index 91%
rename from aws-cli.yaml
rename to aws-cli-v1.yaml
index 4e3d611b7d1b..f0250ce50447 100644
--- a/aws-cli.yaml
+++ b/aws-cli-v1.yaml
@@ -1,11 +1,13 @@
 package:
-  name: aws-cli
+  name: aws-cli-v1
   version: 1.27.165
-  epoch: 0
+  epoch: 1
   description: "Universal Command Line Interface for Amazon Web Services"
   copyright:
     - license: Apache-2.0
   dependencies:
+    provides:
+      - aws-cli=1.999
     runtime:
       - python3
       - py3-setuptools
@@ -48,4 +50,4 @@ update:
   github:
     identifier: aws/aws-cli
     use-tag: true
-    tag-filter: "1.27"
+    tag-filter: "1"
diff --git a/aws-cli-v2.yaml b/aws-cli-v2.yaml
new file mode 100644
index 000000000000..8b6e73dfaa35
--- /dev/null
+++ b/aws-cli-v2.yaml
@@ -0,0 +1,80 @@
+package:
+  name: aws-cli-v2
+  version: 2.13.10
+  epoch: 0
+  description: "Universal Command Line Interface for Amazon Web Services"
+  copyright:
+    - license: Apache-2.0
+  dependencies:
+    provides:
+      - aws-cli=2
+    runtime:
+      - python3
+      - py3-awscrt
+      - py3-certifi
+      - py3-cryptography
+      - py3-dateutil
+      - py3-distro
+      - py3-colorama
+      - py3-docutils
+      - py3-jmespath
+      - py3-urllib3-1
+      - py3-prompt-toolkit
+      - aws-crt-cpp
+
+environment:
+  contents:
+    packages:
+      - wolfi-base
+      - busybox
+      - ca-certificates-bundle
+      - build-base
+
+      - python3-dev
+      - py3-gpep517
+      - py3-flit-core
+
+      - apk-tools
+      - aws-crt-cpp-dev
+
+      - py3-awscrt
+      - py3-distro
+      - py3-botocore
+      - py3-docutils
+      - py3-jmespath
+      - py3-rsa
+      - py3-s3transfer
+      - py3-colorama
+      - py3-cryptography
+      - py3-certifi
+      - py3-dateutil
+      - py3-colorama
+      - py3-urllib3-1
+      - py3-prompt-toolkit
+      - py3-ruamel-yaml
+
+pipeline:
+  - uses: git-checkout
+    with:
+      repository: https://github.com/aws/aws-cli
+      tag: ${{package.version}}
+      expected-commit: 220a5dfbf7e67fb891c2ba6b1d9e532457d1a601
+
+  - runs: |
+      python3 -m gpep517 build-wheel \
+        --wheel-dir dist \
+        --output-fd 3 3>&1 >&2
+
+  - runs: |
+      python3 -m installer -d "${{targets.destdir}}" dist/*.whl
+
+      rm "${{targets.destdir}}"/usr/bin/aws.cmd
+
+  - uses: strip
+
+update:
+  enabled: true
+  github:
+    identifier: aws/aws-cli
+    use-tag: true
+    tag-filter: "2"