From 6b4f9ad063f46339fe350bdff2947018d4ee9c90 Mon Sep 17 00:00:00 2001 From: Adam Nichols Date: Tue, 14 Jan 2025 12:26:37 -0500 Subject: [PATCH 1/5] Remove PAPIv1 auth file support --- .../PipelinesApiVMAuthentication.scala | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/supportedBackends/google/pipelines/common/src/main/scala/cromwell/backend/google/pipelines/common/authentication/PipelinesApiVMAuthentication.scala b/supportedBackends/google/pipelines/common/src/main/scala/cromwell/backend/google/pipelines/common/authentication/PipelinesApiVMAuthentication.scala index c00e2a6c16a..779dbbb855d 100644 --- a/supportedBackends/google/pipelines/common/src/main/scala/cromwell/backend/google/pipelines/common/authentication/PipelinesApiVMAuthentication.scala +++ b/supportedBackends/google/pipelines/common/src/main/scala/cromwell/backend/google/pipelines/common/authentication/PipelinesApiVMAuthentication.scala @@ -6,18 +6,6 @@ import common.validation.ErrorOr._ import common.validation.Validation._ import cromwell.cloudsupport.gcp.GoogleConfiguration import cromwell.core.DockerCredentials -import spray.json.{JsString, JsValue} - -/** - * Interface for Authentication information that can be included as a json object in the file uploaded to GCS - * upon workflow creation and used in the VM. - */ -sealed trait PipelinesApiAuthObject { - def context: String - def map: Map[String, JsValue] - - def toMap: Map[String, Map[String, JsValue]] = Map(context -> map) -} object PipelinesApiDockerCredentials { @@ -53,10 +41,3 @@ case class PipelinesApiDockerCredentials(override val token: String, override val keyName: Option[String], override val authName: Option[String] ) extends DockerCredentials(token = token, keyName = keyName, authName = authName) - with PipelinesApiAuthObject { - - override val context = "docker" - override val map = Map( - "token" -> JsString(token) - ) -} From 682a47c8fcf3a996a1e71b8cf235f50fae070a7e Mon Sep 17 00:00:00 2001 From: Adam Nichols Date: Wed, 15 Jan 2025 10:36:07 -0500 Subject: [PATCH 2/5] Fix codecov --- codecov.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/codecov.yml b/codecov.yml index ca81a8c5ac3..8cc2bdb0204 100644 --- a/codecov.yml +++ b/codecov.yml @@ -1,21 +1,13 @@ codecov: - branch: develop - -coverage: - range: 50..75 - round: down - precision: 2 - status: project: default: base: pr - target: 50% + target: 10% threshold: 5% patch: default: base: pr - target: 50% + target: 10% threshold: 5% - comment: off From 142a3573edc89a2b1fd836cd8da1b617a9b8aaca Mon Sep 17 00:00:00 2001 From: Adam Nichols Date: Wed, 15 Jan 2025 10:41:24 -0500 Subject: [PATCH 3/5] Fix codecov? --- codecov.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/codecov.yml b/codecov.yml index 8cc2bdb0204..4689aefb489 100644 --- a/codecov.yml +++ b/codecov.yml @@ -1,13 +1,17 @@ codecov: + branch: develop + +coverage: + range: 0..100 + status: project: default: base: pr - target: 10% - threshold: 5% + target: 0% patch: default: base: pr - target: 10% - threshold: 5% + target: 0% + comment: off From bb66f0eee3c188fa72b279d5a019328631494fe9 Mon Sep 17 00:00:00 2001 From: Adam Nichols Date: Wed, 15 Jan 2025 14:31:33 -0500 Subject: [PATCH 4/5] Revert "Fix codecov?" This reverts commit 142a3573edc89a2b1fd836cd8da1b617a9b8aaca. --- codecov.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/codecov.yml b/codecov.yml index 4689aefb489..8cc2bdb0204 100644 --- a/codecov.yml +++ b/codecov.yml @@ -1,17 +1,13 @@ codecov: - branch: develop - -coverage: - range: 0..100 - status: project: default: base: pr - target: 0% + target: 10% + threshold: 5% patch: default: base: pr - target: 0% - + target: 10% + threshold: 5% comment: off From b2939b67f753d559b495d4ff4c5ada9581874f55 Mon Sep 17 00:00:00 2001 From: Adam Nichols Date: Wed, 15 Jan 2025 14:31:42 -0500 Subject: [PATCH 5/5] Revert "Fix codecov" This reverts commit 682a47c8fcf3a996a1e71b8cf235f50fae070a7e. --- codecov.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/codecov.yml b/codecov.yml index 8cc2bdb0204..ca81a8c5ac3 100644 --- a/codecov.yml +++ b/codecov.yml @@ -1,13 +1,21 @@ codecov: + branch: develop + +coverage: + range: 50..75 + round: down + precision: 2 + status: project: default: base: pr - target: 10% + target: 50% threshold: 5% patch: default: base: pr - target: 10% + target: 50% threshold: 5% + comment: off