diff --git a/test/integration/account_test.go b/test/integration/account_test.go index fbde24db5b6..162ee545720 100644 --- a/test/integration/account_test.go +++ b/test/integration/account_test.go @@ -43,7 +43,8 @@ func TestAccountDeactivate(t *testing.T) { t.Errorf("account deactivation should have set status to %q, instead got %q", core.StatusDeactivated, got.Status) } - if len(got.Contact) != 0 { - t.Errorf("account deactivation should have cleared contacts field, instead got %+v", got.Contact) - } + // TODO(#5554): Check that the contacts have been cleared. We can't do this + // today because eggsampler/acme unmarshals the WFE's response into the same + // account object as it used to make the request, and a wholly missing + // contacts field doesn't overwrite whatever eggsampler was holding in memory. } diff --git a/vendor/github.com/eggsampler/acme/v3/account.go b/vendor/github.com/eggsampler/acme/v3/account.go index 1c969824e8f..755bcf7e572 100644 --- a/vendor/github.com/eggsampler/acme/v3/account.go +++ b/vendor/github.com/eggsampler/acme/v3/account.go @@ -125,7 +125,9 @@ func (c Client) DeactivateAccount(account Account) (Account, error) { Status: "deactivated", } + fmt.Printf("%#v\n", account) _, err := c.post(account.URL, account.URL, account.PrivateKey, deactivateReq, &account, http.StatusOK) + fmt.Printf("%#v\n", account) return account, err } diff --git a/vendor/github.com/eggsampler/acme/v3/acme.go b/vendor/github.com/eggsampler/acme/v3/acme.go index 0c02cbdb1cf..53393393fb5 100644 --- a/vendor/github.com/eggsampler/acme/v3/acme.go +++ b/vendor/github.com/eggsampler/acme/v3/acme.go @@ -8,7 +8,6 @@ import ( "fmt" "io/ioutil" "net/http" - "os" "regexp" "strings" "time" @@ -227,12 +226,12 @@ func (c Client) post(requestURL, keyID string, privateKey crypto.Signer, payload return resp, err } - if _, b := os.LookupEnv("ACME_DEBUG_POST"); b { - fmt.Println() - fmt.Println("========= " + requestURL) - fmt.Println(string(body)) - fmt.Println() - } + // if _, b := os.LookupEnv("ACME_DEBUG_POST"); b { + fmt.Println() + fmt.Println("========= " + requestURL) + fmt.Println(string(body)) + fmt.Println() + // } if len(body) > 0 && out != nil { if err := json.Unmarshal(body, out); err != nil {