fix: add the parameter sysdig_logging to the fargate_workload_agent (#186)

francesco-racciatti · web-flow · commit 2e7756da82ef · 2022-08-22T22:33:12.000+02:00
diff --git a/.github/workflows/ci-pull-request.yml b/.github/workflows/ci-pull-request.yml
@@ -75,6 +75,7 @@ jobs:
       - name: Get dependencies
         run: |
           go get -u -v github.com/onsi/ginkgo/ginkgo
+          go mod tidy
 
       - name: Test
         run: make test
diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.15
 
 require (
 	cloud.google.com/go/storage v1.13.0 // indirect
-	github.com/Jeffail/gabs/v2 v2.6.1 // indirect
+	github.com/Jeffail/gabs/v2 v2.6.1
 	github.com/agext/levenshtein v1.2.3 // indirect
 	github.com/apparentlymart/go-cidr v1.1.0 // indirect
 	github.com/aws/aws-sdk-go v1.42.32
@@ -28,8 +28,9 @@ require (
 	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
 	github.com/oklog/run v1.1.0 // indirect
 	github.com/opencontainers/image-spec v1.0.2 // indirect
-	github.com/rs/zerolog v1.26.1 // indirect
+	github.com/rs/zerolog v1.26.1
 	github.com/spf13/cast v1.4.1
+	github.com/stretchr/testify v1.7.0
 	github.com/ulikunitz/xz v0.5.10 // indirect
 	github.com/zclconf/go-cty v1.10.0 // indirect
 	golang.org/x/net v0.0.0-20220111093109-d55c255bac03 // indirect
diff --git a/sysdig/data_source_sysdig_fargate_ECS_test.go b/sysdig/data_source_sysdig_fargate_ECS_test.go
@@ -20,6 +20,7 @@ var (
 		OrchestratorPort: "orchestrator_port",
 		CollectorHost:    "collector_host",
 		CollectorPort:    "collector_port",
+		SysdigLogging:    "sysdig_logging",
 	}
 
 	testContainerDefinitionFiles = []string{
@@ -67,6 +68,7 @@ func TestECStransformation(t *testing.T) {
 		OrchestratorPort: "orchestrator_port",
 		CollectorHost:    "collector_host",
 		CollectorPort:    "collector_port",
+		SysdigLogging:    "sysdig_logging",
 	}
 
 	jsonConf, err := json.Marshal(&recipeConfig)
diff --git a/sysdig/data_source_sysdig_fargate_workload_agent.go b/sysdig/data_source_sysdig_fargate_workload_agent.go
@@ -24,7 +24,7 @@ const agentinoKiltDefinition = `build {
         "SYSDIG_COLLECTOR": ${config.collector_host}
         "SYSDIG_COLLECTOR_PORT": ${config.collector_port}
         "SYSDIG_ACCESS_KEY": ${config.sysdig_access_key}
-        "SYSDIG_LOGGING": ""
+        "SYSDIG_LOGGING": ${config.sysdig_logging}
     }
     mount: [
         {
@@ -106,6 +106,11 @@ func dataSourceSysdigFargateWorkloadAgent() *schema.Resource {
 					},
 				},
 			},
+			"sysdig_logging": {
+				Type:        schema.TypeString,
+				Description: "the instrumentation logging level",
+				Optional:    true,
+			},
 			"output_container_definitions": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -236,6 +241,7 @@ type KiltRecipeConfig struct {
 	OrchestratorPort string `json:"orchestrator_port"`
 	CollectorHost    string `json:"collector_host"`
 	CollectorPort    string `json:"collector_port"`
+	SysdigLogging    string `json:"sysdig_logging"`
 }
 
 func dataSourceSysdigFargateWorkloadAgentRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
@@ -246,6 +252,7 @@ func dataSourceSysdigFargateWorkloadAgentRead(ctx context.Context, d *schema.Res
 		OrchestratorPort: d.Get("orchestrator_port").(string),
 		CollectorHost:    d.Get("collector_host").(string),
 		CollectorPort:    d.Get("collector_port").(string),
+		SysdigLogging:    d.Get("sysdig_logging").(string),
 	}
 
 	jsonConf, err := json.Marshal(&recipeConfig)
diff --git a/sysdig/data_source_sysdig_fargate_workload_agent_test.go b/sysdig/data_source_sysdig_fargate_workload_agent_test.go
@@ -34,6 +34,7 @@ data "sysdig_fargate_workload_agent" "test" {
 	collector_port = 1234
 	sysdig_access_key = "abcdef"
 	workload_agent_image = "busybox"
+	sysdig_logging = "info"
 }
 `
 }
diff --git a/sysdig/testfiles/ECSInstrumented.json b/sysdig/testfiles/ECSInstrumented.json
@@ -17,7 +17,7 @@
       },
       {
         "Name": "SYSDIG_LOGGING",
-        "Value": ""
+        "Value": "sysdig_logging"
       },
       {
         "Name": "SYSDIG_ENDPOINT",
diff --git a/sysdig/testfiles/fargate_cmd_test_expected.json b/sysdig/testfiles/fargate_cmd_test_expected.json
@@ -30,7 +30,7 @@
             },
             {
                 "Name": "SYSDIG_LOGGING",
-                "Value": ""
+                "Value": "sysdig_logging"
             },
             {
                 "Name": "SYSDIG_ORCHESTRATOR",
diff --git a/sysdig/testfiles/fargate_combined_test_expected.json b/sysdig/testfiles/fargate_combined_test_expected.json
@@ -30,7 +30,7 @@
             },
             {
                 "Name": "SYSDIG_LOGGING",
-                "Value": ""
+                "Value": "sysdig_logging"
             },
             {
                 "Name": "SYSDIG_ORCHESTRATOR",
diff --git a/sysdig/testfiles/fargate_entrypoint_test_expected.json b/sysdig/testfiles/fargate_entrypoint_test_expected.json
@@ -27,7 +27,7 @@
       },
       {
         "Name": "SYSDIG_LOGGING",
-        "Value": ""
+        "Value": "sysdig_logging"
       },
       {
         "Name": "SYSDIG_ORCHESTRATOR",
diff --git a/sysdig/testfiles/fargate_env_test_expected.json b/sysdig/testfiles/fargate_env_test_expected.json
@@ -27,7 +27,7 @@
             },
             {
                 "Name": "SYSDIG_LOGGING",
-                "Value": ""
+                "Value": "sysdig_logging"
             },
             {
                 "Name": "SYSDIG_ORCHESTRATOR",
diff --git a/sysdig/testfiles/fargate_linuxparameters_test_expected.json b/sysdig/testfiles/fargate_linuxparameters_test_expected.json
@@ -27,7 +27,7 @@
             },
             {
                 "Name": "SYSDIG_LOGGING",
-                "Value": ""
+                "Value": "sysdig_logging"
             },
             {
                 "Name": "SYSDIG_ORCHESTRATOR",
diff --git a/sysdig/testfiles/fargate_log_group_expected.json b/sysdig/testfiles/fargate_log_group_expected.json
@@ -30,7 +30,7 @@
             },
             {
                 "Name": "SYSDIG_LOGGING",
-                "Value": ""
+                "Value": "sysdig_logging"
             },
             {
                 "Name": "SYSDIG_ORCHESTRATOR",
diff --git a/sysdig/testfiles/fargate_volumesfrom_test_expected.json b/sysdig/testfiles/fargate_volumesfrom_test_expected.json
@@ -30,7 +30,7 @@
             },
             {
                 "Name": "SYSDIG_LOGGING",
-                "Value": ""
+                "Value": "sysdig_logging"
             },
             {
                 "Name": "SYSDIG_ORCHESTRATOR",
diff --git a/website/docs/d/fargate_workload_agent.md b/website/docs/d/fargate_workload_agent.md
@@ -43,6 +43,7 @@ data "sysdig_fargate_workload_agent" "instrumented_containers" {
   * `group` - The name of the existing log group for instrumentation logs
   * `stream_prefix` - Prefix for the instrumentation log stream
   * `region` - The AWS region where the target log group resides
+* `sysdig_logging` - (Optional) The instrumentation logging level: `trace`, `debug`, `info`, `warning`, `error`, `silent`.
 
 
 ## Attributes Reference

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ var (`
`20`	`20`	`OrchestratorPort: "orchestrator_port",`
`21`	`21`	`CollectorHost: "collector_host",`
`22`	`22`	`CollectorPort: "collector_port",`
	`23`	`+ SysdigLogging: "sysdig_logging",`
`23`	`24`	`}`
`24`	`25`
`25`	`26`	`testContainerDefinitionFiles = []string{`
`@@ -67,6 +68,7 @@ func TestECStransformation(t *testing.T) {`
`67`	`68`	`OrchestratorPort: "orchestrator_port",`
`68`	`69`	`CollectorHost: "collector_host",`
`69`	`70`	`CollectorPort: "collector_port",`
	`71`	`+ SysdigLogging: "sysdig_logging",`
`70`	`72`	`}`
`71`	`73`
`72`	`74`	`jsonConf, err := json.Marshal(&recipeConfig)`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ data "sysdig_fargate_workload_agent" "test" {`
`34`	`34`	`collector_port = 1234`
`35`	`35`	`sysdig_access_key = "abcdef"`
`36`	`36`	`workload_agent_image = "busybox"`
	`37`	`+ sysdig_logging = "info"`
`37`	`38`	`}`
`38`	`39`	`
`39`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`},`
`18`	`18`	`{`
`19`	`19`	`"Name": "SYSDIG_LOGGING",`
`20`		`- "Value": ""`
	`20`	`+ "Value": "sysdig_logging"`
`21`	`21`	`},`
`22`	`22`	`{`
`23`	`23`	`"Name": "SYSDIG_ENDPOINT",`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`},`
`31`	`31`	`{`
`32`	`32`	`"Name": "SYSDIG_LOGGING",`
`33`		`- "Value": ""`
	`33`	`+ "Value": "sysdig_logging"`
`34`	`34`	`},`
`35`	`35`	`{`
`36`	`36`	`"Name": "SYSDIG_ORCHESTRATOR",`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`},`
`28`	`28`	`{`
`29`	`29`	`"Name": "SYSDIG_LOGGING",`
`30`		`- "Value": ""`
	`30`	`+ "Value": "sysdig_logging"`
`31`	`31`	`},`
`32`	`32`	`{`
`33`	`33`	`"Name": "SYSDIG_ORCHESTRATOR",`