Skip to content

Commit

Permalink
Merge pull request #25 from form3tech-oss/fix/secure-param
Browse files Browse the repository at this point in the history
fix: secure param
  • Loading branch information
fabiomatavelli-f3 authored Mar 28, 2024
2 parents ad0effc + 47ce693 commit 0dab4fe
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 3 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
tf_version: ["1.0", "1.1", "1.2", "1.3", "1.4", "1.5"]
tf_version: ["1.4", "1.5", "1.6", "1.7"]
fail-fast: false
needs: setup-drp
steps:
- name: Checkout
Expand Down Expand Up @@ -57,5 +58,6 @@ jobs:
TF_ACC_LOG: trace
LOG_LEVEL: debug
RS_KEY: rocketskates:r0cketsk8ts
RS_DISABLE_DNS: true
run: |
go test -v ./drpv4 -cover -timeout 30m -count 1
17 changes: 15 additions & 2 deletions drpv4/resource_drp_profile_param.go
Original file line number Diff line number Diff line change
Expand Up @@ -151,17 +151,21 @@ func resourceProfileParamCreate(d *schema.ResourceData, m interface{}) error {
req := c.session.Req().UrlFor("profiles", profile, "params", name)

if secureValue != "" {
sv := models.SecureData{}
sv := &models.SecureData{}
pubkey, err := getPublickey(c, profile)
if err != nil {
return err
}

err = sv.Marshal(pubkey, value)
err = sv.Marshal(pubkey, secureValue)
if err != nil {
return err
}

if err := sv.Validate(); err != nil {
return err
}

if err := req.Post(sv).Do(nil); err != nil {
return err
}
Expand Down Expand Up @@ -206,6 +210,15 @@ func resourceProfileParamRead(d *schema.ResourceData, m interface{}) error {
}

d.Set("value", value)
d.Set("secure_value", nil)
} else {
d.Set("value", nil)

var securedValue string
if err := c.session.Req().UrlFor("profiles", profile, "params", name).Params("decode", "true").Do(&securedValue); err != nil {
return err
}
d.Set("secure_value", securedValue)
}

return nil
Expand Down
1 change: 1 addition & 0 deletions drpv4/resource_drp_reservation.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ func resourceReservation() *schema.Resource {
Type: schema.TypeBool,
Description: "Reservation scoped",
Optional: true,
ForceNew: true,
},
"strategy": {
Type: schema.TypeString,
Expand Down

0 comments on commit 0dab4fe

Please sign in to comment.