cerc-io/stack-orchestrator
17
1
Fork 3
Code Issues 113 Pull Requests 19 Actions Packages Projects Releases 480 Wiki Activity

revert 5308ab1e4e
Some checks failed
Lint Checks / Run linter (push) Successful in 1m8s
Details
Lint Checks / Run linter (pull_request) Successful in 35s
Details
Deploy Test / Run deploy test suite (pull_request) Has been cancelled
Details
K8s Deploy Test / Run deploy test suite on kind/k8s (pull_request) Has been cancelled
Details
Webapp Test / Run webapp test suite (pull_request) Has been cancelled
Details
Smoke Test / Run basic test suite (pull_request) Has been cancelled
Details

Browse Source 
revert Blind commit to fix laconic CLI calls after rename. (#784)

`laconic cns` got renamed to `laconic registry` which breaks all the scripts and commands that use it.

Reviewed-on: #784
Co-authored-by: Thomas E Lackey <telackey@bozemanpass.com>
Co-committed-by: Thomas E Lackey <telackey@bozemanpass.com>
This commit is contained in:
Thomas E Lackey 2024-03-27 20:54:10 +00:00
parent 44faf36837
commit f9713e6363
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stack_orchestrator/data/container-build/cerc-laconic-registry-cli/create-demo-records.sh
View File

@ -5,7 +5,7 @@ if [ -n "$CERC_SCRIPT_DEBUG" ]; then
set -x set -x
fi fi
registry_command="laconic registry" registry_command="laconic cns"
demo_records_dir="scripts/demo-records" demo_records_dir="scripts/demo-records"
# Check we have funds # Check we have funds

2
stack_orchestrator/data/stacks/fixturenet-laconic-loaded/README.md
View File

@ -49,7 +49,7 @@ $ laconic-so --stack fixturenet-laconic-loaded deploy logs
``` ```
## 6. Test with the Registry CLI ## 6. Test with the Registry CLI
``` ```
$ laconic-so --stack fixturenet-laconic-loaded deploy exec cli "laconic registry status" $ laconic-so --stack fixturenet-laconic-loaded deploy exec cli "laconic cns status"
``` ```
## 7. View the laconic console ## 7. View the laconic console
Get the URL for the console web app with this command (the port number will be different for each deployment): Get the URL for the console web app with this command (the port number will be different for each deployment):

2
stack_orchestrator/data/stacks/fixturenet-laconicd/README.md
View File

@ -44,5 +44,5 @@ $ laconic-so --stack fixturenet-laconicd deploy logs
``` ```
## 6. Test with the Registry CLI ## 6. Test with the Registry CLI
``` ```
$ laconic-so --stack fixturenet-laconicd deploy exec cli "laconic registry status" $ laconic-so --stack fixturenet-laconicd deploy exec cli "laconic cns status"
``` ```

13
stack_orchestrator/deploy/webapp/util.py
View File

@ -94,7 +94,7 @@ class LaconicRegistryClient:
) )
def list_records(self, criteria={}, all=False): def list_records(self, criteria={}, all=False):
args = ["laconic", "-c", self.config_file, "registry", "record", "list"] args = ["laconic", "-c", self.config_file, "cns", "record", "list"]
if all: if all:
args.append("--all") args.append("--all")
@ -140,7 +140,7 @@ class LaconicRegistryClient:
if name in self.cache.name_or_id: if name in self.cache.name_or_id:
return self.cache.name_or_id[name] return self.cache.name_or_id[name]
args = ["laconic", "-c", self.config_file, "registry", "name", "resolve", name] args = ["laconic", "-c", self.config_file, "cns", "name", "resolve", name]
parsed = [AttrDict(r) for r in json.loads(logged_cmd(self.log_file, *args))] parsed = [AttrDict(r) for r in json.loads(logged_cmd(self.log_file, *args))]
if parsed: if parsed:
@ -165,7 +165,7 @@ class LaconicRegistryClient:
"laconic", "laconic",
"-c", "-c",
self.config_file, self.config_file,
"registry", "cns",
"record", "record",
"get", "get",
"--id", "--id",
@ -203,8 +203,7 @@ class LaconicRegistryClient:
print(open(record_fname, 'r').read(), file=self.log_file) print(open(record_fname, 'r').read(), file=self.log_file)
new_record_id = json.loads( new_record_id = json.loads(
logged_cmd(self.log_file, "laconic", "-c", self.config_file, "registry", logged_cmd(self.log_file, "laconic", "-c", self.config_file, "cns", "record", "publish", "--filename", record_fname)
"record", "publish", "--filename", record_fname)
)["id"] )["id"]
for name in names: for name in names:
self.set_name(name, new_record_id) self.set_name(name, new_record_id)
@ -213,10 +212,10 @@ class LaconicRegistryClient:
logged_cmd(self.log_file, "rm", "-rf", tmpdir) logged_cmd(self.log_file, "rm", "-rf", tmpdir)
def set_name(self, name, record_id): def set_name(self, name, record_id):
logged_cmd(self.log_file, "laconic", "-c", self.config_file, "registry", "name", "set", name, record_id) logged_cmd(self.log_file, "laconic", "-c", self.config_file, "cns", "name", "set", name, record_id)
def delete_name(self, name): def delete_name(self, name):
logged_cmd(self.log_file, "laconic", "-c", self.config_file, "registry", "name", "delete", name) logged_cmd(self.log_file, "laconic", "-c", self.config_file, "cns", "name", "delete", name)
def file_hash(filename): def file_hash(filename):