Merge pull request #326 from guardian/fix-sf-url-refactor

Fix regression in GoCardless-SalesForce sync
guardian · Jun 17, 2019 · 7b790ae · 7b790ae
2 parents 84e4237 + b2c6e69
commit 7b790ae
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/handlers/sf-gocardless-sync/cfn.yaml b/handlers/sf-gocardless-sync/cfn.yaml
@@ -132,11 +132,6 @@ Resources:
       - !Sub arn:aws:sns:${AWS::Region}:${AWS::AccountId}:subscriptions_dev
       AlarmName: !Sub "GenericError observed on ${LogGroupNamePrefix}-${Stage}"
       ComparisonOperator: GreaterThanOrEqualToThreshold
-      Dimensions:
-        - Name: LogGroup
-          Value: !Sub "${LogGroupNamePrefix}-${Stage}"
-        - Name: Stage
-          Value: !Sub ${Stage}
       EvaluationPeriods: 1
       MetricName: "GenericError Count"
       Namespace: "GoCardlessSalesForceSync"

diff --git a/...rdless-sync/src/main/scala/com/gu/sf_gocardless_sync/salesforce/SalesforceDDMandate.scala b/...rdless-sync/src/main/scala/com/gu/sf_gocardless_sync/salesforce/SalesforceDDMandate.scala
@@ -13,7 +13,7 @@ import play.api.libs.json.{JsValue, Json}
 
 object SalesforceDDMandate extends Logging {
 
-  private val mandateSfObjectsBaseUrl = sfApiBaseUrl + "DD_Mandate__c"
+  private val mandateSfObjectsBaseUrl = sfObjectsBaseUrl + "DD_Mandate__c"
 
   case class BillingAccountSfId(value: String) extends AnyVal
   implicit val formatBillingAccountSfId = Jsonx.formatInline[BillingAccountSfId]

diff --git a/lib/salesforce/src/main/scala/com/gu/salesforce/SalesforceConstants.scala b/lib/salesforce/src/main/scala/com/gu/salesforce/SalesforceConstants.scala
@@ -2,10 +2,10 @@ package com.gu.salesforce
 
 object SalesforceConstants {
 
-  val sfApiBaseUrl = "/services/data/v29.0"
+  private val sfApiBaseUrl = "/services/data/v29.0"
 
-  val soqlQueryBaseUrl = sfApiBaseUrl + "/query/"
+  val soqlQueryBaseUrl: String = sfApiBaseUrl + "/query/"
 
-  val sfObjectsBaseUrl = sfApiBaseUrl + "/sobjects/"
+  val sfObjectsBaseUrl: String = sfApiBaseUrl + "/sobjects/"
 
 }