Skip to content

Commit

Permalink
Merge pull request #274 from rapyuta-robotics/devel
Browse files Browse the repository at this point in the history
🎉 release: v7.1.0
  • Loading branch information
ankitrgadiya authored Feb 14, 2024
2 parents 210aa98 + 3593def commit dbb418e
Show file tree
Hide file tree
Showing 15 changed files with 20 additions and 18 deletions.
1 change: 1 addition & 0 deletions riocli/apply/manifests/deployment-nonros-cloud.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ metadata:
project: "project-guid"
labels:
app: test
#rapyuta.io/region: us
spec:
runtime: cloud # Options: [device, cloud]
depends:
Expand Down
1 change: 1 addition & 0 deletions riocli/apply/manifests/deployment-ros-cloud.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ metadata:
project: "project-guid"
labels:
app: test
#rapyuta.io/region: us
spec:
runtime: cloud # Options: [device, cloud]
depends:
Expand Down
2 changes: 2 additions & 0 deletions riocli/apply/manifests/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ metadata:
project: "project-guid"
labels:
app: test
#rapyuta.io/region: us
spec:
runtime: cloud # Options: [device, cloud]
depends:
Expand Down Expand Up @@ -109,6 +110,7 @@ metadata:
project: "project-guid"
labels:
app: test
#rapyuta.io/region: us
spec:
runtime: cloud # Options: [device, cloud]
depends:
Expand Down
2 changes: 1 addition & 1 deletion riocli/apply/manifests/package-nonros-device.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ spec:
- name: "exec-preInstalled"
type: preInstalled # Options: [docker (default), preInstalled]
command: "roslaunch talker talker.launch"
environmentArgs:
environmentVars:
- name: "key1" # Required
default: "key1-value"
description: "A environment variable"
Expand Down
2 changes: 1 addition & 1 deletion riocli/apply/manifests/package-ros-device-no-rosbag.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ spec:
- name: "exec-preInstalled"
type: preInstalled # Options: [docker (default), preInstalled]
command: "roslaunch talker talker.launch"
environmentArgs:
environmentVars:
- name: "key1" # Required
default: "key1-value"
description: "A environment variable"
Expand Down
2 changes: 1 addition & 1 deletion riocli/apply/manifests/package-ros-device-rosbag.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ spec:
depends:
kind: secret
nameOrGUID: "secret-docker"
environmentArgs:
environmentVars:
- name: "key1" # Required
default: "key1-value"
description: "A environment variable"
Expand Down
6 changes: 3 additions & 3 deletions riocli/apply/manifests/package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ spec:
depends:
kind: secret
nameOrGUID: "secret-docker"
environmentArgs:
environmentVars:
- name: "key1" # Required
default: "key1-value"
description: "A environment variable"
Expand Down Expand Up @@ -386,7 +386,7 @@ spec:
- name: "exec-preInstalled"
type: preInstalled # Options: [docker (default), preInstalled]
command: "roslaunch talker talker.launch"
environmentArgs:
environmentVars:
- name: "key1" # Required
default: "key1-value"
description: "A environment variable"
Expand Down Expand Up @@ -438,7 +438,7 @@ spec:
- name: "exec-preInstalled"
type: preInstalled # Options: [docker (default), preInstalled]
command: "roslaunch talker talker.launch"
environmentArgs:
environmentVars:
- name: "key1" # Required
default: "key1-value"
description: "A environment variable"
Expand Down
1 change: 1 addition & 0 deletions riocli/apply/manifests/staticroute.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@ kind: "StaticRoute"
metadata:
name: "staticroute"
project: "project-guid"
# region: us
labels:
app: test
3 changes: 1 addition & 2 deletions riocli/deployment/delete.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,7 @@ def delete_deployment(

if not force:
with spinner.hidden():
click.confirm('Do you want to delete the above deployment(s)?',
default=True, abort=True)
click.confirm('Do you want to delete the above deployment(s)?', abort=True)
spinner.write('')

try:
Expand Down
3 changes: 1 addition & 2 deletions riocli/deployment/update.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,7 @@ def update_deployment(

if not force:
with spinner.hidden():
click.confirm('Do you want to update above deployment(s)?',
default=True, abort=True)
click.confirm('Do you want to update above deployment(s)?', abort=True)
spinner.write('')

try:
Expand Down
2 changes: 1 addition & 1 deletion riocli/deployment/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ def fetch_deployments(
if (include_all or deployment_name_or_regex == deployment.name or
deployment_name_or_regex == deployment.deploymentId or
(deployment_name_or_regex not in deployment.name and
re.search(deployment_name_or_regex, deployment.name))):
re.search(r'^{}$'.format(deployment_name_or_regex), deployment.name))):
result.append(deployment)

return result
Expand Down
3 changes: 1 addition & 2 deletions riocli/device/delete.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,7 @@ def delete_device(

if not force:
with spinner.hidden():
click.confirm('Do you want to delete above device(s)?',
default=True, abort=True)
click.confirm('Do you want to delete above device(s)?', abort=True)
spinner.write('')

try:
Expand Down
2 changes: 1 addition & 1 deletion riocli/device/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ def fetch_devices(
if (include_all or device.name == device_name_or_regex or
device_name_or_regex == device.uuid or
(device_name_or_regex not in device.name and
re.search(device_name_or_regex, device.name))):
re.search(r'^{}$'.format(device_name_or_regex), device.name))):
result.append(device)

return result
Expand Down
2 changes: 1 addition & 1 deletion riocli/package/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def fetch_packages(
if (include_all or package_name_or_regex == pkg.packageName or
pkg.packageId == package_name_or_regex or
(package_name_or_regex not in pkg.packageName and
re.search(package_name_or_regex, pkg.packageName))):
re.search(r'^{}$'.format(package_name_or_regex), pkg.packageName))):
result.append(pkg)

return result
Expand Down
6 changes: 3 additions & 3 deletions riocli/v2client/client.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2023 Rapyuta Robotics
# Copyright 2024 Rapyuta Robotics
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -342,7 +342,7 @@ def list_static_routes(
while True:
params.update({
"continue": offset,
"limit": 10,
"limit": 50,
})
response = RestClient(url).method(HttpMethod.GET).query_param(
params).headers(headers).execute()
Expand Down Expand Up @@ -463,7 +463,7 @@ def list_secrets(
while True:
params.update({
"continue": offset,
"limit": 10,
"limit": 50,
})
response = RestClient(url).method(HttpMethod.GET).query_param(
params).headers(headers).execute()
Expand Down

0 comments on commit dbb418e

Please sign in to comment.