From 97b6ea6e9927a231defc52596b5a6342286a540b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 14 Aug 2024 20:38:57 +0000 Subject: [PATCH 1/3] Update Overmind Dependencies --- go.mod | 6 +++--- go.sum | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 6103731e..57b082b0 100644 --- a/go.mod +++ b/go.mod @@ -24,9 +24,9 @@ require ( github.com/mitchellh/go-homedir v1.1.0 github.com/muesli/reflow v0.3.0 github.com/muesli/termenv v0.15.3-0.20240618155329-98d742f6907a - github.com/overmindtech/aws-source v0.0.0-20240813071000-4de072d92588 - github.com/overmindtech/sdp-go v0.86.0 - github.com/overmindtech/stdlib-source v0.0.0-20240813140341-ba28e44823a5 + github.com/overmindtech/aws-source v0.0.0-20240814120642-8f003757bf74 + github.com/overmindtech/sdp-go v0.89.0 + github.com/overmindtech/stdlib-source v0.0.0-20240814112505-15f516f52fac github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c github.com/sirupsen/logrus v1.9.3 github.com/spf13/cobra v1.8.1 diff --git a/go.sum b/go.sum index 3dec6883..7a75a1b7 100644 --- a/go.sum +++ b/go.sum @@ -253,16 +253,16 @@ github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/openrdap/rdap v0.9.2-0.20240517203139-eb57b3a8dedd h1:UuQycBx6K0lB0/IfHePshOYjlrptkF4FoApFP2Y4s3k= github.com/openrdap/rdap v0.9.2-0.20240517203139-eb57b3a8dedd/go.mod h1:391Ww1JbjG4FHOlvQqCd6n25CCCPE64JzC5cCYPxhyM= -github.com/overmindtech/aws-source v0.0.0-20240813071000-4de072d92588 h1:rdxeIHrfu7XxX17hNDAWO7QZtGj+Kms0wbvTrXkrjZk= -github.com/overmindtech/aws-source v0.0.0-20240813071000-4de072d92588/go.mod h1:nwZFvh4sFZuou1eKN+ut+B1fBTeLOxI10T4IxvqsNlA= +github.com/overmindtech/aws-source v0.0.0-20240814120642-8f003757bf74 h1:ajgYTlwH61iGTu6T3TcKumQt5ZRHWeiHdyo80lv91/I= +github.com/overmindtech/aws-source v0.0.0-20240814120642-8f003757bf74/go.mod h1:0iAJWxsYAcv4IbUq1OKLww+d435rQkplDdQaLdYLFdE= github.com/overmindtech/discovery v0.27.6 h1:p+xMEIST0fk6HfbejXR+Ea59+JA5zjCO4zvRqelRqwE= github.com/overmindtech/discovery v0.27.6/go.mod h1:A3wvNM6VTo7qfGExWQ+fgh+NfLh35nuPJ7wF4pLYEQI= -github.com/overmindtech/sdp-go v0.86.0 h1:5PL1ElPs57oveJicJW6S0Jaj9k61x5792kWXc8LMofU= -github.com/overmindtech/sdp-go v0.86.0/go.mod h1:ZhvaDruut/s6V0FmtwkpxJv18Uxau275HN72tPGSoNQ= +github.com/overmindtech/sdp-go v0.89.0 h1:z/8L/hOsMod4RKvuP3lCN53QWo7JNFT4031Uf88atDU= +github.com/overmindtech/sdp-go v0.89.0/go.mod h1:ZhvaDruut/s6V0FmtwkpxJv18Uxau275HN72tPGSoNQ= github.com/overmindtech/sdpcache v1.6.4 h1:MJoYBDqDE3s8FrRzZ0RPgFiH39HWI/Mv2ImH1NdLT8k= github.com/overmindtech/sdpcache v1.6.4/go.mod h1:/F9XStVdntRJEQjlZ86BPuB1Y7VPo1PFcsCNiU1IoGE= -github.com/overmindtech/stdlib-source v0.0.0-20240813140341-ba28e44823a5 h1:rD/m+jUaYUMzffjwuAklJuDklW0L4rt2AYWNRrrt12w= -github.com/overmindtech/stdlib-source v0.0.0-20240813140341-ba28e44823a5/go.mod h1:Cp/92EB7NHwThczMKtJ+86pBeRgJA3Y7pwzh03P2o1Y= +github.com/overmindtech/stdlib-source v0.0.0-20240814112505-15f516f52fac h1:PPe/04fy/CRSNyNaa0vvnuhlWP4MPlX8+kqEtbHsetY= +github.com/overmindtech/stdlib-source v0.0.0-20240814112505-15f516f52fac/go.mod h1:kHCpR1c2hXbHNayscyXadvqfKfMTnV+1SnM1Yk8o80g= github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM= github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= From ada4ddb0374b854ef1227c0bc3060749affaa8a3 Mon Sep 17 00:00:00 2001 From: Dylan Ratcliffe Date: Wed, 14 Aug 2024 21:41:29 +0100 Subject: [PATCH 2/3] Added mappings --- tfutils/awssource.go | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/tfutils/awssource.go b/tfutils/awssource.go index acbaa1f5..5e6c3285 100644 --- a/tfutils/awssource.go +++ b/tfutils/awssource.go @@ -556,6 +556,12 @@ var AwssourceData = map[string][]TfMapData{ QueryField: "arn", Scope: "*", }, + { + Type: "elbv2-load-balancer", + Method: sdp.QueryMethod_SEARCH, + QueryField: "id", + Scope: "*", + }, }, "aws_lb_listener": { { @@ -786,6 +792,12 @@ var AwssourceData = map[string][]TfMapData{ QueryField: "arn", Scope: "*", }, + { + Type: "route53-resource-record-set", + Method: sdp.QueryMethod_SEARCH, + QueryField: "id", + Scope: "*", + }, }, "aws_route53_zone": { { @@ -1010,12 +1022,6 @@ var AwssourceData = map[string][]TfMapData{ }, }, "aws_security_group_rule": { - { - Type: "ec2-security-group-rule", - Method: sdp.QueryMethod_GET, - QueryField: "id", - Scope: "*", - }, { Type: "ec2-security-group-rule", Method: sdp.QueryMethod_GET, @@ -1117,6 +1123,22 @@ var AwssourceData = map[string][]TfMapData{ Scope: "*", }, }, + "aws_vpc_security_group_egress_rule": { + { + Type: "ec2-security-group-rule", + Method: sdp.QueryMethod_GET, + QueryField: "security_group_rule_id", + Scope: "*", + }, + }, + "aws_vpc_security_group_ingress_rule": { + { + Type: "ec2-security-group-rule", + Method: sdp.QueryMethod_GET, + QueryField: "security_group_rule_id", + Scope: "*", + }, + }, "egress_only_internet_gateway": { { Type: "ec2-egress-only-internet-gateway", From c1397b11286fabef3d43b87c3b9fd69d7972aa66 Mon Sep 17 00:00:00 2001 From: Dylan Ratcliffe Date: Wed, 14 Aug 2024 20:46:04 +0000 Subject: [PATCH 3/3] Fixed tests to handle new mappings --- tfutils/plan_mapper_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tfutils/plan_mapper_test.go b/tfutils/plan_mapper_test.go index 3e984190..f2d855de 100644 --- a/tfutils/plan_mapper_test.go +++ b/tfutils/plan_mapper_test.go @@ -54,8 +54,8 @@ func TestMappedItemDiffsFromPlan(t *testing.T) { t.Errorf("Expected 16 secrets, got %v", results.RemovedSecrets) } - if len(results.Results) != 5 { - t.Errorf("Expected 5 changes, got %v:", len(results.Results)) + if len(results.Results) != 6 { + t.Errorf("Expected 6 changes, got %v:", len(results.Results)) for _, diff := range results.Results { t.Errorf(" %v", diff) }