Merge pull request #316 from hashicorp/oss/merge-main-de10b275d34c0e70e1641ba7ba657df9d2a8388f
[main] OSS to ENT merge of (de10b27)
This commit is contained in:
commit
cdc66a13c1
2 files changed
+4
-4
No files matched your search
@@ -130,10 +130,10 @@ sudo apt-get update && sudo apt-get install boundary ;\\
|
||||
boundary server -config="${configPath}/pki-worker.hcl"`;
|
||||
|
||||
const hcpContent = `sudo apt-get update && sudo apt-get install jq unzip ;\\
|
||||
wget -q "$(curl -fsSL "https://api.releases.hashicorp.com/v1/releases/boundary-worker/latest?license_class=hcp" \
|
||||
wget -q "$(curl -fsSL "https://api.releases.hashicorp.com/v1/releases/boundary/latest?license_class=enterprise" \
|
||||
| jq -r '.builds[] | select(.arch == "amd64" and .os == "linux") | .url')" ;\\
|
||||
unzip *.zip ;\\
|
||||
./boundary-worker server -config="${configPath}/pki-worker.hcl"`;
|
||||
./boundary server -config="${configPath}/pki-worker.hcl"`;
|
||||
|
||||
return this.features.isEnabled('byow-pki-hcp-cluster-id')
|
||||
? hcpContent
|
||||
|
||||
@@ -77,7 +77,7 @@ module('Acceptance | workers | create', function (hooks) {
|
||||
assert
|
||||
.dom(createSection[1])
|
||||
.doesNotIncludeText(
|
||||
'wget -q "$(curl -fsSL "https://api.releases.hashicorp.com/v1/releases/boundary-worker/latest?license_class=hcp"'
|
||||
'wget -q "$(curl -fsSL "https://api.releases.hashicorp.com/v1/releases/boundary/latest?license_class=enterprise"'
|
||||
);
|
||||
});
|
||||
|
||||
@@ -90,7 +90,7 @@ module('Acceptance | workers | create', function (hooks) {
|
||||
assert
|
||||
.dom(createSection[1])
|
||||
.includesText(
|
||||
'wget -q "$(curl -fsSL "https://api.releases.hashicorp.com/v1/releases/boundary-worker/latest?license_class=hcp"'
|
||||
'wget -q "$(curl -fsSL "https://api.releases.hashicorp.com/v1/releases/boundary/latest?license_class=enterprise"'
|
||||
);
|
||||
assert
|
||||
.dom(createSection[1])
|
||||
|
||||
Reference in new issue
Block a user