Skip to content

Commit e324cd5

Browse files
rcohenmaalexng-canuck
authored andcommitted
Making passphrase and private_key sensitive in LB Certificate and exposing WorkRequest FAILED ErrorDetails for load_balancer resources
1 parent ecee4db commit e324cd5

File tree

2 files changed

+14
-9
lines changed

2 files changed

+14
-9
lines changed

crud/helpers.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,9 @@ func LoadBalancerResourceGet(client *oci_load_balancer.LoadBalancerClient, d *sc
156156
if wr.LifecycleState == oci_load_balancer.WorkRequestLifecycleStateSucceeded {
157157
return "", false, nil
158158
}
159+
if wr.LifecycleState == oci_load_balancer.WorkRequestLifecycleStateFailed {
160+
return "", false, fmt.Errorf("WorkRequest FAILED: %+v", wr.ErrorDetails)
161+
}
159162
}
160163
return "", true, nil
161164
}
@@ -187,7 +190,7 @@ func LoadBalancerWaitForWorkRequest(client *oci_load_balancer.LoadBalancerClient
187190
return e
188191
}
189192
if wr.LifecycleState == oci_load_balancer.WorkRequestLifecycleStateFailed {
190-
return errors.New("Resource creation failed, state FAILED")
193+
return fmt.Errorf("WorkRequest FAILED: %+v", wr.ErrorDetails)
191194
}
192195
return nil
193196
}

provider/load_balancer_certificate_resource.go

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,18 @@ func CertificateResource() *schema.Resource {
4040
ForceNew: true,
4141
},
4242
"passphrase": {
43-
Type: schema.TypeString,
44-
Optional: true,
45-
ForceNew: true,
46-
Default: "",
43+
Type: schema.TypeString,
44+
Optional: true,
45+
ForceNew: true,
46+
Sensitive: true,
47+
Default: "",
4748
},
4849
"private_key": {
49-
Type: schema.TypeString,
50-
Optional: true,
51-
Computed: true,
52-
ForceNew: true,
50+
Type: schema.TypeString,
51+
Optional: true,
52+
Computed: true,
53+
ForceNew: true,
54+
Sensitive: true,
5355
},
5456
"public_certificate": {
5557
Type: schema.TypeString,

0 commit comments

Comments
 (0)