You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by of...@apache.org on 2019/10/17 08:18:46 UTC
[incubator-dlab] branch DLAB-1138 updated: [DLAB-1138] Fixed issue
with dublicate key in billing-gcp
This is an automated email from the ASF dual-hosted git repository.
ofuks pushed a commit to branch DLAB-1138
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1138 by this push:
new b87a6c2 [DLAB-1138] Fixed issue with dublicate key in billing-gcp
b87a6c2 is described below
commit b87a6c2b508ee2863f2c3d12c23ff3a1e71fd62e
Author: Oleh Fuks <ol...@gmail.com>
AuthorDate: Wed Oct 16 16:10:46 2019 +0300
[DLAB-1138] Fixed issue with dublicate key in billing-gcp
---
.../src/main/java/com/epam/dlab/billing/gcp/util/BillingUtils.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/util/BillingUtils.java b/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/util/BillingUtils.java
index 86c9333..881c5d6 100644
--- a/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/util/BillingUtils.java
+++ b/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/util/BillingUtils.java
@@ -62,6 +62,7 @@ public class BillingUtils {
public static Stream<BillingData> exploratoryBillingDataStream(UserInstance userInstance) {
final Stream<BillingData> computationalStream = userInstance.getComputationalResources()
.stream()
+ .filter(cr -> cr.getComputationalId() != null)
.flatMap(cr -> Stream.of(computationalBillableResource(userInstance, cr),
withExploratoryName(userInstance).displayName(cr.getComputationalName() + ":" + VOLUME_PRIMARY).dlabId(String.format(VOLUME_PRIMARY_FORMAT, cr.getComputationalId()))
.resourceType(BillingData.ResourceType.VOLUME).computationalName(cr.getComputationalName()).build()));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org