Merged in feature/SCFF-20 (pull request #1)

Feature/SCFF-20

Author: michaelcizmar

caching/caching_boltdb.go

@@ -3,7 +3,7 @@ package caching
 import (
 	"fmt"
 	"github.com/boltdb/bolt"
-	"github.com/cloudfoundry-community/firehose-to-syslog/logging"
+	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/logging"
 	cfClient "github.com/cloudfoundry-community/go-cfclient"
 	json "github.com/mailru/easyjson"
 	"log"

caching/cachingfakes/fake_caching.go

@@ -5,7 +5,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/cloudfoundry-community/firehose-to-syslog/caching"
+	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/caching"
 )
 
 type FakeCaching struct {

ci/build-all/build-all

@@ -4,9 +4,9 @@ export ROOT_DIR=$PWD
 export GOPATH=$PWD/gopath
 export PATH=$GOPATH/bin:$PATH
 export BUILD_NUMBER=`[ ${VERSION_APP} ] && cat ${VERSION_APP} || echo "0.0.0"`
-cd $GOPATH/src/github.com/cloudfoundry-community/firehose-to-syslog/
+cd $GOPATH/src/bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic
 
 make clean
 make compile
 
-mv dist ${ROOT_DIR}/firehose-to-syslog-ci-build/
+mv dist ${ROOT_DIR}/firehouse-to-sumologic-ci-build/

ci/build-all/build-all.yml

@@ -8,14 +8,14 @@ image_resource:
 
 
 inputs:
-  - name: firehose-to-syslog-ci
-    path: gopath/src/github.com/cloudfoundry-community/firehose-to-syslog/
+  - name: firehouse-to-sumologic-ci
+    path: gopath/src/bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/
   - name: version
 
 outputs:
-  - name: firehose-to-syslog-ci-build 
+  - name: firehouse-to-sumologic-ci-build 
 
 run:
-  path: gopath/src/github.com/cloudfoundry-community/firehose-to-syslog/ci/build-all/build-all
+  path: gopath/src/bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/ci/build-all/build-all
 params:
   VERSION_APP:

ci/pipeline.yml

@@ -1,6 +1,6 @@
 ---
 groups:
-  - name: firehose-to-syslog
+  - name: firehouse-to-sumologic
     jobs: 
     - unit-testing
     - downstream-master
@@ -24,59 +24,59 @@ jobs:
   public: true
   serial: true
   plan:
-   - get: firehose-to-syslog-ci 
-     resource: firehose-to-syslog-develop
+   - get: firehouse-to-sumologic-ci 
+     resource: firehouse-to-sumologic-develop
      trigger: true
    - task: unit-testing
-     file: firehose-to-syslog-ci/ci/unit-testing/unit-testing.yml
+     file: firehouse-to-sumologic-ci/ci/unit-testing/unit-testing.yml
 
 
 - name: unit-testing-master
   public: true
   serial: true
   plan:
-  - get: firehose-to-syslog-ci
-    resource: firehose-to-syslog-master 
+  - get: firehouse-to-sumologic-ci
+    resource: firehouse-to-sumologic-master 
     trigger: true
   - task: unit-testing
-    file: firehose-to-syslog-ci/ci/unit-testing/unit-testing.yml
+    file: firehouse-to-sumologic-ci/ci/unit-testing/unit-testing.yml
 
 
 - name: tag-master
   public: true
   serial: true
   plan:  
-  - get: firehose-to-syslog-ci
-    resource: firehose-to-syslog-master 
+  - get: firehouse-to-sumologic-ci
+    resource: firehouse-to-sumologic-master 
     passed: [unit-testing-master]
   - put: version
     params: {bump: minor}
-  - put: firehose-to-syslog-master 
+  - put: firehouse-to-sumologic-master 
     params: 
       only_tag: true
-      repository: firehose-to-syslog-ci
+      repository: firehouse-to-sumologic-ci
       tag: version/number
 
 
 - name: ship-it
   public: true
   serial: true
   plan:
-  - get: firehose-to-syslog-ci
-    resource: firehose-to-syslog-master 
+  - get: firehouse-to-sumologic-ci
+    resource: firehouse-to-sumologic-master 
     passed: [tag-master]
     trigger: true
   - get: version
   - task: build-binary
-    file: firehose-to-syslog-ci/ci/build-all/build-all.yml
+    file: firehouse-to-sumologic-ci/ci/build-all/build-all.yml
     params:
       VERSION_APP: version/number
   - put: gh-release
     params :
       name: version/number
       tag: version/number
       globs:
-      - firehose-to-syslog-ci-build/dist/*/*/*
+      - firehouse-to-sumologic-ci-build/dist/*/*/*
 
 
 
@@ -86,16 +86,16 @@ jobs:
   serial: true
   plan:
   - aggregate:
-    - get: firehose-to-syslog-ci
-      resource: firehose-to-syslog-develop
+    - get: firehouse-to-sumologic-ci
+      resource: firehouse-to-sumologic-develop
     - get: release-repo-master
-      resource: firehose-to-syslog-master 
+      resource: firehouse-to-sumologic-master 
       trigger: true
       passed: [tag-master]
     - get: release-repo
-      resource: firehose-to-syslog-merge-target
+      resource: firehouse-to-sumologic-merge-target
   - task: merge-master-to-develop
-    file: firehose-to-syslog-ci/ci/merge-master-to-develop/merge-master-to-develop.yml
+    file: firehouse-to-sumologic-ci/ci/merge-master-to-develop/merge-master-to-develop.yml
     params:
       GIT_USERNAME: {{github-username}}
       GIT_EMAIL:  {{github-email}}
@@ -104,24 +104,24 @@ jobs:
 
 
 resources:
-- name: firehose-to-syslog-merge-target
+- name: firehouse-to-sumologic-merge-target
   type: git
   source:
     branch: develop
     private_key: {{private-key-github-concourse}}
-    uri: git@github.com:cloudfoundry-community/firehose-to-syslog.git
+    uri: git@github.com:cloudfoundry-community/firehouse-to-sumologic.git
 
-- name: firehose-to-syslog-develop
+- name: firehouse-to-sumologic-develop
   type: git
   source:
-    uri: git@github.com:cloudfoundry-community/firehose-to-syslog.git
+    uri: git@github.com:cloudfoundry-community/firehouse-to-sumologic.git
     branch: develop
     private_key: {{private-key-github-concourse}}
 
-- name: firehose-to-syslog-master
+- name: firehouse-to-sumologic-master
   type: git
   source:
-    uri: git@github.com:cloudfoundry-community/firehose-to-syslog.git
+    uri: git@github.com:cloudfoundry-community/firehouse-to-sumologic.git
     branch: master
     private_key: {{private-key-github-concourse}}
 
@@ -131,14 +131,14 @@ resources:
   type: github-release
   source:
     user: cloudfoundry-community
-    repository: firehose-to-syslog
+    repository: firehouse-to-sumologic
     access_token: {{github-access-token}}
 
 - name: version
   type: semver-gwenn
   source:
     driver: git
-    uri: git@github.com:cloudfoundry-community/firehose-to-syslog.git
+    uri: git@github.com:cloudfoundry-community/firehouse-to-sumologic.git
     branch: version
     file: version
     private_key: {{private-key-github-concourse}}

ci/unit-testing/unit-testing

@@ -8,7 +8,7 @@ export PATH=$GOPATH/bin:$PATH
 go get github.com/onsi/ginkgo/ginkgo
 go get github.com/onsi/gomega
 
-cd $GOPATH/src/github.com/cloudfoundry-community/firehose-to-syslog/
+cd $GOPATH/src/bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/
 
 
 make test

ci/unit-testing/unit-testing.yml

@@ -7,9 +7,9 @@ image_resource:
     repository: getourneau/alpine-golang-bash
 
 inputs:
-  - name: firehose-to-syslog-ci
-    path: gopath/src/github.com/cloudfoundry-community/firehose-to-syslog/
+  - name: firehouse-to-sumologic-ci
+    path: gopath/src/bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/
 
 run:
-  path: gopath/src/github.com/cloudfoundry-community/firehose-to-syslog/ci/unit-testing/unit-testing
+  path: gopath/src/bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/ci/unit-testing/unit-testing
 

eventRouting/eventRouting_test.go

@@ -1,9 +1,9 @@
 package eventRouting_test
 
 import (
-	. "github.com/cloudfoundry-community/firehose-to-syslog/caching/cachingfakes"
-	. "github.com/cloudfoundry-community/firehose-to-syslog/eventRouting"
-	. "github.com/cloudfoundry-community/firehose-to-syslog/logging/loggingfakes"
+	. "bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/caching/cachingfakes"
+	. "bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/eventRouting"
+	. "bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/logging/loggingfakes"
 	. "github.com/cloudfoundry/sonde-go/events"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"

eventRouting/eventrouting.go

@@ -3,10 +3,10 @@ package eventRouting
 import (
 	"fmt"
 	"github.com/Sirupsen/logrus"
-	"github.com/cloudfoundry-community/firehose-to-syslog/caching"
-	fevents "github.com/cloudfoundry-community/firehose-to-syslog/events"
-	"github.com/cloudfoundry-community/firehose-to-syslog/extrafields"
-	"github.com/cloudfoundry-community/firehose-to-syslog/logging"
+	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/caching"
+	fevents "bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/events"
+	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/extrafields"
+	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/logging"
 	"github.com/cloudfoundry/sonde-go/events"
 	"os"
 	"sort"

events/events.go

@@ -3,8 +3,8 @@ package events
 import (
 	"fmt"
 	"github.com/Sirupsen/logrus"
-	"github.com/cloudfoundry-community/firehose-to-syslog/caching"
-	"github.com/cloudfoundry-community/firehose-to-syslog/utils"
+	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/caching"
+	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/utils"
 	"github.com/cloudfoundry/sonde-go/events"
 )