Merge branch 'master' into feature/add-bearer-auth

.ci/schedule-weekly.groovy

@@ -40,9 +40,9 @@ pipeline {
     stage('Top failing Beats tests - last 7 days') {
       steps {
         setEnvVar('YYYY_MM_DD', new Date().format("yyyy-MM-dd", TimeZone.getTimeZone('UTC')))
-        runWatcher(watcher: 'report-beats-top-failing-tests-weekly-master', subject: "[master] ${env.YYYY_MM_DD}: Top failing Beats tests - last 7 days", sendEmail: true, to: 'beats-contrib@elastic.co')
-        runWatcher(watcher: 'report-beats-top-failing-tests-weekly-7.x', subject: "[7.x] ${env.YYYY_MM_DD}: Top failing Beats tests - last 7 days", sendEmail: true, to: 'beats-contrib@elastic.co')
-        runWatcher(watcher: 'report-beats-top-failing-tests-weekly-7-release', subject: "[7-release] ${env.YYYY_MM_DD}: Top failing Beats tests - last 7 days", sendEmail: true, to: 'beats-contrib@elastic.co')
+        runWatcher(watcher: 'report-beats-top-failing-tests-weekly-master', subject: "[master] ${env.YYYY_MM_DD}: Top failing Beats tests in master branch - last 7 days", sendEmail: true, to: 'beats-contrib@elastic.co')
+        runWatcher(watcher: 'report-beats-top-failing-tests-weekly-7.x', subject: "[7.x] ${env.YYYY_MM_DD}: Top failing Beats tests in 7.x branch - last 7 days", sendEmail: true, to: 'beats-contrib@elastic.co')
+        runWatcher(watcher: 'report-beats-top-failing-tests-weekly-7-release', subject: "[7-release] ${env.YYYY_MM_DD}: Top failing Beats tests in 7 release branch - last 7 days", sendEmail: true, to: 'beats-contrib@elastic.co')
       }
     }
     stage('Sync GitHub labels') {

CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## v1.1.234 (23/08/2021)
+
+#### ⚙️ CI
+
+-  Adjust weekly Beats headers to outsmart Google [#1246](https://github.com/elastic/apm-pipeline-library/pull/1246)
+
+## v1.1.233 (04/08/2021)
+
+#### 🚀 Enhancements
+
+-  Add OTEL_SERVICE_NAME env variable [#1226](https://github.com/elastic/apm-pipeline-library/pull/1226)
+- [**Team:Automation**] Add parameters [#1230](https://github.com/elastic/apm-pipeline-library/pull/1230)
+- [**Team:Automation**] feat: pipeline to destroy clusters [#1229](https://github.com/elastic/apm-pipeline-library/pull/1229)
+
+#### 🐛 Bug Fixes
+
+-  randomString without starting with - [#1235](https://github.com/elastic/apm-pipeline-library/pull/1235)
+
 ## v1.1.232 (29/07/2021)
 *No changelog for this release.*
 

pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>co.elastic</groupId>
   <artifactId>jenkins-library</artifactId>
-  <version>1.1.233-SNAPSHOT</version>
+  <version>1.1.235-SNAPSHOT</version>
   <name>APM Pipeline Shared Library</name>
   <description>Pipeline Shared Library containing utility steps.</description>
   <url>https://github.com/elastic/apm-pipeline-library</url>
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>com.github.tomakehurst</groupId>
       <artifactId>wiremock-jre8</artifactId>
-      <version>2.29.1</version>
+      <version>2.30.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -96,7 +96,7 @@
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>opentelemetry</artifactId>
-      <version>0.16</version>
+      <version>0.17</version>
     </dependency>
     <!-- END Support for the withOtelEnv step -->
   </dependencies>
@@ -213,7 +213,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.0.0-M3</version>
+        <version>3.0.0</version>
         <executions>
           <execution>
             <id>display-info</id>

src/test/groovy/RandomStringStepTest.groovy

@@ -54,11 +54,18 @@ class RandomStringStepTests extends ApmBasePipelineTest {
   }
 
   @Test
-  void test_manipulateString_with_dash() throws Exception {
+  void test_manipulateString_with_ending_dash() throws Exception {
     def ret = script.manipulateString('a-b-c-d-e-', 6)
     printCallStack()
     println ret
     assertTrue(ret == 'a-b-ca')
   }
 
+  @Test
+  void test_manipulateString_with_starting_dash() throws Exception {
+    def ret = script.manipulateString('-a-b-c-d-e', 6)
+    printCallStack()
+    println ret
+    assertTrue(ret == 'aa-b-c')
+  }
 }

vars/randomString.groovy

@@ -38,8 +38,8 @@ def call(Map args = [:]) {
 }
 
 /**
-  Alphanumeric and dash are allowed but not ending with dash
+  Alphanumeric and dash are allowed but not ending nor starting with dash
 */
 def manipulateString(String value, int size) {
-  return value.replaceAll("[\\W]|-", "-").take(size).replaceAll('-$', 'a')
+  return value.replaceAll("[\\W]|-", "-").take(size).replaceAll('-$', 'a').replaceAll('^-', 'a')
 }