Workaround new long ARNs

remind101 · Oct 22, 2020 · 559d068 · 559d068
1 parent 2ef3b50
commit 559d068
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/pkg/arn/arn.go b/pkg/arn/arn.go
@@ -63,7 +63,7 @@ func (a *ARN) String() string {
 // SplitResource splits the Resource section of an ARN into its type and id
 // components.
 func SplitResource(r string) (resource, id string, err error) {
- p := strings.Split(r, "/")
+ p := strings.SplitN(r, "/", 2)
 
  if len(p) != 2 {
  err = ErrInvalidResource

diff --git a/pkg/arn/arn_test.go b/pkg/arn/arn_test.go
@@ -23,6 +23,14 @@ func TestParse(t *testing.T) {
  Account: "249285743859",
  Resource: "service/acme-inc:web",
  }},
+ {"arn:aws:ecs:us-east-1:249285743859:service/my-cluster/acme-inc:web", ARN{
+ ARN: "arn",
+ AWS: "aws",
+ Service: "ecs",
+ Region: "us-east-1",
+ Account: "249285743859",
+ Resource: "service/my-cluster/acme-inc:web",
+ }},
  }
 
  for i, tt := range tests {
@@ -41,6 +49,7 @@ func TestSplitResource(t *testing.T) {
  err error
  }{
  {"service/acme-inc", "service", "acme-inc", nil},
+ {"service/my-cluster-name/acme-inc", "service", "my-cluster-name/acme-inc", nil},
  {"service", "", "", ErrInvalidResource},
  }