diff --git a/sysdig/data_source_sysdig_fargate_workload_agent.go b/sysdig/data_source_sysdig_fargate_workload_agent.go index b2df3cce..d088e235 100644 --- a/sysdig/data_source_sysdig_fargate_workload_agent.go +++ b/sysdig/data_source_sysdig_fargate_workload_agent.go @@ -26,6 +26,7 @@ const agentinoKiltDefinition = `build { "SYSDIG_COLLECTOR_PORT": ${config.collector_port} "SYSDIG_ACCESS_KEY": ${config.sysdig_access_key} "SYSDIG_LOGGING": ${config.sysdig_logging} + "SYSDIG_SIDECAR": ${config.sidecar} } capabilities: ["SYS_PTRACE"] mount: [ @@ -125,6 +126,12 @@ func dataSourceSysdigFargateWorkloadAgent() *schema.Resource { Description: "the instrumentation logging level", Optional: true, }, + "sidecar": { + Type: schema.TypeString, + Description: "Sidecar mode: auto/force/(empty string)", + Default: "", // we will want to change this to "auto" eventually + Optional: true, + }, "output_container_definitions": { Type: schema.TypeString, Computed: true, @@ -300,6 +307,7 @@ type KiltRecipeConfig struct { CollectorHost string `json:"collector_host"` CollectorPort string `json:"collector_port"` SysdigLogging string `json:"sysdig_logging"` + Sidecar string `json:"sidecar"` } type patchOptions struct { @@ -347,6 +355,7 @@ func dataSourceSysdigFargateWorkloadAgentRead(ctx context.Context, d *schema.Res CollectorHost: d.Get("collector_host").(string), CollectorPort: d.Get("collector_port").(string), SysdigLogging: d.Get("sysdig_logging").(string), + Sidecar: d.Get("sidecar").(string), } jsonConf, err := json.Marshal(&recipeConfig) diff --git a/sysdig/testfiles/ECSInstrumented.json b/sysdig/testfiles/ECSInstrumented.json index de711a4a..ae9839ea 100644 --- a/sysdig/testfiles/ECSInstrumented.json +++ b/sysdig/testfiles/ECSInstrumented.json @@ -19,6 +19,10 @@ "Name": "SYSDIG_LOGGING", "Value": "sysdig_logging" }, + { + "Name": "SYSDIG_SIDECAR", + "Value": "" + }, { "Name": "SYSDIG_ENDPOINT", "Value": "value" @@ -86,6 +90,10 @@ "Name": "SYSDIG_LOGGING", "Value": "sysdig_logging" }, + { + "Name": "SYSDIG_SIDECAR", + "Value": "" + }, { "Name": "SYSDIG_ENDPOINT", "Value": "value" diff --git a/sysdig/testfiles/fargate_bare_pdig_expected.json b/sysdig/testfiles/fargate_bare_pdig_expected.json index f869695d..482ed78d 100644 --- a/sysdig/testfiles/fargate_bare_pdig_expected.json +++ b/sysdig/testfiles/fargate_bare_pdig_expected.json @@ -29,6 +29,10 @@ "Name": "SYSDIG_LOGGING", "Value": "sysdig_logging" }, + { + "Name": "SYSDIG_SIDECAR", + "Value": "" + }, { "Name": "SYSDIG_ORCHESTRATOR", "Value": "orchestrator_host" @@ -86,6 +90,10 @@ "Name": "SYSDIG_LOGGING", "Value": "sysdig_logging" }, + { + "Name": "SYSDIG_SIDECAR", + "Value": "" + }, { "Name": "SYSDIG_ORCHESTRATOR", "Value": "orchestrator_host" @@ -164,6 +172,10 @@ "Name": "SYSDIG_LOGGING", "Value": "sysdig_logging" }, + { + "Name": "SYSDIG_SIDECAR", + "Value": "" + }, { "Name": "SYSDIG_ORCHESTRATOR", "Value": "orchestrator_host" diff --git a/sysdig/testfiles/fargate_cmd_test_expected.json b/sysdig/testfiles/fargate_cmd_test_expected.json index 07329576..80e0558a 100644 --- a/sysdig/testfiles/fargate_cmd_test_expected.json +++ b/sysdig/testfiles/fargate_cmd_test_expected.json @@ -32,6 +32,10 @@ "Name": "SYSDIG_LOGGING", "Value": "sysdig_logging" }, + { + "Name": "SYSDIG_SIDECAR", + "Value": "" + }, { "Name": "SYSDIG_ORCHESTRATOR", "Value": "orchestrator_host" @@ -81,6 +85,10 @@ "Name": "SYSDIG_LOGGING", "Value": "sysdig_logging" }, + { + "Name": "SYSDIG_SIDECAR", + "Value": "" + }, { "Name": "SYSDIG_ORCHESTRATOR", "Value": "orchestrator_host" diff --git a/sysdig/testfiles/fargate_combined_test_expected.json b/sysdig/testfiles/fargate_combined_test_expected.json index c24533b1..90cb628f 100644 --- a/sysdig/testfiles/fargate_combined_test_expected.json +++ b/sysdig/testfiles/fargate_combined_test_expected.json @@ -32,6 +32,10 @@ "Name": "SYSDIG_LOGGING", "Value": "sysdig_logging" }, + { + "Name": "SYSDIG_SIDECAR", + "Value": "" + }, { "Name": "SYSDIG_ORCHESTRATOR", "Value": "orchestrator_host" @@ -93,6 +97,10 @@ "Name": "SYSDIG_LOGGING", "Value": "sysdig_logging" }, + { + "Name": "SYSDIG_SIDECAR", + "Value": "" + }, { "Name": "SYSDIG_ORCHESTRATOR", "Value": "orchestrator_host" diff --git a/sysdig/testfiles/fargate_entrypoint_test_expected.json b/sysdig/testfiles/fargate_entrypoint_test_expected.json index 4ae6248a..a897e053 100644 --- a/sysdig/testfiles/fargate_entrypoint_test_expected.json +++ b/sysdig/testfiles/fargate_entrypoint_test_expected.json @@ -29,6 +29,10 @@ "Name": "SYSDIG_LOGGING", "Value": "sysdig_logging" }, + { + "Name": "SYSDIG_SIDECAR", + "Value": "" + }, { "Name": "SYSDIG_ORCHESTRATOR", "Value": "orchestrator_host" @@ -78,6 +82,10 @@ "Name": "SYSDIG_LOGGING", "Value": "sysdig_logging" }, + { + "Name": "SYSDIG_SIDECAR", + "Value": "" + }, { "Name": "SYSDIG_ORCHESTRATOR", "Value": "orchestrator_host" diff --git a/sysdig/testfiles/fargate_env_test_expected.json b/sysdig/testfiles/fargate_env_test_expected.json index 6bf4f0b6..1ec13302 100644 --- a/sysdig/testfiles/fargate_env_test_expected.json +++ b/sysdig/testfiles/fargate_env_test_expected.json @@ -29,6 +29,10 @@ "Name": "SYSDIG_LOGGING", "Value": "sysdig_logging" }, + { + "Name": "SYSDIG_SIDECAR", + "Value": "" + }, { "Name": "SYSDIG_ORCHESTRATOR", "Value": "orchestrator_host" @@ -86,6 +90,10 @@ "Name": "SYSDIG_LOGGING", "Value": "sysdig_logging" }, + { + "Name": "SYSDIG_SIDECAR", + "Value": "" + }, { "Name": "SYSDIG_ORCHESTRATOR", "Value": "orchestrator_host" diff --git a/sysdig/testfiles/fargate_field_case_test_expected.json b/sysdig/testfiles/fargate_field_case_test_expected.json index 51c63c3e..d3dfc0ff 100644 --- a/sysdig/testfiles/fargate_field_case_test_expected.json +++ b/sysdig/testfiles/fargate_field_case_test_expected.json @@ -29,6 +29,10 @@ "Name": "SYSDIG_LOGGING", "Value": "sysdig_logging" }, + { + "Name": "SYSDIG_SIDECAR", + "Value": "" + }, { "Name": "SYSDIG_ORCHESTRATOR", "Value": "orchestrator_host" @@ -78,6 +82,10 @@ "Name": "SYSDIG_LOGGING", "Value": "sysdig_logging" }, + { + "Name": "SYSDIG_SIDECAR", + "Value": "" + }, { "Name": "SYSDIG_ORCHESTRATOR", "Value": "orchestrator_host" @@ -127,6 +135,10 @@ "Name": "SYSDIG_LOGGING", "Value": "sysdig_logging" }, + { + "Name": "SYSDIG_SIDECAR", + "Value": "" + }, { "Name": "SYSDIG_ORCHESTRATOR", "Value": "orchestrator_host" diff --git a/sysdig/testfiles/fargate_ignore_container_test_expected.json b/sysdig/testfiles/fargate_ignore_container_test_expected.json index 48c5d24f..7cd73907 100644 --- a/sysdig/testfiles/fargate_ignore_container_test_expected.json +++ b/sysdig/testfiles/fargate_ignore_container_test_expected.json @@ -29,6 +29,10 @@ "Name": "SYSDIG_LOGGING", "Value": "sysdig_logging" }, + { + "Name": "SYSDIG_SIDECAR", + "Value": "" + }, { "Name": "SYSDIG_ORCHESTRATOR", "Value": "orchestrator_host" @@ -92,6 +96,10 @@ "Name": "SYSDIG_LOGGING", "Value": "sysdig_logging" }, + { + "Name": "SYSDIG_SIDECAR", + "Value": "" + }, { "Name": "SYSDIG_ORCHESTRATOR", "Value": "orchestrator_host" diff --git a/sysdig/testfiles/fargate_linuxparameters_test_expected.json b/sysdig/testfiles/fargate_linuxparameters_test_expected.json index b31f24e7..ff920ab9 100644 --- a/sysdig/testfiles/fargate_linuxparameters_test_expected.json +++ b/sysdig/testfiles/fargate_linuxparameters_test_expected.json @@ -29,6 +29,10 @@ "Name": "SYSDIG_LOGGING", "Value": "sysdig_logging" }, + { + "Name": "SYSDIG_SIDECAR", + "Value": "" + }, { "Name": "SYSDIG_ORCHESTRATOR", "Value": "orchestrator_host" @@ -81,6 +85,10 @@ "Name": "SYSDIG_LOGGING", "Value": "sysdig_logging" }, + { + "Name": "SYSDIG_SIDECAR", + "Value": "" + }, { "Name": "SYSDIG_ORCHESTRATOR", "Value": "orchestrator_host" diff --git a/sysdig/testfiles/fargate_log_group_expected.json b/sysdig/testfiles/fargate_log_group_expected.json index e31af21d..2e5927fe 100644 --- a/sysdig/testfiles/fargate_log_group_expected.json +++ b/sysdig/testfiles/fargate_log_group_expected.json @@ -32,6 +32,10 @@ "Name": "SYSDIG_LOGGING", "Value": "sysdig_logging" }, + { + "Name": "SYSDIG_SIDECAR", + "Value": "" + }, { "Name": "SYSDIG_ORCHESTRATOR", "Value": "orchestrator_host" @@ -90,6 +94,10 @@ "Name": "SYSDIG_LOGGING", "Value": "sysdig_logging" }, + { + "Name": "SYSDIG_SIDECAR", + "Value": "" + }, { "Name": "SYSDIG_ORCHESTRATOR", "Value": "orchestrator_host" diff --git a/sysdig/testfiles/fargate_volumesfrom_test_expected.json b/sysdig/testfiles/fargate_volumesfrom_test_expected.json index a4e78983..60d0b3d4 100644 --- a/sysdig/testfiles/fargate_volumesfrom_test_expected.json +++ b/sysdig/testfiles/fargate_volumesfrom_test_expected.json @@ -32,6 +32,10 @@ "Name": "SYSDIG_LOGGING", "Value": "sysdig_logging" }, + { + "Name": "SYSDIG_SIDECAR", + "Value": "" + }, { "Name": "SYSDIG_ORCHESTRATOR", "Value": "orchestrator_host" @@ -85,6 +89,10 @@ "Name": "SYSDIG_LOGGING", "Value": "sysdig_logging" }, + { + "Name": "SYSDIG_SIDECAR", + "Value": "" + }, { "Name": "SYSDIG_ORCHESTRATOR", "Value": "orchestrator_host"