new(serverless-agent): switch to newer agent-kilt with sidecar_config

sysdiglabs · Feb 15, 2024 · 59efb34 · 59efb34
1 parent f141c21
commit 59efb34
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 5 deletions.
diff --git a/go.mod b/go.mod
@@ -14,7 +14,7 @@ require (
 	github.com/rs/zerolog v1.29.1
 	github.com/spf13/cast v1.5.1
 	github.com/stretchr/testify v1.8.4
-	github.com/sysdiglabs/agent-kilt/runtimes/cloudformation v0.0.0-20231207110334-1d6c07239b4c
+	github.com/sysdiglabs/agent-kilt/runtimes/cloudformation v0.0.0-20240201123620-2272de6dee9f
 	google.golang.org/protobuf v1.30.0
 )
 
@@ -63,7 +63,7 @@ require (
 	github.com/opencontainers/image-spec v1.1.0-rc3 // 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-20231207110334-1d6c07239b4c // indirect
+	github.com/sysdiglabs/agent-kilt/pkg v0.0.0-20240201123620-2272de6dee9f // indirect
 	github.com/vbatts/tar-split v0.11.3 // indirect
 	github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
 	github.com/vmihailenco/msgpack/v4 v4.3.12 // indirect

diff --git a/go.sum b/go.sum
@@ -225,10 +225,14 @@ github.com/sysdiglabs/agent-kilt/pkg v0.0.0-20231124131820-71542fa7267c h1:4EX48
 github.com/sysdiglabs/agent-kilt/pkg v0.0.0-20231124131820-71542fa7267c/go.mod h1:jxZJUWMw4eK8W9kyWeU0sJulx1KyEaIi6oZx4ATLobI=
 github.com/sysdiglabs/agent-kilt/pkg v0.0.0-20231207110334-1d6c07239b4c h1:VmKvTs0e7mmA+9QGIcTBZHkfyNwE5xFZIJ7UWWW86Vs=
 github.com/sysdiglabs/agent-kilt/pkg v0.0.0-20231207110334-1d6c07239b4c/go.mod h1:CTFbnFzGunvQCZKkewsx/XLSchikz9pHIq715Ao90Bw=
+github.com/sysdiglabs/agent-kilt/pkg v0.0.0-20240201123620-2272de6dee9f h1:2DsK+LfZ4oFOKg+hJ7VdYkYBOPLQhm2S3WYRG9sKjg4=
+github.com/sysdiglabs/agent-kilt/pkg v0.0.0-20240201123620-2272de6dee9f/go.mod h1:CTFbnFzGunvQCZKkewsx/XLSchikz9pHIq715Ao90Bw=
 github.com/sysdiglabs/agent-kilt/runtimes/cloudformation v0.0.0-20231124134841-96a4feb9adb9 h1:VWoep4GtewewjvveMxpvMUeJYMAnqj/mxH3rnFMpQr0=
 github.com/sysdiglabs/agent-kilt/runtimes/cloudformation v0.0.0-20231124134841-96a4feb9adb9/go.mod h1:ISt5TFdTW97q10cNZt3gpv8ejVSCuDrJGAu4CNZJcFw=
 github.com/sysdiglabs/agent-kilt/runtimes/cloudformation v0.0.0-20231207110334-1d6c07239b4c h1:hCF6/JBSV0ovF9RfMKMUiROeNzlLtnMWjW5MSbcwA2Q=
 github.com/sysdiglabs/agent-kilt/runtimes/cloudformation v0.0.0-20231207110334-1d6c07239b4c/go.mod h1:iJjZCFs4hKceZHVCFFfU+s46VfBfST6L6/oB4aHzu1s=
+github.com/sysdiglabs/agent-kilt/runtimes/cloudformation v0.0.0-20240201123620-2272de6dee9f h1:AJSUyLqKhSW+wrMnHcg2+8j/KG2++KwbRKzl+gwz6vk=
+github.com/sysdiglabs/agent-kilt/runtimes/cloudformation v0.0.0-20240201123620-2272de6dee9f/go.mod h1:iJjZCFs4hKceZHVCFFfU+s46VfBfST6L6/oB4aHzu1s=
 github.com/urfave/cli v1.22.12/go.mod h1:sSBEIC79qR6OvcmsD4U3KABeOTxDqQtdDnaFuUN30b8=
 github.com/vbatts/tar-split v0.11.3 h1:hLFqsOLQ1SsppQNTMpkpPXClLDfC2A3Zgy9OUU+RVck=
 github.com/vbatts/tar-split v0.11.3/go.mod h1:9QlHN18E+fEH7RdG+QAJJcuya3rqT7eXSTY7wGrAokY=

diff --git a/sysdig/data_source_sysdig_fargate_ECS_test.go b/sysdig/data_source_sysdig_fargate_ECS_test.go
@@ -173,6 +173,13 @@ func TestNewPatchOptions(t *testing.T) {
 	}
 }
 
