Merge pull request #13 from hmrc/release_version_numbers

Allow version numbers to be specified when running a release jar.

Author: vaughansharman

bin/sm

@@ -23,7 +23,7 @@ def ServiceCompleter(prefix, **kwargs):
 def _process_command():
 
     parser = argparse.ArgumentParser(description='Service Manager - Start, Stop and View services')
-    parser.add_argument('-r', '--release', action='store_true', help='Used with start to run services using release versions')
+    parser.add_argument('-r', '--release', type=str, nargs="?", const="LATEST", help='Used with start to run services using the specified release version, or the latest if unspecified')
     parser.add_argument('-f', '--fatjar', action='store_true', help='Used with start to run services using fatjars')
     parser.add_argument('-F', '--feature', action='append', help='Enable a given feature for all services started')
     parser.add_argument('-s', '--status', nargs='*', help='Get the status of a single service or a list of services')

servicemanager/actions/actions.py

@@ -17,13 +17,17 @@ def start_one(context, service_name, fatjar, release, proxy, port=None):
     else:
         run_from = "SOURCE"
 
+    version = release
+    if version == "LATEST":
+        version = None
+
     existing_service_status = context.get_service(service_name).status()
 
     if len(existing_service_status) > 0:
         print "There is already: '" + str(len(existing_service_status)) + "' instance(s) of the service: '" + service_name + "' running"
         return False
 
-    if context.start_service(service_name, run_from, proxy, None, None, port):
+    if context.start_service(service_name, run_from, proxy, port=port, version=version):
         if context.get_service(service_name).is_started_on_default_port():
             print "Started: " + service_name
             return True
@@ -38,7 +42,11 @@ def get_start_cmd(context, service_name, fatjar, release, proxy, port=None):
     else:
         run_from = "SOURCE"
 
-    starter = context.get_service_starter(service_name, run_from, proxy, None, None, port)
+    version = release
+    if version == "LATEST":
+        version = None
+
+    starter = context.get_service_starter(service_name, run_from, proxy, port=port, version=version)
     return starter.get_start_command(run_from)
 
 def stop_profile(context, profile):

servicemanager/service/smjvmservice.py

@@ -29,8 +29,11 @@ def start(self):
             return self.start_from_binary()
 
     def process_arguments(self):
+        run_from = self.run_from
+        if self.run_from=="RELEASE":
+            run_from = (self.version or "UNKNOWN") + "-" + run_from
         jvm_args = ["-Dservice.manager.serviceName=%s" % self.service_name]
-        jvm_args += ["-Dservice.manager.runFrom=%s" % self.run_from]
+        jvm_args += ["-Dservice.manager.runFrom=%s" % run_from]
         if self.context.is_test:
             jvm_args += ["-Dservice.manager.testId=%s" % self.context.test_id]
             jvm_args += ["-Dservice.manager.startTime=%s" % time.time()]

servicemanager/service/smplayservice.py

@@ -79,6 +79,8 @@ def start_from_binary(self):
 
         if not self.context.offline:
             nexus = SmNexus(self.context, self.service_name)
+            if not self.version:
+                self.version = nexus.find_latest_version(self.run_from, self.service_data["binary"]["artifact"])
             nexus.download_jar_if_necessary(self.run_from, self.version)
 
         unzip_dir = self._unzip_play_application()

servicemanager/smnexus.py

@@ -103,7 +103,12 @@ def _get_version_info_from_nexus(self, artifact):
         response.close()
         return dom
 
-    def _find_latest_version(self, repository, artifact):
+    def find_latest_version(self, run_from, artifact):
+        if run_from == "RELEASE":
+            repository = "Release"
+        else:
+            repository = "Snapshot"
+
         version_env_var = None
         if "versionEnv" in self.context.service_data(self.service_name):
             version_env_var = self.context.service_data(self.service_name)["versionEnv"]
@@ -145,14 +150,12 @@ def download_jar_if_necessary(self, run_from, version):
         microservice_target_path = self.context.get_microservice_target_path(self.service_name)
         repo_mappings = self.context.config_value("nexus")["repoMappings"]
         if run_from == "RELEASE":
-            type_repository = "Release"
             url_type_repository = repo_mappings["RELEASE"]
         else:
-            type_repository = "Snapshot"
             url_type_repository = repo_mappings["SNAPSHOT"]
 
         if not version:
-            version = self._find_latest_version(type_repository, artifact)
+            version = self.find_latest_version(run_from, artifact)
 
         if version:
             nexus_extension = self._create_nexus_extension()