From 0b19ab700b12bfdfea66e65ca25055bac87fd89a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Du=C5=A1an=20Andri=C4=87?= <Dusan.Andric@gmail.com>
Date: Wed, 16 Sep 2020 16:35:40 -0400
Subject: [PATCH 1/4] next snapshot

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6289c40..0a68471 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
     </parent>
     <groupId>org.icgc.argo</groupId>
     <artifactId>workflow-management</artifactId>
-    <version>2.7.0</version>
+    <version>2.8.0-SNAPSHOT</version>
     <name>workflow-management</name>
     <description>ARGO Workflow Management</description>
 

From a8b6effa0e4e6ee405ffe400ace874bf748912a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Du=C5=A1an=20Andri=C4=87?= <Dusan.Andric@gmail.com>
Date: Wed, 16 Sep 2020 16:52:32 -0400
Subject: [PATCH 2/4] use runName in secret name

---
 .../argo/workflow_management/service/NextflowService.java | 5 ++---
 .../argo/workflow_management/util/NextflowConfigFile.java | 8 +-------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/icgc/argo/workflow_management/service/NextflowService.java b/src/main/java/org/icgc/argo/workflow_management/service/NextflowService.java
index f7e6583..79410b7 100644
--- a/src/main/java/org/icgc/argo/workflow_management/service/NextflowService.java
+++ b/src/main/java/org/icgc/argo/workflow_management/service/NextflowService.java
@@ -289,7 +289,7 @@ private CmdKubeRun createCmd(@NonNull Launcher launcher, @NonNull RunParams para
     val workflowEngineParams = params.getWorkflowEngineParams();
 
     // Create SecretName and K8s Secret
-    val rdpcSecretName = String.format("%s-%s", SECRET_SUFFIX, UUID.randomUUID());
+    val rdpcSecretName = String.format("%s-%s", UUID.randomUUID(), runName);
     secretProvider
         .generateSecret()
         .ifPresentOrElse(
@@ -323,8 +323,7 @@ private CmdKubeRun createCmd(@NonNull Launcher launcher, @NonNull RunParams para
             k8sConfig.getServiceAccount(),
             workflowEngineParams.getLaunchDir(),
             workflowEngineParams.getProjectDir(),
-            workflowEngineParams.getWorkDir(),
-            rdpcSecretName);
+            workflowEngineParams.getWorkDir());
     cmdParams.put("runConfig", List.of(config));
 
     // Resume workflow by name/id
diff --git a/src/main/java/org/icgc/argo/workflow_management/util/NextflowConfigFile.java b/src/main/java/org/icgc/argo/workflow_management/util/NextflowConfigFile.java
index eb2381d..05d60da 100644
--- a/src/main/java/org/icgc/argo/workflow_management/util/NextflowConfigFile.java
+++ b/src/main/java/org/icgc/argo/workflow_management/util/NextflowConfigFile.java
@@ -36,8 +36,7 @@ public static String createNextflowConfigFile(
       String serviceAccount,
       String launchDir,
       String projectDir,
-      String workDir,
-      String rdpcSecretName)
+      String workDir)
       throws IOException {
     val filePath = String.format("/tmp/%s.config", filename);
 
@@ -63,11 +62,6 @@ public static String createNextflowConfigFile(
     // close it off
     fileContent.add("}");
 
-    // Add K8s Secret Name
-    fileContent.add("params {");
-    writeFormattedLineIfValue(fileContent::add, "\trdpc_secret_name = '%s'", rdpcSecretName);
-    fileContent.add("}");
-
     // Write contents to file
     for (String line : fileContent) {
       writer.write(line + System.lineSeparator());

From 15f4b2e6dbd709055e976eae0c14562dc71046b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Du=C5=A1an=20Andri=C4=87?= <Dusan.Andric@gmail.com>
Date: Thu, 17 Sep 2020 09:16:29 -0400
Subject: [PATCH 3/4] secretname is runName + suffix

---
 .../icgc/argo/workflow_management/service/NextflowService.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/icgc/argo/workflow_management/service/NextflowService.java b/src/main/java/org/icgc/argo/workflow_management/service/NextflowService.java
index 79410b7..372f40a 100644
--- a/src/main/java/org/icgc/argo/workflow_management/service/NextflowService.java
+++ b/src/main/java/org/icgc/argo/workflow_management/service/NextflowService.java
@@ -289,7 +289,7 @@ private CmdKubeRun createCmd(@NonNull Launcher launcher, @NonNull RunParams para
     val workflowEngineParams = params.getWorkflowEngineParams();
 
     // Create SecretName and K8s Secret
-    val rdpcSecretName = String.format("%s-%s", UUID.randomUUID(), runName);
+    val rdpcSecretName = String.format("%s-%s", runName, SECRET_SUFFIX);
     secretProvider
         .generateSecret()
         .ifPresentOrElse(

From 0d8b3d05ba90195ef9f9b5d3476ed3ef66630739 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Du=C5=A1an=20Andri=C4=87?= <Dusan.Andric@gmail.com>
Date: Thu, 17 Sep 2020 10:09:12 -0400
Subject: [PATCH 4/4] next release version (2.8.0)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0a68471..7e7fa6f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
     </parent>
     <groupId>org.icgc.argo</groupId>
     <artifactId>workflow-management</artifactId>
-    <version>2.8.0-SNAPSHOT</version>
+    <version>2.8.0</version>
     <name>workflow-management</name>
     <description>ARGO Workflow Management</description>