From 959c4f4654de56e42914aaa5176ab505ff934671 Mon Sep 17 00:00:00 2001 From: Jed Liu Date: Wed, 11 Dec 2024 17:22:52 -0500 Subject: [PATCH] Fix #49 (#57) Changes to `CommonApiDumpFlags` were being lost. Also took the opportunity to properly organize our import statements. --- apidump/health_check.go | 3 ++- cmd/internal/apidump/apidump.go | 2 +- cmd/internal/apidump/common_flags.go | 6 ++++-- cmd/internal/ec2/ec2.go | 2 +- cmd/internal/ecs/ecs.go | 2 +- cmd/internal/kube/injector/helper.go | 1 + cmd/internal/kube/injector/injector_test.go | 3 ++- cmd/internal/kube/print_fragment.go | 8 +++----- learn/types.go | 5 ++--- learn/util_test.go | 7 +++---- location/location.go | 3 +-- pcap/net_parse_test.go | 5 ++--- pcap/pcap_replay_test.go | 9 ++++----- pcap/stream_test.go | 5 ++--- pcap/util_test.go | 5 ++--- rest/base_client.go | 3 +-- 16 files changed, 32 insertions(+), 37 deletions(-) diff --git a/apidump/health_check.go b/apidump/health_check.go index fde9578e..88103509 100644 --- a/apidump/health_check.go +++ b/apidump/health_check.go @@ -2,8 +2,9 @@ package apidump import ( "fmt" - "github.com/gorilla/mux" "net/http" + + "github.com/gorilla/mux" ) // Handles health check requests for the Docker Extension. diff --git a/cmd/internal/apidump/apidump.go b/cmd/internal/apidump/apidump.go index 1d9e9392..2f6c695b 100644 --- a/cmd/internal/apidump/apidump.go +++ b/cmd/internal/apidump/apidump.go @@ -41,7 +41,7 @@ var ( dockerExtensionMode bool healthCheckPort int - commonApidumpFlags CommonApidumpFlags + commonApidumpFlags *CommonApidumpFlags ) // This function will either startup apidump normally, or never return, with probability diff --git a/cmd/internal/apidump/common_flags.go b/cmd/internal/apidump/common_flags.go index 1432ff5c..356d5837 100644 --- a/cmd/internal/apidump/common_flags.go +++ b/cmd/internal/apidump/common_flags.go @@ -19,7 +19,9 @@ type CommonApidumpFlags struct { SendWitnessPayloads bool } -func AddCommonApiDumpFlags(cmd *cobra.Command) (flags CommonApidumpFlags) { +func AddCommonApiDumpFlags(cmd *cobra.Command) *CommonApidumpFlags { + flags := &CommonApidumpFlags{} + cmd.Flags().StringVar( &flags.Filter, "filter", @@ -88,7 +90,7 @@ func AddCommonApiDumpFlags(cmd *cobra.Command) (flags CommonApidumpFlags) { return flags } -func ConvertCommonApiDumpFlagsToArgs(flags CommonApidumpFlags) []string { +func ConvertCommonApiDumpFlagsToArgs(flags *CommonApidumpFlags) []string { commonApidumpArgs := []string{} if flags.Filter != "" { diff --git a/cmd/internal/ec2/ec2.go b/cmd/internal/ec2/ec2.go index bc86560a..e1539a62 100644 --- a/cmd/internal/ec2/ec2.go +++ b/cmd/internal/ec2/ec2.go @@ -11,7 +11,7 @@ import ( var ( // Postman Insights project id projectID string - apidumpFlags apidump.CommonApidumpFlags + apidumpFlags *apidump.CommonApidumpFlags // Overwrite the existing service file and don't prompt the user forceOverwrite bool diff --git a/cmd/internal/ecs/ecs.go b/cmd/internal/ecs/ecs.go index 49cbb288..6fd2d7da 100644 --- a/cmd/internal/ecs/ecs.go +++ b/cmd/internal/ecs/ecs.go @@ -38,7 +38,7 @@ var ( // apidump flags // These flags will be passed to apidump command in task definition file - apidumpFlags apidump.CommonApidumpFlags + apidumpFlags *apidump.CommonApidumpFlags ) var Cmd = &cobra.Command{ diff --git a/cmd/internal/kube/injector/helper.go b/cmd/internal/kube/injector/helper.go index a4e2cae7..e690fbcb 100644 --- a/cmd/internal/kube/injector/helper.go +++ b/cmd/internal/kube/injector/helper.go @@ -2,6 +2,7 @@ package injector import ( "bytes" + v1 "k8s.io/api/core/v1" kyaml "sigs.k8s.io/yaml" ) diff --git a/cmd/internal/kube/injector/injector_test.go b/cmd/internal/kube/injector/injector_test.go index 22ccdab2..672d11aa 100644 --- a/cmd/internal/kube/injector/injector_test.go +++ b/cmd/internal/kube/injector/injector_test.go @@ -1,13 +1,14 @@ package injector import ( + "testing" + "github.com/stretchr/testify/assert" appsv1 "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - "testing" ) func Test_Inject(t *testing.T) { diff --git a/cmd/internal/kube/print_fragment.go b/cmd/internal/kube/print_fragment.go index 3c021127..4c589299 100644 --- a/cmd/internal/kube/print_fragment.go +++ b/cmd/internal/kube/print_fragment.go @@ -5,17 +5,15 @@ import ( "fmt" "strings" + "github.com/hashicorp/hcl/v2/hclsyntax" + "github.com/hashicorp/hcl/v2/hclwrite" "github.com/postmanlabs/postman-insights-agent/cfg" "github.com/postmanlabs/postman-insights-agent/cmd/internal/cmderr" "github.com/postmanlabs/postman-insights-agent/rest" - v1 "k8s.io/api/core/v1" - "github.com/spf13/cobra" "github.com/zclconf/go-cty/cty" + v1 "k8s.io/api/core/v1" "sigs.k8s.io/yaml" - - "github.com/hashicorp/hcl/v2/hclsyntax" - "github.com/hashicorp/hcl/v2/hclwrite" ) var printHelmChartFragmentCmd = &cobra.Command{ diff --git a/learn/types.go b/learn/types.go index 0853bf15..e3bf9acf 100644 --- a/learn/types.go +++ b/learn/types.go @@ -3,10 +3,9 @@ package learn import ( "strconv" - "github.com/google/uuid" - - "github.com/akitasoftware/akita-libs/akid" pb "github.com/akitasoftware/akita-ir/go/api_spec" + "github.com/akitasoftware/akita-libs/akid" + "github.com/google/uuid" ) var ( diff --git a/learn/util_test.go b/learn/util_test.go index ce4f0c49..c563a5c1 100644 --- a/learn/util_test.go +++ b/learn/util_test.go @@ -4,16 +4,15 @@ import ( "net/http" "net/url" - "github.com/golang/protobuf/proto" - "github.com/google/go-cmp/cmp" - "github.com/pkg/errors" - as "github.com/akitasoftware/akita-ir/go/api_spec" pb "github.com/akitasoftware/akita-ir/go/api_spec" "github.com/akitasoftware/akita-libs/akinet" "github.com/akitasoftware/akita-libs/memview" "github.com/akitasoftware/akita-libs/pbhash" "github.com/akitasoftware/akita-libs/spec_util" + "github.com/golang/protobuf/proto" + "github.com/google/go-cmp/cmp" + "github.com/pkg/errors" ) const ( diff --git a/location/location.go b/location/location.go index a7a15218..a8e81667 100644 --- a/location/location.go +++ b/location/location.go @@ -1,9 +1,8 @@ package location import ( - "github.com/pkg/errors" - "github.com/akitasoftware/akita-libs/akiuri" + "github.com/pkg/errors" ) // Implements pflag.Value interface. diff --git a/pcap/net_parse_test.go b/pcap/net_parse_test.go index 76f5f9d9..4838c89c 100644 --- a/pcap/net_parse_test.go +++ b/pcap/net_parse_test.go @@ -8,12 +8,11 @@ import ( "testing" "time" - "github.com/google/go-cmp/cmp" - "github.com/google/gopacket" - "github.com/akitasoftware/akita-libs/akinet" "github.com/akitasoftware/akita-libs/akinet/http" "github.com/akitasoftware/akita-libs/buffer_pool" + "github.com/google/go-cmp/cmp" + "github.com/google/gopacket" ) var ( diff --git a/pcap/pcap_replay_test.go b/pcap/pcap_replay_test.go index 627feec2..4e953813 100644 --- a/pcap/pcap_replay_test.go +++ b/pcap/pcap_replay_test.go @@ -7,6 +7,10 @@ import ( "testing" "time" + "github.com/akitasoftware/akita-libs/akinet" + akihttp "github.com/akitasoftware/akita-libs/akinet/http" + "github.com/akitasoftware/akita-libs/buffer_pool" + "github.com/akitasoftware/akita-libs/memview" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/google/gopacket" @@ -14,11 +18,6 @@ import ( "github.com/google/gopacket/pcap" "github.com/google/uuid" "github.com/pkg/errors" - - "github.com/akitasoftware/akita-libs/akinet" - akihttp "github.com/akitasoftware/akita-libs/akinet/http" - "github.com/akitasoftware/akita-libs/buffer_pool" - "github.com/akitasoftware/akita-libs/memview" ) // Constants wrapped as functions because we can't read the testdata file at diff --git a/pcap/stream_test.go b/pcap/stream_test.go index ca16ae19..82c82d7a 100644 --- a/pcap/stream_test.go +++ b/pcap/stream_test.go @@ -6,13 +6,12 @@ import ( "testing" "time" + "github.com/akitasoftware/akita-libs/akinet" + "github.com/akitasoftware/akita-libs/memview" "github.com/google/gopacket" "github.com/google/gopacket/layers" "github.com/google/gopacket/reassembly" "github.com/google/uuid" - - "github.com/akitasoftware/akita-libs/akinet" - "github.com/akitasoftware/akita-libs/memview" ) var ( diff --git a/pcap/util_test.go b/pcap/util_test.go index 1e85b65d..7ed0d405 100644 --- a/pcap/util_test.go +++ b/pcap/util_test.go @@ -7,13 +7,12 @@ import ( "strconv" "strings" + "github.com/akitasoftware/akita-libs/akinet" + "github.com/akitasoftware/akita-libs/memview" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/google/gopacket" "github.com/google/gopacket/reassembly" - - "github.com/akitasoftware/akita-libs/akinet" - "github.com/akitasoftware/akita-libs/memview" ) var ( diff --git a/rest/base_client.go b/rest/base_client.go index 2d71283f..39c14628 100644 --- a/rest/base_client.go +++ b/rest/base_client.go @@ -10,10 +10,9 @@ import ( "os" "sync" + "github.com/akitasoftware/akita-libs/akid" "github.com/pkg/errors" "github.com/spf13/viper" - - "github.com/akitasoftware/akita-libs/akid" ) // Use a proxy, "" is none. (This is because the flags package doesn't support Optional)