Skip to content

feat(networkmonitor): implement CloudWatch Network Monitor service (go-3wm1) #2235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
agbishop merged 9 commits into from
Jun 13, 2026
Merged

feat(networkmonitor): implement CloudWatch Network Monitor service (go-3wm1) #2235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a5148ef
feat(networkmonitor): implement services/networkmonitor (new service …
Jun 13, 2026
5814ae0
WIP: checkpoint (auto)
Jun 13, 2026
bbef63d
Merge remote-tracking branch 'origin/main' into polecat/jasper/go-3wm…
Jun 13, 2026
eb8cee6
fix(networkmonitor): fix lint/formatting CI failures (go-qzs6)
Jun 13, 2026
b8fa7c3
WIP: checkpoint (auto)
Jun 13, 2026
5392ab0
fix(cli): reduce getServiceProviders length below funlen limit (go-qzs6)
Jun 13, 2026
eeffe94
merge: resolve cli.go/go.mod/go.sum conflicts with main (funlen keyst…
Jun 13, 2026
f06b10d
Merge branch 'main' into polecat/jasper/go-3wm1@mqbqeccj
agbishop Jun 13, 2026
7caf988
Merge branch 'main' into polecat/jasper/go-3wm1@mqbqeccj
agbishop Jun 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ import (
mqbackend "github.com/blackbirdworks/gopherstack/services/mq"
mwaabackend "github.com/blackbirdworks/gopherstack/services/mwaa"
neptunebackend "github.com/blackbirdworks/gopherstack/services/neptune"
networkmonitorbackend "github.com/blackbirdworks/gopherstack/services/networkmonitor"
omicsbackend "github.com/blackbirdworks/gopherstack/services/omics"
opensearchbackend "github.com/blackbirdworks/gopherstack/services/opensearch"
organizationsbackend "github.com/blackbirdworks/gopherstack/services/organizations"
Expand Down Expand Up @@ -271,6 +272,7 @@ type CLI struct {
resourcegroupstaggingHandler service.Registerable
swfHandler service.Registerable
firehoseHandler service.Registerable
networkmonitorHandler service.Registerable
schedulerHandler service.Registerable
servicediscoveryHandler service.Registerable
transcribeHandler service.Registerable
Expand Down Expand Up @@ -1145,6 +1147,11 @@ func (c *CLI) GetSWFHandler() service.Registerable { return c.swfHandler }
//nolint:ireturn // architecturally required to return interface
func (c *CLI) GetFirehoseHandler() service.Registerable { return c.firehoseHandler }

// GetNetworkMonitorHandler returns the NetworkMonitor handler.
//
//nolint:ireturn // architecturally required to return interface
func (c *CLI) GetNetworkMonitorHandler() service.Registerable { return c.networkmonitorHandler }

// GetSchedulerHandler returns the Scheduler handler (dashboard.AWSSDKProvider).
//
//nolint:ireturn // architecturally required to return interface
Expand Down Expand Up @@ -2258,6 +2265,7 @@ func storeCLIHandlers(cli *CLI, services []service.Registerable) {
cli.resourcegroupstaggingHandler = byName["ResourceGroupsTaggingAPI"]
cli.swfHandler = byName["SWF"]
cli.firehoseHandler = byName["Firehose"]
cli.networkmonitorHandler = byName["NetworkMonitor"]
cli.schedulerHandler = byName["Scheduler"]
cli.route53resolverHandler = byName["Route53Resolver"]
cli.rdsHandler = byName["RDS"]
Expand Down Expand Up @@ -2634,6 +2642,7 @@ func getRemainingServiceProviders() []service.Provider {
&resourcegroupstaggingapibackend.Provider{},
&swfbackend.Provider{},
&firehosebackend.Provider{},
&networkmonitorbackend.Provider{},
&schedulerbackend.Provider{},
&route53resolverbackend.Provider{},
&rdsbackend.Provider{},
Expand Down Expand Up @@ -2699,14 +2708,14 @@ func getRemainingServiceProviders() []service.Provider {
&mediaconvertbackend.Provider{},
&mqbackend.Provider{},
&mediastorebackend.Provider{},
&mediastoredatabackend.Provider{},
}, getLatestServiceProviders()...)
}

// getLatestServiceProviders returns providers for additional services.
// Extracted from getServiceProviders to satisfy the funlen limit.
func getLatestServiceProviders() []service.Provider {
return append([]service.Provider{
&mediastoredatabackend.Provider{},
&memorydbbackend.Provider{},
}, getNewestServiceProviders()...)
}
Expand Down
4 changes: 3 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,9 @@ require (
github.com/aws/aws-sdk-go-v2/service/appstream v1.60.3
)

require github.com/aws/aws-sdk-go-v2/service/omics v1.45.0 // indirect
require github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.14.6

require github.com/aws/aws-sdk-go-v2/service/omics v1.45.0

require (
github.com/antlr/antlr4 v0.0.0-20181218183524-be58ebffde8e // indirect
Expand Down
10 changes: 2 additions & 8 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ github.com/aws/aws-dax-go v1.2.15 h1:30rH3+QgjpjemrVg0NGIG5FnB1izJZ7jUZuBb1Fy8ak
github.com/aws/aws-dax-go v1.2.15/go.mod h1:4f/qGLBQlPYd+fmAfG4n4oSvN19JdKNYYmsr90/MPso=
github.com/aws/aws-sdk-go v1.55.5 h1:KKUZBfBoyqy5d3swXyiC7Q76ic40rYcbqH7qjh59kzU=
github.com/aws/aws-sdk-go v1.55.5/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
github.com/aws/aws-sdk-go-v2 v1.41.11 h1:9PRf7jyTMEUM6fuNRAJa2mO/skJfrF50rENJwf2LXqw=
github.com/aws/aws-sdk-go-v2 v1.41.11/go.mod h1:iiUX27gOXRuYaoeUVXhUpPwjJHzISfPAjjcuhUbLSVs=
github.com/aws/aws-sdk-go-v2 v1.42.0 h1:XvXMJTkFQtpBKIWZnmr9ZEOc2InWM2yldjXEJ/bymhA=
github.com/aws/aws-sdk-go-v2 v1.42.0/go.mod h1:27+ACypSLljLAEKsCYOmrjKh83vuTRkuAe9Uv/3A4bg=
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.10 h1:gx1AwW1Iyk9Z9dD9F4akX5gnN3QZwUB20GGKH/I+Rho=
Expand All @@ -42,12 +40,8 @@ github.com/aws/aws-sdk-go-v2/credentials v1.19.17 h1:gP2nkGsS+KMvF/jfFz2Vv2qiiOq
github.com/aws/aws-sdk-go-v2/credentials v1.19.17/go.mod h1:Bsew3S/moG5iT77giPj1q8wb/s0RE5/QfH+ASjYtuQc=
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.23 h1:UuSfcORqNSz/ey3VPRS8TcVH2Ikf0/sC+Hdj400QI6U=
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.23/go.mod h1:+G/OSGiOFnSOkYloKj/9M35s74LgVAdJBSD5lsFfqKg=
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.27 h1:8sPbKi1/KRHwl5oR3qN9mUXestCeHuaRutxylnr/eVY=
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.27/go.mod h1:QV9IVIopJ1dpQUno0f9VYDUwOEjj8u0iEJ4JiZVre3Y=
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.29 h1:f3vKqSo13fhTYb+JEcXwXefZQE26I1FB5eTSniU67ko=
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.29/go.mod h1:MzoLFUArKGpGD+ukmPiTPG1X5x4o6M2kq4v2dr1FiEc=
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.27 h1:9d8AoASQY9UwrOSmiJ7uSM0MGUPFhnenwSvpaFfat2c=
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.27/go.mod h1:x0rldpsnUQaQIs4Rh+Vwm9Z/0vI6BxadGtsgJfZFb8s=
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.29 h1:RdwIf/CuUsvJX3RgJagbOyotl/cxoLY4xviKuE7p2GY=
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.29/go.mod h1:71wt8W2EgswdZy9Mf9KNnzxZ3TiZlv4caKghPktDOkA=
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.24 h1:OQqn11BtaYv1WLUowvcA30MpzIu8Ti4pcLPIIyoKZrA=
Expand Down Expand Up @@ -252,6 +246,8 @@ github.com/aws/aws-sdk-go-v2/service/mwaa v1.40.1 h1:fVJ6uZsjHWiMbT4tPsNPmA5VEln
github.com/aws/aws-sdk-go-v2/service/mwaa v1.40.1/go.mod h1:O2kdYrYDkdHdUpvYcrWQoYaJgPJCGHdaLF06ep3HzKI=
github.com/aws/aws-sdk-go-v2/service/neptune v1.44.1 h1:Akp3PA62O+s8Tze5/4f3YthrAT6OHhay9QhUPv7zw6Y=
github.com/aws/aws-sdk-go-v2/service/neptune v1.44.1/go.mod h1:YNCq3tFuuD8sxXKR9NC7n8gdafguPzxp+WFKuivplTw=
github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.14.6 h1:SE8N02CtLWVY/3UM+mqAA5tcnmC6fKhUg3R9gVyk120=
github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.14.6/go.mod h1:0OibDBxn2Uj3XhWpXkqAQkom2usZf200CpfV2K1PirI=
github.com/aws/aws-sdk-go-v2/service/omics v1.45.0 h1:eYMKiWBNj6Q61yQCN25B0SLfb1VFLV0axyrrB6rXW9w=
github.com/aws/aws-sdk-go-v2/service/omics v1.45.0/go.mod h1:czP0k4tesyOIDgyiUY0jP8AxVtxCy9keGlLm1IheCmQ=
github.com/aws/aws-sdk-go-v2/service/opensearch v1.59.0 h1:rhlLa2SwSeKva0DEUrbRc5DN2bAsIPvcmW7N/c2MUgI=
Expand Down Expand Up @@ -362,8 +358,6 @@ github.com/aws/aws-sdk-go-v2/service/workspaces v1.68.3 h1:VdduyWoOF4l/GUaNfSIFE
github.com/aws/aws-sdk-go-v2/service/workspaces v1.68.3/go.mod h1:CuyzqbKdY8lN//0RPBb7OkQ9YRFYBFpK5SQjlANpWJI=
github.com/aws/aws-sdk-go-v2/service/xray v1.36.20 h1:5V3CHiHP3OHaeB6e1tOC2hw5FrHkxepAho+4MEJG4QM=
github.com/aws/aws-sdk-go-v2/service/xray v1.36.20/go.mod h1:sgjg2v2UIv+sDFiig3tbkJ4sGSQrXQ2f+YgWg8TLOu4=
github.com/aws/smithy-go v1.27.0 h1:ZoFioDKJxkSIW2otF9T0aPtNlUwhdVCcuZh/rzH9Hus=
github.com/aws/smithy-go v1.27.0/go.mod h1:YE2RhdIuDbA5E5bTdciG9KrW3+TiEONeUWCqxX9i1Fc=
github.com/aws/smithy-go v1.27.1 h1:4T340VFndXtADGF52gYa1POyL7s9E4Z1OeZ1hCscIw8=
github.com/aws/smithy-go v1.27.1/go.mod h1:YE2RhdIuDbA5E5bTdciG9KrW3+TiEONeUWCqxX9i1Fc=
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
Expand Down
10 changes: 10 additions & 0 deletions internal/teststack/teststack.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ import (
mqbackend "github.com/blackbirdworks/gopherstack/services/mq"
mwaabackend "github.com/blackbirdworks/gopherstack/services/mwaa"
neptunebackend "github.com/blackbirdworks/gopherstack/services/neptune"
networkmonitorbackend "github.com/blackbirdworks/gopherstack/services/networkmonitor"
opensearchbackend "github.com/blackbirdworks/gopherstack/services/opensearch"
organizationsbackend "github.com/blackbirdworks/gopherstack/services/organizations"
pinpointbackend "github.com/blackbirdworks/gopherstack/services/pinpoint"
Expand Down Expand Up @@ -189,6 +190,7 @@ type Stack struct {
ResourceGroupsTaggingHandler *rgtabackend.Handler
SWFHandler *swfbackend.Handler
FirehoseHandler *firehosebackend.Handler
NetworkMonitorHandler *networkmonitorbackend.Handler
SchedulerHandler *schedulerbackend.Handler
Route53ResolverHandler *route53resolverbackend.Handler
TranscribeHandler *transcribebackend.Handler
Expand Down Expand Up @@ -562,6 +564,7 @@ func registerLatestServices(registry *service.Registry, h handlers) {
_ = registry.Register(h.wafv2)
_ = registry.Register(h.xray)
_ = registry.Register(h.s3tables)
_ = registry.Register(h.networkmonitor)
}

// handlers bundles all service handlers created for a test stack.
Expand Down Expand Up @@ -606,6 +609,7 @@ type handlers struct {
rgtagging *rgtabackend.Handler
swf *swfbackend.Handler
firehose *firehosebackend.Handler
networkmonitor *networkmonitorbackend.Handler
scheduler *schedulerbackend.Handler
route53resolver *route53resolverbackend.Handler
transcribe *transcribebackend.Handler
Expand Down Expand Up @@ -788,6 +792,11 @@ func populateExtendedHandlers(h *handlers) {
h.firehose = firehosebackend.NewHandler(
firehosebackend.NewInMemoryBackend(config.DefaultAccountID, config.DefaultRegion),
)
h.networkmonitor = networkmonitorbackend.NewHandler(
networkmonitorbackend.NewInMemoryBackend(config.DefaultRegion, config.DefaultAccountID),
)
h.networkmonitor.AccountID = config.DefaultAccountID
h.networkmonitor.DefaultRegion = config.DefaultRegion
h.scheduler = schedulerbackend.NewHandler(
schedulerbackend.NewInMemoryBackend(config.DefaultAccountID, config.DefaultRegion),
)
Expand Down Expand Up @@ -1231,6 +1240,7 @@ func buildStack(
ResourceGroupsTaggingHandler: h.rgtagging,
SWFHandler: h.swf,
FirehoseHandler: h.firehose,
NetworkMonitorHandler: h.networkmonitor,
SchedulerHandler: h.scheduler,
Route53ResolverHandler: h.route53resolver,
TranscribeHandler: h.transcribe,
Expand Down
Loading
Loading