From db1578abadc60d470969c4f42a75eced77d4fa8b Mon Sep 17 00:00:00 2001 From: Matt Vanderpol Date: Tue, 26 Dec 2023 11:03:16 -0800 Subject: [PATCH 1/6] Update zipstream-php to latest version To meet `psr/http-message` v2.x dependency in my app --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index c06b576..3e4d249 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "illuminate/support": "^8.0|^9.0|^10", "illuminate/filesystem": "^8.0|^9.0|^10", "illuminate/console": "^8.0|^9.0|^10", - "maennchen/zipstream-php": "^2.1", + "maennchen/zipstream-php": "^3.0", "guzzlehttp/guzzle": "^6.3|^7.2", "aws/aws-sdk-php": "^3.216.1" }, From 9c92171f99528f2f9907635c820d81a55be4e41f Mon Sep 17 00:00:00 2001 From: Matt Vanderpol Date: Tue, 26 Dec 2023 11:21:38 -0800 Subject: [PATCH 2/6] Revert "Update zipstream-php to latest version" To have branch with just config steps updates. This reverts commit db1578abadc60d470969c4f42a75eced77d4fa8b. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 3e4d249..c06b576 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "illuminate/support": "^8.0|^9.0|^10", "illuminate/filesystem": "^8.0|^9.0|^10", "illuminate/console": "^8.0|^9.0|^10", - "maennchen/zipstream-php": "^3.0", + "maennchen/zipstream-php": "^2.1", "guzzlehttp/guzzle": "^6.3|^7.2", "aws/aws-sdk-php": "^3.216.1" }, From 1b15b487181116dccc68e9949966ad248efd8732 Mon Sep 17 00:00:00 2001 From: Matt Vanderpol Date: Tue, 26 Dec 2023 11:28:19 -0800 Subject: [PATCH 3/6] Button labels to match current values in UI --- src/Commands/Configure.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Commands/Configure.php b/src/Commands/Configure.php index 9cfddd0..9ed36cb 100644 --- a/src/Commands/Configure.php +++ b/src/Commands/Configure.php @@ -116,10 +116,10 @@ protected function askForAdminCredentials() $this->text('We will only use these for this session, then they will be forgotten.'); $this->line(''); $this->text('Visit this link: https://console.aws.amazon.com/iam/home#/users'); - $this->text(' --> Click "Add User."'); + $this->text(' --> Click "Create user"'); $this->text(' '); $this->text(' --> Enter "sidecar-cli-helper" as the name.'); - $this->text(' --> Press "Next: Permissions."'); + $this->text(' --> Press "Next"'); $this->text(' '); $this->text(' --> Choose "Attach existing policies directly."'); $this->text(' --> Select "AdministratorAccess."'); From 0bcd6ecfff7b756c408e78285f3c674646078134 Mon Sep 17 00:00:00 2001 From: Matt Vanderpol Date: Tue, 26 Dec 2023 11:29:25 -0800 Subject: [PATCH 4/6] Update verb for consistency with other directions. --- src/Commands/Configure.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Commands/Configure.php b/src/Commands/Configure.php index 9ed36cb..4c16813 100644 --- a/src/Commands/Configure.php +++ b/src/Commands/Configure.php @@ -119,7 +119,7 @@ protected function askForAdminCredentials() $this->text(' --> Click "Create user"'); $this->text(' '); $this->text(' --> Enter "sidecar-cli-helper" as the name.'); - $this->text(' --> Press "Next"'); + $this->text(' --> Click "Next"'); $this->text(' '); $this->text(' --> Choose "Attach existing policies directly."'); $this->text(' --> Select "AdministratorAccess."'); From f754bee7f579aa7f721db3a567b97db0a63b4725 Mon Sep 17 00:00:00 2001 From: Matt Vanderpol Date: Tue, 26 Dec 2023 11:32:02 -0800 Subject: [PATCH 5/6] Updates to config directions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove periods from quoted text where period isn’t in the button label to avoid confusion. Added clarification for scroll location for more complete direction. Updated steps where minor flow changes in the UI were present. --- src/Commands/Configure.php | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/Commands/Configure.php b/src/Commands/Configure.php index 4c16813..c93276a 100644 --- a/src/Commands/Configure.php +++ b/src/Commands/Configure.php @@ -121,17 +121,20 @@ protected function askForAdminCredentials() $this->text(' --> Enter "sidecar-cli-helper" as the name.'); $this->text(' --> Click "Next"'); $this->text(' '); - $this->text(' --> Choose "Attach existing policies directly."'); - $this->text(' --> Select "AdministratorAccess."'); + $this->text(' --> Choose "Attach policies directly"'); + $this->text(' --> Select "AdministratorAccess"'); + $this->text(' '); + $this->text(' --> Click "Next"'); + $this->text(' '); + $this->text(' --> Click "Create user"'); $this->text(' '); - $this->text(' --> Click "Create user."'); - $this->text(''); $this->text(' --> Navigate to the "sidecar-cli-helper" user.'); $this->text(' --> Click "Security Credentials."'); - $this->text(' --> Scroll down and click "Create access key."'); - $this->text(' --> Select "Application running outside AWS."'); - $this->text(' --> Click "Next."'); - $this->text(' --> Click "Create access key."'); + $this->text(' --> Scroll down to "Access keys" and click "Create access key"'); + $this->text(' --> Select "Application running outside AWS"'); + $this->text(' --> Click "Next"'); + $this->text(' '); + $this->text(' --> Click "Create access key"'); $this->line(str_repeat('-', $this->width)); $this->key = $this->ask('Enter the Access key ID'); From 14e8ddc917dd91d3bd89e3331feaa4c65d419fe2 Mon Sep 17 00:00:00 2001 From: Matt Vanderpol Date: Tue, 26 Dec 2023 11:34:29 -0800 Subject: [PATCH 6/6] Direction change to match latest AWS interface --- src/Commands/Configure.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Commands/Configure.php b/src/Commands/Configure.php index c93276a..68b7e06 100644 --- a/src/Commands/Configure.php +++ b/src/Commands/Configure.php @@ -137,7 +137,7 @@ protected function askForAdminCredentials() $this->text(' --> Click "Create access key"'); $this->line(str_repeat('-', $this->width)); - $this->key = $this->ask('Enter the Access key ID'); + $this->key = $this->ask('Enter the Access key'); $this->secret = $this->secret('Enter the Secret access key'); if ($this->key && $this->secret) {