Skip to content

Commit a7f8a1e

Browse files
briangleesonbriangleeson
authored
feat(tekton): add support for waiting runs limit (IBM-Cloud#6335)
* feat(tekton): add support for waiting runs limit * chore: more limit_waiting_run updates * chore: package updates * chore: code review fix * chore: fix packages
1 parent 7c0efde commit a7f8a1e

17 files changed

+128
-18
lines changed

‎go.mod‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ require (
1414
github.com/IBM/code-engine-go-sdk v0.0.0-20241217191651-e1821f8c58c3
1515
github.com/IBM/configuration-aggregator-go-sdk v0.0.2
1616
github.com/IBM/container-registry-go-sdk v1.1.0
17-
github.com/IBM/continuous-delivery-go-sdk/v2 v2.0.2
17+
github.com/IBM/continuous-delivery-go-sdk/v2 v2.0.3
1818
github.com/IBM/event-notifications-go-admin-sdk v0.15.0
1919
github.com/IBM/eventstreams-go-sdk v1.4.0
2020
github.com/IBM/go-sdk-core/v5 v5.20.1
@@ -237,7 +237,6 @@ replace github.com/hashicorp/vault => github.com/hashicorp/vault v1.18.2
237237

238238
replace github.com/hashicorp/vault/api/auth/approle => github.com/hashicorp/vault/api/auth/approle v0.8.0
239239

240-
241240
exclude (
242241
github.com/kubernetes-incubator/external-storage v0.0.0-00010101000000-000000000000
243242
github.com/kubernetes-incubator/external-storage v0.20.4-openstorage-rc2

‎go.sum‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ github.com/IBM/configuration-aggregator-go-sdk v0.0.2 h1:IRDIrGyLNXq+wQRj/js/Bzr
114114
github.com/IBM/configuration-aggregator-go-sdk v0.0.2/go.mod h1:Ql2N5j4d4Pj1/GoLzFwZw0DomCG4b1O33kKs3TZ+O+I=
115115
github.com/IBM/container-registry-go-sdk v1.1.0 h1:sYyknIod8R4RJZQqAheiduP6wbSTphE9Ag8ho28yXjc=
116116
github.com/IBM/container-registry-go-sdk v1.1.0/go.mod h1:4TwsCnQtVfZ4Vkapy/KPvQBKFc3VOyUZYkwRU4FTPrs=
117-
github.com/IBM/continuous-delivery-go-sdk/v2 v2.0.2 h1:yCJJnSLNYkpF7v9n0tw8CpQbSy43E/NbFOopRf1PgoM=
118-
github.com/IBM/continuous-delivery-go-sdk/v2 v2.0.2/go.mod h1:2MajFr6C5H2jyj7qtjBxAPnZAjbPiK4CAJNk3fKNnPo=
117+
github.com/IBM/continuous-delivery-go-sdk/v2 v2.0.3 h1:5oyqzqwywzVef30h1qjNEBcgxOvdDiX43ppsZyCTwik=
118+
github.com/IBM/continuous-delivery-go-sdk/v2 v2.0.3/go.mod h1:Iibf+4gRasEZHakDgnMm7TOX87xex0L+DfghUclcmcg=
119119
github.com/IBM/event-notifications-go-admin-sdk v0.15.0 h1:5rmEbZmGhJiS+WZOK+ABp83nXmlIG5nLL0b1dCswO1Y=
120120
github.com/IBM/event-notifications-go-admin-sdk v0.15.0/go.mod h1:9fG6k1gYRqiChZvmn1iRIjaKCXuDBCOlPH6xPJN+mMU=
121121
github.com/IBM/eventstreams-go-sdk v1.4.0 h1:yS/Ns29sBOe8W2tynQmz9HTKqQZ0ckse4Py5Oy/F2rM=
@@ -149,8 +149,6 @@ github.com/IBM/mqcloud-go-sdk v0.2.0 h1:QOWk8ZGk0QfIL0MOGTKzNdM3Qe0Hk+ifAFtNSFQo
149149
github.com/IBM/mqcloud-go-sdk v0.2.0/go.mod h1:VZQKMtqmcdXKhmLhLiPuS/UHMs/5yo2tA/nD83cQt9E=
150150
github.com/IBM/networking-go-sdk v0.51.9 h1:THZ5BlvWcjOfgcdROvGdgxSXOOeqlf/ykK35fUCLteg=
151151
github.com/IBM/networking-go-sdk v0.51.9/go.mod h1:iM2xvQYk6cG6ZED8+7iRqt/eKGFIAxy4/gYUdlFswMQ=
152-
github.com/IBM/platform-services-go-sdk v0.84.3 h1:9dnnkF9BSUXzWRuKz4WRLHeZRQ8XY5gMTybiugvAeFY=
153-
github.com/IBM/platform-services-go-sdk v0.84.3/go.mod h1:aGD045m6I8pfcB77wft8w2cHqWOJjcM3YSSV55BX0Js=
154152
github.com/IBM/platform-services-go-sdk v0.84.4 h1:HMq5E0DjAeta9OG4cEKEcHZLSaVj77t1+nJveJ8FIS4=
155153
github.com/IBM/platform-services-go-sdk v0.84.4/go.mod h1:aGD045m6I8pfcB77wft8w2cHqWOJjcM3YSSV55BX0Js=
156154
github.com/IBM/project-go-sdk v0.3.5 h1:L+YClFUa14foS0B/hOOY9n7sIdsT5/XQicnXOyJSpyM=

‎ibm/service/cdtektonpipeline/data_source_ibm_cd_tekton_pipeline.go‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,11 @@ func DataSourceIBMCdTektonPipeline() *schema.Resource {
332332
Computed: true,
333333
Description: "Mark the trigger as a favorite.",
334334
},
335+
"limit_waiting_runs": &schema.Schema{
336+
Type: schema.TypeBool,
337+
Computed: true,
338+
Description: "Flag that will limit the trigger to a maximum of one waiting run. A newly triggered run will cause any other waiting run(s) to be automatically cancelled.",
339+
},
335340
"enable_events_from_forks": &schema.Schema{
336341
Type: schema.TypeBool,
337342
Computed: true,
@@ -812,6 +817,9 @@ func DataSourceIBMCdTektonPipelineTriggerToMap(model cdtektonpipelinev2.TriggerI
812817
if model.Favorite != nil {
813818
modelMap["favorite"] = *model.Favorite
814819
}
820+
if model.LimitWaitingRuns != nil {
821+
modelMap["limit_waiting_runs"] = *model.LimitWaitingRuns
822+
}
815823
if model.EnableEventsFromForks != nil {
816824
modelMap["enable_events_from_forks"] = *model.EnableEventsFromForks
817825
}
@@ -975,6 +983,9 @@ func DataSourceIBMCdTektonPipelineTriggerManualTriggerToMap(model *cdtektonpipel
975983
if model.Favorite != nil {
976984
modelMap["favorite"] = *model.Favorite
977985
}
986+
if model.LimitWaitingRuns != nil {
987+
modelMap["limit_waiting_runs"] = *model.LimitWaitingRuns
988+
}
978989
return modelMap, nil
979990
}
980991

@@ -1015,6 +1026,9 @@ func DataSourceIBMCdTektonPipelineTriggerScmTriggerToMap(model *cdtektonpipeline
10151026
if model.Favorite != nil {
10161027
modelMap["favorite"] = *model.Favorite
10171028
}
1029+
if model.LimitWaitingRuns != nil {
1030+
modelMap["limit_waiting_runs"] = *model.LimitWaitingRuns
1031+
}
10181032
if model.EnableEventsFromForks != nil {
10191033
modelMap["enable_events_from_forks"] = *model.EnableEventsFromForks
10201034
}
@@ -1071,6 +1085,9 @@ func DataSourceIBMCdTektonPipelineTriggerTimerTriggerToMap(model *cdtektonpipeli
10711085
if model.Favorite != nil {
10721086
modelMap["favorite"] = *model.Favorite
10731087
}
1088+
if model.LimitWaitingRuns != nil {
1089+
modelMap["limit_waiting_runs"] = *model.LimitWaitingRuns
1090+
}
10741091
if model.Cron != nil {
10751092
modelMap["cron"] = *model.Cron
10761093
}
@@ -1117,6 +1134,9 @@ func DataSourceIBMCdTektonPipelineTriggerGenericTriggerToMap(model *cdtektonpipe
11171134
if model.Favorite != nil {
11181135
modelMap["favorite"] = *model.Favorite
11191136
}
1137+
if model.LimitWaitingRuns != nil {
1138+
modelMap["limit_waiting_runs"] = *model.LimitWaitingRuns
1139+
}
11201140
if model.Secret != nil {
11211141
secretMap, err := DataSourceIBMCdTektonPipelineGenericSecretToMap(model.Secret)
11221142
if err != nil {

‎ibm/service/cdtektonpipeline/data_source_ibm_cd_tekton_pipeline_test.go‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,7 @@ func TestDataSourceIBMCdTektonPipelineTriggerToMap(t *testing.T) {
431431
model["max_concurrent_runs"] = int(4)
432432
model["enabled"] = true
433433
model["favorite"] = false
434+
model["limit_waiting_runs"] = false
434435
model["enable_events_from_forks"] = false
435436
model["source"] = []map[string]interface{}{triggerSourceModel}
436437
model["events"] = []string{"push", "pull_request"}
@@ -491,6 +492,7 @@ func TestDataSourceIBMCdTektonPipelineTriggerToMap(t *testing.T) {
491492
model.MaxConcurrentRuns = core.Int64Ptr(int64(4))
492493
model.Enabled = core.BoolPtr(true)
493494
model.Favorite = core.BoolPtr(false)
495+
model.LimitWaitingRuns = core.BoolPtr(false)
494496
model.EnableEventsFromForks = core.BoolPtr(false)
495497
model.Source = triggerSourceModel
496498
model.Events = []string{"push", "pull_request"}
@@ -677,6 +679,7 @@ func TestDataSourceIBMCdTektonPipelineTriggerManualTriggerToMap(t *testing.T) {
677679
model["max_concurrent_runs"] = int(4)
678680
model["enabled"] = true
679681
model["favorite"] = false
682+
model["limit_waiting_runs"] = false
680683

681684
assert.Equal(t, result, model)
682685
}
@@ -707,6 +710,7 @@ func TestDataSourceIBMCdTektonPipelineTriggerManualTriggerToMap(t *testing.T) {
707710
model.MaxConcurrentRuns = core.Int64Ptr(int64(4))
708711
model.Enabled = core.BoolPtr(true)
709712
model.Favorite = core.BoolPtr(false)
713+
model.LimitWaitingRuns = core.BoolPtr(false)
710714

711715
result, err := cdtektonpipeline.DataSourceIBMCdTektonPipelineTriggerManualTriggerToMap(model)
712716
assert.Nil(t, err)
@@ -756,6 +760,7 @@ func TestDataSourceIBMCdTektonPipelineTriggerScmTriggerToMap(t *testing.T) {
756760
model["max_concurrent_runs"] = int(4)
757761
model["enabled"] = true
758762
model["favorite"] = false
763+
model["limit_waiting_runs"] = false
759764
model["enable_events_from_forks"] = false
760765
model["source"] = []map[string]interface{}{triggerSourceModel}
761766
model["events"] = []string{"push", "pull_request"}
@@ -805,6 +810,7 @@ func TestDataSourceIBMCdTektonPipelineTriggerScmTriggerToMap(t *testing.T) {
805810
model.MaxConcurrentRuns = core.Int64Ptr(int64(4))
806811
model.Enabled = core.BoolPtr(true)
807812
model.Favorite = core.BoolPtr(false)
813+
model.LimitWaitingRuns = core.BoolPtr(false)
808814
model.EnableEventsFromForks = core.BoolPtr(false)
809815
model.Source = triggerSourceModel
810816
model.Events = []string{"push", "pull_request"}
@@ -843,6 +849,7 @@ func TestDataSourceIBMCdTektonPipelineTriggerTimerTriggerToMap(t *testing.T) {
843849
model["max_concurrent_runs"] = int(4)
844850
model["enabled"] = true
845851
model["favorite"] = false
852+
model["limit_waiting_runs"] = false
846853
model["cron"] = "testString"
847854
model["timezone"] = "America/Los_Angeles, CET, Europe/London, GMT, US/Eastern, or UTC"
848855

@@ -875,6 +882,7 @@ func TestDataSourceIBMCdTektonPipelineTriggerTimerTriggerToMap(t *testing.T) {
875882
model.MaxConcurrentRuns = core.Int64Ptr(int64(4))
876883
model.Enabled = core.BoolPtr(true)
877884
model.Favorite = core.BoolPtr(false)
885+
model.LimitWaitingRuns = core.BoolPtr(false)
878886
model.Cron = core.StringPtr("testString")
879887
model.Timezone = core.StringPtr("America/Los_Angeles, CET, Europe/London, GMT, US/Eastern, or UTC")
880888

@@ -918,6 +926,7 @@ func TestDataSourceIBMCdTektonPipelineTriggerGenericTriggerToMap(t *testing.T) {
918926
model["max_concurrent_runs"] = int(4)
919927
model["enabled"] = true
920928
model["favorite"] = false
929+
model["limit_waiting_runs"] = false
921930
model["secret"] = []map[string]interface{}{genericSecretModel}
922931
model["webhook_url"] = "testString"
923932
model["filter"] = "event.type == 'message' && event.text.contains('urgent')"
@@ -958,6 +967,7 @@ func TestDataSourceIBMCdTektonPipelineTriggerGenericTriggerToMap(t *testing.T) {
958967
model.MaxConcurrentRuns = core.Int64Ptr(int64(4))
959968
model.Enabled = core.BoolPtr(true)
960969
model.Favorite = core.BoolPtr(false)
970+
model.LimitWaitingRuns = core.BoolPtr(false)
961971
model.Secret = genericSecretModel
962972
model.WebhookURL = core.StringPtr("testString")
963973
model.Filter = core.StringPtr("event.type == 'message' && event.text.contains('urgent')")

‎ibm/service/cdtektonpipeline/data_source_ibm_cd_tekton_pipeline_trigger.go‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,11 @@ func DataSourceIBMCdTektonPipelineTrigger() *schema.Resource {
150150
Computed: true,
151151
Description: "Mark the trigger as a favorite.",
152152
},
153+
"limit_waiting_runs": &schema.Schema{
154+
Type: schema.TypeBool,
155+
Computed: true,
156+
Description: "Flag that will limit the trigger to a maximum of one waiting run. A newly triggered run will cause any other waiting run(s) to be automatically cancelled.",
157+
},
153158
"enable_events_from_forks": &schema.Schema{
154159
Type: schema.TypeBool,
155160
Computed: true,
@@ -384,6 +389,12 @@ func dataSourceIBMCdTektonPipelineTriggerRead(context context.Context, d *schema
384389
}
385390
}
386391

392+
if !core.IsNil(trigger.LimitWaitingRuns) {
393+
if err = d.Set("limit_waiting_runs", trigger.LimitWaitingRuns); err != nil {
394+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting limit_waiting_runs: %s", err), "(Data) ibm_cd_tekton_pipeline_trigger", "read", "set-limit_waiting_runs").GetDiag()
395+
}
396+
}
397+
387398
if !core.IsNil(trigger.EnableEventsFromForks) {
388399
if err = d.Set("enable_events_from_forks", trigger.EnableEventsFromForks); err != nil {
389400
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting enable_events_from_forks: %s", err), "(Data) ibm_cd_tekton_pipeline_trigger", "read", "set-enable_events_from_forks").GetDiag()

‎ibm/service/cdtektonpipeline/data_source_ibm_cd_tekton_pipeline_trigger_test.go‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ func TestAccIBMCdTektonPipelineTriggerDataSourceAllArgs(t *testing.T) {
5151
triggerMaxConcurrentRuns := fmt.Sprintf("%d", acctest.RandIntRange(10, 100))
5252
triggerEnabled := "false"
5353
triggerFavorite := "true"
54+
triggerLimitWaitingRuns := "true"
5455
triggerEnableEventsFromForks := "true"
5556
triggerFilter := fmt.Sprintf("tf_filter_%d", acctest.RandIntRange(10, 100))
5657
triggerCron := fmt.Sprintf("tf_cron_%d", acctest.RandIntRange(10, 100))
@@ -61,7 +62,7 @@ func TestAccIBMCdTektonPipelineTriggerDataSourceAllArgs(t *testing.T) {
6162
Providers: acc.TestAccProviders,
6263
Steps: []resource.TestStep{
6364
resource.TestStep{
64-
Config: testAccCheckIBMCdTektonPipelineTriggerDataSourceConfig(triggerPipelineID, triggerType, triggerName, triggerEventListener, triggerMaxConcurrentRuns, triggerEnabled, triggerFavorite, triggerEnableEventsFromForks, triggerFilter, triggerCron, triggerTimezone),
65+
Config: testAccCheckIBMCdTektonPipelineTriggerDataSourceConfig(triggerPipelineID, triggerType, triggerName, triggerEventListener, triggerMaxConcurrentRuns, triggerEnabled, triggerFavorite, triggerLimitWaitingRuns, triggerEnableEventsFromForks, triggerFilter, triggerCron, triggerTimezone),
6566
Check: resource.ComposeTestCheckFunc(
6667
resource.TestCheckResourceAttrSet("data.ibm_cd_tekton_pipeline_trigger.cd_tekton_pipeline_trigger_instance", "id"),
6768
resource.TestCheckResourceAttrSet("data.ibm_cd_tekton_pipeline_trigger.cd_tekton_pipeline_trigger_instance", "pipeline_id"),
@@ -74,6 +75,7 @@ func TestAccIBMCdTektonPipelineTriggerDataSourceAllArgs(t *testing.T) {
7475
resource.TestCheckResourceAttrSet("data.ibm_cd_tekton_pipeline_trigger.cd_tekton_pipeline_trigger_instance", "max_concurrent_runs"),
7576
resource.TestCheckResourceAttrSet("data.ibm_cd_tekton_pipeline_trigger.cd_tekton_pipeline_trigger_instance", "enabled"),
7677
resource.TestCheckResourceAttrSet("data.ibm_cd_tekton_pipeline_trigger.cd_tekton_pipeline_trigger_instance", "favorite"),
78+
resource.TestCheckResourceAttrSet("data.ibm_cd_tekton_pipeline_trigger.cd_tekton_pipeline_trigger_instance", "limit_waiting_runs"),
7779
),
7880
},
7981
},
@@ -147,7 +149,7 @@ func testAccCheckIBMCdTektonPipelineTriggerDataSourceConfigBasic(triggerPipeline
147149
`, rgName, tcName, triggerType, triggerName, triggerEventListener)
148150
}
149151

150-
func testAccCheckIBMCdTektonPipelineTriggerDataSourceConfig(triggerPipelineID string, triggerType string, triggerName string, triggerEventListener string, triggerMaxConcurrentRuns string, triggerEnabled string, triggerFavorite string, triggerEnableEventsFromForks string, triggerFilter string, triggerCron string, triggerTimezone string) string {
152+
func testAccCheckIBMCdTektonPipelineTriggerDataSourceConfig(triggerPipelineID string, triggerType string, triggerName string, triggerEventListener string, triggerMaxConcurrentRuns string, triggerEnabled string, triggerFavorite string, triggerLimitWaitingRuns string, triggerEnableEventsFromForks string, triggerFilter string, triggerCron string, triggerTimezone string) string {
151153
rgName := acc.CdResourceGroupName
152154
tcName := fmt.Sprintf("tf_name_%d", acctest.RandIntRange(10, 100))
153155
return fmt.Sprintf(`
@@ -205,6 +207,7 @@ func testAccCheckIBMCdTektonPipelineTriggerDataSourceConfig(triggerPipelineID st
205207
type = "%s"
206208
name = "%s"
207209
event_listener = "%s"
210+
limit_waiting_runs = %s
208211
max_concurrent_runs = %s
209212
enabled = %s
210213
favorite = %s
@@ -214,7 +217,7 @@ func testAccCheckIBMCdTektonPipelineTriggerDataSourceConfig(triggerPipelineID st
214217
pipeline_id = ibm_cd_tekton_pipeline_trigger.cd_tekton_pipeline_trigger_instance.pipeline_id
215218
trigger_id = ibm_cd_tekton_pipeline_trigger.cd_tekton_pipeline_trigger_instance.trigger_id
216219
}
217-
`, rgName, tcName, triggerType, triggerName, triggerEventListener, triggerMaxConcurrentRuns, triggerEnabled, triggerFavorite)
220+
`, rgName, tcName, triggerType, triggerName, triggerEventListener, triggerLimitWaitingRuns, triggerMaxConcurrentRuns, triggerEnabled, triggerFavorite)
218221
}
219222

220223
func TestDataSourceIBMCdTektonPipelineTriggerTriggerPropertyToMap(t *testing.T) {

‎ibm/service/cdtektonpipeline/resource_ibm_cd_tekton_pipeline.go‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -401,6 +401,11 @@ func ResourceIBMCdTektonPipeline() *schema.Resource {
401401
Computed: true,
402402
Description: "Mark the trigger as a favorite.",
403403
},
404+
"limit_waiting_runs": &schema.Schema{
405+
Type: schema.TypeBool,
406+
Computed: true,
407+
Description: "Flag that will limit the trigger to a maximum of one waiting run. A newly triggered run will cause any other waiting run(s) to be automatically cancelled.",
408+
},
404409
"enable_events_from_forks": &schema.Schema{
405410
Type: schema.TypeBool,
406411
Optional: true,
@@ -1023,6 +1028,9 @@ func ResourceIBMCdTektonPipelineTriggerToMap(model cdtektonpipelinev2.TriggerInt
10231028
if model.Favorite != nil {
10241029
modelMap["favorite"] = *model.Favorite
10251030
}
1031+
if model.LimitWaitingRuns != nil {
1032+
modelMap["limit_waiting_runs"] = *model.LimitWaitingRuns
1033+
}
10261034
if model.EnableEventsFromForks != nil {
10271035
modelMap["enable_events_from_forks"] = *model.EnableEventsFromForks
10281036
}
@@ -1172,6 +1180,9 @@ func ResourceIBMCdTektonPipelineTriggerManualTriggerToMap(model *cdtektonpipelin
11721180
if model.Favorite != nil {
11731181
modelMap["favorite"] = *model.Favorite
11741182
}
1183+
if model.LimitWaitingRuns != nil {
1184+
modelMap["limit_waiting_runs"] = *model.LimitWaitingRuns
1185+
}
11751186
return modelMap, nil
11761187
}
11771188

@@ -1212,6 +1223,9 @@ func ResourceIBMCdTektonPipelineTriggerScmTriggerToMap(model *cdtektonpipelinev2
12121223
if model.Favorite != nil {
12131224
modelMap["favorite"] = *model.Favorite
12141225
}
1226+
if model.LimitWaitingRuns != nil {
1227+
modelMap["limit_waiting_runs"] = *model.LimitWaitingRuns
1228+
}
12151229
if model.EnableEventsFromForks != nil {
12161230
modelMap["enable_events_from_forks"] = *model.EnableEventsFromForks
12171231
}
@@ -1268,6 +1282,9 @@ func ResourceIBMCdTektonPipelineTriggerTimerTriggerToMap(model *cdtektonpipeline
12681282
if model.Favorite != nil {
12691283
modelMap["favorite"] = *model.Favorite
12701284
}
1285+
if model.LimitWaitingRuns != nil {
1286+
modelMap["limit_waiting_runs"] = *model.LimitWaitingRuns
1287+
}
12711288
if model.Cron != nil {
12721289
modelMap["cron"] = *model.Cron
12731290
}
@@ -1314,6 +1331,9 @@ func ResourceIBMCdTektonPipelineTriggerGenericTriggerToMap(model *cdtektonpipeli
13141331
if model.Favorite != nil {
13151332
modelMap["favorite"] = *model.Favorite
13161333
}
1334+
if model.LimitWaitingRuns != nil {
1335+
modelMap["limit_waiting_runs"] = *model.LimitWaitingRuns
1336+
}
13171337
if model.Secret != nil {
13181338
secretMap, err := ResourceIBMCdTektonPipelineGenericSecretToMap(model.Secret)
13191339
if err != nil {

‎ibm/service/cdtektonpipeline/resource_ibm_cd_tekton_pipeline_definition.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ func resourceIBMCdTektonPipelineDefinitionRead(context context.Context, d *schem
205205
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "ibm_cd_tekton_pipeline_definition", "read", "set-href").GetDiag()
206206
}
207207
}
208-
if err = d.Set("pipeline_id", parts[0]); err != nil {
208+
if err = d.Set("pipeline_id", d.Get("pipeline_id").(string)); err != nil {
209209
err = fmt.Errorf("Error setting pipeline_id: %s", err)
210210
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "ibm_cd_tekton_pipeline_definition", "read", "set-pipeline_id").GetDiag()
211211
}

‎ibm/service/cdtektonpipeline/resource_ibm_cd_tekton_pipeline_property.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ func resourceIBMCdTektonPipelinePropertyRead(context context.Context, d *schema.
210210
return tfErr.GetDiag()
211211
}
212212

213-
if err = d.Set("pipeline_id", parts[0]); err != nil {
213+
if err = d.Set("pipeline_id", d.Get("pipeline_id").(string)); err != nil {
214214
err = fmt.Errorf("Error setting pipeline_id: %s", err)
215215
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "ibm_cd_tekton_pipeline_property", "read", "set-pipeline_id").GetDiag()
216216
}

0 commit comments

Comments
 (0)