Skip to content

Commit 017ef99

Browse files
committed
Fix missing error-checks enforced by Hashicorp
1 parent 35c0b7a commit 017ef99

File tree

4 files changed

+13
-5
lines changed

4 files changed

+13
-5
lines changed

provider/core_local_peering_gateway_resource.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,10 @@ func (s *LocalPeeringGatewayResourceCrud) ConnectLocalPeeringGateway() error {
212212
s.D.Set("peer_id", "")
213213
return fmt.Errorf("unexpected Peering Status `%s` after trying to connect to the peer Local Peering Gateway", string(response.LocalPeeringGateway.PeeringStatus))
214214
}
215-
s.SetData()
215+
216+
if err := s.SetData(); err != nil {
217+
return err
218+
}
216219
}
217220
return nil
218221
}

provider/core_remote_peering_connection_resource.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,10 @@ func (s *RemotePeeringConnectionResourceCrud) ConnectRemotePeeringConnection() e
213213
s.D.Set("peer_id", "")
214214
return fmt.Errorf("unexpected Peering Status `%s` after trying to connect to the peer Remote Peering Connection (RPC). Make sure the peering_status of the peer RPC is not REVOKED", string(response.RemotePeeringConnection.PeeringStatus))
215215
}
216-
s.SetData()
216+
217+
if err := s.SetData(); err != nil {
218+
return err
219+
}
217220

218221
return nil
219222
}

provider/identity_compartment_resource.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,7 @@ func (s *CompartmentResourceCrud) Create() error {
209209
s.Res = &compartment
210210
//Update with correct description
211211
s.D.SetId(s.ID())
212-
s.Update()
213-
return nil
212+
return s.Update()
214213
}
215214
}
216215
}

provider/test_helpers.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ package provider
55
import (
66
"bytes"
77
"fmt"
8+
"log"
89
"text/template"
910
"time"
1011

@@ -18,7 +19,9 @@ var tmpl template.Template = *template.New("tmpl")
1819
func apply(template string, values map[string]string) string {
1920
b := new(bytes.Buffer)
2021
t, _ := tmpl.Parse(template)
21-
t.Execute(b, values)
22+
if err := t.Execute(b, values); err != nil {
23+
log.Printf("[WARN] Unable to apply values to template: '%s'", err)
24+
}
2225
return b.String()
2326
}
2427

0 commit comments

Comments
 (0)