-
Notifications
You must be signed in to change notification settings - Fork 22
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: Improved arm64 support, add missing docs #1480
Conversation
Codecov Report
@@ Coverage Diff @@
## main #1480 +/- ##
==========================================
- Coverage 87.83% 87.82% -0.02%
==========================================
Files 210 210
Lines 19760 19763 +3
==========================================
Hits 17356 17356
- Misses 1545 1546 +1
- Partials 859 861 +2
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
1a380ad
to
db562b6
Compare
test/bdd/common_steps.go
Outdated
@@ -623,6 +623,7 @@ func (d *CommonSteps) httpPostFileWithSignatureAndExpectedCode(url, path, pubKey | |||
} | |||
|
|||
func (d *CommonSteps) httpPost(url, data, contentType string) error { | |||
println(fmt.Sprintf("!!!DEREK in httpPost step method")) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
remove this msg
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oops, I didn't mean to commit this. I removed it.
test/bdd/common_steps.go
Outdated
@@ -632,12 +633,16 @@ func (d *CommonSteps) httpPost(url, data, contentType string) error { | |||
|
|||
data = resolved.(string) | |||
|
|||
println(fmt.Sprintf("!!!DEREK in httpPost step method, url=[%s], data=[%s], contentType=[%s]", url, data, contentType)) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
remove this msg
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oops, I didn't mean to commit this. I removed it.
test/bdd/common_steps.go
Outdated
resp, err := d.doHTTPPost(url, []byte(data), contentType) | ||
if err != nil { | ||
return err | ||
} | ||
|
||
if resp.StatusCode != http.StatusOK { | ||
println(fmt.Sprintf("!!!DEREK in httpPost step method, did not get status OK, url=[%s], data=[%s], contentType=[%s]", url, data, contentType)) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
remove this msg
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oops, I didn't mean to commit this. I removed it.
test/bdd/common_steps.go
Outdated
@@ -252,7 +252,7 @@ func (d *CommonSteps) jsonPathOfBoolResponseEquals(path, expected string) error | |||
return nil | |||
} | |||
|
|||
return fmt.Errorf("JSON path resolves to [%s] which is not the expected value [%s]", strBool, expected) | |||
return fmt.Errorf("JSON path resolves to [%s] which is not the expected value [%s], !!!DEREK response was [%s]", strBool, expected, d.state.getResponse()) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
remove this msg
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oops, I didn't mean to commit this. I removed it.
test/bdd/bddtests_test.go
Outdated
@@ -83,7 +85,7 @@ func TestMain(m *testing.M) { | |||
panic(fmt.Sprintf("Error composing system in BDD context: %s", err)) | |||
} | |||
|
|||
testSleep := 120 | |||
testSleep := 180 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why increase to 180?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I was doing this locally for some testing - I didn't mean to commit this. I reverted back to 120.
test/bdd/bddtests_test.go
Outdated
@@ -52,6 +52,8 @@ func TestMain(m *testing.M) { | |||
tags = cmdTags.Value.String() | |||
} | |||
|
|||
println("tags to use are ", tags) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
remove this msg
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oops, I didn't mean to commit this. I removed it.
* BDD tests are no longer hardcoded to use the amd64 binary for CLI commands. They now select between amd64 and arm64 based on the running system's detected architecture. * Updated the Makefile's extract-orb-cli-binaries target to extract the arm64 binaries (they were being built before but were never extracted). * Resolved a warning from Docker that would get printed when running the generate-test-keys Makefile target on an arm64 system. The warning from Docker alerts you that the image for frapsoft/openssl is for amd64, which doesn't match the system you're on. To resolve the warning, you have to either use an image that matches the system architecture, or explicitly state the platform using the --platform flag. In this case, there is only an amd64 version of frapsoft/openssl, so I added the explicit flag to resolve the warning. I also added a TODO for us to find an arm64 alternative in the future (although the amd64 version of frapsoft/openssl does seem to work fine on arm64 Mac OS currently, presumably due to Apple's Rosetta translation layer or some other emulation layer). * Updated the documentation for the BDD tests to indicate that some hosts file entries are required for some tests to function correctly and to add some clarification+extra detail regarding the PostgreSQL Command Line Tools. Signed-off-by: Derek Trider <Derek.Trider@securekey.com>
Signed-off-by: Derek Trider Derek.Trider@securekey.com