From 022d181afff698563d9fd5c6804568073c1b31fe Mon Sep 17 00:00:00 2001 From: Diana Doherty Date: Wed, 15 Mar 2023 16:10:25 -0400 Subject: [PATCH] Add ecr preflight checks --- etc/man/man1/meroxa-account-list.1 | 2 +- etc/man/man1/meroxa-account-set.1 | 2 +- etc/man/man1/meroxa-account.1 | 2 +- etc/man/man1/meroxa-api.1 | 2 +- etc/man/man1/meroxa-apps-deploy.1 | 2 +- etc/man/man1/meroxa-apps-describe.1 | 2 +- etc/man/man1/meroxa-apps-init.1 | 2 +- etc/man/man1/meroxa-apps-list.1 | 2 +- etc/man/man1/meroxa-apps-logs.1 | 2 +- etc/man/man1/meroxa-apps-remove.1 | 2 +- etc/man/man1/meroxa-apps-run.1 | 2 +- etc/man/man1/meroxa-apps-upgrade.1 | 2 +- etc/man/man1/meroxa-apps.1 | 2 +- etc/man/man1/meroxa-auth-login.1 | 2 +- etc/man/man1/meroxa-auth-logout.1 | 2 +- etc/man/man1/meroxa-auth-whoami.1 | 2 +- etc/man/man1/meroxa-auth.1 | 2 +- etc/man/man1/meroxa-billing.1 | 2 +- etc/man/man1/meroxa-builds-describe.1 | 2 +- etc/man/man1/meroxa-builds-logs.1 | 2 +- etc/man/man1/meroxa-builds.1 | 2 +- etc/man/man1/meroxa-completion.1 | 2 +- etc/man/man1/meroxa-config-describe.1 | 2 +- etc/man/man1/meroxa-config-set.1 | 2 +- etc/man/man1/meroxa-config.1 | 2 +- etc/man/man1/meroxa-environments-create.1 | 2 +- etc/man/man1/meroxa-environments-describe.1 | 2 +- etc/man/man1/meroxa-environments-list.1 | 2 +- etc/man/man1/meroxa-environments-remove.1 | 2 +- etc/man/man1/meroxa-environments-repair.1 | 2 +- etc/man/man1/meroxa-environments-update.1 | 2 +- etc/man/man1/meroxa-environments.1 | 2 +- etc/man/man1/meroxa-login.1 | 2 +- etc/man/man1/meroxa-logout.1 | 2 +- etc/man/man1/meroxa-open-billing.1 | 2 +- etc/man/man1/meroxa-open.1 | 2 +- etc/man/man1/meroxa-resources-create.1 | 2 +- etc/man/man1/meroxa-resources-describe.1 | 2 +- etc/man/man1/meroxa-resources-list.1 | 2 +- etc/man/man1/meroxa-resources-remove.1 | 2 +- etc/man/man1/meroxa-resources-rotate-tunnel-key.1 | 2 +- etc/man/man1/meroxa-resources-update.1 | 2 +- etc/man/man1/meroxa-resources-validate.1 | 2 +- etc/man/man1/meroxa-resources.1 | 2 +- etc/man/man1/meroxa-transforms-list.1 | 2 +- etc/man/man1/meroxa-transforms.1 | 2 +- etc/man/man1/meroxa-version.1 | 2 +- etc/man/man1/meroxa-whoami.1 | 2 +- etc/man/man1/meroxa.1 | 2 +- go.mod | 2 +- go.sum | 4 ++-- utils/display/environments.go | 8 ++++++++ vendor/github.com/meroxa/meroxa-go/pkg/meroxa/auth.go | 2 +- .../github.com/meroxa/meroxa-go/pkg/meroxa/environment.go | 1 + vendor/github.com/meroxa/meroxa-go/pkg/meroxa/meroxa.go | 4 ++-- vendor/github.com/meroxa/meroxa-go/pkg/meroxa/options.go | 4 ++-- vendor/modules.txt | 4 ++-- 57 files changed, 68 insertions(+), 59 deletions(-) diff --git a/etc/man/man1/meroxa-account-list.1 b/etc/man/man1/meroxa-account-list.1 index 5f8cc984e..5f42e713f 100644 --- a/etc/man/man1/meroxa-account-list.1 +++ b/etc/man/man1/meroxa-account-list.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-account-set.1 b/etc/man/man1/meroxa-account-set.1 index 8811d84f6..2dc96a292 100644 --- a/etc/man/man1/meroxa-account-set.1 +++ b/etc/man/man1/meroxa-account-set.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-account.1 b/etc/man/man1/meroxa-account.1 index 51c19a65c..8d9e0e0ae 100644 --- a/etc/man/man1/meroxa-account.1 +++ b/etc/man/man1/meroxa-account.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-api.1 b/etc/man/man1/meroxa-api.1 index 31675d399..82e61ffe2 100644 --- a/etc/man/man1/meroxa-api.1 +++ b/etc/man/man1/meroxa-api.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-apps-deploy.1 b/etc/man/man1/meroxa-apps-deploy.1 index c9b4957c3..e51eec68b 100644 --- a/etc/man/man1/meroxa-apps-deploy.1 +++ b/etc/man/man1/meroxa-apps-deploy.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-apps-describe.1 b/etc/man/man1/meroxa-apps-describe.1 index a4ad8b278..6090d513a 100644 --- a/etc/man/man1/meroxa-apps-describe.1 +++ b/etc/man/man1/meroxa-apps-describe.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-apps-init.1 b/etc/man/man1/meroxa-apps-init.1 index 4d40cb862..124579caf 100644 --- a/etc/man/man1/meroxa-apps-init.1 +++ b/etc/man/man1/meroxa-apps-init.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-apps-list.1 b/etc/man/man1/meroxa-apps-list.1 index 70ef0ba09..13181e629 100644 --- a/etc/man/man1/meroxa-apps-list.1 +++ b/etc/man/man1/meroxa-apps-list.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-apps-logs.1 b/etc/man/man1/meroxa-apps-logs.1 index 527d47e5c..6b9a80a7a 100644 --- a/etc/man/man1/meroxa-apps-logs.1 +++ b/etc/man/man1/meroxa-apps-logs.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-apps-remove.1 b/etc/man/man1/meroxa-apps-remove.1 index 9ac887d9d..2057757e3 100644 --- a/etc/man/man1/meroxa-apps-remove.1 +++ b/etc/man/man1/meroxa-apps-remove.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-apps-run.1 b/etc/man/man1/meroxa-apps-run.1 index 20dac584f..e7b193a63 100644 --- a/etc/man/man1/meroxa-apps-run.1 +++ b/etc/man/man1/meroxa-apps-run.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-apps-upgrade.1 b/etc/man/man1/meroxa-apps-upgrade.1 index ade5c02e0..0a0e36e7a 100644 --- a/etc/man/man1/meroxa-apps-upgrade.1 +++ b/etc/man/man1/meroxa-apps-upgrade.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-apps.1 b/etc/man/man1/meroxa-apps.1 index 04152bc8e..3f900f3d4 100644 --- a/etc/man/man1/meroxa-apps.1 +++ b/etc/man/man1/meroxa-apps.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-auth-login.1 b/etc/man/man1/meroxa-auth-login.1 index f34573b39..53ba70633 100644 --- a/etc/man/man1/meroxa-auth-login.1 +++ b/etc/man/man1/meroxa-auth-login.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-auth-logout.1 b/etc/man/man1/meroxa-auth-logout.1 index fa840ebe4..97cbb2752 100644 --- a/etc/man/man1/meroxa-auth-logout.1 +++ b/etc/man/man1/meroxa-auth-logout.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-auth-whoami.1 b/etc/man/man1/meroxa-auth-whoami.1 index 697b3dbde..907ef7dce 100644 --- a/etc/man/man1/meroxa-auth-whoami.1 +++ b/etc/man/man1/meroxa-auth-whoami.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-auth.1 b/etc/man/man1/meroxa-auth.1 index 05ad24ea8..48904baed 100644 --- a/etc/man/man1/meroxa-auth.1 +++ b/etc/man/man1/meroxa-auth.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-billing.1 b/etc/man/man1/meroxa-billing.1 index b77ddc77c..e04b5030b 100644 --- a/etc/man/man1/meroxa-billing.1 +++ b/etc/man/man1/meroxa-billing.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-builds-describe.1 b/etc/man/man1/meroxa-builds-describe.1 index bdf14558b..1e3677215 100644 --- a/etc/man/man1/meroxa-builds-describe.1 +++ b/etc/man/man1/meroxa-builds-describe.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-builds-logs.1 b/etc/man/man1/meroxa-builds-logs.1 index f26c93ce9..74e8b92bb 100644 --- a/etc/man/man1/meroxa-builds-logs.1 +++ b/etc/man/man1/meroxa-builds-logs.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-builds.1 b/etc/man/man1/meroxa-builds.1 index 4875477cd..59b8af1fd 100644 --- a/etc/man/man1/meroxa-builds.1 +++ b/etc/man/man1/meroxa-builds.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-completion.1 b/etc/man/man1/meroxa-completion.1 index 14d4ae8ab..924495399 100644 --- a/etc/man/man1/meroxa-completion.1 +++ b/etc/man/man1/meroxa-completion.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-config-describe.1 b/etc/man/man1/meroxa-config-describe.1 index 00d3b6d47..5c6a3915c 100644 --- a/etc/man/man1/meroxa-config-describe.1 +++ b/etc/man/man1/meroxa-config-describe.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-config-set.1 b/etc/man/man1/meroxa-config-set.1 index add1170ad..76595f8d9 100644 --- a/etc/man/man1/meroxa-config-set.1 +++ b/etc/man/man1/meroxa-config-set.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-config.1 b/etc/man/man1/meroxa-config.1 index d42559293..f4cb3eeb8 100644 --- a/etc/man/man1/meroxa-config.1 +++ b/etc/man/man1/meroxa-config.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-environments-create.1 b/etc/man/man1/meroxa-environments-create.1 index 2b448f593..a1606e27c 100644 --- a/etc/man/man1/meroxa-environments-create.1 +++ b/etc/man/man1/meroxa-environments-create.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-environments-describe.1 b/etc/man/man1/meroxa-environments-describe.1 index 3c5ee7d8e..8f66bbe46 100644 --- a/etc/man/man1/meroxa-environments-describe.1 +++ b/etc/man/man1/meroxa-environments-describe.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-environments-list.1 b/etc/man/man1/meroxa-environments-list.1 index a830fe25e..2156010a5 100644 --- a/etc/man/man1/meroxa-environments-list.1 +++ b/etc/man/man1/meroxa-environments-list.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-environments-remove.1 b/etc/man/man1/meroxa-environments-remove.1 index 14c8446f8..28174ab1b 100644 --- a/etc/man/man1/meroxa-environments-remove.1 +++ b/etc/man/man1/meroxa-environments-remove.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-environments-repair.1 b/etc/man/man1/meroxa-environments-repair.1 index 37c0d7f8f..c3e305c90 100644 --- a/etc/man/man1/meroxa-environments-repair.1 +++ b/etc/man/man1/meroxa-environments-repair.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-environments-update.1 b/etc/man/man1/meroxa-environments-update.1 index 96f2aae72..bded1438b 100644 --- a/etc/man/man1/meroxa-environments-update.1 +++ b/etc/man/man1/meroxa-environments-update.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-environments.1 b/etc/man/man1/meroxa-environments.1 index 75d3b17e3..5b29a82f1 100644 --- a/etc/man/man1/meroxa-environments.1 +++ b/etc/man/man1/meroxa-environments.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-login.1 b/etc/man/man1/meroxa-login.1 index c8f2578a9..a4cff5ceb 100644 --- a/etc/man/man1/meroxa-login.1 +++ b/etc/man/man1/meroxa-login.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-logout.1 b/etc/man/man1/meroxa-logout.1 index ca0c64eb3..b0ff37176 100644 --- a/etc/man/man1/meroxa-logout.1 +++ b/etc/man/man1/meroxa-logout.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-open-billing.1 b/etc/man/man1/meroxa-open-billing.1 index 72111e62a..902ceda4c 100644 --- a/etc/man/man1/meroxa-open-billing.1 +++ b/etc/man/man1/meroxa-open-billing.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-open.1 b/etc/man/man1/meroxa-open.1 index 4f6e3ff1d..de2aa67bb 100644 --- a/etc/man/man1/meroxa-open.1 +++ b/etc/man/man1/meroxa-open.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-resources-create.1 b/etc/man/man1/meroxa-resources-create.1 index 0c6902454..88a7016c6 100644 --- a/etc/man/man1/meroxa-resources-create.1 +++ b/etc/man/man1/meroxa-resources-create.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-resources-describe.1 b/etc/man/man1/meroxa-resources-describe.1 index e60a556c4..f922077e7 100644 --- a/etc/man/man1/meroxa-resources-describe.1 +++ b/etc/man/man1/meroxa-resources-describe.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-resources-list.1 b/etc/man/man1/meroxa-resources-list.1 index 934a0a19d..3984f706e 100644 --- a/etc/man/man1/meroxa-resources-list.1 +++ b/etc/man/man1/meroxa-resources-list.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-resources-remove.1 b/etc/man/man1/meroxa-resources-remove.1 index d95d7e8ad..51dca00c5 100644 --- a/etc/man/man1/meroxa-resources-remove.1 +++ b/etc/man/man1/meroxa-resources-remove.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-resources-rotate-tunnel-key.1 b/etc/man/man1/meroxa-resources-rotate-tunnel-key.1 index 22e0b131d..1f495cc9b 100644 --- a/etc/man/man1/meroxa-resources-rotate-tunnel-key.1 +++ b/etc/man/man1/meroxa-resources-rotate-tunnel-key.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-resources-update.1 b/etc/man/man1/meroxa-resources-update.1 index 58775cd4d..95e587d3b 100644 --- a/etc/man/man1/meroxa-resources-update.1 +++ b/etc/man/man1/meroxa-resources-update.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-resources-validate.1 b/etc/man/man1/meroxa-resources-validate.1 index 09a98456c..85f9c1c9e 100644 --- a/etc/man/man1/meroxa-resources-validate.1 +++ b/etc/man/man1/meroxa-resources-validate.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-resources.1 b/etc/man/man1/meroxa-resources.1 index e82f63917..19e6a6f46 100644 --- a/etc/man/man1/meroxa-resources.1 +++ b/etc/man/man1/meroxa-resources.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-transforms-list.1 b/etc/man/man1/meroxa-transforms-list.1 index af079365b..a643208e2 100644 --- a/etc/man/man1/meroxa-transforms-list.1 +++ b/etc/man/man1/meroxa-transforms-list.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-transforms.1 b/etc/man/man1/meroxa-transforms.1 index e8e56dc47..18a0c2abb 100644 --- a/etc/man/man1/meroxa-transforms.1 +++ b/etc/man/man1/meroxa-transforms.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-version.1 b/etc/man/man1/meroxa-version.1 index 5543a668b..2ed2466d7 100644 --- a/etc/man/man1/meroxa-version.1 +++ b/etc/man/man1/meroxa-version.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-whoami.1 b/etc/man/man1/meroxa-whoami.1 index f71dcee22..2c2e9a5b9 100644 --- a/etc/man/man1/meroxa-whoami.1 +++ b/etc/man/man1/meroxa-whoami.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa.1 b/etc/man/man1/meroxa.1 index d37d9bfff..e7b1a66b1 100644 --- a/etc/man/man1/meroxa.1 +++ b/etc/man/man1/meroxa.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Feb 2023" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "Mar 2023" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/go.mod b/go.mod index 94cb651ba..d43daf108 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/manifoldco/promptui v0.9.0 github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-runewidth v0.0.13 // indirect - github.com/meroxa/meroxa-go v0.0.0-20230223202938-b5c515d4d643 + github.com/meroxa/meroxa-go v0.0.0-20230316160201-f7bae0e537fb github.com/nirasan/go-oauth-pkce-code-verifier v0.0.0-20170819232839-0fbfe93532da github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4 github.com/rivo/uniseg v0.2.0 // indirect diff --git a/go.sum b/go.sum index 2eb63f813..dcba2eb23 100644 --- a/go.sum +++ b/go.sum @@ -536,8 +536,8 @@ github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lL github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2/go.mod h1:eD9eIE7cdwcMi9rYluz88Jz2VyhSmden33/aXg4oVIY= -github.com/meroxa/meroxa-go v0.0.0-20230223202938-b5c515d4d643 h1:2dqnY1xQyAoS54qLmg2Ho1VYcqd2PNWNTHRn1iXpIH8= -github.com/meroxa/meroxa-go v0.0.0-20230223202938-b5c515d4d643/go.mod h1:OdTP4P/yHcTAqOE86kDXoTTLqC1Vj+/PFMG41kOcmhI= +github.com/meroxa/meroxa-go v0.0.0-20230316160201-f7bae0e537fb h1:eQTWI8puBDJPtIKwOsMwxDExRJ0YK/T+DNCDOUS8dOs= +github.com/meroxa/meroxa-go v0.0.0-20230316160201-f7bae0e537fb/go.mod h1:VaDn0fLKHG2VoI9MQVEqwtfum4BaGr8pcgtfWRe8/Dk= github.com/meroxa/turbine-core v0.0.0-20230113145603-c7b1554653fa h1:addv/qyR+R6fqHBrJMf4sLp52BAfk4rf88f58aul1hw= github.com/meroxa/turbine-core v0.0.0-20230113145603-c7b1554653fa/go.mod h1:zhJZykOx6X/L2OKNv8a2P0w7LrwXv3nLh0BLIzfrUh8= github.com/meroxa/turbine-go v1.0.0 h1:5/mLoRbtdefpcC35fG3YZioz1qgrlaHOKh56n2hJ9lQ= diff --git a/utils/display/environments.go b/utils/display/environments.go index 03b4d9991..20f9ca9fa 100644 --- a/utils/display/environments.go +++ b/utils/display/environments.go @@ -105,6 +105,10 @@ func EnvironmentTable(environment *meroxa.Environment) string { {Align: simpletable.AlignRight, Text: "AWS EC2 Permissions Status:"}, {Text: strings.Join(environment.Status.PreflightDetails.PreflightPermissions.EC2, " ; ")}, }, + { + {Align: simpletable.AlignRight, Text: "AWS ECR Permissions Status:"}, + {Text: strings.Join(environment.Status.PreflightDetails.PreflightPermissions.ECR, " ; ")}, + }, { {Align: simpletable.AlignRight, Text: "AWS EKS Permissions Status:"}, {Text: strings.Join(environment.Status.PreflightDetails.PreflightPermissions.EKS, " ; ")}, @@ -169,6 +173,10 @@ func EnvironmentPreflightTable(environment *meroxa.Environment) string { {Align: simpletable.AlignRight, Text: "AWS EC2 Permissions Status:"}, {Text: strings.Join(environment.Status.PreflightDetails.PreflightPermissions.EC2, " ; ")}, }, + { + {Align: simpletable.AlignRight, Text: "AWS ECR Permissions Status:"}, + {Text: strings.Join(environment.Status.PreflightDetails.PreflightPermissions.ECR, " ; ")}, + }, { {Align: simpletable.AlignRight, Text: "AWS EKS Permissions Status:"}, {Text: strings.Join(environment.Status.PreflightDetails.PreflightPermissions.EKS, " ; ")}, diff --git a/vendor/github.com/meroxa/meroxa-go/pkg/meroxa/auth.go b/vendor/github.com/meroxa/meroxa-go/pkg/meroxa/auth.go index 35735fc63..f6ca57d5b 100644 --- a/vendor/github.com/meroxa/meroxa-go/pkg/meroxa/auth.go +++ b/vendor/github.com/meroxa/meroxa-go/pkg/meroxa/auth.go @@ -10,7 +10,7 @@ import ( "net/http" "time" - "github.com/cristalhq/jwt/v3" + jwt "github.com/cristalhq/jwt/v3" "golang.org/x/oauth2" ) diff --git a/vendor/github.com/meroxa/meroxa-go/pkg/meroxa/environment.go b/vendor/github.com/meroxa/meroxa-go/pkg/meroxa/environment.go index 6a8c4951d..18d0a7ba7 100644 --- a/vendor/github.com/meroxa/meroxa-go/pkg/meroxa/environment.go +++ b/vendor/github.com/meroxa/meroxa-go/pkg/meroxa/environment.go @@ -33,6 +33,7 @@ type PreflightPermissions struct { MSK []string `json:"msk"` EKS []string `json:"eks"` EC2 []string `json:"ec2"` + ECR []string `json:"ecr"` KMS []string `json:"kms"` IAM []string `json:"iam"` Cloudformation []string `json:"cloudformation"` diff --git a/vendor/github.com/meroxa/meroxa-go/pkg/meroxa/meroxa.go b/vendor/github.com/meroxa/meroxa-go/pkg/meroxa/meroxa.go index 4e4defa8a..d476ed7b6 100644 --- a/vendor/github.com/meroxa/meroxa-go/pkg/meroxa/meroxa.go +++ b/vendor/github.com/meroxa/meroxa-go/pkg/meroxa/meroxa.go @@ -167,7 +167,7 @@ func (c *client) AddHeader(key, value string) { } func (r *Requester) AddHeader(key, value string) { - if r.headers == nil { + if len(r.headers) == 0 { r.headers = make(http.Header) } r.headers.Add(key, value) @@ -208,7 +208,7 @@ func (r *Requester) newRequest(ctx context.Context, method, path string, body in } // add global headers to request - if r.headers != nil { + if len(r.headers) > 0 { req.Header = r.headers } req.Header.Add("Content-Type", jsonContentType) diff --git a/vendor/github.com/meroxa/meroxa-go/pkg/meroxa/options.go b/vendor/github.com/meroxa/meroxa-go/pkg/meroxa/options.go index 4c33638af..7494325eb 100644 --- a/vendor/github.com/meroxa/meroxa-go/pkg/meroxa/options.go +++ b/vendor/github.com/meroxa/meroxa-go/pkg/meroxa/options.go @@ -83,7 +83,7 @@ func WithAuthentication(conf *oauth2.Config, accessToken, refreshToken string, o // WithAccountUUID sets the http client to use for requests. func WithAccountUUID(accountUUID string) Option { return func(r *Requester) error { - if r.headers == nil { + if len(r.headers) == 0 { r.headers = make(http.Header) } r.headers.Add(meroxaAccountUUIDHeader, accountUUID) @@ -94,7 +94,7 @@ func WithAccountUUID(accountUUID string) Option { // WithHeader allows for setting a generic header to use for requests. func WithHeader(key, value string) Option { return func(r *Requester) error { - if r.headers == nil { + if len(r.headers) == 0 { r.headers = make(http.Header) } r.headers.Add(key, value) diff --git a/vendor/modules.txt b/vendor/modules.txt index 5ba2a8abb..8a0b99c42 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -196,8 +196,8 @@ github.com/mattn/go-runewidth # github.com/mattn/go-shellwords v1.0.12 ## explicit; go 1.13 github.com/mattn/go-shellwords -# github.com/meroxa/meroxa-go v0.0.0-20230223202938-b5c515d4d643 -## explicit; go 1.17 +# github.com/meroxa/meroxa-go v0.0.0-20230316160201-f7bae0e537fb +## explicit; go 1.20 github.com/meroxa/meroxa-go/pkg/meroxa github.com/meroxa/meroxa-go/pkg/mock # github.com/meroxa/turbine-core v0.0.0-20230113145603-c7b1554653fa