From 6fcfdbdd58a7705eb7101ea34e4ff366e38b4077 Mon Sep 17 00:00:00 2001 From: Paul Crooks Date: Thu, 17 Jul 2025 15:43:33 +0000 Subject: [PATCH] refactor(serverless): Migrate to new agent-kilt package Ref: SMAGENT-6727 --- go.mod | 11 ++++------- go.sum | 18 ++++++++---------- sysdig/data_source_sysdig_fargate_ECS_test.go | 2 +- ...ata_source_sysdig_fargate_workload_agent.go | 2 +- 4 files changed, 14 insertions(+), 19 deletions(-) diff --git a/go.mod b/go.mod index e5917316f..e24a5997c 100644 --- a/go.mod +++ b/go.mod @@ -2,8 +2,6 @@ module github.com/draios/terraform-provider-sysdig go 1.24.4 -replace github.com/sysdiglabs/agent-kilt/pkg => github.com/sysdiglabs/agent-kilt/pkg v0.0.0-20250617143519-c6c40780f72f // fixes local replacement in upstream github.com/sysdiglabs/agent-kilt/runtimes/cloudformation - require ( github.com/Jeffail/gabs/v2 v2.7.0 github.com/aws/aws-sdk-go v1.55.7 @@ -15,7 +13,7 @@ require ( github.com/rs/zerolog v1.34.0 github.com/spf13/cast v1.9.2 github.com/stretchr/testify v1.10.0 - github.com/sysdiglabs/agent-kilt/runtimes/cloudformation v0.0.0-20250617143519-c6c40780f72f + github.com/sysdiglabs/agent-kilt v1.0.0 google.golang.org/protobuf v1.36.6 ) @@ -26,7 +24,7 @@ require ( github.com/cloudflare/circl v1.6.1 // indirect github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/docker/cli v28.3.1+incompatible // indirect + github.com/docker/cli v28.3.2+incompatible // indirect github.com/docker/distribution v2.8.3+incompatible // indirect github.com/docker/docker-credential-helpers v0.9.3 // indirect github.com/fatih/color v1.18.0 // indirect @@ -66,7 +64,6 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/sirupsen/logrus v1.9.3 // indirect - github.com/sysdiglabs/agent-kilt/pkg v0.0.0-replace // indirect github.com/vbatts/tar-split v0.12.1 // indirect github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect @@ -75,8 +72,8 @@ require ( golang.org/x/crypto v0.39.0 // indirect golang.org/x/mod v0.25.0 // indirect golang.org/x/net v0.41.0 // indirect - golang.org/x/sync v0.15.0 // indirect - golang.org/x/sys v0.33.0 // indirect + golang.org/x/sync v0.16.0 // indirect + golang.org/x/sys v0.34.0 // indirect golang.org/x/text v0.26.0 // indirect golang.org/x/tools v0.34.0 // indirect google.golang.org/appengine v1.6.8 // indirect diff --git a/go.sum b/go.sum index e67890c78..a030fc995 100644 --- a/go.sum +++ b/go.sum @@ -25,8 +25,8 @@ github.com/cyphar/filepath-securejoin v0.4.1/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGL github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/docker/cli v28.3.1+incompatible h1:ZUdwOLDEBoE3TE5rdC9IXGY5HPHksJK3M+hJEWhh2mc= -github.com/docker/cli v28.3.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v28.3.2+incompatible h1:mOt9fcLE7zaACbxW1GeS65RI67wIJrTnqS3hP2huFsY= +github.com/docker/cli v28.3.2+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk= github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker-credential-helpers v0.9.3 h1:gAm/VtF9wgqJMoxzT3Gj5p4AqIjCBS4wrsOh9yRqcz8= @@ -185,10 +185,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/sysdiglabs/agent-kilt/pkg v0.0.0-20250617143519-c6c40780f72f h1:X27tf4xcM+IbqG114ydGpsllCTrn+k4FnGlsVdKUfmY= -github.com/sysdiglabs/agent-kilt/pkg v0.0.0-20250617143519-c6c40780f72f/go.mod h1:3dZJ86ERFWxqMCERxmByN1a1oV4FytyN03ZuYn7+3t4= -github.com/sysdiglabs/agent-kilt/runtimes/cloudformation v0.0.0-20250617143519-c6c40780f72f h1:/DEATdmJgM4S6EDNU0ldBKfSMYaQCajd+Hy3pgk1XGg= -github.com/sysdiglabs/agent-kilt/runtimes/cloudformation v0.0.0-20250617143519-c6c40780f72f/go.mod h1:iTmXn0RctN4Gk/fuepQ2mHCHzL2YsO37/128PwnB/SE= +github.com/sysdiglabs/agent-kilt v1.0.0 h1:IMb4hgZ0sZATcQv2faQfDDlkrrWEuEiFeeJ+t4dn7ZM= +github.com/sysdiglabs/agent-kilt v1.0.0/go.mod h1:hUy3bM/Scj61zbsPMntt4x1yqR+M5d+vFYqSikJjXy4= github.com/vbatts/tar-split v0.12.1 h1:CqKoORW7BUWBe7UL/iqTVvkTBOF8UvOMKOIZykxnnbo= github.com/vbatts/tar-split v0.12.1/go.mod h1:eF6B6i6ftWQcDqEn3/iGFRFRo8cBIMSJVOpnNdfTMFA= github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= @@ -237,8 +235,8 @@ golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.15.0 h1:KWH3jNZsfyT6xfAfKiz6MRNmd46ByHDYaZ7KSkCtdW8= -golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= +golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw= +golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -253,8 +251,8 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw= -golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= +golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA= +golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg= diff --git a/sysdig/data_source_sysdig_fargate_ECS_test.go b/sysdig/data_source_sysdig_fargate_ECS_test.go index 84c8bc585..57ff7c84a 100644 --- a/sysdig/data_source_sysdig_fargate_ECS_test.go +++ b/sysdig/data_source_sysdig_fargate_ECS_test.go @@ -13,7 +13,7 @@ import ( "github.com/Jeffail/gabs/v2" "github.com/stretchr/testify/assert" - "github.com/sysdiglabs/agent-kilt/runtimes/cloudformation/cfnpatcher" + "github.com/sysdiglabs/agent-kilt/pkg/cfnpatcher" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) diff --git a/sysdig/data_source_sysdig_fargate_workload_agent.go b/sysdig/data_source_sysdig_fargate_workload_agent.go index a53c2c121..ccb78ecc5 100644 --- a/sysdig/data_source_sysdig_fargate_workload_agent.go +++ b/sysdig/data_source_sysdig_fargate_workload_agent.go @@ -14,7 +14,7 @@ import ( "github.com/aws/aws-sdk-go/service/ecs" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - "github.com/sysdiglabs/agent-kilt/runtimes/cloudformation/cfnpatcher" + "github.com/sysdiglabs/agent-kilt/pkg/cfnpatcher" ) const agentinoKiltDefinition = `build {