Better error messages for handling when unlock is attempted against a non-current batch. v1.1.5

Author: IanMeyers

unlockBatch.js

@@ -6,74 +6,111 @@
         http://aws.amazon.com/asl/
 
     or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and limitations under the License. 
-*/
+ */
 
 var aws = require('aws-sdk');
 require('./constants');
 var common = require('./common');
 
-if (process.argv.length < 4) {
-	console.log("You must provide an AWS Region Code, Batch ID, and configured Input Location to use Unlock");
+var usage = function() {
+	console.log("You must provide an AWS Region Code, Batch ID, and configured Input Location to use Unlock.");
 	process.exit(ERROR);
 }
+
+if (process.argv.length < 4) {
+	usage();
+}
+
 var setRegion = process.argv[2];
 var thisBatchId = process.argv[3];
 var prefix = process.argv[4];
 
+if (!thisBatchId || !prefix) {
+	usage();
+}
 var dynamoDB = new aws.DynamoDB({
 	apiVersion : '2012-08-10',
 	region : setRegion
 });
 
-var updateBatchStatus = {
+var getConfig = {
 	Key : {
-		batchId : {
-			S : thisBatchId,
-		},
 		s3Prefix : {
 			S : prefix
 		}
 	},
-	TableName : batchTable,
-	AttributeUpdates : {
-		status : {
-			Action : 'PUT',
-			Value : {
-				S : 'open'
-			}
-		},
-		lastUpdate : {
-			Action : 'PUT',
-			Value : {
-				N : '' + common.now()
-			}
-		}
-	},
-	// the batch to be unlocked must be in locked or error state - we can't reopen
-	// 'complete' batches
-	Expected : {
-		status : {
-			AttributeValueList : [ {
-				S : 'locked'
-			}, {
-				S : 'error'
-			} ],
-			ComparisonOperator : 'IN'
-		}
-	}
+	TableName : configTable,
+	ConsistentRead : true
 };
 
-dynamoDB.updateItem(updateBatchStatus, function(err, data) {
+dynamoDB.getItem(getConfig, function(err, data) {
 	if (err) {
-		if (err.code === conditionCheckFailed) {
-			console.log("Batch " + thisBatchId + " cannot be unlocked");
+		console.log(err);
+		process.exit(ERROR);
+	} else {
+		if (!data) {
+			console.log("Unable to find Configuration with S3 Prefix " + prefix + " in Region " + setRegion);
 		} else {
-			console.log(err);
-			process.exit(ERROR);
+			// only allow unlocking if the batch is allocated as current
+			if (data.Item.currentBatch.S !== thisBatchId) {
+				console.log("Batch " + thisBatchId + " is not currently allocated as the open batch for Load Configuration on "
+						+ prefix + ". Use reprocessBatch.js to rerun the load of this Batch.");
+				process.exit(ERROR);
+			} else {
+				var updateBatchStatus = {
+					Key : {
+						batchId : {
+							S : thisBatchId,
+						},
+						s3Prefix : {
+							S : prefix
+						}
+					},
+					TableName : batchTable,
+					AttributeUpdates : {
+						status : {
+							Action : 'PUT',
+							Value : {
+								S : 'open'
+							}
+						},
+						lastUpdate : {
+							Action : 'PUT',
+							Value : {
+								N : '' + common.now()
+							}
+						}
+					},
+					// the batch to be unlocked must be in locked or error state - we
+					// can't reopen
+					// 'complete' batches
+					Expected : {
+						status : {
+							AttributeValueList : [ {
+								S : 'locked'
+							}, {
+								S : 'error'
+							} ],
+							ComparisonOperator : 'IN'
+						}
+					}
+				};
+
+				dynamoDB.updateItem(updateBatchStatus, function(err, data) {
+					if (err) {
+						if (err.code === conditionCheckFailed) {
+							console.log("Batch " + thisBatchId + " cannot be unlocked as it is not in 'locked' or 'error' status");
+						} else {
+							console.log(err);
+							process.exit(ERROR);
+						}
+					} else {
+						console.log("Batch " + thisBatchId + " Unlocked and ready for reprocessing");
+					}
+
+					process.exit(OK);
+				});
+			}
 		}
-	} else {
-		console.log("Batch " + thisBatchId + " Unlocked and ready for reprocessing");
 	}
-
-	process.exit(OK);
 });