publish: add elastic prefix in the layer name and version as suffix (#115)

Author: v1v

.ci/Jenkinsfile

@@ -9,7 +9,6 @@ pipeline {
     BASE_DIR = "src/github.com/elastic/${env.REPO}"
     PIPELINE_LOG_LEVEL = 'INFO'
     SUFFIX_ARN_FILE = 'arn-file.md'
-    ELASTIC_LAYER_NAME = 'apm-lambda-extension'
     RELEASE_URL_MESSAGE = "(<https://github.com/elastic/${env.REPO}/releases/tag/${env.TAG_NAME}|${env.TAG_NAME}>)"
     SLACK_CHANNEL = '#apm-serverless'
     NOTIFY_TO = 'build-apm+apm-serverless@elastic.co'
@@ -36,6 +35,7 @@ pipeline {
         deleteDir()
         gitCheckout(basedir: "${BASE_DIR}")
         stash allowEmpty: true, name: 'source', useDefaultExcludes: false
+        setEnvVar('ELASTIC_LAYER_NAME', "elastic-apm-extension${getVersion()}")
       }
     }
     stage('Lint'){
@@ -191,6 +191,18 @@ pipeline {
   }
 }
 
+/**
+* Transform TAG releases from v{major}.{minor}.{patch} to
+* ver-{major}-{minor}-{patch}. f.i: given v1.2.3 then
+* -ver-1-2-3.
+*/
+def getVersion() {
+  if (env.BRANCH_NAME?.trim() && env.BRANCH_NAME.startsWith('v')) {
+    return env.BRANCH_NAME.replaceAll('v', '-ver').replaceAll('\\.', '-')
+  }
+  return ''
+}
+
 def notifyStatus(def args = [:]) {
   releaseNotification(slackChannel: "${env.SLACK_CHANNEL}",
                       slackColor: args.slackStatus,

apm-lambda-extension/Makefile

@@ -51,7 +51,7 @@ get-all-aws-regions:
 publish-in-all-aws-regions: validate-layer-name get-all-aws-regions
 	@mkdir -p $(AWS_FOLDER)
 	@while read AWS_DEFAULT_REGION; do \
-		echo "publish '$(ELASTIC_LAYER_NAME)' in $${AWS_DEFAULT_REGION}"; \
+		echo "publish '$(ELASTIC_LAYER_NAME)-$(ARCHITECTURE)' in $${AWS_DEFAULT_REGION}"; \
 		AWS_DEFAULT_REGION="$${AWS_DEFAULT_REGION}" ELASTIC_LAYER_NAME=$(ELASTIC_LAYER_NAME) $(MAKE) publish > $(AWS_FOLDER)/$${AWS_DEFAULT_REGION}; \
 		AWS_DEFAULT_REGION="$${AWS_DEFAULT_REGION}" ELASTIC_LAYER_NAME=$(ELASTIC_LAYER_NAME) $(MAKE) grant-public-layer-access; \
 	done <.regions
@@ -61,7 +61,7 @@ publish: validate-layer-name validate-aws-default-region
 	@aws lambda \
 		--output json \
 		publish-layer-version \
-		--layer-name "${ELASTIC_LAYER_NAME}" \
+		--layer-name "$(ELASTIC_LAYER_NAME)-$(ARCHITECTURE)" \
 		--description "AWS Lambda Extension Layer for Elastic APM $(ARCHITECTURE)" \
 		--license "Apache-2.0" \
 		--zip-file "fileb://./bin/extension.zip"

apm-lambda-extension/cli/build-and-publish.js

@@ -38,7 +38,7 @@ function getLastJsonFromShellOutput (output) {
 function buildAndPublish () {
   return new Promise(function (resolve, reject) {
     if (!process.env.ELASTIC_LAYER_NAME) {
-      process.env.ELASTIC_LAYER_NAME = 'apm-lambda-extension'
+      process.env.ELASTIC_LAYER_NAME = 'elastic-apm-extension'
     }
     console.log('running cd .. && make build-and-publish')
     exec('cd .. && make build-and-publish', (error, stdout, stderr) => {