Merge pull request #28 from NUWCDIVNPT/phase-1-dev

Fix Issue #27 and increment version to 1.0.0-beta.2
NUWCDIVNPT · Oct 28, 2020 · eadc2d0 · eadc2d0
2 parents 5191f90 + 1d90ac6
commit eadc2d0
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 13 deletions.
diff --git a/api/source/package.json b/api/source/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stig-management-api",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.0-beta.2",
   "description": "An API for managing evaluations of Security Technical Implementation Guide (STIG) assessments.",
   "main": "index.js",
   "scripts": {

diff --git a/api/source/service/mysql/utils.js b/api/source/service/mysql/utils.js
@@ -419,18 +419,16 @@ module.exports.updateStatsAssetStig = async function(connection, options) {
         mediumCount = stats.mediumCount,
         lowCount = stats.lowCount
     `
-    console.log(`Connection ${connection.connection.connectionId} STATS SELECT`)
     const [stats] = await connection.query(sqlSelect, binds)
-    console.log(`Connection ${connection.connection.connectionId} STATS UPDATE`)
-    const [result] = await connection.query(sqlUpdate, stats[0])
-    if (result.affectedRows == 0) {
-      console.log(`Connection ${connection.connection.connectionId} STATS INSERT`)
-      await connection.query(sqlInsert, stats[0])
+    if (stats.length > 0) {
+      const [result] = await connection.query(sqlUpdate, stats[0])
+      if (result.affectedRows == 0) {
+        await connection.query(sqlInsert, stats[0])
+      }
     }
     return true  
   }
   catch (err) {
-    console.log(`Connection ${connection.connection.connectionId} STATS ERROR ${err.message}`)
     throw err
   }
 }

diff --git a/api/source/specification/stig-manager.yaml b/api/source/specification/stig-manager.yaml
@@ -7,7 +7,7 @@ info:
   contact:
     name: Carl Smigielski
     email: carl.a.smigielski@saic.com
-  version: 1.0.0-beta.1
+  version: 1.0.0-beta.2
 servers:
   - url: 'http://localhost:54000/api'
 paths:

diff --git a/api/source/utils/config.js b/api/source/utils/config.js
@@ -1,5 +1,5 @@
 let config = {
-    version: '1.0.0-beta.1',
+    version: '1.0.0-beta.2',
     commit: {
         branch: process.env.COMMIT_BRANCH || 'na',
         sha: process.env.COMMIT_SHA || 'na',

diff --git a/clients/extjs/js/Env.js b/clients/extjs/js/Env.js
@@ -1,7 +1,7 @@
 Ext.ns('STIGMAN')
 
 STIGMAN.Env = {
-    version: '1.0.0-beta.1',
+    version: '1.0.0-beta.2',
     apiBase: "/api" || "../api",
     commit: {
         branch: "" || "na",

diff --git a/clients/extjs/js/Env.js.template b/clients/extjs/js/Env.js.template
@@ -1,7 +1,7 @@
 Ext.ns('STIGMAN')
 
 STIGMAN.Env = {
-    version: '1.0.0-beta.1',
+    version: '1.0.0-beta.2',
     apiBase: "${STIGMAN_CLIENT_API_BASE}" || "../api",
     commit: {
         branch: "${COMMIT_BRANCH}" || "na",

diff --git a/docs/Release_Notes.md b/docs/Release_Notes.md
@@ -6,4 +6,7 @@
 This is the initial beta release of STIG Manager
 
 ### 1.0.0-beta.1
-Numerous enhancements and bug fixes, including token handling and better concurrency. The project is ready for non-production deployments and pilots to demonstrate suitability for first production release.
+Numerous enhancements and bug fixes, including token handling and better concurrency. The project is ready for non-production deployments and pilots to demonstrate suitability for first production release.
+
+### 1.0.0-beta.2
+Fixed GitHub Issue #27. STIG checklist imports were critically affected by a regression introduced with beta.1