+func getSidecarConfig() string {
+	scObj := gabs.New()
+	scObj.Set("image_auth_secret", "RepositoryCredentials", "CredentialsParameter")
+	sc, _ := json.Marshal(scObj)
+	return string(sc)
+}
+
 func TestECStransformation(t *testing.T) {
 	inputfile, err := os.ReadFile("testfiles/ECSinput.json")
 	if err != nil {
@@ -181,10 +188,10 @@ func TestECStransformation(t *testing.T) {
 
 	kiltConfig := &cfnpatcher.Configuration{
 		Kilt:               agentinoKiltDefinition,
-		ImageAuthSecret:    "image_auth_secret",
 		OptIn:              false,
 		UseRepositoryHints: true,
 		RecipeConfig:       getKiltRecipe(t),
+		SidecarConfig:      getSidecarConfig(),
 	}
 
 	patchOpts := &patchOptions{}
@@ -206,10 +213,10 @@ func TestPatchFargateTaskDefinition(t *testing.T) {
 	// Kilt Configuration, test invariant
 	kiltConfig := &cfnpatcher.Configuration{
 		Kilt:               agentinoKiltDefinition,
-		ImageAuthSecret:    "image_auth_secret",
 		OptIn:              false,
 		UseRepositoryHints: true,
 		RecipeConfig:       getKiltRecipe(t),
+		SidecarConfig:      getSidecarConfig(),
 	}
 
 	// File readers

diff --git a/sysdig/data_source_sysdig_fargate_workload_agent.go b/sysdig/data_source_sysdig_fargate_workload_agent.go
@@ -445,12 +445,27 @@ func dataSourceSysdigFargateWorkloadAgentRead(ctx context.Context, d *schema.Res
 		return diag.Errorf("Failed to serialize configuration: %v", err.Error())
 	}
 
+	scObj := gabs.New()
+	imageAuth := d.Get("image_auth_secret").(string)
+	if imageAuth != "" {
+		_, err := scObj.Set(imageAuth, "RepositoryCredentials", "CredentialsParameter")
+		if err != nil {
+			return diag.Errorf("cannot set image auth secret in sidecar config: %v", err.Error())
+		}
+	}
+
+	sc, err := json.Marshal(scObj)
+	if err != nil {
+		panic("cannot marshal sidecar config: " + err.Error())
+	}
+	sidecarConfig := string(sc)
+
 	kiltConfig := &cfnpatcher.Configuration{
 		Kilt:               agentinoKiltDefinition,
-		ImageAuthSecret:    d.Get("image_auth_secret").(string),
 		OptIn:              false,
 		UseRepositoryHints: true,
 		RecipeConfig:       string(jsonConf),
+		SidecarConfig:      sidecarConfig,
 	}
 
 	containerDefinitions := d.Get("container_definitions").(string)