Skip to content

Commit 0db9384

Browse files
authored
feat(teams): allow ibm metrics on sysdig token (#378)
1 parent 6c0ac7e commit 0db9384

File tree

3 files changed

+5
-13
lines changed

3 files changed

+5
-13
lines changed

GNUmakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ testacc: fmtcheck
4242

4343
junit-report: fmtcheck
4444
@go install github.com/jstemmer/go-junit-report/v2@latest
45-
CGO_ENABLED=1 TF_ACC=1 go test $(TEST) -v $(TESTARGS) -tags=$(TEST_SUITE) -timeout 120m -race -parallel=1 2>&1 | tee output.txt
45+
CGO_ENABLED=1 TF_ACC=1 TF_LOG=DEBUG go test $(TEST) -v $(TESTARGS) -tags=$(TEST_SUITE) -timeout 120m -race -parallel=1 2>&1 | tee output.txt
4646
! grep -q "\[build failed\]" output.txt
4747
go-junit-report -in output.txt -out junit-report.xml
4848

sysdig/resource_sysdig_monitor_team.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -193,9 +193,7 @@ func resourceSysdigMonitorTeamRead(ctx context.Context, d *schema.ResourceData,
193193
_ = d.Set("user_roles", userMonitorRolesToSet(t.UserRoles))
194194
_ = d.Set("entrypoint", entrypointToSet(t.EntryPoint))
195195

196-
if clients.GetClientType() == IBMMonitor {
197-
resourceSysdigTeamReadIBM(d, &t)
198-
}
196+
resourceSysdigTeamReadIBM(d, &t)
199197

200198
return nil
201199
}
@@ -298,9 +296,7 @@ func teamFromResourceData(d *schema.ResourceData, clientType ClientType) v2.Team
298296
t.EntryPoint.Selection = val.(string)
299297
}
300298

301-
if clientType == IBMMonitor {
302-
teamFromResourceDataIBM(d, &t)
303-
}
299+
teamFromResourceDataIBM(d, &t)
304300

305301
return t
306302
}

sysdig/resource_sysdig_secure_team.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -202,9 +202,7 @@ func resourceSysdigSecureTeamRead(ctx context.Context, d *schema.ResourceData, m
202202
return diag.FromErr(err)
203203
}
204204

205-
if clients.GetClientType() == IBMSecure {
206-
resourceSysdigTeamReadIBM(d, &t)
207-
}
205+
resourceSysdigTeamReadIBM(d, &t)
208206

209207
return nil
210208
}
@@ -292,9 +290,7 @@ func secureTeamFromResourceData(d *schema.ResourceData, clientType ClientType) v
292290
t.ZoneIDs[i] = z.(int)
293291
}
294292

295-
if clientType == IBMSecure {
296-
teamFromResourceDataIBM(d, &t)
297-
}
293+
teamFromResourceDataIBM(d, &t)
298294

299295
return t
300296
}

0 commit comments

Comments
 (0)