Merge branch 'main' into dependencies

OpenC3 · Sep 13, 2023 · 9767346 · 9767346
2 parents 2719fd0 + 6120962
commit 9767346
Show file tree

Hide file tree

Showing 28 changed files with 1,077 additions and 287 deletions.
diff --git a/.github/workflows/post_release_clamav.yml b/.github/workflows/post_release_clamav.yml
@@ -76,13 +76,13 @@ jobs:
             // const tag = context.ref.replace("refs/tags/", "");
             console.log("tag = ", tag);
             // Get release for this tag
-            const release = await github.repos.getReleaseByTag({
+            const release = await github.rest.repos.getReleaseByTag({
               owner: context.repo.owner,
               repo: context.repo.repo,
               tag
             });
             // Upload the release asset
-            await github.repos.uploadReleaseAsset({
+            await github.rest.repos.uploadReleaseAsset({
               owner: context.repo.owner,
               repo: context.repo.repo,
               release_id: release.data.id,

diff --git a/.github/workflows/post_release_trivy.yml b/.github/workflows/post_release_trivy.yml
@@ -34,7 +34,6 @@ jobs:
           ignore-unfixed: true
           vuln-type: "os,library"
           scanners: "vuln"
-          severity: "CRITICAL,HIGH"
       - name: Run Trivy on image ruby in SBOM mode
         uses: aquasecurity/trivy-action@master
         with:
@@ -50,7 +49,6 @@ jobs:
           ignore-unfixed: true
           vuln-type: "os,library"
           scanners: "vuln"
-          severity: "CRITICAL,HIGH"
       - name: Run Trivy on image node in SBOM mode
         uses: aquasecurity/trivy-action@master
         with:
@@ -66,7 +64,6 @@ jobs:
           ignore-unfixed: true
           vuln-type: "os,library"
           scanners: "vuln"
-          severity: "CRITICAL,HIGH"
       - name: Run Trivy on image base in SBOM mode
         uses: aquasecurity/trivy-action@master
         with:
@@ -82,7 +79,6 @@ jobs:
           ignore-unfixed: true
           vuln-type: "os,library"
           scanners: "vuln"
-          severity: "CRITICAL,HIGH"
       - name: Run Trivy on image cosmos-init in SBOM mode
         uses: aquasecurity/trivy-action@master
         with:
@@ -98,7 +94,6 @@ jobs:
           ignore-unfixed: true
           vuln-type: "os,library"
           scanners: "vuln"
-          severity: "CRITICAL,HIGH"
       - name: Run Trivy on image redis in SBOM mode
         uses: aquasecurity/trivy-action@master
         with:
@@ -114,7 +109,6 @@ jobs:
           ignore-unfixed: true
           vuln-type: "os,library"
           scanners: "vuln"
-          severity: "CRITICAL,HIGH"
       - name: Run Trivy on image minio in SBOM mode
         uses: aquasecurity/trivy-action@master
         with:
@@ -130,7 +124,6 @@ jobs:
           ignore-unfixed: true
           vuln-type: "os,library"
           scanners: "vuln"
-          severity: "CRITICAL,HIGH"
       - name: Run Trivy on image operator in SBOM mode
         uses: aquasecurity/trivy-action@master
         with:
@@ -146,7 +139,6 @@ jobs:
           ignore-unfixed: true
           vuln-type: "os,library"
           scanners: "vuln"
-          severity: "CRITICAL,HIGH"
       - name: Run Trivy on image cosmos-cmd-tlm-api in SBOM mode
         uses: aquasecurity/trivy-action@master
         with:
@@ -162,7 +154,6 @@ jobs:
           ignore-unfixed: true
           vuln-type: "os,library"
           scanners: "vuln"
-          severity: "CRITICAL,HIGH"
       - name: Run Trivy on image cosmos-script-runner-api in SBOM mode
         uses: aquasecurity/trivy-action@master
         with:
@@ -178,7 +169,6 @@ jobs:
           ignore-unfixed: true
           vuln-type: "os,library"
           scanners: "vuln"
-          severity: "CRITICAL,HIGH"
       - name: Run Trivy on image traefik in SBOM mode
         uses: aquasecurity/trivy-action@master
         with:
@@ -198,21 +188,21 @@ jobs:
             // const tag = context.ref.replace("refs/tags/", "");
             console.log("tag = ", tag);
             // Get release for this tag
-            const release = await github.repos.getReleaseByTag({
+            const release = await github.rest.repos.getReleaseByTag({
               owner: context.repo.owner,
               repo: context.repo.repo,
               tag
             });
             // Upload the release asset
-            await github.repos.uploadReleaseAsset({
+            await github.rest.repos.uploadReleaseAsset({
               owner: context.repo.owner,
               repo: context.repo.repo,
               release_id: release.data.id,
               name: "${{ steps.date.outputs.date }}_trivy_results_v${{ github.event.inputs.version }}.zip",
               data: await fs.readFileSync("trivy_results.zip")
             });
             // Upload the release asset
-            await github.repos.uploadReleaseAsset({
+            await github.rest.repos.uploadReleaseAsset({
               owner: context.repo.owner,
               repo: context.repo.repo,
               release_id: release.data.id,

diff --git a/openc3-cosmos-init/plugins/packages/openc3-cosmos-ace-diff/src/index.js b/openc3-cosmos-init/plugins/packages/openc3-cosmos-ace-diff/src/index.js
@@ -572,10 +572,6 @@ function computeDiff(acediff, diffType, offsetLeft, offsetRight, diffText) {
     )
 
     let rightStartLine = currentLineOtherEditor
-    if (offsetRight !== 0) {
-      rightStartLine += 1
-    }
-
     var sameLineInsert = info.startLine === info.endLine
 
     // whether or not this diff is a plain INSERT into the other editor, or overwrites a line take a little work to
@@ -619,10 +615,6 @@ function computeDiff(acediff, diffType, offsetLeft, offsetRight, diffText) {
     )
 
     let leftStartLine = currentLineOtherEditor
-    if (offsetLeft !== 0) {
-      leftStartLine += 1
-    }
-
     var sameLineInsert = info.startLine === info.endLine
     var numRows = 0
     if (
@@ -715,11 +707,16 @@ function getLineForCharPosition(editor, offsetChars) {
 
   for (let i = 0; i < lines.length; i += 1) {
     runningTotal += lines[i].length + 1 // +1 needed for newline char
-    if (offsetChars <= runningTotal) {
+    if (offsetChars < runningTotal) {
       foundLine = i
       break
     }
   }
+  // If we're past the end of the buffer then we need to bump the line total
+  // because we're basically inserting after the last line
+  if (runningTotal > editor.ace.getSession().getValue().length) {
+    foundLine += 1
+  }
   return foundLine
 }
 

diff --git a/openc3-cosmos-init/plugins/packages/openc3-cosmos-demo/targets/INST/procedures/checks.rb b/openc3-cosmos-init/plugins/packages/openc3-cosmos-demo/targets/INST/procedures/checks.rb
@@ -1,5 +1,7 @@
-# Display the environment variables
+# Display all environment variables
 puts ENV.inspect
+# Print the TYPE env var which is set in the INST COMMANDING screen
+puts "ENV['TYPE']:#{ENV['TYPE']}"
 
 collect_cnt = tlm("<%= target_name %> HEALTH_STATUS COLLECTS")
 cmd("<%= target_name %> COLLECT with DURATION 11, TYPE NORMAL")

diff --git a/openc3-cosmos-init/plugins/packages/openc3-cosmos-demo/targets/INST/screens/commanding.txt b/openc3-cosmos-init/plugins/packages/openc3-cosmos-demo/targets/INST/screens/commanding.txt
@@ -50,6 +50,7 @@ VERTICAL
     BUTTON 'Run Script' "var script=screen.getNamedWidget('SCRIPTNAME').text();" \
       "var ctype=screen.getNamedWidget('COLLECT_TYPE').text();" \
       # Set some environment variables to be used by the script as ENV['TYPE']
+      # See INST/procedures/checks.rb for an example of usage
       "var env = {}; env['TYPE'] = ctype;" \
       "runScript('INST/procedures/'+script, !screen.getNamedWidget('BG').checked(), env)"
   END

diff --git a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/components/DetailsDialog.vue b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/components/DetailsDialog.vue
@@ -292,7 +292,17 @@ export default {
                     }
                   }
                 }
-                this.rawValue = values[0][0]
+                if (
+                  this.details.data_type.includes('INT') &&
+                  !this.details.array_size
+                ) {
+                  // For INT and UINT display both dec and hex
+                  this.rawValue = `${values[0][0]} (0x${values[0][0]
+                    .toString(16)
+                    .toUpperCase()})`
+                } else {
+                  this.rawValue = values[0][0]
+                }
                 this.convertedValue = values[1][0]
                 this.formattedValue = values[2][0]
                 this.unitsValue = values[3][0]

diff --git a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/services/cable.js b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/services/cable.js
@@ -47,7 +47,7 @@ export default class Cable {
             window.openc3Scope +
             '&authorization=' +
             localStorage.openc3Token
-          this._cable = ActionCable.createConsumer(final_url)
+          this._cable = ActionCable.createConsumer(encodeURI(final_url))
         }
         return this._cable.subscriptions.create(
           {

diff --git a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/base/AppFooter.vue b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/tools/base/AppFooter.vue
@@ -65,7 +65,6 @@ export default {
   created: function () {
     this.getSourceUrl()
     Api.get(`/openc3-api/info`).then((response) => {
-      console.log(response)
       if (response.data.enterprise) {
         this.edition = 'COSMOS Enterprise'
       } else {

diff --git a/openc3/python/openc3/microservices/__init__.py b/openc3/python/openc3/microservices/__init__.py