From af1583ac80099a61b0fc5ce093c32269b7b4cd41 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 --- go.mod | 2 +- go.sum | 4 ++-- utils/display/environments.go | 8 ++++++++ .../github.com/meroxa/meroxa-go/pkg/meroxa/environment.go | 1 + vendor/modules.txt | 2 +- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 94cb651ba..eb49efd44 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-20230315194850-592ac99b220c 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..c10cc94c4 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-20230315194850-592ac99b220c h1:4fptlftN/w5zaPHI4X+cFZxcMZCDhuqlH/VTYGCIu4s= +github.com/meroxa/meroxa-go v0.0.0-20230315194850-592ac99b220c/go.mod h1:+w11KsQtYKTUwCDRJb2RBqTjmr3OMYP6PMJcP+hCjD0= 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/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/modules.txt b/vendor/modules.txt index 5ba2a8abb..bbca061f5 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -196,7 +196,7 @@ 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 +# github.com/meroxa/meroxa-go v0.0.0-20230315194850-592ac99b220c ## explicit; go 1.17 github.com/meroxa/meroxa-go/pkg/meroxa github.com/meroxa/meroxa-go/pkg/mock