Log warning about usage of the deprecated resolve tag

src/lighter/main.py

@@ -130,9 +130,13 @@ def parse_service(filename, targetdir=None, verifySecrets=False):
     # Fetch and merge json template from maven
     if util.rget(document, 'maven', 'version') or util.rget(document, 'maven', 'resolve'):
         coord = document['maven']
+        versionspec = coord.get('version')
+        if not versionspec:
+            versionspec = coord['resolve']
+            logging.warn("The 'resolve:' tag is deprecated, please switch to 'version:' which is a drop-in replacement in %s" % filename)
 
         resolver = maven.ArtifactResolver(coord['repository'], coord['groupid'], coord['artifactid'], coord.get('classifier'))
-        version = resolver.resolve(coord.get('version') or coord['resolve'])
+        version = resolver.resolve(versionspec)
 
         artifact = resolver.fetch(version)
         config = util.merge(config, artifact.body)

src/lighter/test/deploy_test.py

@@ -101,7 +101,7 @@ def testResolveMavenJson(self):
             lighter.deploy('http://localhost:1/', filenames=['src/resources/yaml/integration/myservice.yml'])
             self.assertTrue(self._called)
 
-    def testRangeInVersionTag(self):
+    def testDeprecatedResolveTag(self):
         """
         Checks that version ranges can be resolved in the "version: " tag as well
         """

src/resources/yaml/integration/myservice-nonstring-envkey.yml

@@ -1,7 +1,7 @@
 maven:
   groupid: 'com.meltwater'
   artifactid: 'myservice'
-  resolve: '[1.0.0,1.1.0)'
+  version: '[1.0.0,1.1.0)'
 override:
   env:
     TRUE: '123'

src/resources/yaml/integration/myservice-nonstring-envvar.yml

@@ -1,7 +1,7 @@
 maven:
   groupid: 'com.meltwater'
   artifactid: 'myservice'
-  resolve: '[1.0.0,1.1.0)'
+  version: '[1.0.0,1.1.0)'
 override:
   env:
     INTVAR: 123

src/resources/yaml/integration/myservice-unresolved-variable.yml

@@ -1,8 +1,8 @@
 maven:
   groupid: 'com.meltwater'
   artifactid: 'myservice'
-  resolve: '[1.0.0,1.1.0)'
+  version: '[1.0.0,1.1.0)'
 override:
   cpus: 1.0
   env:
-    DATABASE: 'database:3306'
+    DATABASE: 'database:3306'

src/resources/yaml/integration/myservice-version-range.yml

@@ -1,7 +1,7 @@
 maven:
   groupid: 'com.meltwater'
   artifactid: 'myservice'
-  version: '[1.0.0,1.1.0)'
+  resolve: '[1.0.0,1.1.0)'
 override:
   cpus: 1.0
   env:

src/resources/yaml/integration/myservice.yml

@@ -1,7 +1,7 @@
 maven:
   groupid: 'com.meltwater'
   artifactid: 'myservice'
-  resolve: '[1.0.0,1.1.0)'
+  version: '[1.0.0,1.1.0)'
 override:
   cpus: 1.0
   env:

src/resources/yaml/staging/myservice-unique-snapshot.yml

@@ -1,7 +1,7 @@
 maven:
   groupid: 'com.meltwater'
   artifactid: 'myservice-snapshot'
-  resolve: '[,]-SNAPSHOT'
+  version: '[,]-SNAPSHOT'
   classifier: 'marathon'
 override:
   cpus: 1.0