Skip to content

Commit 981dad7

Browse files
committed
1 parent 0294176 commit 981dad7

5 files changed

+9
-9
lines changed

provider/core_instance_resource.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,7 @@ func (s *InstanceResourceCrud) getPrimaryVnic() (*oci_core.Vnic, error) {
624624

625625
for _, attachment := range attachments {
626626
if attachment.LifecycleState == oci_core.VnicAttachmentLifecycleStateAttached {
627-
request := oci_core.GetVnicRequest{attachment.VnicId}
627+
request := oci_core.GetVnicRequest{VnicId: attachment.VnicId}
628628
response, _ := s.VirtualNetworkClient.GetVnic(context.Background(), request)
629629
vnic := &response.Vnic
630630

provider/load_balancer_backend_resource_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ func (s *ResourceLoadBalancerBackendTestSuite) TestAccResourceLoadBalancerBacken
187187
func(ts *terraform.State) (err error) {
188188
res2, err = fromInstanceState(ts, s.ResourceName, "name")
189189
if res == res2 {
190-
fmt.Errorf("new resource expected to be created but was not")
190+
return fmt.Errorf("new resource expected to be created but was not")
191191
}
192192
return err
193193
},

provider/load_balancer_backend_set_resource_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ func (s *ResourceLoadBalancerBackendSetTestSuite) TestAccResourceLoadBalancerBac
143143
func(ts *terraform.State) (err error) {
144144
res2, err = fromInstanceState(ts, s.ResourceName, "name")
145145
if res != res2 {
146-
fmt.Errorf("new resource created when it should not have been")
146+
return fmt.Errorf("new resource created when it should not have been")
147147
}
148148
return err
149149
},
@@ -190,7 +190,7 @@ func (s *ResourceLoadBalancerBackendSetTestSuite) TestAccResourceLoadBalancerBac
190190
func(ts *terraform.State) (err error) {
191191
res2, err = fromInstanceState(ts, s.ResourceName, "name")
192192
if res != res2 {
193-
fmt.Errorf("new resource created when it should not have been")
193+
return fmt.Errorf("new resource created when it should not have been")
194194
}
195195
return err
196196
},
@@ -245,7 +245,7 @@ func (s *ResourceLoadBalancerBackendSetTestSuite) TestAccResourceLoadBalancerBac
245245
func(ts *terraform.State) (err error) {
246246
res2, err = fromInstanceState(ts, s.ResourceName, "name")
247247
if res != res2 {
248-
fmt.Errorf("new resource created when it should not have been")
248+
return fmt.Errorf("new resource created when it should not have been")
249249
}
250250
return err
251251
},

provider/load_balancer_listener_resource_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ func (s *ResourceLoadBalancerListenerTestSuite) TestAccResourceLoadBalancerListe
125125
func(ts *terraform.State) (err error) {
126126
resId2, err = fromInstanceState(ts, s.ResourceName, "id")
127127
if resId2 == resId {
128-
fmt.Errorf("resource expected to be recreated but was not")
128+
return fmt.Errorf("resource expected to be recreated but was not")
129129
}
130130
resId = resId2
131131
return err
@@ -161,7 +161,7 @@ func (s *ResourceLoadBalancerListenerTestSuite) TestAccResourceLoadBalancerListe
161161
func(ts *terraform.State) (err error) {
162162
resId2, err = fromInstanceState(ts, s.ResourceName, "id")
163163
if resId2 != resId {
164-
fmt.Errorf("resource recreated when it should not have been")
164+
return fmt.Errorf("resource recreated when it should not have been")
165165
}
166166
resId = resId2
167167
return err

provider/load_balancer_load_balancer_resource_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ func (s *ResourceLoadBalancerLBTestSuite) TestAccResourceLoadBalancerLB_basicPri
113113
func(ts *terraform.State) (err error) {
114114
resId2, err = fromInstanceState(ts, s.ResourceName, "id")
115115
if resId2 != resId {
116-
fmt.Errorf("resource recreated when it should not have been")
116+
return fmt.Errorf("resource recreated when it should not have been")
117117
}
118118
return err
119119
},
@@ -140,7 +140,7 @@ func (s *ResourceLoadBalancerLBTestSuite) TestAccResourceLoadBalancerLB_basicPri
140140
func(ts *terraform.State) (err error) {
141141
resId2, err = fromInstanceState(ts, s.ResourceName, "id")
142142
if resId2 == resId {
143-
fmt.Errorf("resource was not recreated as expected")
143+
return fmt.Errorf("resource was not recreated as expected")
144144
}
145145
return err
146146
},

0 commit comments

Comments
 (0)